From e65f9cb17abef6eaf81ce344cc6654f5dfed3d9c Mon Sep 17 00:00:00 2001 From: Rhon Joe Date: Wed, 20 Sep 2023 12:27:06 +0800 Subject: [PATCH] Complete type defined. (#1200) --- .../components/app/chat/copy-btn/index.tsx | 8 ++++--- .../config/automatic/get-automatic-res.tsx | 12 ++++------ web/service/base.ts | 22 +++++++++---------- web/service/debug.ts | 8 ++++++- 4 files changed, 27 insertions(+), 23 deletions(-) diff --git a/web/app/components/app/chat/copy-btn/index.tsx b/web/app/components/app/chat/copy-btn/index.tsx index 5e2a9bdaaff091..a03b99105740e7 100644 --- a/web/app/components/app/chat/copy-btn/index.tsx +++ b/web/app/components/app/chat/copy-btn/index.tsx @@ -1,9 +1,10 @@ 'use client' -import React from 'react' +import { useRef, useState } from 'react' import { t } from 'i18next' import copy from 'copy-to-clipboard' import s from './style.module.css' import Tooltip from '@/app/components/base/tooltip' +import { randomString } from '@/utils' type ICopyBtnProps = { value: string @@ -16,12 +17,13 @@ const CopyBtn = ({ className, isPlain, }: ICopyBtnProps) => { - const [isCopied, setIsCopied] = React.useState(false) + const [isCopied, setIsCopied] = useState(false) + const selector = useRef(`copy-tooltip-${randomString(4)}`) return (
diff --git a/web/app/components/app/configuration/config/automatic/get-automatic-res.tsx b/web/app/components/app/configuration/config/automatic/get-automatic-res.tsx index 1928dd8f90085f..32c39102957c0b 100644 --- a/web/app/components/app/configuration/config/automatic/get-automatic-res.tsx +++ b/web/app/components/app/configuration/config/automatic/get-automatic-res.tsx @@ -14,6 +14,8 @@ import OpeningStatement from '@/app/components/app/configuration/features/chat-g import GroupName from '@/app/components/app/configuration/base/group-name' import Loading from '@/app/components/base/loading' import Confirm from '@/app/components/base/confirm' +// type +import type { AutomaticRes } from '@/service/debug' const noDataIcon = ( @@ -21,12 +23,6 @@ const noDataIcon = ( ) -export type AutomaticRes = { - prompt: string - variables: string[] - opening_statement: string -} - export type IGetAutomaticResProps = { mode: AppType isShow: boolean @@ -98,7 +94,7 @@ const GetAutomaticRes: FC = ({ audiences, hoping_to_solve: hopingToSolve, }) - setRes(res as AutomaticRes) + setRes(res) } finally { setLoadingFalse() @@ -193,7 +189,7 @@ const GetAutomaticRes: FC = ({ onClose={() => setShowConfirmOverwrite(false)} onConfirm={() => { setShowConfirmOverwrite(false) - onFinished(res as AutomaticRes) + onFinished(res!) }} onCancel={() => setShowConfirmOverwrite(false)} /> diff --git a/web/service/base.ts b/web/service/base.ts index 00ce140d6920a9..16bbc70f130496 100644 --- a/web/service/base.ts +++ b/web/service/base.ts @@ -77,18 +77,18 @@ export function format(text: string) { return res.replaceAll('\n', '
').replaceAll('```', '') } -const handleStream = (response: any, onData: IOnData, onCompleted?: IOnCompleted, onThought?: IOnThought, onMessageEnd?: IOnMessageEnd) => { +const handleStream = (response: Response, onData: IOnData, onCompleted?: IOnCompleted, onThought?: IOnThought, onMessageEnd?: IOnMessageEnd) => { if (!response.ok) throw new Error('Network response was not ok') - const reader = response.body.getReader() + const reader = response.body?.getReader() const decoder = new TextDecoder('utf-8') let buffer = '' - let bufferObj: any + let bufferObj: Record let isFirstMessage = true function read() { let hasError = false - reader.read().then((result: any) => { + reader?.read().then((result: any) => { if (result.done) { onCompleted && onCompleted() return @@ -99,7 +99,7 @@ const handleStream = (response: any, onData: IOnData, onCompleted?: IOnCompleted lines.forEach((message) => { if (message.startsWith('data: ')) { // check if it starts with data: try { - bufferObj = JSON.parse(message.substring(6)) // remove data: and parse as json + bufferObj = JSON.parse(message.substring(6)) as Record// remove data: and parse as json } catch (e) { // mute handle message cut off @@ -113,11 +113,11 @@ const handleStream = (response: any, onData: IOnData, onCompleted?: IOnCompleted onData('', false, { conversationId: undefined, messageId: '', - errorMessage: bufferObj.message, - errorCode: bufferObj.code, + errorMessage: bufferObj?.message, + errorCode: bufferObj?.code, }) hasError = true - onCompleted && onCompleted(true) + onCompleted?.(true) return } if (bufferObj.event === 'message') { @@ -130,10 +130,10 @@ const handleStream = (response: any, onData: IOnData, onCompleted?: IOnCompleted isFirstMessage = false } else if (bufferObj.event === 'agent_thought') { - onThought?.(bufferObj as any) + onThought?.(bufferObj as ThoughtItem) } else if (bufferObj.event === 'message_end') { - onMessageEnd?.(bufferObj as any) + onMessageEnd?.(bufferObj as MessageEnd) } } }) @@ -146,7 +146,7 @@ const handleStream = (response: any, onData: IOnData, onCompleted?: IOnCompleted errorMessage: `${e}`, }) hasError = true - onCompleted && onCompleted(true) + onCompleted?.(true) return } if (!hasError) diff --git a/web/service/debug.ts b/web/service/debug.ts index a9e3ec55052233..03fa9d877ac0ac 100644 --- a/web/service/debug.ts +++ b/web/service/debug.ts @@ -1,6 +1,12 @@ import type { IOnCompleted, IOnData, IOnError, IOnMessageEnd } from './base' import { get, post, ssePost } from './base' +export type AutomaticRes = { + prompt: string + variables: string[] + opening_statement: string +} + export const sendChatMessage = async (appId: string, body: Record, { onData, onCompleted, onError, getAbortController, onMessageEnd }: { onData: IOnData onCompleted: IOnCompleted @@ -46,7 +52,7 @@ export const fetchConvesationMessages = (appId: string, conversation_id: string) } export const generateRule = (body: Record) => { - return post('/rule-generate', { + return post('/rule-generate', { body, }) }