feat: use correct branch name in csv urls (#220)

.github/workflows/deploy_prod.yml

@@ -22,6 +22,7 @@ jobs:
           AIO_RUNTIME_APIHOST: 'https://adobeioruntime.net'
           FIREFALL_ENDPOINT: 'https://firefall.adobe.io'
           FIREFALL_API_KEY: aem-sidekick-genai-assistant
+          TARGET_API_KEY: 1a6d085515114ef9a6937de9ab7d61fe
           IMS_ENDPOINT: 'https://ims-na1.adobelogin.com'
           IMS_CLIENT_ID: aem-genai-assistant
           IMS_SERVICE_CLIENT_ID: aem-sidekick-genai-assistant
@@ -35,7 +36,8 @@ jobs:
       run: |
         npm install
         npm run grammar
+        npm run prompts
         npm run build
         npm run lint
         npm run test
-        npm run deploy
+        npm run deploy

.github/workflows/deploy_qa.yml

@@ -2,7 +2,7 @@ name: Deploy to QA
 
 on:
   pull_request:
-    branches: 
+    branches:
       - main
     types: [closed]
 
@@ -24,6 +24,7 @@ jobs:
           AIO_RUNTIME_APIHOST: 'https://adobeioruntime.net'
           FIREFALL_ENDPOINT: 'https://firefall.adobe.io'
           FIREFALL_API_KEY: aem-sidekick-genai-assistant
+          TARGET_API_KEY: 1a6d085515114ef9a6937de9ab7d61fe
           IMS_ENDPOINT: 'https://ims-na1.adobelogin.com'
           IMS_CLIENT_ID: aem-genai-assistant
           IMS_SERVICE_CLIENT_ID: aem-sidekick-genai-assistant
@@ -37,7 +38,8 @@ jobs:
       run: |
         npm install
         npm run grammar
+        npm run prompts
         npm run build
         npm run lint
         npm run test
-        npm run deploy
+        npm run deploy

.github/workflows/pr_test_frontend.yml

@@ -20,6 +20,7 @@ jobs:
       run: |
         npm install
         npm run grammar
+        npm run prompts
         npm run build
         npm run lint
-        npm run test
+        npm run test

.gitignore

@@ -40,3 +40,4 @@ coverage
 # logs folder for aio-run-detached
 logs
 
+

.husky/pre-commit

@@ -1,17 +1,10 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
-# If *.prompt files or prompt-index.json file have changed, run prompts
-if [ -n "$(git diff --cached --name-only | grep -E 'examples/.*\.prompt$')" ] || [ -n "$(git diff --cached --name-only | grep -E 'examples/prompt-index.json$')" ]; then
-  npm run prompts
-else 
-    echo "No prompt files changed. Skipping 'npm run prompts'"
-fi
-
 # If excel or csv files in the examples/ directory have changed, run the zip examples script
 if [ -n "$(git diff --cached --name-only | grep -E 'examples/.*\.(csv|xlsx)$')" ]; then
  npm run examples
-else 
+else
     echo "No excel or csv files changed. Skipping 'npm run examples'"
 fi
 

actions/csv/index.js

@@ -15,7 +15,7 @@ const { asGenericAction } = require('../GenericAction.js');
 
 async function main({ url }) {
   const text = await wretch(url).get().text();
-  const { data } = Papa.parse(text, {});
+  const { data } = Papa.parse(text, { skipEmptyLines: true });
   return data;
 }
 

package.json

@@ -12,7 +12,7 @@
     "build": "REACT_APP_VERSION=$npm_package_version aio app build",
     "deploy:app": "npm run grammar && REACT_APP_VERSION=$npm_package_version aio app deploy --no-actions",
     "deploy:actions": "aio app deploy --no-web-assets",
-    "deploy": "npm run grammar && REACT_APP_VERSION=$npm_package_version aio app deploy",
+    "deploy": "npm run grammar && npm run prompts && REACT_APP_VERSION=$npm_package_version aio app deploy",
     "lint": "eslint --quiet 'web-src/src/**/*.js' 'actions/*.js'",
     "fix": "eslint --fix --quiet 'web-src/src/**/*.js' 'actions/*.js'",
     "test": "jest --collectCoverageFrom='[\"web-src/src/**/*.js\",\"actions/**/*.js\"]' --coverage --passWithNoTests ./actions ./web-src/src ./e2e"

prompt-templates/card.prompt

@@ -79,7 +79,7 @@ Additional context: [[
 {{@target_audience,
   label="Target Audience",
   description="Choose your audience. For Target, audiences with no description will be unavailable. For CSV, Adobe provides audiences to get you started. To modify audiences publish a CSV file and update the URL in the prompt.",
-  csv="https://raw.githubusercontent.com/adobe/aem-genai-assistant/data/target-audiences.csv",
+  csv="https://raw.githubusercontent.com/adobe/aem-genai-assistant/GIT_BRANCH/data/target-audiences.csv",
   adobe_target=true,
   type=audience
 }}

prompt-templates/cart-abandonment.prompt

@@ -68,7 +68,7 @@ Additional context: [[
 {{@target_audience,
   label="Target Audience",
   description="Choose your audience. For Target, audiences with no description will be unavailable. For CSV, Adobe provides audiences to get you started. To modify audiences publish a CSV file and update the URL in the prompt.",
-  csv="https://raw.githubusercontent.com/adobe/aem-genai-assistant/settings/data/target-audiences.csv",
+  csv="https://raw.githubusercontent.com/adobe/aem-genai-assistant/GIT_BRANCH/data/target-audiences.csv",
   adobe_target=true,
   type=audience
 }}

prompt-templates/headline.prompt

@@ -42,7 +42,7 @@ To ensure the Headlines are effective and meet our objectives, adhere to the fol
 {{@target_audience,
   label="Target Audience",
   description="Choose your audience. For Target, audiences with no description will be unavailable. For CSV, Adobe provides audiences to get you started. To modify audiences publish a CSV file and update the URL in the prompt.",
-  csv="https://raw.githubusercontent.com/adobe/aem-genai-assistant/settings/data/target-audiences.csv",
+  csv="https://raw.githubusercontent.com/adobe/aem-genai-assistant/GIT_BRANCH/data/target-audiences.csv",
   adobe_target=true,
   type=audience
 }}

prompt-templates/hero.prompt

@@ -81,7 +81,7 @@ Additional context: [[
 {{@target_audience,
   label="Target Audience",
   description="Choose your audience. For Target, audiences with no description will be unavailable. For CSV, Adobe provides audiences to get you started. To modify audiences publish a CSV file and update the URL in the prompt.",
-  csv="https://raw.githubusercontent.com/adobe/aem-genai-assistant/settings/data/target-audiences.csv",
+  csv="https://raw.githubusercontent.com/adobe/aem-genai-assistant/GIT_BRANCH/data/target-audiences.csv",
   adobe_target=true,
   type=audience
 }}

prompt-templates/rewrite.prompt

@@ -66,7 +66,7 @@ Additional context: [[
 {{@target_audience,
   label="Target Audience",
   description="Choose your audience. For Target, audiences with no description will be unavailable. For CSV, Adobe provides audiences to get you started. To modify audiences publish a CSV file and update the URL in the prompt.",
-  csv="https://raw.githubusercontent.com/adobe/aem-genai-assistant/settings/data/target-audiences.csv",
+  csv="https://raw.githubusercontent.com/adobe/aem-genai-assistant/GIT_BRANCH/data/target-audiences.csv",
   adobe_target=true,
   type=audience
 }}

prompt-templates/tile.prompt

@@ -80,7 +80,7 @@ Additional context: [[
 {{@target_audience,
   label="Target Audience",
   description="Choose your audience. For Target, audiences with no description will be unavailable. For CSV, Adobe provides audiences to get you started. To modify audiences publish a CSV file and update the URL in the prompt.",
-  csv="https://raw.githubusercontent.com/adobe/aem-genai-assistant/settings/data/target-audiences.csv",
+  csv="https://raw.githubusercontent.com/adobe/aem-genai-assistant/GIT_BRANCH/data/target-audiences.csv",
   adobe_target=true,
   type=audience
 }}

scripts/prompt-generator.js

@@ -12,6 +12,7 @@
 
 const fs = require('fs');
 const path = require('path');
+const { exec } = require('child_process');
 
 const DATA_DIR = path.join(__dirname, '../data');
 const PROMPT_TEMPLATES_DIR = path.join(__dirname, '../prompt-templates');
@@ -64,6 +65,18 @@ const createBundledPromptTemplates = (promptIndex) => {
   return bundledPromptTemplates;
 };
 
+const getGitBranchName = async () => {
+  return new Promise((resolve) => {
+    exec('git branch --show-current', (err, stdout, stderr) => {
+      if (err) {
+        console.error(`Error: ${err}`);
+        return 'main';
+      }
+      resolve(stdout.replace(/(\r\n|\n|\r)/gm, ''));
+    });
+  });
+};
+
 const startProgram = async () => {
   console.log('- Prompt Generator Starting...');
   try {
@@ -77,13 +90,14 @@ const startProgram = async () => {
     const bundledPromptTemplates = createBundledPromptTemplates(sortedPromptIndex);
 
     // Add the prompt templates to the target files
-    promptIndex.forEach((prompt) => {
+    for await (const prompt of promptIndex) {
       console.log(`\t\t* Adding ${prompt.label}`);
       // Try to read the prompt template file
       // If it fails, log the error and continue
       try {
         const promptTemplate = fs.readFileSync(path.join(PROMPT_TEMPLATES_DIR, prompt.file), 'utf8');
-        prompt.template = promptTemplate;
+        const branchName = await getGitBranchName();
+        prompt.template = promptTemplate.replace(/GIT_BRANCH/g, branchName);
         delete prompt.file;
 
         // Add the prompt to the bundled prompt templates file
@@ -93,7 +107,7 @@ const startProgram = async () => {
         console.log(`\t\t\t! Error: ${err}`);
         console.log(`\t\t\t! Skipping ${prompt.label}`);
       }
-    });
+    }
 
     // Write the prompt templates to the target files
     saveBundledPromptTemplates(bundledPromptTemplates);

web-src/src/components/AudienceSelector.js

@@ -34,6 +34,10 @@ const styles = {
   `,
 };
 
+export function isTargetEnabled(adobeTarget) {
+  return /^(true|1|yes)$/i.test(adobeTarget?.toString().trim());
+}
+
 export function useGetItemsFromTarget() {
   const { targetService } = useApplicationContext();
   return useCallback(async () => {
@@ -93,9 +97,9 @@ export function AudienceSelector({
 
   useEffect(() => {
     setItems([]);
-    if (adobeTarget && !csv) {
+    if (isTargetEnabled(adobeTarget) && !csv) {
       setDataSource(DATA_SOURCES.TARGET);
-    } else if (csv && !adobeTarget) {
+    } else if (csv && !isTargetEnabled(adobeTarget)) {
       setDataSource(DATA_SOURCES.CSV);
     }
     if (dataSource === DATA_SOURCES.CSV) {

web-src/src/components/AudienceSelector.test.js

@@ -11,10 +11,58 @@
  */
 import { renderHook, waitFor } from '@testing-library/react';
 import { useApplicationContext } from './ApplicationProvider.js';
-import { useGetItemsFromTarget } from './AudienceSelector.js';
+import { isTargetEnabled, useGetItemsFromTarget } from './AudienceSelector.js';
 
 jest.mock('./ApplicationProvider.js');
 
+describe('isTargetEnabled', () => {
+  test('returns true for "true" (case insensitive) with or without spaces', () => {
+    expect(isTargetEnabled('true')).toBe(true);
+    expect(isTargetEnabled(' TRUE ')).toBe(true);
+  });
+
+  test('returns true for "1" with or without spaces', () => {
+    expect(isTargetEnabled('1')).toBe(true);
+    expect(isTargetEnabled(' 1 ')).toBe(true);
+  });
+
+  test('returns true for "yes" (case insensitive) with or without spaces', () => {
+    expect(isTargetEnabled('yes')).toBe(true);
+    expect(isTargetEnabled(' YES ')).toBe(true);
+  });
+
+  test('returns false for "false"', () => {
+    expect(isTargetEnabled('false')).toBe(false);
+  });
+
+  test('returns false for "0"', () => {
+    expect(isTargetEnabled('0')).toBe(false);
+  });
+
+  test('returns false for "no"', () => {
+    expect(isTargetEnabled('no')).toBe(false);
+  });
+
+  test('returns false for undefined', () => {
+    expect(isTargetEnabled(undefined)).toBe(false);
+  });
+
+  test('returns false for null', () => {
+    expect(isTargetEnabled(null)).toBe(false);
+  });
+
+  test('returns false for non-string values', () => {
+    expect(isTargetEnabled(123)).toBe(false);
+    expect(isTargetEnabled({})).toBe(false);
+    expect(isTargetEnabled([])).toBe(false);
+  });
+
+  test('returns false for string values that do not match "true", "1", or "yes" exactly, even without spaces', () => {
+    expect(isTargetEnabled('_True')).toBe(false);
+    expect(isTargetEnabled('Yes.')).toBe(false);
+  });
+});
+
 describe('useGetItemsFromTarget', () => {
   it('should return audiences sorted by description and mapped correctly', async () => {
     const mockAudiences = [