@applica-software-guru/persona-sdk 0.1.69 → 0.1.70

package/dist/protocol/transaction.d.ts

@@ -22,7 +22,7 @@ declare class PersonaPersistableTransaction {
     private manager;
     constructor(transaction: PersonaTransaction, manager: PersonaTransactionsManager);
     getFunctionCall(): FunctionCall | null;
-    invoke(tools: PersonaTools): Promise<void>;
+    invoke(tools: PersonaTools, toolInstance?: ToolInstance): Promise<void>;
     complete(output: any): Promise<void>;
     fail(error: string): Promise<void>;
 }
@@ -39,9 +39,11 @@ declare class PersonaTransactionProtocol extends PersonaProtocolBase {
     config: PersonaTransactionProtocolConfig;
     notify: boolean;
     private _tools;
+    private _toolSchema;
     constructor(config: PersonaTransactionProtocolConfig);
     getName(): string;
     getPriority(): number;
+    getToolInstance(name: string): ToolInstance | undefined;
     connect(session: Session): Promise<Session>;
     disconnect(): Promise<void>;
     syncSession(session: Session): Promise<void>;

package/dist/protocol/transaction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transaction.d.ts","sourceRoot":"","sources":["../../../src/protocol/transaction.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"transaction.d.ts","sourceRoot":"","sources":["../../../src/protocol/transaction.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@applica-software-guru/persona-sdk",
   "private": false,
-  "version": "0.1.69",
+  "version": "0.1.70",
   "type": "module",
   "scripts": {
     "dev": "vite",

package/src/protocol/transaction.ts

@@ -1,6 +1,7 @@
 import { PersonaProtocolBase } from './base';
 import { Session, ProtocolStatus, PersonaProtocolBaseConfig, PersonaTransaction, FunctionCall, PersonaPacket } from '../types';
 import { ToolInstance } from '../tools';
+import _ from 'lodash';
 
 type FinishTransactionRequest = {
   success: boolean;
@@ -56,7 +57,7 @@ class PersonaPersistableTransaction {
     return this.transaction.functionCall;
   }
 
-  async invoke(tools: PersonaTools): Promise<void> {
+  async invoke(tools: PersonaTools, toolInstance?: ToolInstance): Promise<void> {
     const functionCall = this.transaction.functionCall;
     if (!functionCall) {
       await this.fail('No function call found');
@@ -70,15 +71,18 @@ class PersonaPersistableTransaction {
       return;
     }
     try {
-      // Get parameter names in order
+      const properties = _.get(toolInstance, 'schema.config.parameters.properties', {});
       const paramNames =
-        tool
-          .toString()
-          .replace(/\n/g, ' ')
-          .match(/^[^(]*\(([^)]*)\)/)?.[1]
-          .split(',')
-          .map((p: string) => p.trim())
-          .filter(Boolean) || [];
+        properties && Object.keys(properties).length > 0
+          ? Object.keys(properties)
+          : tool
+              .toString()
+              .replace(/\n/g, ' ')
+              .match(/^[^(]*\(([^)]*)\)/)?.[1]
+              .split(',')
+              .map((p: string) => p.trim())
+              .filter(Boolean) || [];
+
       // Map arguments in order
       const orderedArgs = paramNames.map((name: string) => functionArgs[name]);
       const result = await tool.apply(null, orderedArgs);
@@ -110,6 +114,7 @@ class PersonaTransactionProtocol extends PersonaProtocolBase {
   config: PersonaTransactionProtocolConfig;
   notify: boolean = true;
   private _tools: PersonaTools;
+  private _toolSchema: { [key: string]: ToolInstance } = {};
 
   constructor(config: PersonaTransactionProtocolConfig) {
     super();
@@ -121,6 +126,7 @@ class PersonaTransactionProtocol extends PersonaProtocolBase {
       for (const tool of config.tools as ToolInstance[]) {
         if (tool.schema && tool.implementation) {
           this._tools[tool.schema.name] = tool.implementation;
+          this._toolSchema[tool.schema.name] = tool;
         }
       }
     } else {
@@ -136,6 +142,10 @@ class PersonaTransactionProtocol extends PersonaProtocolBase {
     return 0;
   }
 
+  public getToolInstance(name: string): ToolInstance | undefined {
+    return this._toolSchema[name];
+  }
+
   public async connect(session: Session): Promise<Session> {
     this.setStatus('connected');
     return session;
@@ -153,13 +163,13 @@ class PersonaTransactionProtocol extends PersonaProtocolBase {
   public async sendPacket(_: PersonaPacket): Promise<void> {}
 
   public onTransaction(transaction: PersonaTransaction): void {
-    console.log('transaction received:', transaction);
     const manager = new PersonaTransactionsManager(this.config);
     const persistable = new PersonaPersistableTransaction(transaction, manager);
     if (this.config.onTransaction) {
       this.config.onTransaction(persistable);
     } else {
-      persistable.invoke(this._tools);
+      const toolInstance = transaction.functionCall ? this.getToolInstance(transaction.functionCall.name) : undefined;
+      persistable.invoke(this._tools, toolInstance);
     }
   }