Merge pull request #301 from xmliszt/preview

Fix error message and lift safety setting for conversation generation
xmliszt · Feb 20, 2024 · 74ba193 · 74ba193
2 parents 3f214e7 + 809d91e
commit 74ba193
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 29 deletions.
diff --git a/app/ai/page.tsx b/app/ai/page.tsx
@@ -54,7 +54,8 @@ export default function AiPage() {
           const googleError = tryParseErrorAsGoogleAIError(error, 'topic-generation');
           setErrorMessage(googleError.message);
         } catch (error) {
-          setErrorMessage(error.message ?? 'Something went wrong.');
+          console.error(error);
+          setErrorMessage('Something went wrong. Please try again!');
         }
       } finally {
         setIsLoading(false);

diff --git a/app/level/[id]/level-page-client-wrapper.tsx b/app/level/[id]/level-page-client-wrapper.tsx
@@ -27,7 +27,6 @@ import { Input } from '@/components/ui/input';
 import { Label } from '@/components/ui/label';
 import { Progress } from '@/components/ui/progress';
 import { CONSTANTS } from '@/lib/constants';
-import { tryParseErrorAsGoogleAIError } from '@/lib/errors/google-ai-error-parser';
 import { HASH } from '@/lib/hash';
 import { getPersistence, setPersistence } from '@/lib/persistence/persistence';
 import { fetchWord } from '@/lib/services/wordService';
@@ -251,27 +250,16 @@ export function LevelPageClientWrapper(props: LevelWordsProviderProps) {
           await generateConversationFromAI(inputConversation);
         setConversation(newConversation);
       } catch (error) {
-        try {
-          const googleError = tryParseErrorAsGoogleAIError(error, 'conversation');
-          setConversation([
-            ...inputConversation,
-            {
-              role: 'error',
-              content: googleError.message,
-              timestamp: new Date().toISOString(),
-            },
-          ]);
-        } catch (error) {
-          console.error(error);
-          setConversation([
-            ...inputConversation,
-            {
-              role: 'error',
-              content: error.message ?? CONSTANTS.errors.overloaded,
-              timestamp: new Date().toISOString(),
-            },
-          ]);
-        }
+        console.error(error);
+        setConversation([
+          ...inputConversation,
+          {
+            role: 'error',
+            content:
+              "Oops! I encountered a technical issue and I'm unable to continue the conversation right now. Please try again later!",
+            timestamp: new Date().toISOString(),
+          },
+        ]);
       } finally {
         setIsWaitingForAIResponse(false);
         setIsLoading(false);

diff --git a/app/level/[id]/server/generate-conversation-from-ai.ts b/app/level/[id]/server/generate-conversation-from-ai.ts
@@ -4,7 +4,7 @@ import 'server-only';
 
 import { cookies } from 'next/headers';
 
-import { googleGeminiPro } from '@/lib/google-ai';
+import { googleGeminiPro, SAFETY_SETTINGS } from '@/lib/google-ai';
 
 /**
  * Generate conversations from AI.
@@ -46,6 +46,7 @@ export async function generateConversationFromAI(
     generationConfig: {
       maxOutputTokens: 100,
     },
+    safetySettings: SAFETY_SETTINGS,
   });
   if (!userMessage) throw new Error('Missing user message');
   const completion = await chat.sendMessage(userMessage);

diff --git a/lib/google-ai.ts b/lib/google-ai.ts
@@ -12,21 +12,21 @@ export const googleGeminiPro = googleAI.getGenerativeModel({
   model: 'gemini-pro',
 });
 
-export const HIGH_SAFETY_SETTINGS: SafetySetting[] = [
+export const SAFETY_SETTINGS: SafetySetting[] = [
   {
     category: HarmCategory.HARM_CATEGORY_DANGEROUS_CONTENT,
-    threshold: HarmBlockThreshold.BLOCK_LOW_AND_ABOVE,
+    threshold: HarmBlockThreshold.BLOCK_NONE,
   },
   {
     category: HarmCategory.HARM_CATEGORY_HARASSMENT,
-    threshold: HarmBlockThreshold.BLOCK_LOW_AND_ABOVE,
+    threshold: HarmBlockThreshold.BLOCK_NONE,
   },
   {
     category: HarmCategory.HARM_CATEGORY_HATE_SPEECH,
-    threshold: HarmBlockThreshold.BLOCK_LOW_AND_ABOVE,
+    threshold: HarmBlockThreshold.BLOCK_NONE,
   },
   {
     category: HarmCategory.HARM_CATEGORY_SEXUALLY_EXPLICIT,
-    threshold: HarmBlockThreshold.BLOCK_LOW_AND_ABOVE,
+    threshold: HarmBlockThreshold.BLOCK_NONE,
   },
 ];