@optimizely-opal/opal-tool-ocp-sdk 1.0.0-beta.2 → 1.0.0-beta.3

package/src/function/GlobalToolFunction.test.ts

@@ -36,6 +36,9 @@ jest.mock('@zaiusinc/app-sdk', () => ({
     warn: jest.fn(),
     debug: jest.fn(),
   },
+  LogVisibility: {
+    Zaius: 'zaius'
+  },
 }));
 
 // Create a concrete implementation for testing

package/src/function/GlobalToolFunction.ts

@@ -1,6 +1,7 @@
 import { GlobalFunction, Response, amendLogContext } from '@zaiusinc/app-sdk';
 import { authenticateGlobalRequest, extractAuthData } from '../auth/AuthUtils';
 import { toolsService } from '../service/Service';
+import { ToolLogger } from '../logging/ToolLogger';
 
 /**
  * Abstract base class for global tool-based function execution
@@ -24,6 +25,8 @@ export abstract class GlobalToolFunction extends GlobalFunction {
    * @returns Response as the HTTP response
    */
   public async perform(): Promise<Response> {
+    const startTime = Date.now();
+
     // Extract customer_id from auth data for global context attribution
     const authInfo = extractAuthData(this.request);
     const customerId = authInfo?.authData?.credentials?.customer_id;
@@ -33,6 +36,14 @@ export abstract class GlobalToolFunction extends GlobalFunction {
       customerId: customerId || ''
     });
 
+    ToolLogger.logRequest(this.request);
+
+    const response = await this.handleRequest();
+    ToolLogger.logResponse(this.request, response, Date.now() - startTime);
+    return response;
+  }
+
+  private async handleRequest(): Promise<Response> {
     if (!(await this.authorizeRequest())) {
       return new Response(403, { error: 'Forbidden' });
     }

package/src/function/ToolFunction.test.ts

@@ -36,6 +36,9 @@ jest.mock('@zaiusinc/app-sdk', () => ({
     warn: jest.fn(),
     debug: jest.fn(),
   },
+  LogVisibility: {
+    Zaius: 'zaius'
+  },
 }));
 
 // Create a concrete implementation for testing

package/src/function/ToolFunction.ts

@@ -1,6 +1,7 @@
 import { Function, Response, amendLogContext } from '@zaiusinc/app-sdk';
 import { authenticateRegularRequest } from '../auth/AuthUtils';
 import { toolsService } from '../service/Service';
+import { ToolLogger } from '../logging/ToolLogger';
 
 /**
  * Abstract base class for tool-based function execution
@@ -19,12 +20,28 @@ export abstract class ToolFunction extends Function {
   }
 
   /**
-   * Process the incoming request using the tools service
+   * Process the incoming request with logging
    *
    * @returns Response as the HTTP response
    */
   public async perform(): Promise<Response> {
+    const startTime = Date.now();
     amendLogContext({ opalThreadId: this.request.headers.get('x-opal-thread-id') || '' });
+
+    ToolLogger.logRequest(this.request);
+
+    const response = await this.handleRequest();
+
+    ToolLogger.logResponse(this.request, response, Date.now() - startTime);
+    return response;
+  }
+
+  /**
+   * Handle the core request processing logic
+   *
+   * @returns Response as the HTTP response
+   */
+  private async handleRequest(): Promise<Response> {
     if (!(await this.authorizeRequest())) {
       return new Response(403, { error: 'Forbidden' });
     }
@@ -33,6 +50,7 @@ export abstract class ToolFunction extends Function {
       const isReady = await this.ready();
       return new Response(200, { ready: isReady });
     }
+
     // Pass 'this' as context so decorated methods can use the existing instance
     return toolsService.processRequest(this.request, this);
   }