fix: promptContext crash #1420 (#1422)

Opla · Dec 16, 2024 · 30c62c3 · 30c62c3
1 parent c42caf1
commit 30c62c3
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 15 deletions.
diff --git a/webapp/features/Threads/Prompt/PromptContext.tsx b/webapp/features/Threads/Prompt/PromptContext.tsx
@@ -161,12 +161,14 @@ function PromptProvider({
         );
         if (text && text.length > 0) {
           const response = await tokenize(activeService, text);
-          updateUsage({
-            conversationId: selectedConversation?.id,
-            text,
-            tokenCount: response?.tokens.length || 0,
-            activeService,
-          });
+          if (response) {
+            updateUsage({
+              conversationId: selectedConversation?.id,
+              text,
+              tokenCount: response?.tokens.length || 0,
+              activeService,
+            });
+          }
         } else {
           updateUsage({
             conversationId: selectedConversation?.id,

diff --git a/webapp/utils/providers/index.ts b/webapp/utils/providers/index.ts
@@ -28,22 +28,24 @@ import { CommandManager } from '../commands/types';
 import { invokeTauri } from '../backend/tauri';
 import { mapKeys } from '../data';
 import { /* toCamelCase, */ toCamelCase, toSnakeCase } from '../string';
-// import logger from '../logger';
+import logger from '../logger';
 
 export const tokenize = async (
   activeService: AIImplService,
   text: string,
 ): Promise<LlmTokenizeResponse | undefined> => {
   const { provider, model } = activeService;
-  let response: LlmTokenizeResponse;
+  let response: LlmTokenizeResponse | undefined;
   if (model && provider) {
-    response = await invokeTauri<LlmTokenizeResponse>('llm_call_tokenize', {
-      model: model.name,
-      provider: mapKeys(provider, toSnakeCase),
-      text,
-    });
-  } else {
-    return undefined;
+    try {
+      response = await invokeTauri<LlmTokenizeResponse>('llm_call_tokenize', {
+        model: model.name,
+        provider: mapKeys(provider, toSnakeCase),
+        text,
+      });
+    } catch (e) {
+      logger.error('tokenizer: ', e);
+    }
   }
   return response;
 };