浏览代码

fix: reset some config not work: like var required status, dataset, feature status (#305)

tags/0.3.2
Joel 2 年前
父节点
当前提交
3e380c082a
没有帐户链接到提交者的电子邮件

+ 5
- 5
web/app/components/app/configuration/config/index.tsx 查看文件

setModelConfig, setModelConfig,
setPrevPromptConfig, setPrevPromptConfig,
setFormattingChanged, setFormattingChanged,
moreLikeThisConifg,
setMoreLikeThisConifg,
moreLikeThisConfig,
setMoreLikeThisConfig,
suggestedQuestionsAfterAnswerConfig, suggestedQuestionsAfterAnswerConfig,
setSuggestedQuestionsAfterAnswerConfig, setSuggestedQuestionsAfterAnswerConfig,
} = useContext(ConfigContext) } = useContext(ConfigContext)
const { featureConfig, handleFeatureChange } = useFeature({ const { featureConfig, handleFeatureChange } = useFeature({
introduction, introduction,
setIntroduction, setIntroduction,
moreLikeThis: moreLikeThisConifg.enabled,
moreLikeThis: moreLikeThisConfig.enabled,
setMoreLikeThis: (value) => { setMoreLikeThis: (value) => {
setMoreLikeThisConifg(produce(moreLikeThisConifg, (draft) => {
setMoreLikeThisConfig(produce(moreLikeThisConfig, (draft) => {
draft.enabled = value draft.enabled = value
})) }))
}, },
} }


{/* TextnGeneration config */} {/* TextnGeneration config */}
{moreLikeThisConifg.enabled && (
{moreLikeThisConfig.enabled && (
<ExperienceEnchanceGroup /> <ExperienceEnchanceGroup />
)} )}



+ 2
- 2
web/app/components/app/configuration/debug/index.tsx 查看文件

mode, mode,
introduction, introduction,
suggestedQuestionsAfterAnswerConfig, suggestedQuestionsAfterAnswerConfig,
moreLikeThisConifg,
moreLikeThisConfig,
inputs, inputs,
// setInputs, // setInputs,
formattingChanged, formattingChanged,
user_input_form: promptVariablesToUserInputsForm(modelConfig.configs.prompt_variables), user_input_form: promptVariablesToUserInputsForm(modelConfig.configs.prompt_variables),
opening_statement: introduction, opening_statement: introduction,
suggested_questions_after_answer: suggestedQuestionsAfterAnswerConfig, suggested_questions_after_answer: suggestedQuestionsAfterAnswerConfig,
more_like_this: moreLikeThisConifg,
more_like_this: moreLikeThisConfig,
agent_mode: { agent_mode: {
enabled: true, enabled: true,
tools: [...postDatasets], tools: [...postDatasets],

+ 59
- 42
web/app/components/app/configuration/index.tsx 查看文件

import { useContext } from 'use-context-selector' import { useContext } from 'use-context-selector'
import { usePathname } from 'next/navigation' import { usePathname } from 'next/navigation'
import produce from 'immer' import produce from 'immer'
import type { CompletionParams, Inputs, ModelConfig, PromptConfig, PromptVariable, MoreLikeThisConfig } from '@/models/debug'
import { useBoolean } from 'ahooks'
import Button from '../../base/button'
import Loading from '../../base/loading'
import type { CompletionParams, Inputs, ModelConfig, MoreLikeThisConfig, PromptConfig, PromptVariable } from '@/models/debug'
import type { DataSet } from '@/models/datasets' import type { DataSet } from '@/models/datasets'
import type { ModelConfig as BackendModelConfig } from '@/types/app' import type { ModelConfig as BackendModelConfig } from '@/types/app'
import ConfigContext from '@/context/debug-configuration' import ConfigContext from '@/context/debug-configuration'
import { ToastContext } from '@/app/components/base/toast' import { ToastContext } from '@/app/components/base/toast'
import { fetchTenantInfo } from '@/service/common' import { fetchTenantInfo } from '@/service/common'
import { fetchAppDetail, updateAppModelConfig } from '@/service/apps' import { fetchAppDetail, updateAppModelConfig } from '@/service/apps'
import { userInputsFormToPromptVariables, promptVariablesToUserInputsForm } from '@/utils/model-config'
import { promptVariablesToUserInputsForm, userInputsFormToPromptVariables } from '@/utils/model-config'
import { fetchDatasets } from '@/service/datasets' import { fetchDatasets } from '@/service/datasets'
import AccountSetting from '@/app/components/header/account-setting' import AccountSetting from '@/app/components/header/account-setting'
import { useBoolean } from 'ahooks'
import Button from '../../base/button'
import Loading from '../../base/loading'


const Configuration: FC = () => { const Configuration: FC = () => {
const { t } = useTranslation() const { t } = useTranslation()
const matched = pathname.match(/\/app\/([^/]+)/) const matched = pathname.match(/\/app\/([^/]+)/)
const appId = (matched?.length && matched[1]) ? matched[1] : '' const appId = (matched?.length && matched[1]) ? matched[1] : ''
const [mode, setMode] = useState('') const [mode, setMode] = useState('')
const [pusblisedConfig, setPusblisedConfig] = useState<{
modelConfig: ModelConfig,
const [publishedConfig, setPublishedConfig] = useState<{
modelConfig: ModelConfig
completionParams: CompletionParams completionParams: CompletionParams
} | null>(null) } | null>(null)


prompt_template: '', prompt_template: '',
prompt_variables: [], prompt_variables: [],
}) })
const [moreLikeThisConifg, setMoreLikeThisConifg] = useState<MoreLikeThisConfig>({
const [moreLikeThisConfig, setMoreLikeThisConfig] = useState<MoreLikeThisConfig>({
enabled: false, enabled: false,
}) })
const [suggestedQuestionsAfterAnswerConfig, setSuggestedQuestionsAfterAnswerConfig] = useState<MoreLikeThisConfig>({ const [suggestedQuestionsAfterAnswerConfig, setSuggestedQuestionsAfterAnswerConfig] = useState<MoreLikeThisConfig>({
prompt_template: '', prompt_template: '',
prompt_variables: [] as PromptVariable[], prompt_variables: [] as PromptVariable[],
}, },
opening_statement: '',
more_like_this: null,
suggested_questions_after_answer: null,
dataSets: [],
}) })


