feat(nl-to-mquery): support type defensive search

XuHaoJun · Sep 26, 2024 · e70b887 · e70b887
1 parent a5dad9e
commit e70b887
Show file tree

Hide file tree

Showing 11 changed files with 194 additions and 32 deletions.
diff --git a/backend/backend/nl_to_mquery/myopenai.py b/backend/backend/nl_to_mquery/myopenai.py
@@ -38,6 +38,8 @@ def create_prompt(question: str) -> str:
   parts.append('3. Translated Mongodb Query, do not include db.*.find, just json, and do not include any description or explaintion.')
   parts.append('4. Should not duplicate key, put conditions to "$and" query')
   parts.append('5. Column "typesV2" is same thing to pokemon "types"')
+  parts.append('6. Pokemon has resitance(or strengths) to some attack types, is meaning column "typeDefensives" effective < 1 (include 0), else if weaknesses is effective > 1, effective == 1 is meaing no strengths or weaknesses')
+  parts.append('7. Someone ask 4x type resitance is meaning effective 0.25, 2x type resitance is meaning effective 0.5; 4x type weakness is meaning effective 4, 2x type weakness is meaning effective 2')
   parts.append('Translate this question into Mongodb Query:')
   parts.append(question)
   return '\n'.join(parts)

diff --git a/backend/backend/nl_to_mquery/pokedex.json b/backend/backend/nl_to_mquery/pokedex.json
@@ -52,6 +52,80 @@
     "nameDisplay": "Bulbasaur",
     "defaultFormNameDisplay": "",
     "typesV2": ["poison", "grass"],
