From 675c11db34362e93ade6f868bba3b7068be242cf Mon Sep 17 00:00:00 2001
From: Jazee6 <jmzzzcn@gmail.com>
Date: Sun, 23 Jun 2024 10:51:30 +0800
Subject: [PATCH] feat: Gemini 1.5 Pro

---
 Dockerfile                     |  6 +++---
 components/ChatList.vue        |  3 ++-
 nuxt.config.ts                 | 13 -------------
 package.json                   |  2 +-
 server/api/auth/gemini.post.ts | 25 ++++++++++++++++++++++---
 utils/db.ts                    |  6 ++++++
 6 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f4dfa9d..3d6f891 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,11 +4,11 @@ WORKDIR /app
 
 EXPOSE 3000
 
-RUN npm i -g pnpm@9.1.4
+RUN npm i -g pnpm
 
-COPY package.json ./
+ADD package.json pnpm-lock.yaml ./
 
-COPY patches ./patches
+ADD patches ./patches
 
 RUN pnpm install
 
diff --git a/components/ChatList.vue b/components/ChatList.vue
index 25071b0..df67030 100644
--- a/components/ChatList.vue
+++ b/components/ChatList.vue
@@ -39,7 +39,8 @@ const md: MarkdownIt = markdownit({
           </li>
         </template>
         <template v-else>
-          <li v-if="i.type === 'text'" v-html="md.render(i.content)" class="assistant chat-item assistant-text prose"
+          <li v-if="i.type === 'text'" v-html="md.render(i.content)"
+              class="assistant chat-item assistant-text prose prose-pre:break-words prose-pre:whitespace-pre-wrap"
               :class="index+1===history.length && loading ?  'loading':''"/>
           <li v-else-if="i.type === 'image'" class="assistant image-item">
             <template v-for="img_url in i.src_url" :key="img_url">
diff --git a/nuxt.config.ts b/nuxt.config.ts
index a53cc91..1aa7ac4 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -33,19 +33,6 @@ export default defineNuxtConfig({
             ]
         }
     },
-    vite: {
-        build: {
-            rollupOptions: {
-                output: {
-                    manualChunks: (id) => {
-                        if (id.includes('node_modules')) {
-                            return 'vendor'
-                        }
-                    }
-                }
-            }
-        }
-    },
     i18n: {
         vueI18n: './i18n.config.ts',
         strategy: 'no_prefix',
diff --git a/package.json b/package.json
index bfe1845..aea9197 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cloudflare-ai-web",
-  "version": "3.0.2",
+  "version": "3.1.0",
   "private": true,
   "type": "module",
   "scripts": {
diff --git a/server/api/auth/gemini.post.ts b/server/api/auth/gemini.post.ts
index 11ef318..9d2f99c 100644
--- a/server/api/auth/gemini.post.ts
+++ b/server/api/auth/gemini.post.ts
@@ -1,4 +1,4 @@
-import {GoogleGenerativeAI} from '@google/generative-ai'
+import {GoogleGenerativeAI, HarmBlockThreshold, HarmCategory, SafetySetting} from '@google/generative-ai'
 import {headers} from '~/utils/helper';
 import {OpenAIMessage} from "~/utils/types";
 
@@ -10,7 +10,7 @@ export default defineEventHandler(async (event) => {
     const messages: OpenAIMessage[] = JSON.parse(<string>body.get('messages'))
     const files = body.getAll('files') as File[]
 
-    const m = genAI.getGenerativeModel({model})
+    const m = genAI.getGenerativeModel({model, safetySettings})
     let msg = messages.slice(1)
 
     let res
@@ -59,4 +59,23 @@ async function fileToGenerativePart(file: File) {
             mimeType: file.type,
         },
     };
-}
\ No newline at end of file
+}
+
+const safetySettings: SafetySetting[] = [
+    {
+        category: HarmCategory.HARM_CATEGORY_HARASSMENT,
+        threshold: HarmBlockThreshold.BLOCK_NONE,
+    },
+    {
+        category: HarmCategory.HARM_CATEGORY_HATE_SPEECH,
+        threshold: HarmBlockThreshold.BLOCK_NONE,
+    },
+    {
+        category: HarmCategory.HARM_CATEGORY_SEXUALLY_EXPLICIT,
+        threshold: HarmBlockThreshold.BLOCK_NONE,
+    },
+    {
+        category: HarmCategory.HARM_CATEGORY_DANGEROUS_CONTENT,
+        threshold: HarmBlockThreshold.BLOCK_NONE,
+    },
+]
diff --git a/utils/db.ts b/utils/db.ts
index ea75b1f..e7b8dd8 100644
--- a/utils/db.ts
+++ b/utils/db.ts
@@ -73,6 +73,12 @@ export const uniModals: Model[] = [
         name: 'Gemini 1.5 flash',
         provider: 'google',
         type: 'universal'
+    },
+    {
+        id: 'gemini-1.5-pro',
+        name: 'Gemini 1.5 Pro',
+        provider: 'google',
+        type: 'universal'
     }
 ]