const setModelConfig = (newModelConfig: ModelConfig) => { const setModelConfig = (newModelConfig: ModelConfig) => {
} }


const setModelId = (modelId: string) => { const setModelId = (modelId: string) => {
const newModelConfig = produce(modelConfig, (draft) => {
const newModelConfig = produce(modelConfig, (draft: any) => {
draft.model_id = modelId draft.model_id = modelId
}) })
setModelConfig(newModelConfig) setModelConfig(newModelConfig)
} }


const syncToPublishedConfig = (_pusblisedConfig: any) => {
setModelConfig(_pusblisedConfig.modelConfig)
setCompletionParams(_pusblisedConfig.completionParams)
}

const [dataSets, setDataSets] = useState<DataSet[]>([]) const [dataSets, setDataSets] = useState<DataSet[]>([])


const syncToPublishedConfig = (_publishedConfig: any) => {
const modelConfig = _publishedConfig.modelConfig
setModelConfig(_publishedConfig.modelConfig)
setCompletionParams(_publishedConfig.completionParams)
setDataSets(modelConfig.dataSets || [])
// feature
setIntroduction(modelConfig.opening_statement)
setMoreLikeThisConfig(modelConfig.more_like_this || {
enabled: false,
})
setSuggestedQuestionsAfterAnswerConfig(modelConfig.suggested_questions_after_answer || {
enabled: false,
})
}

const [hasSetCustomAPIKEY, setHasSetCustomerAPIKEY] = useState(true) const [hasSetCustomAPIKEY, setHasSetCustomerAPIKEY] = useState(true)
const [isTrailFinished, setIsTrailFinished] = useState(false) const [isTrailFinished, setIsTrailFinished] = useState(false)
const hasSetAPIKEY = hasSetCustomAPIKEY || !isTrailFinished const hasSetAPIKEY = hasSetCustomAPIKEY || !isTrailFinished
const model = res.model_config.model const model = res.model_config.model


