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

feat: add image translation feature and enhance regex list functionality

Browse Source
This commit is contained in:
Kwaroran
2024-12-27 15:51:29 +09:00
parent c5f5786af7
commit 191be6d5c1
12 changed files with 376 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,7 +19,7 @@ import {createParser} from 'eventsource-parser'
import {Ollama} from 'ollama/dist/browser.mjs'
import { applyChatTemplate } from "./templates/chatTemplate";
import { OobaParams } from "./prompt";
import { extractJSON, getOpenAIJSONSchema } from "./templates/jsonSchema";
import { extractJSON, getGeneralJSONSchema, getOpenAIJSONSchema } from "./templates/jsonSchema";
import { getModelInfo, LLMFlags, LLMFormat, type LLMModel } from "../model/modellist";
@@ -39,6 +39,8 @@ interface requestDataArgument{
continue?:boolean
chatId?:string
noMultiGen?:boolean
schema?:string
extractJson?:string
}
interface RequestDataArgumentExtended extends requestDataArgument{
@@ -357,6 +359,7 @@ export async function requestChatDataMain(arg:requestDataArgument, model:ModelMo
targ.abortSignal = abortSignal
targ.modelInfo = getModelInfo(targ.aiModel)
targ.mode = model
targ.extractJson = arg.extractJson ?? db.extractJson
if(targ.aiModel === 'reverse_proxy'){
targ.modelInfo.internalID = db.customProxyRequestModel
targ.modelInfo.format = db.customAPIFormat
@@ -694,10 +697,10 @@ async function requestOpenAI(arg:RequestDataArgumentExtended):Promise<requestDat
body.seed = db.generationSeed
}
if(db.jsonSchemaEnabled){
if(db.jsonSchemaEnabled || arg.schema){
body.response_format = {
"type": "json_schema",
"json_schema": getOpenAIJSONSchema()
"json_schema": getOpenAIJSONSchema(arg.schema)
}
}
@@ -862,9 +865,9 @@ async function requestOpenAI(arg:RequestDataArgumentExtended):Promise<requestDat
try {
const rawChunk = data.replace("data: ", "")
if(rawChunk === "[DONE]"){
if(db.extractJson && db.jsonSchemaEnabled){
if(arg.extractJson && (db.jsonSchemaEnabled || arg.schema)){
for(const key in readed){
const extracted = extractJSON(readed[key], db.extractJson)
const extracted = extractJSON(readed[key], arg.extractJson)
JSONreaded[key] = extracted
}
console.log(JSONreaded)
@@ -897,9 +900,9 @@ async function requestOpenAI(arg:RequestDataArgumentExtended):Promise<requestDat
} catch (error) {}
}
}
if(db.extractJson && db.jsonSchemaEnabled){
if(arg.extractJson && (db.jsonSchemaEnabled || arg.schema)){
for(const key in readed){
const extracted = extractJSON(readed[key], db.extractJson)
const extracted = extractJSON(readed[key], arg.extractJson)
JSONreaded[key] = extracted
}
console.log(JSONreaded)
@@ -974,12 +977,12 @@ async function requestOpenAI(arg:RequestDataArgumentExtended):Promise<requestDat
if(res.ok){
try {
if(arg.multiGen && dat.choices){
if(db.extractJson && db.jsonSchemaEnabled){
if(arg.extractJson && (db.jsonSchemaEnabled || arg.schema)){
const c = dat.choices.map((v:{
message:{content:string}
}) => {
const extracted = extractJSON(v.message.content, db.extractJson)
const extracted = extractJSON(v.message.content, arg.extractJson)
return ["char",extracted]
})
@@ -999,10 +1002,10 @@ async function requestOpenAI(arg:RequestDataArgumentExtended):Promise<requestDat
}
if(dat?.choices[0]?.text){
if(db.extractJson && db.jsonSchemaEnabled){
if(arg.extractJson && (db.jsonSchemaEnabled || arg.schema)){
try {
const parsed = JSON.parse(dat.choices[0].text)
const extracted = extractJSON(parsed, db.extractJson)
const extracted = extractJSON(parsed, arg.extractJson)
return {
type: 'success',
result: extracted
@@ -1020,10 +1023,10 @@ async function requestOpenAI(arg:RequestDataArgumentExtended):Promise<requestDat
result: dat.choices[0].text
}
}
if(db.extractJson && db.jsonSchemaEnabled){
if(arg.extractJson && (db.jsonSchemaEnabled || arg.schema)){
return {
type: 'success',
result: extractJSON(dat.choices[0].message.content, db.extractJson)
result: extractJSON(dat.choices[0].message.content, arg.extractJson)
}
}
const msg:OpenAIChatFull = (dat.choices[0].message)
@@ -1693,6 +1696,13 @@ async function requestGoogleCloudVertex(arg:RequestDataArgumentExtended):Promise
}
}
if(db.jsonSchemaEnabled || arg.schema){
body.generation_config.response_mime_type = "application/json"
body.generation_config.response_schema = getGeneralJSONSchema(arg.schema, ['$schema','additionalProperties'])
console.log(body.generation_config.response_schema)
}
let url = ''
if(arg.customURL){
@@ -1756,6 +1766,13 @@ async function requestGoogleCloudVertex(arg:RequestDataArgumentExtended):Promise
}
}
if(arg.extractJson && (db.jsonSchemaEnabled || arg.schema)){
for(let i=0;i<rDatas.length;i++){
const extracted = extractJSON(rDatas[i], arg.extractJson)
rDatas[i] = extracted
}
}
if(rDatas.length > 1){
const thought = rDatas.splice(rDatas.length-2, 1)[0]
rDatas[rDatas.length-1] = `<Thoughts>${thought}</Thoughts>\n\n${rDatas.join('\n\n')}`
@@ -1827,6 +1844,12 @@ async function requestGoogleCloudVertex(arg:RequestDataArgumentExtended):Promise
processDataItem(res.data)
}
if(arg.extractJson && (db.jsonSchemaEnabled || arg.schema)){
for(let i=0;i<rDatas.length;i++){
const extracted = extractJSON(rDatas[i], arg.extractJson)
rDatas[i] = extracted
}
}
if(rDatas.length > 1){
const thought = rDatas.splice(rDatas.length-2, 1)[0]
@@ -2539,7 +2562,7 @@ async function requestClaude(arg:RequestDataArgumentExtended):Promise<requestDat
break
}
text += "Error:" + JSON.parse(e.data).error?.message
if(db.extractJson && db.jsonSchemaEnabled){
if(arg.extractJson && (db.jsonSchemaEnabled || arg.schema)){
controller.enqueue({
"0": extractJSON(text, db.jsonSchema)
})
@@ -2618,7 +2641,7 @@ async function requestClaude(arg:RequestDataArgumentExtended):Promise<requestDat
result: JSON.stringify(res.data)
}
}
if(db.extractJson && db.jsonSchemaEnabled){
if(arg.extractJson && db.jsonSchemaEnabled){
return {
type: 'success',
result: extractJSON(resText, db.jsonSchema)

1
src/ts/process/stableDiff.ts
View File

@@ -522,7 +522,6 @@ export async function generateAIImage(genPrompt:string, currentChar:character, n
if(!auth){
db.account = JSON.parse(localStorage.getItem("fallbackRisuToken"))
auth = db?.account?.token
db.account.useSync = true
}
const da = await globalFetch(keiServerURL() + '/imaggen', {
body: {

27
src/ts/process/templates/jsonSchema.ts
View File

@@ -120,14 +120,33 @@ export function convertInterfaceToSchema(int:string){
return schema
}
export function getOpenAIJSONSchema(){
export function getOpenAIJSONSchema(schema?:string){
const db = getDatabase()
const schema = {
return {
"name": "format",
"strict": db.strictJsonSchema,
"schema": convertInterfaceToSchema(db.jsonSchema)
"schema": convertInterfaceToSchema(schema ?? db.jsonSchema)
}
return schema
}
export function getGeneralJSONSchema(schema?:string, excludes:string[] = []){
const db = getDatabase()
function process(data:any){
const keys = Object.keys(data)
for(const key of keys){
if(excludes.includes(key)){
delete data[key]
}
if(typeof data[key] === 'object'){
data[key] = process(data[key])
}
}
return data
}
const d = convertInterfaceToSchema(schema ?? db.jsonSchema)
return process(d)
}
export function extractJSON(data:string, format:string){