+    "typeDefensives": [
+      {
+        "attackType": "normal",
+        "effective": 1
+      },
+      {
+        "attackType": "fighting",
+        "effective": 2
+      },
+      {
+        "attackType": "flying",
+        "effective": 4
+      },
+      {
+        "attackType": "poison",
+        "effective": 0
+      },
+      {
+        "attackType": "ground",
+        "effective": 0.25
+      },
+      {
+        "attackType": "rock",
+        "effective": 0.5 
+      },
+      {
+        "attackType": "bug",
+        "effective": 1
+      },
+      {
+        "attackType": "ghost",
+        "effective": 0
+      },
+      {
+        "attackType": "steel",
+        "effective": 1
+      },
+      {
+        "attackType": "fire",
+        "effective": 1
+      },
+      {
+        "attackType": "water",
+        "effective": 1
+      },
+      {
+        "attackType": "grass",
+        "effective": 1
+      },
+      {
+        "attackType": "electric",
+        "effective": 1
+      },
+      {
+        "attackType": "psychic",
+        "effective": 1
+      },
+      {
+        "attackType": "ice",
+        "effective": 1
+      },
+      {
+        "attackType": "dragon",
+        "effective": 1
+      },
+      {
+        "attackType": "dark",
+        "effective": 1
+      },
+      {
+        "attackType": "fairy",
+        "effective": 1
+      }
+    ],
     "abilities": [
       {
         "is_hidden": false,

diff --git a/src/app/[lang]/pokedex/OpenAISearch.tsx b/src/app/[lang]/pokedex/OpenAISearch.tsx
@@ -6,6 +6,7 @@ import { useLingui } from "@lingui/react"
 import { useQueryClient } from "@tanstack/react-query"
 import { Search } from "lucide-react"
 import * as R from "remeda"
+import sift from "sift"
 
 import { Button } from "@/components/ui/button"
 import { Input } from "@/components/ui/input"
@@ -40,19 +41,31 @@ export const OpenAISearch = ({ mquery, onChange }: OpenAISearchProps) => {
       msg`Fairy and Psychic dual-type with at least 125 Special Attack and 100 Special Defense, knowing Psychic or Moonblast.`,
       msg`Not a Fire-type, but can Flamethrower, Special Attack is at least 90, Speed is 80 or higher`,
       msg`Name contain "cat", Ability is "Intimidate"`,
+      msg`Have type resistance to fire, grass, fairy, fighting types, and have move that is ground type and special attack power is 70 or higher`,
     ],
     []
   )
 
   const queryClient = useQueryClient()
 
+  const siftError = React.useMemo<any>(() => {
+    if (query.data?.mquery) {
+      try {
+        sift(query.data?.mquery)
+      } catch (error) {
+        return error
+      }
+    }
+    return null
+  }, [query.data?.mquery])
+
   return (
     <div className="flex flex-col gap-2">
       <div className="flex items-center gap-1">
         <Input
           type="search"
+          className="min-h-[40px] md:max-w-[40%]"
           placeholder={i18n._(msg`Find pokemons by question...`)}
-          className="md:max-w-[40%]"
           value={question}
           onChange={(e) => {
             setEnableQuery(false)
@@ -80,7 +93,10 @@ export const OpenAISearch = ({ mquery, onChange }: OpenAISearchProps) => {
       {query.error && (
         <div className="text-red-500">{formatResponseError(query.error)}</div>
       )}
-      <div className="flex flex-wrap gap-1">
+      {!query.error && siftError && (
+        <div className="text-red-500">can not find pokemon</div>
+      )}
+      <div className="flex flex-wrap gap-3">
         {sampleQuestions.map((question, i) => (
           <Button
             key={`sampleQuestions[${i}]`}
@@ -90,6 +106,7 @@ export const OpenAISearch = ({ mquery, onChange }: OpenAISearchProps) => {
               setEnableQuery(true)
               setQuestion(i18n._(question))
             }}
+            disabled={query.isFetching}
           >
             <Search className="mr-2 h-4 w-4" />
             {i18n._(question)}

diff --git a/src/components/ui/textarea.tsx b/src/components/ui/textarea.tsx
@@ -0,0 +1,24 @@
+import * as React from "react"
+
+import { cn } from "@/lib/utils"
+
+export interface TextareaProps
+  extends React.TextareaHTMLAttributes<HTMLTextAreaElement> {}
+
+const Textarea = React.forwardRef<HTMLTextAreaElement, TextareaProps>(
+  ({ className, ...props }, ref) => {
+    return (
+      <textarea
+        className={cn(
+          "flex min-h-[80px] w-full rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50",
+          className
+        )}
+        ref={ref}
+        {...props}
+      />
+    )
+  }
+)
+Textarea.displayName = "Textarea"
+
+export { Textarea }
diff --git a/src/domain/pokemon.ts b/src/domain/pokemon.ts
@@ -81,6 +81,12 @@ export interface Pokemon2 extends Pokemon {
       >
     }
   >
+  typeDefensives: TypeDefensive[]
+}
+
+interface TypeDefensive {
+  attackType: string
+  effective: number
 }
 
 export interface PokemonAbilityFk2 extends PokemonAbilityFk {

diff --git a/src/locales/en.po b/src/locales/en.po
@@ -39,11 +39,11 @@ msgstr "Envolution"
 msgid "Export All"
 msgstr "Export All"
 
-#: src/app/[lang]/pokedex/OpenAISearch.tsx:40
+#: src/app/[lang]/pokedex/OpenAISearch.tsx:41
 msgid "Fairy and Psychic dual-type with at least 125 Special Attack and 100 Special Defense, knowing Psychic or Moonblast."
 msgstr "Fairy and Psychic dual-type with at least 125 Special Attack and 100 Special Defense, knowing Psychic or Moonblast."
 
-#: src/app/[lang]/pokedex/OpenAISearch.tsx:54
+#: src/app/[lang]/pokedex/OpenAISearch.tsx:68
 msgid "Find pokemons by question..."
 msgstr "Find pokemons by question..."
 
@@ -55,6 +55,10 @@ msgstr "Found <0>{0}</0> pokemons"
 msgid "gmax"
 msgstr "Gmax"
 
+#: src/app/[lang]/pokedex/OpenAISearch.tsx:45
+msgid "Have type resistance to fire, grass, fairy, fighting types, and have move that is ground type and special attack power is 70 or higher"
+msgstr "Have type resistance to fire, grass, fairy, fighting types, and have move that is ground type and special attack power is 70 or higher"
+
 #: src/app/[lang]/pokedex/[id]/PokemonDetailPage.tsx:151
 msgid "Hidden Ability"
 msgstr "Hidden Ability"
@@ -88,15 +92,15 @@ msgstr "Mega-X"
 msgid "mega-y"
 msgstr "Mega-Y"
 
-#: src/app/[lang]/pokedex/OpenAISearch.tsx:42
+#: src/app/[lang]/pokedex/OpenAISearch.tsx:43
 msgid "Name contain \"cat\", Ability is \"Intimidate\""
 msgstr "Name contain \"cat\", Ability is \"Intimidate\""
 
 #: src/components/CommandMenu.tsx:150
 msgid "No results found."
 msgstr "No results found."
 
-#: src/app/[lang]/pokedex/OpenAISearch.tsx:41
+#: src/app/[lang]/pokedex/OpenAISearch.tsx:42
 msgid "Not a Fire-type, but can Flamethrower, Special Attack is at least 90, Speed is 80 or higher"
 msgstr "Not a Fire-type, but can Flamethrower, Special Attack is at least 90, Speed is 80 or higher"
 

diff --git a/src/locales/ja.po b/src/locales/ja.po
@@ -39,11 +39,11 @@ msgstr ""
 msgid "Export All"
 msgstr ""
 
-#: src/app/[lang]/pokedex/OpenAISearch.tsx:40
+#: src/app/[lang]/pokedex/OpenAISearch.tsx:41
 msgid "Fairy and Psychic dual-type with at least 125 Special Attack and 100 Special Defense, knowing Psychic or Moonblast."
 msgstr ""
 
-#: src/app/[lang]/pokedex/OpenAISearch.tsx:54
+#: src/app/[lang]/pokedex/OpenAISearch.tsx:68
 msgid "Find pokemons by question..."
 msgstr ""
 
@@ -55,6 +55,10 @@ msgstr ""
 msgid "gmax"
 msgstr ""
 
+#: src/app/[lang]/pokedex/OpenAISearch.tsx:45
+msgid "Have type resistance to fire, grass, fairy, fighting types, and have move that is ground type and special attack power is 70 or higher"
+msgstr ""
+
 #: src/app/[lang]/pokedex/[id]/PokemonDetailPage.tsx:151
 msgid "Hidden Ability"
 msgstr ""
@@ -88,15 +92,15 @@ msgstr ""
 msgid "mega-y"
 msgstr ""
 
-#: src/app/[lang]/pokedex/OpenAISearch.tsx:42
+#: src/app/[lang]/pokedex/OpenAISearch.tsx:43
 msgid "Name contain \"cat\", Ability is \"Intimidate\""
 msgstr ""
 
 #: src/components/CommandMenu.tsx:150
 msgid "No results found."
 msgstr ""
 
-#: src/app/[lang]/pokedex/OpenAISearch.tsx:41
+#: src/app/[lang]/pokedex/OpenAISearch.tsx:42
 msgid "Not a Fire-type, but can Flamethrower, Special Attack is at least 90, Speed is 80 or higher"
 msgstr ""
 

diff --git a/src/locales/ko.po b/src/locales/ko.po
@@ -39,11 +39,11 @@ msgstr ""
 msgid "Export All"
 msgstr ""
 
-#: src/app/[lang]/pokedex/OpenAISearch.tsx:40
+#: src/app/[lang]/pokedex/OpenAISearch.tsx:41
 msgid "Fairy and Psychic dual-type with at least 125 Special Attack and 100 Special Defense, knowing Psychic or Moonblast."
 msgstr ""
 
-#: src/app/[lang]/pokedex/OpenAISearch.tsx:54
+#: src/app/[lang]/pokedex/OpenAISearch.tsx:68
 msgid "Find pokemons by question..."
 msgstr ""
 
@@ -55,6 +55,10 @@ msgstr ""
 msgid "gmax"
 msgstr ""
 
+#: src/app/[lang]/pokedex/OpenAISearch.tsx:45
+msgid "Have type resistance to fire, grass, fairy, fighting types, and have move that is ground type and special attack power is 70 or higher"
+msgstr ""
+
 #: src/app/[lang]/pokedex/[id]/PokemonDetailPage.tsx:151
 msgid "Hidden Ability"
 msgstr ""
@@ -88,15 +92,15 @@ msgstr ""
 msgid "mega-y"
 msgstr ""
 
-#: src/app/[lang]/pokedex/OpenAISearch.tsx:42
+#: src/app/[lang]/pokedex/OpenAISearch.tsx:43
 msgid "Name contain \"cat\", Ability is \"Intimidate\""
 msgstr ""
 
 #: src/components/CommandMenu.tsx:150
 msgid "No results found."
 msgstr ""
 
-#: src/app/[lang]/pokedex/OpenAISearch.tsx:41
+#: src/app/[lang]/pokedex/OpenAISearch.tsx:42
 msgid "Not a Fire-type, but can Flamethrower, Special Attack is at least 90, Speed is 80 or higher"
 msgstr ""
 

diff --git a/src/locales/zh-Hans.po b/src/locales/zh-Hans.po
@@ -39,11 +39,11 @@ msgstr ""
 msgid "Export All"
 msgstr ""
 
-#: src/app/[lang]/pokedex/OpenAISearch.tsx:40
+#: src/app/[lang]/pokedex/OpenAISearch.tsx:41
 msgid "Fairy and Psychic dual-type with at least 125 Special Attack and 100 Special Defense, knowing Psychic or Moonblast."
 msgstr ""
 
-#: src/app/[lang]/pokedex/OpenAISearch.tsx:54
+#: src/app/[lang]/pokedex/OpenAISearch.tsx:68
 msgid "Find pokemons by question..."
 msgstr ""
 
@@ -55,6 +55,10 @@ msgstr ""
 msgid "gmax"
 msgstr ""
 
+#: src/app/[lang]/pokedex/OpenAISearch.tsx:45
+msgid "Have type resistance to fire, grass, fairy, fighting types, and have move that is ground type and special attack power is 70 or higher"
+msgstr ""
+
 #: src/app/[lang]/pokedex/[id]/PokemonDetailPage.tsx:151
 msgid "Hidden Ability"
 msgstr ""
@@ -88,15 +92,15 @@ msgstr ""
 msgid "mega-y"
 msgstr ""
 
-#: src/app/[lang]/pokedex/OpenAISearch.tsx:42
+#: src/app/[lang]/pokedex/OpenAISearch.tsx:43
 msgid "Name contain \"cat\", Ability is \"Intimidate\""
 msgstr ""
 
 #: src/components/CommandMenu.tsx:150
 msgid "No results found."
 msgstr ""
 
-#: src/app/[lang]/pokedex/OpenAISearch.tsx:41
+#: src/app/[lang]/pokedex/OpenAISearch.tsx:42
 msgid "Not a Fire-type, but can Flamethrower, Special Attack is at least 90, Speed is 80 or higher"
 msgstr ""