let datasets: any = null let datasets: any = null
if (modelConfig.agent_mode?.enabled) {
if (modelConfig.agent_mode?.enabled)
datasets = modelConfig.agent_mode?.tools.filter(({ dataset }: any) => dataset?.enabled) datasets = modelConfig.agent_mode?.tools.filter(({ dataset }: any) => dataset?.enabled)
}


if (dataSets && datasets?.length && datasets?.length > 0) { if (dataSets && datasets?.length && datasets?.length > 0) {
const { data: dataSetsWithDetail } = await fetchDatasets({ url: '/datasets', params: { page: 1, ids: datasets.map(({ dataset }: any) => dataset.id) } }) const { data: dataSetsWithDetail } = await fetchDatasets({ url: '/datasets', params: { page: 1, ids: datasets.map(({ dataset }: any) => dataset.id) } })
datasets = dataSetsWithDetail datasets = dataSetsWithDetail
setDataSets(datasets) setDataSets(datasets)
} }

setIntroduction(modelConfig.opening_statement)
if (modelConfig.more_like_this)
setMoreLikeThisConfig(modelConfig.more_like_this)

if (modelConfig.suggested_questions_after_answer)
setSuggestedQuestionsAfterAnswerConfig(modelConfig.suggested_questions_after_answer)

const config = { const config = {
modelConfig: { modelConfig: {
provider: model.provider, provider: model.provider,
model_id: model.name, model_id: model.name,
configs: { configs: {
prompt_template: modelConfig.pre_prompt, prompt_template: modelConfig.pre_prompt,
prompt_variables: userInputsFormToPromptVariables(modelConfig.user_input_form)
prompt_variables: userInputsFormToPromptVariables(modelConfig.user_input_form),
}, },
opening_statement: modelConfig.opening_statement,
more_like_this: modelConfig.more_like_this,
suggested_questions_after_answer: modelConfig.suggested_questions_after_answer,
dataSets: datasets || [],
}, },
completionParams: model.completion_params, completionParams: model.completion_params,
} }
syncToPublishedConfig(config) syncToPublishedConfig(config)
setPusblisedConfig(config)
setIntroduction(modelConfig.opening_statement)
if (modelConfig.more_like_this) {
setMoreLikeThisConifg(modelConfig.more_like_this)
}
if (modelConfig.suggested_questions_after_answer) {
setSuggestedQuestionsAfterAnswerConfig(modelConfig.suggested_questions_after_answer)
}
setPublishedConfig(config)

setHasFetchedDetail(true) setHasFetchedDetail(true)
}) })
}, [appId]) }, [appId])
const promptTemplate = modelConfig.configs.prompt_template const promptTemplate = modelConfig.configs.prompt_template
const promptVariables = modelConfig.configs.prompt_variables const promptVariables = modelConfig.configs.prompt_variables


// not save empty key adn name
// const missingNameItem = promptVariables.find(item => item.name.trim() === '')
// if (missingNameItem) {
// notify({ type: 'error', message: t('appDebug.errorMessage.nameOfKeyRequired', { key: missingNameItem.key }) })
// return
// }

const postDatasets = dataSets.map(({ id }) => ({ const postDatasets = dataSets.map(({ id }) => ({
dataset: { dataset: {
enabled: true, enabled: true,
id, id,
}
},
})) }))


// new model config data struct // new model config data struct
pre_prompt: promptTemplate, pre_prompt: promptTemplate,
user_input_form: promptVariablesToUserInputsForm(promptVariables), user_input_form: promptVariablesToUserInputsForm(promptVariables),
opening_statement: introduction || '', opening_statement: introduction || '',
more_like_this: moreLikeThisConifg,
more_like_this: moreLikeThisConfig,
suggested_questions_after_answer: suggestedQuestionsAfterAnswerConfig, suggested_questions_after_answer: suggestedQuestionsAfterAnswerConfig,
agent_mode: { agent_mode: {
enabled: true, enabled: true,
tools: [...postDatasets]
tools: [...postDatasets],
}, },
model: { model: {
provider: modelConfig.provider, provider: modelConfig.provider,
} }


