chore: Update createClient and useClient function parameter names

Update the second parameter of the createClient function in index.ts and the useClient function in react.ts from `api: ClientApi` to `api: ClientApiMethods`. This change improves the clarity and consistency of the function parameter names.
TabbyML · Nov 30, 2024 · f1ad5fb · f1ad5fb
1 parent 04176ef
commit f1ad5fb
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 38 deletions.
diff --git a/ee/tabby-ui/app/chat/page.tsx b/ee/tabby-ui/app/chat/page.tsx
@@ -10,7 +10,6 @@ import { ErrorBoundary } from 'react-error-boundary'
 import remarkGfm from 'remark-gfm'
 import remarkMath from 'remark-math'
 import {
-  clientApiKeys,
   TABBY_CHAT_PANEL_API_VERSION,
   type ChatMessage,
   type Context,
@@ -72,6 +71,10 @@ export default function ChatPage() {
   const isInEditor = !!client || undefined
   const useMacOSKeyboardEventHandler = useRef<boolean>()
 
+  // server feature support check
+  const [supportsOnApplyInEditorV2, setSupportsOnApplyInEditorV2] =
+    useState(false)
+
   const sendMessage = (message: ChatMessage) => {
     if (chatRef.current) {
       chatRef.current.sendUserChat(message)
@@ -223,24 +226,16 @@ export default function ChatPage() {
     }
   }, [server, client])
 
-  const [serverCapabilities, setServerCapabilities] = useState(
-    new Map<string, boolean>()
-  )
-
   useEffect(() => {
     if (server) {
       server?.onLoaded({
         apiVersion: TABBY_CHAT_PANEL_API_VERSION
       })
 
       const checkCapabilities = async () => {
-        const results = await Promise.all(
-          clientApiKeys.map(async key => {
-            const hasCapability = await server.hasCapability!(key)
-            return [key, hasCapability] as [string, boolean]
-          })
-        )
-        setServerCapabilities(new Map(results))
+        server
+          ?.hasCapability('onApplyInEditorV2')
+          .then(setSupportsOnApplyInEditorV2)
       }
 
       checkCapabilities()
@@ -388,11 +383,11 @@ export default function ChatPage() {
         onSubmitMessage={isInEditor && server?.onSubmitMessage}
         onApplyInEditor={
           isInEditor &&
-          (serverCapabilities.get('onApplyInEditorV2')
+          (supportsOnApplyInEditorV2
             ? server?.onApplyInEditorV2
             : server?.onApplyInEditor)
         }
-        serverCapabilities={serverCapabilities}
+        supportsOnApplyInEditorV2={supportsOnApplyInEditorV2}
       />
     </ErrorBoundary>
   )

diff --git a/ee/tabby-ui/app/search/components/assistant-message-section.tsx b/ee/tabby-ui/app/search/components/assistant-message-section.tsx
@@ -56,6 +56,7 @@ import {
   TooltipContent,
   TooltipTrigger
 } from '@/components/ui/tooltip'
+import { ChatContext } from '@/components/chat/chat'
 import { CodeReferences } from '@/components/chat/code-references'
 import { CopyButton } from '@/components/copy-button'
 import {
@@ -65,7 +66,6 @@ import {
 } from '@/components/message-markdown'
 
 import { ConversationMessage, SearchContext, SOURCE_CARD_STYLE } from './search'
-import { ChatContext } from '@/components/chat/chat'
 
 export function AssistantMessageSection({
   message,
@@ -95,7 +95,7 @@ export function AssistantMessageSection({
     onUpdateMessage
   } = useContext(SearchContext)
 
-  const {serverCapabilities}= useContext(ChatContext)
+  const { supportsOnApplyInEditorV2 } = useContext(ChatContext)
 
   const [isEditing, setIsEditing] = useState(false)
   const [showMoreSource, setShowMoreSource] = useState(false)
@@ -331,7 +331,7 @@ export function AssistantMessageSection({
               contextInfo={contextInfo}
               fetchingContextInfo={fetchingContextInfo}
               canWrapLongLines={!isLoading}
-              serverCapabilities={serverCapabilities}
+              supportsOnApplyInEditorV2={supportsOnApplyInEditorV2}
             />
             {/* if isEditing, do not display error message block */}
             {message.error && <ErrorMessageBlock error={message.error} />}

diff --git a/ee/tabby-ui/app/search/components/user-message-section.tsx b/ee/tabby-ui/app/search/components/user-message-section.tsx
@@ -16,13 +16,13 @@ export function UserMessageSection({
   ...props
 }: QuestionBlockProps) {
   const { contextInfo, fetchingContextInfo } = useContext(SearchContext)
-  const { serverCapabilities } = useContext(ChatContext)
+  const { supportsOnApplyInEditorV2 } = useContext(ChatContext)
   return (
     <div className={cn('font-semibold', className)} {...props}>
       <MessageMarkdown
         message={message.content}
         contextInfo={contextInfo}
-        serverCapabilities={serverCapabilities}
+        supportsOnApplyInEditorV2={supportsOnApplyInEditorV2}
         fetchingContextInfo={fetchingContextInfo}
         className="text-xl prose-p:mb-2 prose-p:mt-0"
         headline

diff --git a/ee/tabby-ui/components/chat/chat.tsx b/ee/tabby-ui/components/chat/chat.tsx
@@ -49,7 +49,7 @@ type ChatContextValue = {
   activeSelection: Context | null
   removeRelevantContext: (index: number) => void
   chatInputRef: RefObject<HTMLTextAreaElement>
-  serverCapabilities: Map<string, boolean>
+  supportsOnApplyInEditorV2: boolean
 }
 
 export const ChatContext = React.createContext<ChatContextValue>(
@@ -84,7 +84,7 @@ interface ChatProps extends React.ComponentProps<'div'> {
     | ((content: string) => void)
     | ((content: string, opts?: { languageId: string; smart: boolean }) => void)
   chatInputRef: RefObject<HTMLTextAreaElement>
-  serverCapabilities: Map<string, boolean>
+  supportsOnApplyInEditorV2: boolean
 }
 
 function ChatRenderer(
@@ -105,7 +105,7 @@ function ChatRenderer(
     onSubmitMessage,
     onApplyInEditor,
     chatInputRef,
-    serverCapabilities
+    supportsOnApplyInEditorV2
   }: ChatProps,
   ref: React.ForwardedRef<ChatRef>
 ) {
@@ -533,7 +533,7 @@ function ChatRenderer(
         removeRelevantContext,
         chatInputRef,
         activeSelection,
-        serverCapabilities
+        supportsOnApplyInEditorV2
       }}
     >
       <div className="flex justify-center overflow-x-hidden">

diff --git a/ee/tabby-ui/components/chat/question-answer.tsx b/ee/tabby-ui/components/chat/question-answer.tsx
@@ -108,7 +108,7 @@ function UserMessageCard(props: { message: UserMessage }) {
   const { message } = props
   const [{ data }] = useMe()
   const selectContext = message.selectContext
-  const { onNavigateToContext, serverCapabilities } =
+  const { onNavigateToContext, supportsOnApplyInEditorV2 } =
     React.useContext(ChatContext)
   const selectCodeSnippet = React.useMemo(() => {
     if (!selectContext?.content) return ''
@@ -166,7 +166,7 @@ function UserMessageCard(props: { message: UserMessage }) {
           <MessageMarkdown
             message={message.message}
             canWrapLongLines
-            serverCapabilities={serverCapabilities}
+            supportsOnApplyInEditorV2={supportsOnApplyInEditorV2}
           />
           <div className="hidden md:block">
             <UserMessageCardActions {...props} />
@@ -261,7 +261,7 @@ function AssistantMessageCard(props: AssistantMessageCardProps) {
     onNavigateToContext,
     onApplyInEditor,
     onCopyContent,
-    serverCapabilities
+    supportsOnApplyInEditorV2
   } = React.useContext(ChatContext)
   const [relevantCodeHighlightIndex, setRelevantCodeHighlightIndex] =
     React.useState<number | undefined>(undefined)
@@ -398,7 +398,7 @@ function AssistantMessageCard(props: AssistantMessageCardProps) {
               onCodeCitationMouseEnter={onCodeCitationMouseEnter}
               onCodeCitationMouseLeave={onCodeCitationMouseLeave}
               canWrapLongLines={!isLoading}
-              serverCapabilities={serverCapabilities}
+              supportsOnApplyInEditorV2={supportsOnApplyInEditorV2}
             />
             {!!message.error && <ErrorMessageBlock error={message.error} />}
           </>

diff --git a/ee/tabby-ui/components/message-markdown/index.tsx b/ee/tabby-ui/components/message-markdown/index.tsx
@@ -78,7 +78,7 @@ export interface MessageMarkdownProps {
   className?: string
   // wrapLongLines for code block
   canWrapLongLines?: boolean
-  serverCapabilities: Map<string, boolean>
+  supportsOnApplyInEditorV2: boolean
 }
 
 type MessageMarkdownContextValue = {
@@ -93,7 +93,7 @@ type MessageMarkdownContextValue = {
   contextInfo: ContextInfo | undefined
   fetchingContextInfo: boolean
   canWrapLongLines: boolean
-  serverCapabilities: Map<string, boolean>
+  supportsOnApplyInEditorV2: boolean
 }
 
 const MessageMarkdownContext = createContext<MessageMarkdownContextValue>(
@@ -111,7 +111,7 @@ export function MessageMarkdown({
   fetchingContextInfo,
   className,
   canWrapLongLines,
-  serverCapabilities,
+  supportsOnApplyInEditorV2,
   ...rest
 }: MessageMarkdownProps) {
   const messageAttachments: MessageAttachments = useMemo(() => {
@@ -187,7 +187,7 @@ export function MessageMarkdown({
         contextInfo,
         fetchingContextInfo: !!fetchingContextInfo,
         canWrapLongLines: !!canWrapLongLines,
-        serverCapabilities: serverCapabilities
+        supportsOnApplyInEditorV2
       }}
     >
       <MemoizedReactMarkdown
@@ -255,7 +255,7 @@ export function MessageMarkdown({
                 onApplyInEditor={onApplyInEditor}
                 onCopyContent={onCopyContent}
                 canWrapLongLines={canWrapLongLines}
-                serverCapabilities={serverCapabilities}
+                supportsOnApplyInEditorV2={supportsOnApplyInEditorV2}
                 {...props}
               />
             )
@@ -305,15 +305,15 @@ export function ErrorMessageBlock({
 }
 
 function CodeBlockWrapper(props: CodeBlockProps) {
-  const { canWrapLongLines, serverCapabilities } = useContext(
+  const { canWrapLongLines, supportsOnApplyInEditorV2 } = useContext(
     MessageMarkdownContext
   )
 
   return (
     <CodeBlock
       {...props}
       canWrapLongLines={canWrapLongLines}
-      serverCapabilities={serverCapabilities}
+      supportsOnApplyInEditorV2={supportsOnApplyInEditorV2}
     />
   )
 }

diff --git a/ee/tabby-ui/components/ui/codeblock.tsx b/ee/tabby-ui/components/ui/codeblock.tsx
@@ -35,7 +35,7 @@ export interface CodeBlockProps {
     opts?: { languageId: string; smart: boolean }
   ) => void
   canWrapLongLines: boolean | undefined
-  serverCapabilities: Map<string, boolean>
+  supportsOnApplyInEditorV2: boolean
 }
 
 interface languageMap {
@@ -85,7 +85,7 @@ const CodeBlock: FC<CodeBlockProps> = memo(
     onCopyContent,
     onApplyInEditor,
     canWrapLongLines,
-    serverCapabilities
+    supportsOnApplyInEditorV2
   }) => {
     const [wrapLongLines, setWrapLongLines] = useState(false)
     const { isCopied, copyToClipboard } = useCopyToClipboard({
@@ -123,7 +123,7 @@ const CodeBlock: FC<CodeBlockProps> = memo(
                 </TooltipContent>
               </Tooltip>
             )}
-            {serverCapabilities.get('onApplyInEditorV2') && onApplyInEditor && (
+            {supportsOnApplyInEditorV2 && onApplyInEditor && (
               <Tooltip>
                 <TooltipTrigger asChild>
                   <Button
@@ -146,7 +146,7 @@ const CodeBlock: FC<CodeBlockProps> = memo(
                 </TooltipContent>
               </Tooltip>
             )}
-            {serverCapabilities.get('onApplyInEditor') && onApplyInEditor && (
+            {onApplyInEditor && (
               <Tooltip>
                 <TooltipTrigger asChild>
                   <Button