Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. Weโ€™ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

โœจ feat: support setMessageItem #17

Merged
merged 1 commit into from
Dec 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/ProChat/container/Provider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@ import { memo, ReactNode } from 'react';
import { DevtoolsOptions } from 'zustand/middleware';
import { ChatProps, createStore, Provider, useStoreApi } from '../store';

interface ProChatProviderProps extends ChatProps {
interface ProChatProviderProps<T extends Record<string, any> = Record<string, any>>
extends ChatProps<T> {
children: ReactNode;
devtoolOptions?: boolean | DevtoolsOptions;
chatRef?: ProChatChatReference;
}

export const ProChatProvider = memo<ProChatProviderProps>(
export const ProChatProvider = memo<ProChatProviderProps<any>>(
({
children,
devtoolOptions,
Expand Down
31 changes: 18 additions & 13 deletions src/ProChat/container/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { App as Container } from 'antd';
import { CSSProperties, ReactNode, memo } from 'react';
import { CSSProperties, ReactNode } from 'react';

import App from './App';

Expand All @@ -8,7 +8,7 @@ import { ChatProps } from '../store';
import { ProChatProvider } from './Provider';
import { ProChatChatReference } from './StoreUpdater';

export interface ProChatProps extends ChatProps {
export interface ProChatProps<T extends Record<string, any>> extends ChatProps<T> {
renderInput?: ReactNode;
__PRO_CHAT_STORE_DEVTOOLS__?: boolean | DevtoolsOptions;
showTitle?: boolean;
Expand All @@ -17,14 +17,19 @@ export interface ProChatProps extends ChatProps {
chatRef?: ProChatChatReference;
}

export const ProChat = memo<ProChatProps>(
({ renderInput, __PRO_CHAT_STORE_DEVTOOLS__, showTitle, style, className, ...props }) => {
return (
<ProChatProvider {...props} devtoolOptions={__PRO_CHAT_STORE_DEVTOOLS__}>
<Container>
<App chatInput={renderInput} showTitle={showTitle} style={style} className={className} />
</Container>
</ProChatProvider>
);
},
);
export function ProChat<T extends Record<string, any> = Record<string, any>>({
renderInput,
__PRO_CHAT_STORE_DEVTOOLS__,
showTitle,
style,
className,
...props
}: ProChatProps<T>) {
return (
<ProChatProvider {...props} devtoolOptions={__PRO_CHAT_STORE_DEVTOOLS__}>
<Container>
<App chatInput={renderInput} showTitle={showTitle} style={style} className={className} />
</Container>
</ProChatProvider>
);
}
29 changes: 29 additions & 0 deletions src/ProChat/hooks/useProChat.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,31 @@ export interface ProChatInstance
ChatStore,
'resendMessage' | 'stopGenerateMessage' | 'sendMessage' | 'deleteMessage' | 'clearMessage'
> {
/**
* ่Žทๅ–ๅฝ“ๅ‰่Šๅคฉๅˆ—่กจๅฏน่ฑก
* @returns ChatStore['chats']
*/
getChats: () => ChatStore['chats'];
/**
* ่Žทๅ–ๅฝ“ๅ‰่Šๅคฉๆถˆๆฏๅˆ—่กจ
* @returns ChatMessage[]
*/
getChatMessages: () => ChatMessage[];
/**
* ่ฎพ็ฝฎๆถˆๆฏๅ†…ๅฎน
* @param id
* @param content
* @returns void
*/
setMessageContent: (id: string, content: string) => void;
/**
* ไฟฎๆ”นๆถˆๆฏ็š„ๆŸไธชๅฑžๆ€ง
* @param id
* @param key
* @param value
* @returns void
*/
setMessageValue: (id: string, key: keyof ChatMessage<Record<string, any>>, value: any) => void;
}

export const useProChat = () => {
Expand All @@ -33,6 +55,12 @@ export const useProChat = () => {
dispatchMessage({ type: 'updateMessage', id, key: 'content', value: content });
});

const setMessageValue = useMemoizedFn(
(id: string, key: keyof ChatMessage<Record<string, any>>, value) => {
dispatchMessage({ type: 'updateMessage', id, key, value });
arvinxx marked this conversation as resolved.
Show resolved Hide resolved
},
);

return useMemo<ProChatInstance>(() => {
return {
getChats,
Expand All @@ -43,6 +71,7 @@ export const useProChat = () => {
deleteMessage,
clearMessage,
setMessageContent,
setMessageValue,
};
}, []);
};
10 changes: 5 additions & 5 deletions src/ProChat/store/initialState.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@ import { FlexBasicProps } from 'react-layout-kit/lib/FlexBasic';

export type ChatRequest = (messages: ChatMessage[], config: ModelConfig) => Promise<Response>;

export interface ChatPropsState {
export interface ChatPropsState<T extends Record<string, any> = Record<string, any>> {
/**
* ่ฏญ่จ€ๆจกๅž‹่ง’่‰ฒ่ฎพๅฎš
*/
config: ModelConfig;
/**
* ่Šๅคฉ่ฎฐๅฝ•
*/
chats: ChatMessageMap;
onChatsChange?: (chats: ChatMessageMap) => void;
chats: ChatMessageMap<T>;
onChatsChange?: (chats: ChatMessageMap<T>) => void;
displayMode: 'chat' | 'docs';
userMeta: MetaData;
assistantMeta: MetaData;
Expand All @@ -31,7 +31,7 @@ export interface ChatPropsState {
* @param message
* @returns message id
*/
genMessageId?: (message: ChatMessage[], parentId: string) => Promise<string>;
genMessageId?: (message: ChatMessage<T>[], parentId: string) => Promise<string>;

/**
* ้‡็ฝฎๆถˆๆฏ
Expand Down Expand Up @@ -64,7 +64,7 @@ export interface ChatPropsState {
/**
* ไฟกๆฏๆก†้ขๅค–ๆธฒๆŸ“
*/
messageItemExtraRender?: (message: ChatMessage, type: 'assistant' | 'user') => React.ReactNode;
messageItemExtraRender?: (message: ChatMessage<T>, type: 'assistant' | 'user') => React.ReactNode;

/**
* ไฟกๆฏๆก†้กถ้ƒจ็š„ๆ“ไฝœๅˆ—่กจ
Expand Down
5 changes: 3 additions & 2 deletions src/ProChat/store/store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,11 @@ import { createWithEqualityFn } from 'zustand/traditional';
import { ChatAction, chatAction } from './action';
import { ChatPropsState, ChatState, initialState } from './initialState';

export interface ChatProps extends Partial<ChatPropsState> {
export interface ChatProps<T extends Record<string, any> = Record<string, any>>
extends Partial<ChatPropsState<T>> {
// init
loading?: boolean;
initialChats?: ChatPropsState['chats'];
initialChats?: ChatPropsState<T>['chats'];
userMeta?: MetaData;
assistantMeta?: MetaData;
}
Expand Down
10 changes: 6 additions & 4 deletions src/types/message.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export interface ChatMessageError {
type: string | number;
}

export interface ChatMessage {
export interface ChatMessage<T extends Record<string, any> = Record<string, any>> {
/**
* @title ๅ†…ๅฎน
* @description ๆถˆๆฏๅ†…ๅฎน
Expand All @@ -27,11 +27,13 @@ export interface ChatMessage {
createAt: number;
id: string;
updateAt: number;
extra?: Record<string, any>;
extra?: T;
}

export type ChatMessageMap = Record<string, ChatMessage>;

export type ChatMessageMap<T extends Record<string, any> = Record<string, any>> = Record<
string,
ChatMessage<T>
>;
export interface OpenAIFunctionCall {
arguments?: string;
name: string;
Expand Down