await updateAppModelConfig({ url: `/apps/${appId}/model-config`, body: data }) await updateAppModelConfig({ url: `/apps/${appId}/model-config`, body: data })
setPusblisedConfig({
modelConfig,
const newModelConfig = produce(modelConfig, (draft: any) => {
draft.opening_statement = introduction
draft.more_like_this = moreLikeThisConfig
draft.suggested_questions_after_answer = suggestedQuestionsAfterAnswerConfig
draft.dataSets = dataSets
})
setPublishedConfig({
modelConfig: newModelConfig,
completionParams, completionParams,
}) })
notify({ type: 'success', message: t('common.api.success'), duration: 3000 }) notify({ type: 'success', message: t('common.api.success'), duration: 3000 })


const [showConfirm, setShowConfirm] = useState(false) const [showConfirm, setShowConfirm] = useState(false)
const resetAppConfig = () => { const resetAppConfig = () => {
// debugger
syncToPublishedConfig(pusblisedConfig)
syncToPublishedConfig(publishedConfig)
setShowConfirm(false) setShowConfirm(false)
} }


setControlClearChatMessage, setControlClearChatMessage,
prevPromptConfig, prevPromptConfig,
setPrevPromptConfig, setPrevPromptConfig,
moreLikeThisConifg,
setMoreLikeThisConifg,
moreLikeThisConfig,
setMoreLikeThisConfig,
suggestedQuestionsAfterAnswerConfig, suggestedQuestionsAfterAnswerConfig,
setSuggestedQuestionsAfterAnswerConfig, setSuggestedQuestionsAfterAnswerConfig,
formattingChanged, formattingChanged,
modelConfig, modelConfig,
setModelConfig, setModelConfig,
dataSets, dataSets,
setDataSets
setDataSets,
}} }}
> >
<> <>

+ 9
- 5
web/app/components/base/switch/index.tsx 查看文件

'use client' 'use client'
import React, { useState } from 'react'
import React, { useEffect, useState } from 'react'
import classNames from 'classnames' import classNames from 'classnames'
import { Switch as OriginalSwitch } from '@headlessui/react' import { Switch as OriginalSwitch } from '@headlessui/react'




const Switch = ({ onChange, size = 'lg', defaultValue = false, disabled = false }: SwitchProps) => { const Switch = ({ onChange, size = 'lg', defaultValue = false, disabled = false }: SwitchProps) => {
const [enabled, setEnabled] = useState(defaultValue) const [enabled, setEnabled] = useState(defaultValue)
useEffect(() => {
setEnabled(defaultValue)
}, [defaultValue])
const wrapStyle = { const wrapStyle = {
lg: 'h-6 w-11', lg: 'h-6 w-11',
md: 'h-4 w-7'
md: 'h-4 w-7',
} }


const circleStyle = { const circleStyle = {
lg: 'h-5 w-5', lg: 'h-5 w-5',
md: 'h-3 w-3'
md: 'h-3 w-3',
} }


const translateLeft = { const translateLeft = {
lg: 'translate-x-5', lg: 'translate-x-5',
md: 'translate-x-3'
md: 'translate-x-3',
} }
return ( return (
<OriginalSwitch <OriginalSwitch
checked={enabled} checked={enabled}
onChange={(checked: boolean) => { onChange={(checked: boolean) => {
if (disabled) return;
if (disabled)
return
setEnabled(checked) setEnabled(checked)
onChange(checked) onChange(checked)
}} }}

+ 3
- 3
web/app/components/share/text-generation/index.tsx 查看文件

const [appId, setAppId] = useState<string>('') const [appId, setAppId] = useState<string>('')
const [siteInfo, setSiteInfo] = useState<SiteInfo | null>(null) const [siteInfo, setSiteInfo] = useState<SiteInfo | null>(null)
const [promptConfig, setPromptConfig] = useState<PromptConfig | null>(null) const [promptConfig, setPromptConfig] = useState<PromptConfig | null>(null)
const [moreLikeThisConifg, setMoreLikeThisConifg] = useState<MoreLikeThisConfig | null>(null)
const [moreLikeThisConfig, setMoreLikeThisConfig] = useState<MoreLikeThisConfig | null>(null)
const [isResponsing, { setTrue: setResponsingTrue, setFalse: setResponsingFalse }] = useBoolean(false) const [isResponsing, { setTrue: setResponsingTrue, setFalse: setResponsingFalse }] = useBoolean(false)
const [query, setQuery] = useState('') const [query, setQuery] = useState('')
const [completionRes, setCompletionRes] = useState('') const [completionRes, setCompletionRes] = useState('')
prompt_template: '', // placeholder for feture prompt_template: '', // placeholder for feture
prompt_variables, prompt_variables,
} as PromptConfig) } as PromptConfig)
setMoreLikeThisConifg(more_like_this)
setMoreLikeThisConfig(more_like_this)
})() })()
}, []) }, [])


