Add multiple languages to ocr, try catch gpt

teresuki · Apr 7, 2023 · b9fad20 · b9fad20
1 parent 4b0535c
commit b9fad20
Show file tree

Hide file tree

Showing 9 changed files with 126 additions and 40 deletions.
diff --git a/dist/commands/gpt.js b/dist/commands/gpt.js
diff --git a/dist/commands/gpt.js.map b/dist/commands/gpt.js.map
diff --git a/dist/commands/ocr.js b/dist/commands/ocr.js
diff --git a/dist/commands/ocr.js.map b/dist/commands/ocr.js.map
diff --git a/dist/slash_commands.js b/dist/slash_commands.js
diff --git a/dist/slash_commands.js.map b/dist/slash_commands.js.map
diff --git a/ts/commands/gpt.ts b/ts/commands/gpt.ts
@@ -22,20 +22,25 @@ export default async function gpt(interaction: ChatInputCommandInteraction) {
 }
 
 async function getChatGPTResponse(query: string): Promise<string> {
-  const response = await axios.post(
-    CHAT_GPT_CHAT_URL,
-    {
-      model: 'gpt-3.5-turbo',
-      messages: [{role: 'user', content: query}],
-    },
-    {
-      headers: {
-        'Content-Type': 'application/json',
-        Authorization: `Bearer ${OPENAI_API_KEY}`,
+  try {
+    const response = await axios.post(
+      CHAT_GPT_CHAT_URL,
+      {
+        model: 'gpt-3.5-turbo',
+        messages: [{role: 'user', content: query}],
       },
-    }
-  );
-  console.log(response.data.choices);
-  const content = response.data.choices[0].message.content;
-  return content;
+      {
+        headers: {
+          'Content-Type': 'application/json',
+          Authorization: `Bearer ${OPENAI_API_KEY}`,
+        },
+      }
+    );
+    console.log(response.data.choices);
+    const content = response.data.choices[0].message.content;
+    return content;
+  } catch (error) {
+    console.log('> Error', error);
+    return 'Can not call ChatGPT now, please try again later.';
+  }
 }
diff --git a/ts/commands/ocr.ts b/ts/commands/ocr.ts
@@ -13,16 +13,25 @@ export default async function (msg: Message, tokens: any) {
 export async function ocr(interaction: ChatInputCommandInteraction) {
   await interaction.deferReply();
   interaction.followUp('OCR with OCR Space...');
-  var image = interaction.options.get('image');
+  const image = interaction.options.get('image');
+  var language = 'eng';
+  try {
+    language = interaction.options.get('language')!.value as string;
+  } catch (error) {
+    console.log('> Error', error);
+  }
   console.log(image);
   const imageUrl = image?.attachment?.url as string;
-  const text = await getOcrText(imageUrl);
+  const text = await getOcrText(imageUrl, language);
   interaction.editReply(text);
 }
 
-async function getOcrText(imageUrl: string): Promise<string> {
-  const ocrUrl = `${OCR_SPACE_IMAGEURL_URL}?apikey=${OCR_SPACE_API_KEY}&url=${imageUrl}&isOverlayRequired=true&iscreatesearchablepdf=true&issearchablepdfhidetextlayer=true`;
-  // const response = await fetch(ocrUrl);
+async function getOcrText(imageUrl: string, language: string): Promise<string> {
+  var ocrUrl = '';
+  ocrUrl = `${OCR_SPACE_IMAGEURL_URL}?apikey=${OCR_SPACE_API_KEY}&url=${imageUrl}&isOverlayRequired=true&iscreatesearchablepdf=true&issearchablepdfhidetextlayer=true&language=${language}`;
+  if (language === 'vie') {
+    ocrUrl += `&OCREngine=3`;
+  }
   try {
     const response = await axios.get(ocrUrl);
     const text = response.data.ParsedResults[0].ParsedText as string;