mincomk/risuai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[feat] gemini non-vertex support

Browse Source
This commit is contained in:
kwaroran
2023-12-21 13:39:00 +09:00
parent bb8d7506f3
commit 438ab1349c
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/lib/Setting/Pages/BotSettings.svelte
View File

@@ -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>

16
src/ts/process/request.ts
View File

@@ -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"
if(PROJECT_ID !== 'aigoogle'){
headers['Authorization'] = "Bearer " + db.google.accessToken
}
const url = `https://${REGION}-aiplatform.googleapis.com/v1/projects/${PROJECT_ID}/locations/us-central1/publishers/google/models/${aiModel}:streamGenerateContent`
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,
})