content={completionRes} content={completionRes}
messageId={messageId} messageId={messageId}
isInWebApp isInWebApp
moreLikeThis={moreLikeThisConifg?.enabled}
moreLikeThis={moreLikeThisConfig?.enabled}
onFeedback={handleFeedback} onFeedback={handleFeedback}
feedback={feedback} feedback={feedback}
onSave={handleSaveMessage} onSave={handleSaveMessage}

+ 6
- 6
web/context/debug-configuration.ts 查看文件

import { createContext } from 'use-context-selector' import { createContext } from 'use-context-selector'
import type { CompletionParams, Inputs, ModelConfig, PromptConfig, MoreLikeThisConfig, SuggestedQuestionsAfterAnswerConfig } from '@/models/debug'
import type { CompletionParams, Inputs, ModelConfig, MoreLikeThisConfig, PromptConfig, SuggestedQuestionsAfterAnswerConfig } from '@/models/debug'
import type { DataSet } from '@/models/datasets' import type { DataSet } from '@/models/datasets'


type IDebugConfiguration = { type IDebugConfiguration = {
setControlClearChatMessage: (controlClearChatMessage: number) => void setControlClearChatMessage: (controlClearChatMessage: number) => void
prevPromptConfig: PromptConfig prevPromptConfig: PromptConfig
setPrevPromptConfig: (prevPromptConfig: PromptConfig) => void setPrevPromptConfig: (prevPromptConfig: PromptConfig) => void
moreLikeThisConifg: MoreLikeThisConfig,
setMoreLikeThisConifg: (moreLikeThisConfig: MoreLikeThisConfig) => void
suggestedQuestionsAfterAnswerConfig: SuggestedQuestionsAfterAnswerConfig,
moreLikeThisConfig: MoreLikeThisConfig
setMoreLikeThisConfig: (moreLikeThisConfig: MoreLikeThisConfig) => void
suggestedQuestionsAfterAnswerConfig: SuggestedQuestionsAfterAnswerConfig
setSuggestedQuestionsAfterAnswerConfig: (suggestedQuestionsAfterAnswerConfig: SuggestedQuestionsAfterAnswerConfig) => void setSuggestedQuestionsAfterAnswerConfig: (suggestedQuestionsAfterAnswerConfig: SuggestedQuestionsAfterAnswerConfig) => void
formattingChanged: boolean formattingChanged: boolean
setFormattingChanged: (formattingChanged: boolean) => void setFormattingChanged: (formattingChanged: boolean) => void
prompt_variables: [], prompt_variables: [],
}, },
setPrevPromptConfig: () => { }, setPrevPromptConfig: () => { },
moreLikeThisConifg: {
moreLikeThisConfig: {
enabled: false, enabled: false,
}, },
setMoreLikeThisConifg: () => { },
setMoreLikeThisConfig: () => { },
suggestedQuestionsAfterAnswerConfig: { suggestedQuestionsAfterAnswerConfig: {
enabled: false, enabled: false,
}, },

+ 63
- 58
web/models/debug.ts 查看文件

export type Inputs = Record<string, string | number | object> export type Inputs = Record<string, string | number | object>


export type PromptVariable = { export type PromptVariable = {
key: string,
name: string,
type: string, // "string" | "number" | "select",
default?: string | number,
required: boolean,
key: string
name: string
type: string // "string" | "number" | "select",
default?: string | number
required: boolean
options?: string[] options?: string[]
max_length?: number max_length?: number
} }


