From 438ab1349c09f0d2fd9ed487112b061b82f84555 Mon Sep 17 00:00:00 2001
From: kwaroran <kwaworan@gmail.com>
Date: Thu, 21 Dec 2023 13:39:00 +0900
Subject: [PATCH] [feat] gemini non-vertex support

---
 src/lib/Setting/Pages/BotSettings.svelte | 15 +++++++++++++--
 src/ts/process/request.ts                | 18 +++++++++---------
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/lib/Setting/Pages/BotSettings.svelte b/src/lib/Setting/Pages/BotSettings.svelte
index 7ead5cca..befc2f33 100644
--- a/src/lib/Setting/Pages/BotSettings.svelte
+++ b/src/lib/Setting/Pages/BotSettings.svelte
@@ -119,8 +119,19 @@
     <span class="text-textcolor">Google Bearer Token</span>
     <TextInput marginBottom={true} size={"sm"} placeholder="..." bind:value={$DataBase.google.accessToken}/>
 
-    <span class="text-textcolor">Google Project ID</span>
-    <TextInput marginBottom={true} size={"sm"} placeholder="..." bind:value={$DataBase.google.projectId}/>
+    {#if $DataBase.google.projectId !== 'aigoogle'}
+        <span class="text-textcolor">Google Project ID</span>
+        <TextInput marginBottom={true} size={"sm"} placeholder="..." bind:value={$DataBase.google.projectId}/>
+    {/if}
+
+    <Check check={$DataBase.google.projectId !== 'aigoogle'} className="mb-2" name={'Use Vertex AI'} onChange={(v) => {
+        if(!v){
+            $DataBase.google.projectId = 'aigoogle'
+        }
+        else{
+            $DataBase.google.projectId = ''
+        }
+    }}/>
 {/if}
 {#if $DataBase.aiModel.startsWith('novellist') || $DataBase.subModel.startsWith('novellist')}
     <span class="text-textcolor">NovelList {language.apiKey}</span>
diff --git a/src/ts/process/request.ts b/src/ts/process/request.ts
index da158ea6..b243de1d 100644
--- a/src/ts/process/request.ts
+++ b/src/ts/process/request.ts
@@ -1169,19 +1169,19 @@ export async function requestChatDataMain(arg:requestDataArgument, model:'model'
                 safetySettings: uncensoredCatagory
             }
 
+            let headers:{[key:string]:string} = {}
 
             const PROJECT_ID=db.google.projectId
-            const MODEL_ID= aiModel === 'palm2' ? 'text-bison' :
-                                        'palm2_unicorn' ? 'text-unicorn' : 
-                                        ''
             const REGION="us-central1"
-            
-            const url = `https://${REGION}-aiplatform.googleapis.com/v1/projects/${PROJECT_ID}/locations/us-central1/publishers/google/models/${aiModel}:streamGenerateContent`
+            if(PROJECT_ID !== 'aigoogle'){
+                headers['Authorization'] = "Bearer " + db.google.accessToken
+            }
+
+            const url = PROJECT_ID !== 'aigoogle' ?
+                `https://${REGION}-aiplatform.googleapis.com/v1/projects/${PROJECT_ID}/locations/us-central1/publishers/google/models/${aiModel}:streamGenerateContent`
+                : `https://generativelanguage.googleapis.com/v1beta/models/${aiModel}:generateContent?key=${db.google.accessToken}`
             const res = await globalFetch(url, {
-                headers: {
-                    "Content-Type": "application/json",
-                    "Authorization": "Bearer " + db.google.accessToken
-                },
+                headers: headers,
                 body: body,
             })