fix: direct invoke (#134)

* fix: direct invoke

* fix: direct invoke

* fix: direct invocation

* chore: debug info

* fix: direct invocation

* fix: include static prompts

* fix: static prompts, move agents out of tasks

* fix: move prompt files to static

* fix: prompt path

* fix: prompt path

* fix: persist siteId

Author: solaris007

package.json

@@ -42,6 +42,7 @@
     "timeout": 900000,
     "nodeVersion": 22,
     "static": [
+      "static/prompts/",
       "static/cls1.md",
       "static/cls2.md",
       "static/inp1.md",

src/tasks/agents/base.js renamed to src/agents/base.js

@@ -10,13 +10,10 @@
  * governing permissions and limitations under the License.
  */
 import { readFileSync } from 'fs';
-import { fileURLToPath } from 'url';
 import path from 'path';
 
-export function readPromptFile(importMetaUrl, relPath) {
-  const filename = fileURLToPath(importMetaUrl);
-  const dirname = path.dirname(filename);
-  const fullPath = path.resolve(dirname, relPath);
+export function readPromptFile(relPath) {
+  const fullPath = path.resolve(process.cwd(), 'static/prompts/', relPath);
   return readFileSync(fullPath, 'utf-8');
 }
 

src/tasks/agents/brand-profile/index.js renamed to src/agents/brand-profile/index.js

@@ -42,8 +42,8 @@ async function run(context, env, log) {
     throw new Error('brand-profile: context.baseURL is required');
   }
 
-  const systemPrompt = readPromptFile(import.meta.url, './prompts/system.prompt');
-  const userTemplate = readPromptFile(import.meta.url, './prompts/user.prompt');
+  const systemPrompt = readPromptFile('brand-profile/system.prompt');
+  const userTemplate = readPromptFile('brand-profile/user.prompt');
   const userPrompt = renderTemplate(userTemplate, { baseURL, params: JSON.stringify(params) });
 
   return callModel({
@@ -53,7 +53,7 @@ async function run(context, env, log) {
 
 async function persist(message, context, result) {
   const { log, dataAccess } = context;
-  const siteId = message?.context?.siteId;
+  const siteId = message?.siteId;
 
   if (!isValidUUID(siteId)) {
     log.warn(`brand-profile persist: invalid siteId ${siteId}`);

src/tasks/agents/registry.js renamed to src/agents/registry.js

@@ -13,9 +13,14 @@ import wrap from '@adobe/helix-shared-wrap';
 import { helixStatus } from '@adobe/helix-status';
 import secrets from '@adobe/helix-shared-secrets';
 import dataAccess from '@adobe/spacecat-shared-data-access';
-import { sqsEventAdapter } from '@adobe/spacecat-shared-utils';
-import { internalServerError, notFound, ok } from '@adobe/spacecat-shared-http-utils';
+import {
+  internalServerError,
+  notFound,
+  ok,
+  badRequest,
+} from '@adobe/spacecat-shared-http-utils';
 import { imsClientWrapper } from '@adobe/spacecat-shared-ims-client';
+import { isNonEmptyObject, sqsEventAdapter } from '@adobe/spacecat-shared-utils';
 
 import { runOpportunityStatusProcessor as opportunityStatusProcessor } from './tasks/opportunity-status-processor/handler.js';
 import { runDisableImportAuditProcessor as disableImportAuditProcessor } from './tasks/disable-import-audit-processor/handler.js';
@@ -31,7 +36,7 @@ const HANDLERS = {
   'agent-executor': agentExecutor,
   'slack-notify': slackNotify,
   'cwv-demo-suggestions-processor': cwvDemoSuggestionsProcessor,
-  dummy: (message) => ok(message),
+  dummy: (message) => ok(message), // for tests
 };
 
 // Custom secret name resolver to use the correct secret path
@@ -93,17 +98,20 @@ const runDirect = wrap(processTask)
   .with(secrets, { name: getSecretName })
   .with(helixStatus);
 
-function isSqsEvent(event, context) {
-  if (Array.isArray(event?.Records)) {
-    return true;
-  }
-  if (Array.isArray(context?.invocation?.event?.Records)) {
-    return true;
-  }
-  return typeof event?.type !== 'string';
+function isSqsEvent(event) {
+  return Array.isArray(event?.Records);
 }
 
 export const main = async (event, context) => {
-  const handler = isSqsEvent(event, context) ? runSQS : runDirect;
-  return handler(event, context);
+  if (isSqsEvent(event)) {
+    return runSQS(event, context);
+  }
+
+  const payload = context?.invocation?.event;
+  if (!isNonEmptyObject(payload)) {
+    context?.log?.warn?.('Direct invocation missing payload');
+    return badRequest('Event does not contain a valid message body');
+  }
+
+  return runDirect(payload, context);
 };

src/index.js

@@ -12,7 +12,7 @@
 import { ok, badRequest } from '@adobe/spacecat-shared-http-utils';
 import { hasText, isNonEmptyObject } from '@adobe/spacecat-shared-utils';
 
-import { getAgent } from '../agents/registry.js';
+import { getAgent } from '../../agents/registry.js';
 
 /**
  * Message shape:

src/tasks/agent-executor/handler.js

@@ -13,12 +13,10 @@
 /* eslint-env mocha */
 
 import { expect } from 'chai';
-import { fileURLToPath } from 'url';
 import path from 'path';
-import os from 'os';
 import fs from 'fs';
 
-import { readPromptFile, renderTemplate } from '../../../src/tasks/agents/base.js';
+import { readPromptFile, renderTemplate } from '../../src/agents/base.js';
 
 describe('agents/base utilities', () => {
   describe('renderTemplate', () => {
@@ -46,39 +44,22 @@ describe('agents/base utilities', () => {
   });
 
   describe('readPromptFile', () => {
-    const testDir = path.dirname(fileURLToPath(import.meta.url));
-
     const unlink = (filePath) => {
       try {
         fs.unlinkSync(filePath);
       } catch (e) { /* ignore */ }
     };
 
-    it('reads a file via relative path against import.meta.url dirname', () => {
+    it('reads a file via relative path against static prompt dirname', () => {
       const relName = 'tmp.prompt';
-      const relPath = `./${relName}`;
-      const absPath = path.resolve(testDir, relName);
+      const absPath = path.resolve(process.cwd(), 'static/prompts/', relName);
       const content = 'relative content';
       try {
         fs.writeFileSync(absPath, content, 'utf-8');
-        const read = readPromptFile(import.meta.url, relPath);
-        expect(read).to.equal(content);
-      } finally {
-        unlink(absPath);
-      }
-    });
-
-    it('reads a file via absolute path ignoring dirname resolution', () => {
-      const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'base-test-'));
-      const absPath = path.join(tmpDir, 'abs.prompt');
-      const content = 'absolute content';
-      try {
-        fs.writeFileSync(absPath, content, 'utf-8');
-        const read = readPromptFile(import.meta.url, absPath);
+        const read = readPromptFile('./tmp.prompt');
         expect(read).to.equal(content);
       } finally {
         unlink(absPath);
-        unlink(tmpDir);
       }
     });
   });

src/tasks/agents/brand-profile/prompts/system.prompt renamed to static/prompts/brand-profile/system.prompt

@@ -49,11 +49,11 @@ describe('agents/brand-profile', () => {
     });
     const createFrom = sandbox.stub().returns({ fetchChatCompletion });
 
-    const mod = await esmock('../../../../src/tasks/agents/brand-profile/index.js', {
+    const mod = await esmock('../../../src/agents/brand-profile/index.js', {
       '@adobe/spacecat-shared-gpt-client': {
         AzureOpenAIClient: { createFrom },
       },
-      '../../../../src/tasks/agents/base.js': {
+      '../../../src/agents/base.js': {
         readPromptFile: sandbox.stub()
           .onFirstCall()
           .returns('SYS_PROMPT')
@@ -78,8 +78,8 @@ describe('agents/brand-profile', () => {
   });
 
   it('run() throws on invalid baseURL', async () => {
-    const mod = await esmock('../../../../src/tasks/agents/brand-profile/index.js', {
-      '../../../../src/tasks/agents/base.js': {
+    const mod = await esmock('../../../src/agents/brand-profile/index.js', {
+      '../../../src/agents/base.js': {
         readPromptFile: sandbox.stub(),
         renderTemplate: sandbox.stub(),
       },
@@ -94,11 +94,11 @@ describe('agents/brand-profile', () => {
     });
     const createFrom = sandbox.stub().returns({ fetchChatCompletion });
 
-    const mod = await esmock('../../../../src/tasks/agents/brand-profile/index.js', {
+    const mod = await esmock('../../../src/agents/brand-profile/index.js', {
       '@adobe/spacecat-shared-gpt-client': {
         AzureOpenAIClient: { createFrom },
       },
-      '../../../../src/tasks/agents/base.js': {
+      '../../../src/agents/base.js': {
         readPromptFile: sandbox.stub()
           .onFirstCall()
           .returns('SYS_PROMPT')
@@ -119,11 +119,11 @@ describe('agents/brand-profile', () => {
     });
     const createFrom = sandbox.stub().returns({ fetchChatCompletion });
 
-    const mod = await esmock('../../../../src/tasks/agents/brand-profile/index.js', {
+    const mod = await esmock('../../../src/agents/brand-profile/index.js', {
       '@adobe/spacecat-shared-gpt-client': {
         AzureOpenAIClient: { createFrom },
       },
-      '../../../../src/tasks/agents/base.js': {
+      '../../../src/agents/base.js': {
         readPromptFile: sandbox.stub()
           .onFirstCall()
           .returns('SYS_PROMPT')
@@ -142,20 +142,20 @@ describe('agents/brand-profile', () => {
   });
 
   it('persist() returns early for invalid siteId', async () => {
-    const mod = await esmock('../../../../src/tasks/agents/brand-profile/index.js', {});
+    const mod = await esmock('../../../src/agents/brand-profile/index.js', {});
 
     await mod.default.persist(
-      { context: { siteId: 'invalid' } },
+      { siteId: 'invalid' },
       context,
       { ok: true },
     );
     expect(log.warn).to.have.been.calledWith(sinon.match('brand-profile persist: invalid siteId'));
   });
 
   it('persist() returns early for empty result', async () => {
-    const mod = await esmock('../../../../src/tasks/agents/brand-profile/index.js', {});
+    const mod = await esmock('../../../src/agents/brand-profile/index.js', {});
     await mod.default.persist(
-      { context: { siteId: '123e4567-e89b-12d3-a456-426614174000' } },
+      { siteId: '123e4567-e89b-12d3-a456-426614174000' },
       context,
       {},
     );
@@ -166,9 +166,9 @@ describe('agents/brand-profile', () => {
     const findById = sandbox.stub().resolves(null);
     context.dataAccess.Site = { findById };
 
-    const mod = await esmock('../../../../src/tasks/agents/brand-profile/index.js', {});
+    const mod = await esmock('../../../src/agents/brand-profile/index.js', {});
     await mod.default.persist(
-      { context: { siteId: '123e4567-e89b-12d3-a456-426614174000' } },
+      { siteId: '123e4567-e89b-12d3-a456-426614174000' },
       context,
       { ok: true },
     );
@@ -195,14 +195,14 @@ describe('agents/brand-profile', () => {
     context.dataAccess.Site = { findById };
 
     const toDynamoItem = sandbox.stub().callsFake((c) => c);
-    const mod = await esmock('../../../../src/tasks/agents/brand-profile/index.js', {
+    const mod = await esmock('../../../src/agents/brand-profile/index.js', {
       '@adobe/spacecat-shared-data-access/src/models/site/config.js': {
         Config: { toDynamoItem },
       },
     });
 
     await mod.default.persist(
-      { context: { siteId: '123e4567-e89b-12d3-a456-426614174000', baseURL: 'https://example.com' } },
+      { siteId: '123e4567-e89b-12d3-a456-426614174000', baseURL: 'https://example.com' },
       context,
       { any: 'result' },
     );
@@ -230,14 +230,14 @@ describe('agents/brand-profile', () => {
     context.dataAccess.Site = { findById };
 
     const toDynamoItem = sandbox.stub().callsFake((c) => c);
-    const mod = await esmock('../../../../src/tasks/agents/brand-profile/index.js', {
+    const mod = await esmock('../../../src/agents/brand-profile/index.js', {
       '@adobe/spacecat-shared-data-access/src/models/site/config.js': {
         Config: { toDynamoItem },
       },
     });
 
     await mod.default.persist(
-      { context: { siteId: '123e4567-e89b-12d3-a456-426614174000', baseURL: 'https://example.com' } },
+      { siteId: '123e4567-e89b-12d3-a456-426614174000', baseURL: 'https://example.com' },
       context,
       { unchanged: true },
     );
@@ -267,14 +267,14 @@ describe('agents/brand-profile', () => {
     context.dataAccess.Site = { findById };
 
     const toDynamoItem = sandbox.stub().callsFake((c) => c);
-    const mod = await esmock('../../../../src/tasks/agents/brand-profile/index.js', {
+    const mod = await esmock('../../../src/agents/brand-profile/index.js', {
       '@adobe/spacecat-shared-data-access/src/models/site/config.js': {
         Config: { toDynamoItem },
       },
     });
 
     await mod.default.persist(
-      { context: { siteId: '123e4567-e89b-12d3-a456-426614174000' } },
+      { siteId: '123e4567-e89b-12d3-a456-426614174000' },
       context,
       { foo: 'bar' },
     );