Merge branch 'main' into feat/oppty-workspace-email-notify

Author: jjenscodee

CHANGELOG.md

@@ -1,3 +1,24 @@
+## [1.324.2](https://github.com/adobe/spacecat-api-service/compare/v1.324.1...v1.324.2) (2026-02-27)
+
+
+### Bug Fixes
+
+* move llmo onboarding publish trigger off request path ([#1870](https://github.com/adobe/spacecat-api-service/issues/1870)) ([f9a94be](https://github.com/adobe/spacecat-api-service/commit/f9a94be67041432dba5cee83fe226b3938fcc7ff))
+
+## [1.324.1](https://github.com/adobe/spacecat-api-service/compare/v1.324.0...v1.324.1) (2026-02-26)
+
+
+### Bug Fixes
+
+* **deps:** update adobe fixes ([#1862](https://github.com/adobe/spacecat-api-service/issues/1862)) ([051f780](https://github.com/adobe/spacecat-api-service/commit/051f7802b80c0d063022af281f334b36deb6108a))
+
+# [1.324.0](https://github.com/adobe/spacecat-api-service/compare/v1.323.2...v1.324.0) (2026-02-26)
+
+
+### Features
+
+* auto-resolve author URL and code config from RUM bundles during onboarding ([#1856](https://github.com/adobe/spacecat-api-service/issues/1856)) ([36a164b](https://github.com/adobe/spacecat-api-service/commit/36a164beac32801f966f3d818c080f620804b85f))
+
 ## [1.323.2](https://github.com/adobe/spacecat-api-service/compare/v1.323.1...v1.323.2) (2026-02-25)
 
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/spacecat-api-service",
-  "version": "1.323.2",
+  "version": "1.324.2",
   "description": "SpaceCat API Service",
   "main": "src/index.js",
   "type": "module",
@@ -22,7 +22,7 @@
     "build": "hedy -v --test-bundle",
     "deploy": "hedy -v --deploy --aws-deploy-bucket=spacecat-prod-deploy --pkgVersion=latest",
     "deploy-stage": "hedy -v --deploy --aws-deploy-bucket=spacecat-stage-deploy --pkgVersion=latest",
-    "deploy-dev": "hedy -v --deploy --pkgVersion=latest$CI_BUILD_NUM -l latest --aws-deploy-bucket=spacecat-dev-deploy --cleanup-ci=24h",
+    "deploy-dev": "hedy -v --deploy --pkgVersion=latest$CI_BUILD_NUM -l dzehnder --aws-deploy-bucket=spacecat-dev-deploy --cleanup-ci=24h",
     "deploy-secrets": "hedy --aws-update-secrets --params-file=secrets/secrets.env",
     "docs": "npm run docs:lint && npm run docs:build",
     "docs:build": "npx @redocly/cli build-docs -o ./docs/index.html --config docs/openapi/redocly-config.yaml",
@@ -77,7 +77,7 @@
     "@adobe/spacecat-shared-ahrefs-client": "1.10.5",
     "@adobe/spacecat-shared-athena-client": "1.9.4",
     "@adobe/spacecat-shared-brand-client": "1.1.36",
-    "@adobe/spacecat-shared-data-access": "3.2.0",
+    "@adobe/spacecat-shared-data-access": "3.4.0",
     "@adobe/spacecat-shared-data-access-v2": "npm:@adobe/spacecat-shared-data-access@2.109.0",
     "@adobe/spacecat-shared-gpt-client": "1.6.17",
     "@adobe/spacecat-shared-http-utils": "1.21.0",
@@ -86,7 +86,7 @@
     "@adobe/spacecat-shared-scrape-client": "2.5.1",
     "@adobe/spacecat-shared-slack-client": "1.6.0",
     "@adobe/spacecat-shared-tier-client": "1.3.12",
-    "@adobe/spacecat-shared-tokowaka-client": "1.9.0",
+    "@adobe/spacecat-shared-tokowaka-client": "1.10.0",
     "@adobe/spacecat-shared-utils": "1.96.3",
     "@aws-sdk/client-s3": "3.996.0",
     "@aws-sdk/client-secrets-manager": "3.996.0",

package.json

@@ -33,7 +33,6 @@ import { isHelixSite } from '../support/utils.js';
 import { getHlxConfigMessagePart } from '../utils/slack/base.js';
 
 const CDN_HOOK_SECRET_NAME = 'INCOMING_WEBHOOK_SECRET_CDN';
-
 export const BUTTON_LABELS = {
   APPROVE_CUSTOMER: 'As Customer',
   APPROVE_FRIENDS_FAMILY: 'As Friends/Family',

src/controllers/hooks.js

@@ -19,6 +19,7 @@ import { composeBaseURL, tracingFetch as fetch, isNonEmptyArray } from '@adobe/s
 import AhrefsAPIClient from '@adobe/spacecat-shared-ahrefs-client';
 import { parse as parseDomain } from 'tldts';
 import { postSlackMessage } from '../../utils/slack/base.js';
+import DrsClient from '../../support/drs-client.js';
 
 // LLMO Constants
 const LLMO_PRODUCT_CODE = EntitlementModel.PRODUCT_CODES.LLMO;
@@ -39,6 +40,7 @@ export const BASIC_AUDITS = [
 export const ASO_DEMO_ORG = '66331367-70e6-4a49-8445-4f6d9c265af9';
 
 export const ASO_CRITICAL_SITES = [];
+const LLMO_ONBOARDING_PUBLISH_TRIGGER = 'trigger:llmo-onboarding-publish';
 
 /**
  * Generates the data folder name from a domain.
@@ -254,53 +256,6 @@ export async function validateSiteNotOnboarded(baseURL, imsOrgId, dataFolder, co
   }
 }
 
-/**
- * Publishes a file to admin.hlx.page.
- * @param {string} filename - The filename to publish
- * @param {string} outputLocation - The output location
- * @param {object} log - Logger instance
- */
-async function publishToAdminHlx(filename, outputLocation, log) {
-  try {
-    const org = 'adobe';
-    const site = 'project-elmo-ui-data';
-    const ref = 'main';
-    const jsonFilename = `${filename.replace(/\.[^/.]+$/, '')}.json`;
-    const path = `${outputLocation}/${jsonFilename}`;
-    const headers = { Cookie: `auth_token=${process.env.HLX_ADMIN_TOKEN}` };
-
-    if (!process.env.HLX_ADMIN_TOKEN) {
-      log.warn('LLMO onboarding: HLX_ADMIN_TOKEN is not set');
-    }
-
-    const baseUrl = 'https://admin.hlx.page';
-    const endpoints = [
-      { name: 'preview', url: `${baseUrl}/preview/${org}/${site}/${ref}/${path}` },
-      { name: 'live', url: `${baseUrl}/live/${org}/${site}/${ref}/${path}` },
-    ];
-
-    for (const [index, endpoint] of endpoints.entries()) {
-      log.debug(`Publishing Excel report via admin API (${endpoint.name}): ${endpoint.url}`);
-
-      // eslint-disable-next-line no-await-in-loop
-      const response = await fetch(endpoint.url, { method: 'POST', headers });
-
-      if (!response.ok) {
-        throw new Error(`${endpoint.name} failed: ${response.status} ${response.statusText}`);
-      }
-
-      log.debug(`Excel report successfully published to ${endpoint.name}`);
-
-      if (index === 0) {
-        // eslint-disable-next-line no-await-in-loop,max-statements-per-line
-        await new Promise((resolve) => { setTimeout(resolve, 2000); });
-      }
-    }
-  } catch (publishError) {
-    log.error(`Failed to publish via admin.hlx.page: ${publishError.message}`);
-  }
-}
-
 /**
  * Starts a bulk status job for a given path.
  * @param {string} path - The folder path to get status for
@@ -545,9 +500,6 @@ export async function copyFilesToSharepoint(dataFolder, context, say = () => {})
     log.warn(`Warning: Query index at ${dataFolder} already exists. Skipping creation.`);
     await say(`Query index in ${dataFolder} already exists. Skipping creation.`);
   }
-
-  log.debug('Publishing query-index to admin.hlx.page');
-  await publishToAdminHlx('query-index', dataFolder, log);
 }
 
 /**
@@ -999,6 +951,22 @@ export async function triggerAudits(audits, context, site) {
   );
 }
 
+export async function enqueueLlmoOnboardingPublish(context, site, dataFolder) {
+  const { sqs, dataAccess, log } = context;
+  const { Configuration } = dataAccess;
+  const configuration = await Configuration.findLatest();
+
+  await sqs.sendMessage(configuration.getQueues().audits, {
+    type: LLMO_ONBOARDING_PUBLISH_TRIGGER,
+    siteId: site.getId(),
+    auditContext: {
+      dataFolder,
+    },
+  });
+
+  log.info(`Queued ${LLMO_ONBOARDING_PUBLISH_TRIGGER} for site ${site.getId()}`);
+}
+
 /**
  * Complete LLMO onboarding process.
  * @param {object} params - Onboarding parameters
@@ -1039,6 +1007,12 @@ export async function performLlmoOnboarding(params, context, say = () => {}) {
     // Copy files to SharePoint
     await copyFilesToSharepoint(dataFolder, context, say);
 
+    try {
+      await enqueueLlmoOnboardingPublish(context, site, dataFolder);
+    } catch (error) {
+      log.warn(`Failed to enqueue ${LLMO_ONBOARDING_PUBLISH_TRIGGER} for site ${site.getId()}: ${error.message}`);
+    }
+
     // Update index config
     await updateIndexConfig(dataFolder, context, say);
 
@@ -1083,8 +1057,37 @@ export async function performLlmoOnboarding(params, context, say = () => {}) {
     site.setConfig(Config.toDynamoItem(siteConfig));
     await site.save();
 
-    // Trigger audits
-    await triggerAudits([...BASIC_AUDITS, 'llmo-customer-analysis', 'wikipedia-analysis'], context, site);
+    // Trigger audits (llmo-customer-analysis is NOT triggered here; it will be triggered
+    // after the DRS prompt generation job completes, via SNS → audit-worker. LLMO-1819)
+    await triggerAudits([...BASIC_AUDITS, 'wikipedia-analysis'], context, site);
+
+    // Submit DRS prompt generation job (non-blocking)
+    try {
+      const drsClient = DrsClient(context);
+      if (drsClient.isConfigured()) {
+        // Try to get audience from brand profile, fall back to default
+        const brandProfile = siteConfig.getBrandProfile?.();
+        const audience = brandProfile?.main_profile?.target_audience
+          || `General consumers interested in ${brandName} products and services`;
+
+        const drsJob = await drsClient.submitPromptGenerationJob({
+          baseUrl: baseURL,
+          brandName: brandName.trim(),
+          audience,
+          region: 'US',
+          numPrompts: 42,
+          siteId: site.getId(),
+          imsOrgId,
+        });
+        log.info(`Started DRS prompt generation: job=${drsJob.job_id}`);
+        say(`:robot_face: Started DRS prompt generation job: ${drsJob.job_id}`);
+      } else {
+        log.debug('DRS client not configured, skipping prompt generation');
+      }
+    } catch (drsError) {
+      log.error(`Failed to start DRS prompt generation: ${drsError.message}`);
+      say(':warning: Failed to start DRS prompt generation (will need manual trigger)');
+    }
 
     return {
       site,

src/controllers/llmo/llmo-onboarding.js

@@ -0,0 +1,116 @@
+/*
+ * Copyright 2026 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+import { tracingFetch as fetch } from '@adobe/spacecat-shared-utils';
+
+/**
+ * Client for interacting with the Data Retrieval Service (DRS) API.
+ * Used to submit prompt generation jobs for LLMO onboarding.
+ *
+ * @param {object} context - The request context
+ * @returns {object} DRS client with methods for submitting jobs
+ */
+export default function DrsClient(context) {
+  const { env, log } = context;
+  const drsApiUrl = env.DRS_API_URL;
+  const drsApiKey = env.DRS_API_KEY;
+
+  /**
+   * Checks if the DRS client is properly configured.
+   * @returns {boolean} True if DRS_API_URL and DRS_API_KEY are set
+   */
+  function isConfigured() {
+    return Boolean(drsApiUrl && drsApiKey);
+  }
+
+  /**
+   * Submits a prompt generation job to DRS.
+   *
+   * @param {object} params - Job parameters
+   * @param {string} params.baseUrl - The base URL of the site
+   * @param {string} params.brandName - The brand name
+   * @param {string} params.audience - Target audience description
+   * @param {string} [params.region='US'] - Geographic region for prompts
+   * @param {number} [params.numPrompts=42] - Number of prompts to generate
+   * @param {string} params.siteId - The SpaceCat site ID
+   * @param {string} params.imsOrgId - The Adobe IMS organization ID
+   * @returns {Promise<object>} Job submission result with job_id
+   * @throws {Error} If job submission fails or DRS is not configured
+   */
+  async function submitPromptGenerationJob({
+    baseUrl,
+    brandName,
+    audience,
+    region = 'US',
+    numPrompts = 42,
+    siteId,
+    imsOrgId,
+  }) {
+    if (!isConfigured()) {
+      throw new Error('DRS client is not configured. Set DRS_API_URL and DRS_API_KEY environment variables.');
+    }
+
+    const payload = {
+      provider_id: 'prompt_generation_base_url',
+      source: 'onboarding',
+      parameters: {
+        base_url: baseUrl,
+        brand_name: brandName,
+        audience,
+        region,
+        num_prompts: numPrompts,
+        model: 'gpt-5-nano',
+        metadata: {
+          site_id: siteId,
+          imsOrgId,
+          base_url: baseUrl,
+          brand: brandName,
+          region,
+        },
+      },
+    };
+
+    log.info(`Submitting DRS prompt generation job for site ${siteId}`, {
+      baseUrl,
+      brandName,
+      region,
+      numPrompts,
+    });
+
+    const response = await fetch(`${drsApiUrl}/jobs`, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+        'x-api-key': drsApiKey,
+      },
+      body: JSON.stringify(payload),
+    });
+
+    if (!response.ok) {
+      const errorText = await response.text();
+      throw new Error(`DRS job submission failed: ${response.status} - ${errorText}`);
+    }
+
+    const result = await response.json();
+    log.info(`DRS job submitted successfully: ${result.job_id}`, {
+      siteId,
+      jobId: result.job_id,
+    });
+
+    return result;
+  }
+
+  return {
+    isConfigured,
+    submitPromptGenerationJob,
+  };
+}