export type CompletionParams = { export type CompletionParams = {
max_tokens: number,
temperature: number,
top_p: number,
presence_penalty: number,
frequency_penalty: number,
max_tokens: number
temperature: number
top_p: number
presence_penalty: number
frequency_penalty: number
} }


export type ModelId = "gpt-3.5-turbo" | "text-davinci-003"
export type ModelId = 'gpt-3.5-turbo' | 'text-davinci-003'


export type PromptConfig = { export type PromptConfig = {
prompt_template: string,
prompt_variables: PromptVariable[],
prompt_template: string
prompt_variables: PromptVariable[]
} }


export type MoreLikeThisConfig = { export type MoreLikeThisConfig = {


// frontend use. Not the same as backend // frontend use. Not the same as backend
export type ModelConfig = { export type ModelConfig = {
provider: string, // LLM Provider: for example "OPENAI"
model_id: string,
provider: string // LLM Provider: for example "OPENAI"
model_id: string
configs: PromptConfig configs: PromptConfig
opening_statement: string | null
more_like_this: {
enabled: boolean
} | null
suggested_questions_after_answer: {
enabled: boolean
} | null
dataSets: any[]
} }


export type DebugRequestBody = { export type DebugRequestBody = {
inputs: Inputs,
query: string,
completion_params: CompletionParams,
inputs: Inputs
query: string
completion_params: CompletionParams
model_config: ModelConfig model_config: ModelConfig
} }


export type DebugResponse = { export type DebugResponse = {
id: string,
answer: string,
created_at: string,
id: string
answer: string
created_at: string
} }



export type DebugResponseStream = { export type DebugResponseStream = {
id: string,
data: string,
created_at: string,
id: string
data: string
created_at: string
} }



export type FeedBackRequestBody = { export type FeedBackRequestBody = {
message_id: string,
rating: 'like' | 'dislike',
content?: string,
message_id: string
rating: 'like' | 'dislike'
content?: string
from_source: 'api' | 'log' from_source: 'api' | 'log'
} }



export type FeedBackResponse = { export type FeedBackResponse = {
message_id: string,
message_id: string
rating: 'like' | 'dislike' rating: 'like' | 'dislike'
} }


// Log session list // Log session list
export type LogSessionListQuery = { export type LogSessionListQuery = {
keyword?: string,
start?: string, // format datetime(YYYY-mm-dd HH:ii)
end?: string, // format datetime(YYYY-mm-dd HH:ii)
page: number,
limit: number, // default 20. 1-100
keyword?: string
start?: string // format datetime(YYYY-mm-dd HH:ii)
end?: string // format datetime(YYYY-mm-dd HH:ii)
page: number
limit: number // default 20. 1-100
} }


export type LogSessionListResponse = { export type LogSessionListResponse = {
data: { data: {
id: string,
conversation_id: string,
query: string, // user's query question
message: string, // prompt send to LLM
answer: string,
creat_at: string,
}[],
total: number,
page: number,
id: string
conversation_id: string
query: string // user's query question
message: string // prompt send to LLM
answer: string
creat_at: string
}[]
total: number
page: number
} }


// log session detail and debug // log session detail and debug
export type LogSessionDetailResponse = { export type LogSessionDetailResponse = {
id: string,
cnversation_id: string,
model_provider: string,
query: string,
inputs: Record<string, string | number | object>[],
message: string,
message_tokens: number, // number of tokens in message
answer: string,
answer_tokens: number, // number of tokens in answer
provider_response_latency: number, // used time in ms
from_source: 'api' | 'log',
id: string
cnversation_id: string
model_provider: string
query: string
inputs: Record<string, string | number | object>[]
message: string
message_tokens: number // number of tokens in message
answer: string
answer_tokens: number // number of tokens in answer
provider_response_latency: number // used time in ms
from_source: 'api' | 'log'
} }


export type SavedMessage = { export type SavedMessage = {
id: string,
id: string
answer: string answer: string
}
}

正在加载...
取消
保存