Merge pull request #548 from dcSpark/paulccari/update-use-tools

fix: misc improvements
dcSpark · Dec 3, 2024 · dd9c89e · dd9c89e
2 parents c4da44e + a7a90b7
commit dd9c89e
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 9 deletions.
diff --git a/apps/shinkai-desktop/src/components/agent/add-agent.tsx b/apps/shinkai-desktop/src/components/agent/add-agent.tsx
@@ -93,7 +93,7 @@ function AddAgentPage() {
         custom_prompt: '',
         custom_system_prompt: '',
         other_model_params: {},
-        use_tools: DEFAULT_CHAT_CONFIG.use_tools,
+        use_tools: true,
       },
       llmProviderId: defaultAgentId,
     },

diff --git a/apps/shinkai-desktop/src/pages/chat/empty-message.tsx b/apps/shinkai-desktop/src/pages/chat/empty-message.tsx
@@ -111,8 +111,8 @@ const EmptyMessage = () => {
             </Badge>
             {[
               {
-                text: 'Search in Perplexity',
-                prompt: 'Search in Perplexity for: ',
+                text: 'Search in DuckDuckGo',
+                prompt: 'Search in DuckDuckGo for: ',
               },
               {
                 text: 'Summarize a Youtube video',

diff --git a/apps/shinkai-desktop/src/pages/layout/main-layout.tsx b/apps/shinkai-desktop/src/pages/layout/main-layout.tsx
@@ -183,8 +183,12 @@ const ResetConnectionDialog = ({
   isOpen: boolean;
   onOpenChange: (open: boolean) => void;
 }) => {
-  const { mutateAsync: shinkaiNodeKill } = useShinkaiNodeKillMutation();
-  const { mutateAsync: shinkaiNodeSpawn } = useShinkaiNodeSpawnMutation({
+  const { mutateAsync: shinkaiNodeKill, isPending: isShinkaiNodeKillPending } =
+    useShinkaiNodeKillMutation();
+  const {
+    mutateAsync: shinkaiNodeSpawn,
+    isPending: isShinkaiNodeSpawnPending,
+  } = useShinkaiNodeSpawnMutation({
     onSuccess: async () => {
       if (!encryptionKeys) return;
       await submitRegistrationNoCode({
@@ -195,13 +199,20 @@ const ResetConnectionDialog = ({
       });
     },
   });
-  const { mutateAsync: shinkaiNodeRemoveStorage } =
-    useShinkaiNodeRemoveStorageMutation();
+  const {
+    mutateAsync: shinkaiNodeRemoveStorage,
+    isPending: isShinkaiNodeRemoveStoragePending,
+  } = useShinkaiNodeRemoveStorageMutation();
   const { setShinkaiNodeOptions } = useShinkaiNodeManager();
   const { encryptionKeys } = useGetEncryptionKeys();
   const setAuth = useAuth((state) => state.setAuth);
   const navigate = useNavigate();
 
+  const isResetLoading =
+    isShinkaiNodeKillPending ||
+    isShinkaiNodeRemoveStoragePending ||
+    isShinkaiNodeSpawnPending;
+
   const { mutateAsync: submitRegistrationNoCode } = useSubmitRegistrationNoCode(
     {
       onSuccess: (response, setupPayload) => {
@@ -254,6 +265,8 @@ const ResetConnectionDialog = ({
         <AlertDialogFooter className="mt-4 flex items-center justify-end gap-2.5">
           <Button
             className="min-w-32 text-sm"
+            disabled={isResetLoading}
+            isLoading={isResetLoading}
             onClick={handleReset}
             size="sm"
             variant={'destructive'}
@@ -627,6 +640,8 @@ const MainLayout = () => {
     }
     if (isSuccess && nodeInfo?.update_requires_reset) {
       setNeedsResetApp(true);
+    } else {
+      setNeedsResetApp(false);
     }
   }, [isSuccess, nodeInfo?.status, isFetching]);
 

diff --git a/libs/shinkai-message-ts/src/api/tools/index.ts b/libs/shinkai-message-ts/src/api/tools/index.ts
@@ -17,6 +17,7 @@ import {
   GetPlaygroundToolsResponse,
   GetToolResponse,
   GetToolsResponse,
+  GetToolsSearchResponse,
   PayInvoiceRequest,
   SaveToolCodeRequest,
   SaveToolCodeResponse,
@@ -86,7 +87,9 @@ export const searchTools = async (
       responseType: 'json',
     },
   );
-  return response.data as GetToolsResponse;
+  const data = response.data as GetToolsSearchResponse;
+  const formattedData = data.map(([header]) => header);
+  return formattedData as GetToolsResponse;
 };
 
 export const updateTool = async (

diff --git a/libs/shinkai-message-ts/src/api/tools/types.ts b/libs/shinkai-message-ts/src/api/tools/types.ts
@@ -92,6 +92,7 @@ export type GetToolResponse = {
   type: ShinkaiToolType;
 };
 export type GetToolsResponse = ShinkaiToolHeader[];
+export type GetToolsSearchResponse = [ShinkaiToolHeader, number][];
 
 export type AddToolRequest = {
   type: ShinkaiToolType;

diff --git a/libs/shinkai-node-state/src/v2/constants.ts b/libs/shinkai-node-state/src/v2/constants.ts
@@ -43,7 +43,7 @@ export const DEFAULT_CHAT_CONFIG = {
   top_k: 40,
   top_p: 0.9,
   stream: true,
-  use_tools: true,
+  use_tools: false,
 } as const;
 
 export const OPTIMISTIC_USER_MESSAGE_ID = 'OPTIMISTIC_USER_MESSAGE_ID';