From 03bdca0958f791521074b240f16f1a1bfee664c5 Mon Sep 17 00:00:00 2001
From: kwaroran <amasio1234@proton.me>
Date: Sat, 7 Dec 2024 03:20:45 +0900
Subject: [PATCH] Remove unused Plugin button from ModelList and update model
 parameters for Gemini Exp 1206; adjust URL generation logic in request
 functions.

---
 src/lib/UI/ModelList.svelte          | 3 ---
 src/ts/model/modellist.ts            | 8 ++++++++
 src/ts/process/models/modelString.ts | 2 +-
 src/ts/process/request.ts            | 4 ++--
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/lib/UI/ModelList.svelte b/src/lib/UI/ModelList.svelte
index bf2da255..a030a8b6 100644
--- a/src/lib/UI/ModelList.svelte
+++ b/src/lib/UI/ModelList.svelte
@@ -72,9 +72,6 @@
                     {/each}
                 {/await}
             </Arcodion>
-            {#if DBState.db.plugins.length > 0}
-                <button onclick={() => {changeModel('custom')}} class="hover:bg-selected px-6 py-2 text-lg" >Plugin</button>
-            {/if}
             <div class="text-textcolor2 text-xs">
                 <CheckInput name={language.showUnrecommended}  grayText bind:check={showUnrec}/>
             </div>
diff --git a/src/ts/model/modellist.ts b/src/ts/model/modellist.ts
index 5428b02d..3a8ad319 100644
--- a/src/ts/model/modellist.ts
+++ b/src/ts/model/modellist.ts
@@ -695,6 +695,14 @@ export const LLMModels: LLMModel[] = [
         provider: LLMProvider.GoogleCloud,
         format: LLMFormat.GoogleCloud,
         flags: [LLMFlags.hasImageInput, LLMFlags.hasFirstSystemPrompt],
+        parameters: ['temperature', 'top_k', 'top_p']
+    },
+    {
+        name: "Gemini Exp 1206",
+        id: 'gemini-exp-1206',
+        provider: LLMProvider.GoogleCloud,
+        format: LLMFormat.GoogleCloud,
+        flags: [LLMFlags.hasImageInput, LLMFlags.hasFirstSystemPrompt],
         recommended: true,
         parameters: ['temperature', 'top_k', 'top_p']
     },
diff --git a/src/ts/process/models/modelString.ts b/src/ts/process/models/modelString.ts
index 6727cb28..40e72d9f 100644
--- a/src/ts/process/models/modelString.ts
+++ b/src/ts/process/models/modelString.ts
@@ -4,7 +4,7 @@ export function getGenerationModelString(){
     const db = getDatabase()
     switch (db.aiModel){
         case 'reverse_proxy':
-            return 'reverse_proxy-' + (db.reverseProxyOobaMode ? 'ooba' : db.proxyRequestModel)
+            return 'custom-' + (db.reverseProxyOobaMode ? 'ooba' : db.customProxyRequestModel)
         case 'openrouter':
             return 'openrouter-' + db.openrouterRequestModel
         default:
diff --git a/src/ts/process/request.ts b/src/ts/process/request.ts
index 17568743..47c6a11e 100644
--- a/src/ts/process/request.ts
+++ b/src/ts/process/request.ts
@@ -1580,7 +1580,7 @@ async function requestGoogleCloudVertex(arg:RequestDataArgumentExtended):Promise
 
     const url = arg.customURL ?? (arg.modelInfo.format === LLMFormat.VertexAIGemini ?
         `https://${REGION}-aiplatform.googleapis.com/v1/projects/${PROJECT_ID}/locations/us-central1/publishers/google/models/${arg.modelInfo.internalID}:streamGenerateContent`
-        : `https://generativelanguage.googleapis.com/v1beta/models/${arg.modelInfo.internalID}:generateContent?key=${db.google.accessToken}`)
+        : `https://generativelanguage.googleapis.com/v1beta/models/${arg.modelInfo.internalID}:generateContent?key=${(arg.aiModel === 'reverse_proxy') ?  db.proxyKey : db.google.accessToken}`)
     const res = await globalFetch(url, {
         headers: headers,
         body: body,
@@ -2533,7 +2533,7 @@ async function requestWebLLM(arg:RequestDataArgumentExtended):Promise<requestDat
         top_p: db.ooba.top_p,
         repetition_penalty: db.ooba.repetition_penalty,
         typical_p: db.ooba.typical_p,
-    })
+    } as any)
     return {
         type: 'success',
         result: unstringlizeChat(v.generated_text as string, formated, currentChar?.name ?? '')