Merge pull request #36 from dcSpark/nico/update-wasm-intra-sender

update wasm with intra sender
dcSpark · Oct 11, 2023 · 6e386c3 · 6e386c3
2 parents baeddf2 + 606a754
commit 6e386c3
Show file tree

Hide file tree

Showing 24 changed files with 300 additions and 190 deletions.
diff --git a/apps/shinkai-app/src/pages/Chat.tsx b/apps/shinkai-app/src/pages/Chat.tsx
@@ -135,8 +135,8 @@ const Chat: React.FC = () => {
     if (selectedFile) {
       // Call sendTextMessageWithFilesForInbox if selectedFile is not null
       ({ inboxId, message } = await sendTextMessageWithFilesForInbox(
-        sender,
-        '',
+        shinkai_identity,
+        profile,
         receiver,
         inputMessage,
         deserializedId,
@@ -145,8 +145,8 @@ const Chat: React.FC = () => {
       ));
     } else {
       ({ inboxId, message } = await sendTextMessageWithInbox(
-        sender,
-        '',
+        shinkai_identity,
+        profile,
         receiver,
         inputMessage,
         deserializedId,

diff --git a/apps/shinkai-app/src/pages/CreateJob.tsx b/apps/shinkai-app/src/pages/CreateJob.tsx
@@ -12,30 +12,36 @@ import {
   IonSelectOption,
   IonTextarea,
   IonTitle,
-} from "@ionic/react";
+} from '@ionic/react';
 import {
-  createJob, getProfileAgents, sendMessageToJob
-} from "@shinkai_network/shinkai-message-ts/api";
-import { SerializedAgent } from "@shinkai_network/shinkai-message-ts/models";
-import { InboxNameWrapper, JobCreationWrapper,JobScopeWrapper } from "@shinkai_network/shinkai-message-ts/wasm";
-import { History } from "history";
-import { useEffect, useState } from "react";
-import { useDispatch, useSelector } from "react-redux";
-import { useHistory } from "react-router-dom";
-
-import Button from "../components/ui/Button";
-import { IonContentCustom, IonHeaderCustom } from "../components/ui/Layout";
-import { useSetup } from "../hooks/usetSetup";
-import { RootState } from "../store";
-import { addAgents } from "../store/actions";
+  createJob,
+  getProfileAgents,
+  sendMessageToJob,
+} from '@shinkai_network/shinkai-message-ts/api';
+import { SerializedAgent } from '@shinkai_network/shinkai-message-ts/models';
+import {
+  InboxNameWrapper,
+  JobCreationWrapper,
+  JobScopeWrapper,
+} from '@shinkai_network/shinkai-message-ts/wasm';
+import { History } from 'history';
+import { useEffect, useState } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import { useHistory } from 'react-router-dom';
+
+import Button from '../components/ui/Button';
+import { IonContentCustom, IonHeaderCustom } from '../components/ui/Layout';
+import { useSetup } from '../hooks/usetSetup';
+import { RootState } from '../store';
+import { addAgents } from '../store/actions';
 
 const CreateJob: React.FC = () => {
   useSetup();
   const dispatch = useDispatch();
   const setupDetailsState = useSelector(
     (state: RootState) => state.setupDetails
   );
-  const [jobContent, setJobContent] = useState("");
+  const [jobContent, setJobContent] = useState('');
   const [selectedAgent, setSelectedAgent] = useState<SerializedAgent | null>(
     null
   );
@@ -44,71 +50,77 @@ const CreateJob: React.FC = () => {
 
   useEffect(() => {
     const fetchAgents = async () => {
-      const { shinkai_identity, profile } =
-        setupDetailsState;
+      const { shinkai_identity, profile } = setupDetailsState;
       const node_name = shinkai_identity;
       const sender_subidentity = `${profile}`;
 
       const profiles = await getProfileAgents(
-        node_name + '/' + sender_subidentity,
-        '',
+        node_name,
+        sender_subidentity,
         node_name,
         setupDetailsState
       );
       dispatch(addAgents(profiles));
+
+      // Set the first agent as the selected agent
+      if (profiles.length > 0) {
+        setSelectedAgent(profiles[0]);
+      }
     };
 
     fetchAgents();
   }, [dispatch, setupDetailsState]);
 
   const handleCreateJob = async () => {
-    console.log("Creating job with content:", jobContent);
+    console.log('Creating job with content:', jobContent);
 
     const { shinkai_identity, profile } = setupDetailsState;
-    const sender = shinkai_identity + "/" + profile;
+    const sender = shinkai_identity + '/' + profile;
 
     const job_creation = JobCreationWrapper.empty().get_scope;
-    console.log("buckets: ", job_creation.buckets);
-    console.log("scope:", job_creation);
+    console.log('buckets: ', job_creation.buckets);
+    console.log('scope:', job_creation);
 
     const scope = new JobScopeWrapper(
       job_creation.buckets,
       job_creation.documents
     );
-    console.log("scope:", scope.to_jsvalue());
+    console.log('scope:', scope.to_jsvalue());
 
-    console.log("Selected agent:", selectedAgent);
+    console.log('Selected agent:', selectedAgent);
 
     const receiver = shinkai_identity;
     const receiver_subidentity = `${profile}/agent/${selectedAgent?.id}`;
 
     // Call createJob
     const jobId = await createJob(
       scope.to_jsvalue(),
-      sender,
+      shinkai_identity,
+      profile,
       receiver,
       receiver_subidentity,
       setupDetailsState
     );
-    console.log("Job created with id:", jobId);
+    console.log('Job created with id:', jobId);
 
     if (jobId) {
       const result = await sendMessageToJob(
         jobId.toString(),
         jobContent,
-        "",
-        sender,
+        '',
+        shinkai_identity,
+        profile,
         receiver,
         receiver_subidentity,
         setupDetailsState
       );
-      dispatch({ type: "SEND_MESSAGE_SUCCESS", payload: result });
+      dispatch({ type: 'SEND_MESSAGE_SUCCESS', payload: result });
 
       // Hacky solution because react-router can't handle dots in the URL
       const jobInboxName = InboxNameWrapper.get_job_inbox_name_from_params(
         jobId.toString()
       );
-      const encodedJobId = jobInboxName.get_value.replace(/\./g, "~");
+      const encodedJobId = jobInboxName.get_value.replace(/\./g, '~');
       history.push(`/job-chat/${encodeURIComponent(encodedJobId)}`);
     }
   };
@@ -124,12 +136,12 @@ const CreateJob: React.FC = () => {
       <IonContentCustom>
         <IonGrid
           className={
-            "md:rounded-[1.25rem] bg-white dark:bg-slate-800 p-4 md:p-10 space-y-2 md:space-y-4"
+            'md:rounded-[1.25rem] bg-white dark:bg-slate-800 p-4 md:p-10 space-y-2 md:space-y-4'
           }
         >
           <IonRow>
             <IonCol>
-              <h2 className={"text-lg mb-3 md:mb-8 text-center"}>
+              <h2 className={'text-lg mb-3 md:mb-8 text-center'}>
                 New Job Details
               </h2>
 
@@ -156,7 +168,7 @@ const CreateJob: React.FC = () => {
                 />
               </IonItem>
 
-              <div style={{ marginTop: "20px" }}>
+              <div style={{ marginTop: '20px' }}>
                 <Button onClick={handleCreateJob}>Create Job</Button>
               </div>
             </IonCol>

diff --git a/apps/shinkai-app/src/pages/JobChat.tsx b/apps/shinkai-app/src/pages/JobChat.tsx
@@ -63,16 +63,13 @@ const JobChat: React.FC = () => {
     console.log('Sending message: ', inputMessage);
     if (inputMessage.trim() === '') return;
 
-    const sender = `${shinkai_identity}/${profile}`;
-    console.log('Sender:', sender);
-
     const message_to_send = inputMessage;
     setInputMessage('');
     setSelectedFile(null);
     if (selectedFile) {
       sendTextMessageWithFilesForInbox(
-        sender,
-        '',
+        shinkai_identity,
+        profile,
         shinkai_identity,
         message_to_send,
         deserializedId,
@@ -86,7 +83,8 @@ const JobChat: React.FC = () => {
         extractJobIdFromInbox(deserializedId.toString()),
         message_to_send,
         '',
-        sender,
+        shinkai_identity,
+        profile,
         shinkai_identity,
         '',
         setupDetailsState

diff --git a/apps/shinkai-visor/src/components/inbox/inbox.tsx b/apps/shinkai-visor/src/components/inbox/inbox.tsx
@@ -108,14 +108,13 @@ export const Inbox = () => {
     fromPreviousMessagesRef.current = false;
     const decodedInboxId = decodeURIComponent(inboxId);
     if (isJobInbox(decodedInboxId)) {
-      const sender = `${auth.shinkai_identity}/${auth.profile}`;
       const jobId = extractJobIdFromInbox(decodedInboxId);
       sendMessageToJob({
         jobId,
         message: value,
-        sender,
         files_inbox: '',
         shinkaiIdentity: auth.shinkai_identity,
+        profile: auth.profile,
         my_device_encryption_sk: auth.my_device_encryption_sk,
         my_device_identity_sk: auth.my_device_identity_sk,
         node_encryption_pk: auth.node_encryption_pk,
@@ -126,12 +125,13 @@ export const Inbox = () => {
       const sender = `${auth.shinkai_identity}/${auth.profile}/device/${auth.registration_name}`;
       const receiver = extractReceiverShinkaiName(decodedInboxId, sender);
       sendMessageToInbox({
-        sender,
+        sender: auth.shinkai_identity,
+        sender_subidentity: auth.profile,
         receiver,
         message: value,
         inboxId: inboxId as string,
-        my_device_encryption_sk: auth.profile_encryption_sk,
-        my_device_identity_sk: auth.profile_identity_sk,
+        my_device_encryption_sk: auth.my_device_encryption_sk,
+        my_device_identity_sk: auth.my_device_identity_sk,
         node_encryption_pk: auth.node_encryption_pk,
         profile_encryption_sk: auth.profile_encryption_sk,
         profile_identity_sk: auth.profile_identity_sk,

diff --git a/apps/shinkai-visor/src/store/inbox/inbox-actions.ts b/apps/shinkai-visor/src/store/inbox/inbox-actions.ts
@@ -122,13 +122,13 @@ export const sendMessage = createAsyncThunk<
   ApiConfig.getInstance().setEndpoint(node.nodeData.nodeAddress);
 
   if (isJobInbox(args.inboxId)) {
-    const sender = `${node.nodeData.shinkaiIdentity}/${node.nodeData.profile}`;
     const jobId = extractJobIdFromInbox(args.inboxId);
     await sendMessageToJob(
       jobId,
       args.message,
       '',
-      sender,
+      node.nodeData.shinkaiIdentity,
+      node.nodeData.profile,
       node.nodeData.shinkaiIdentity,
       '',
       {

diff --git a/apps/shinkai-visor/src/store/jobs/jobs-actions.ts b/apps/shinkai-visor/src/store/jobs/jobs-actions.ts
@@ -22,8 +22,6 @@ export const createJob = createAsyncThunk<
 
   ApiConfig.getInstance().setEndpoint(node.nodeData.nodeAddress);
 
-  const sender = node.nodeData.shinkaiIdentity + "/" + node.nodeData.profile;
-  const receiver = node.nodeData.shinkaiIdentity;
   const receiver_subidentity = `${node.nodeData.profile}/agent/${args.agentId}`;
 
   const job_creation = JobCreationWrapper.empty().get_scope;
@@ -34,8 +32,9 @@ export const createJob = createAsyncThunk<
 
   const jobId = await createJobApi(
     scope.to_jsvalue(),
-    sender,
-    receiver,
+    node.nodeData.shinkaiIdentity,
+    node.nodeData.profile,
+    node.nodeData.shinkaiIdentity,
     receiver_subidentity,
     {
       my_device_encryption_sk: node.credentials.myDeviceEncryptionSharedKey,
@@ -50,8 +49,9 @@ export const createJob = createAsyncThunk<
     jobId,
     args.content,
     '',
-    sender,
-    receiver,
+    node.nodeData.shinkaiIdentity,
+    node.nodeData.profile,
+    node.nodeData.shinkaiIdentity,
     receiver_subidentity,
     {
       my_device_encryption_sk: node.credentials.myDeviceEncryptionSharedKey,

diff --git a/libs/shinkai-message-ts/package.json b/libs/shinkai-message-ts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shinkai_network/shinkai-message-ts",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "description": "Shinkai Message TS wrapper for wasm library",
   "type": "module",
   "main": "src/index.js",