Merge from Dev (#119)

This commit is contained in:
kwaroran
2023-05-27 03:51:55 +09:00
committed by GitHub
2 changed files with 8 additions and 4 deletions

View File

@@ -29,7 +29,7 @@ async function drive(request, env){
const json = await resp.json() const json = await resp.json()
if(json.access_token && json.expires_in){ if(json.access_token && json.expires_in){
return new Response(json, { return new Response(JSON.stringify(json), {
status: 200, status: 200,
headers: headerE headers: headerE
}) })

View File

@@ -37,6 +37,7 @@ export async function requestChatData(arg:requestDataArgument, model:'model'|'su
if(da.type === 'success' || da.type === 'streaming' || da.noRetry){ if(da.type === 'success' || da.type === 'streaming' || da.noRetry){
return da return da
} }
trys += 1 trys += 1
if(trys > db.requestRetrys){ if(trys > db.requestRetrys){
return da return da
@@ -423,8 +424,8 @@ export async function requestChatDataMain(arg:requestDataArgument, model:'model'
case "kobold":{ case "kobold":{
const proompt = stringlizeChat(formated, currentChar?.name ?? '') const proompt = stringlizeChat(formated, currentChar?.name ?? '')
const url = new URL(db.koboldURL) const url = new URL(db.koboldURL)
url.pathname = '/generate' url.pathname = 'api/v1/generate'
const da = await fetch(url, { const da = await fetch(url, {
method: "POST", method: "POST",
body: JSON.stringify({ body: JSON.stringify({
@@ -446,7 +447,10 @@ export async function requestChatDataMain(arg:requestDataArgument, model:'model'
} }
const data = await da.json() const data = await da.json()
return data.results[0].text return {
type: 'success',
result: data.results[0].text
}
} }
default:{ default:{
if(aiModel.startsWith("horde:::")){ if(aiModel.startsWith("horde:::")){