responding to feedback, removing dead code, refactoring

Author: david-shibley-contentful

apps/google-docs/functions/agents/documentParserAgent/documentParser.agent.ts

@@ -44,15 +44,8 @@ export async function createPreviewWithAgent(
     apiKey: openAiApiKey,
   });
 
-  console.log('Document Parser Agent document JSON received (fetched from frontend)');
-
-  // Step 1: Build extraction prompt
-  const promptStartTime = Date.now();
   const prompt = buildExtractionPrompt({ contentTypes, documentJson, locale });
-  const promptDuration = Date.now() - promptStartTime;
-  console.log(`[Timing] Build extraction prompt: ${promptDuration}ms`);
 
-  // Step 3: Generate object with AI
   const aiStartTime = Date.now();
   const result = await generateObject({
     model: openaiClient(modelVersion),
@@ -64,14 +57,7 @@ export async function createPreviewWithAgent(
   const aiDuration = Date.now() - aiStartTime;
   console.log(`[Timing] AI generateObject: ${aiDuration}ms`);
 
-  // Step 4: Process result
-  const processStartTime = Date.now();
   const finalResult = result.object as FinalEntriesResult;
-  const processDuration = Date.now() - processStartTime;
-  console.log(`[Timing] Process result: ${processDuration}ms`);
-
-  const totalDuration = Date.now() - promptStartTime;
-  console.log(`[Timing] Total Document Parser Agent execution: ${totalDuration}ms`);
 
   return finalResult;
 }

apps/google-docs/functions/handlers/createEntries/createEntriesHandler.ts

@@ -31,8 +31,7 @@ export const handler: FunctionEventHandler<
   event: AppActionRequest<'Custom', CreateEntriesParameters>,
   context: FunctionEventContext
 ) => {
-  const { contentTypeIds, documentJson, entries: providedEntries } = event.body;
-  const { openAiApiKey } = context.appInstallationParameters as AppInstallationParameters;
+  const { contentTypeIds, entries: providedEntries } = event.body;
 
   if (!contentTypeIds || contentTypeIds.length === 0) {
     throw new Error('At least one content type ID is required');
@@ -51,16 +50,6 @@ export const handler: FunctionEventHandler<
     entriesToCreate = providedEntries;
     summary = `Creating ${entriesToCreate.length} entries from plan`;
     totalEntries = entriesToCreate.length;
-  } else if (documentJson) {
-    // Fallback: analyze document if entries not provided but documentJson is available
-    const aiDocumentResponse = await createPreviewWithAgent({
-      documentJson,
-      openAiApiKey,
-      contentTypes,
-    });
-    entriesToCreate = aiDocumentResponse.entries;
-    summary = aiDocumentResponse.summary;
-    totalEntries = aiDocumentResponse.totalEntries;
   } else {
     throw new Error('Either entries or documentJson must be provided');
   }

apps/google-docs/functions/handlers/createPreview/createPreviewHandler.ts

@@ -4,11 +4,9 @@ import type {
   FunctionTypeEnum,
   AppActionRequest,
 } from '@contentful/node-apps-toolkit';
-import { ContentTypeProps } from 'contentful-management';
 import { createPreviewWithAgent } from '../../agents/documentParserAgent/documentParser.agent';
 import { fetchContentTypes } from '../../service/contentTypeService';
 import { initContentfulManagementClient } from '../../service/initCMAClient';
-import { EntryToCreate } from '../../agents/documentParserAgent/schema';
 
 export type AppActionParameters = {
   contentTypeIds: string[];
@@ -19,74 +17,6 @@ interface AppInstallationParameters {
   openAiApiKey: string;
 }
 
-interface AssetInfo {
-  url: string;
-  altText: string;
-  fileName: string;
-}
-
-/**
- * Extracts asset information from entries by scanning RichText fields for image tokens
- */
-function extractAssetsFromEntries(
-  entries: EntryToCreate[],
-  contentTypes: ContentTypeProps[]
-): AssetInfo[] {
-  const IMAGE_TOKEN_REGEX = /!\[([^\]]*?)\]\(([\s\S]*?)\)/g;
-  const assetsMap = new Map<string, AssetInfo>();
-
-  for (const entry of entries) {
-    const contentType = contentTypes.find((ct) => ct.sys.id === entry.contentTypeId);
-    if (!contentType) continue;
-
-    // Check all RichText fields
-    for (const field of contentType.fields) {
-      if (field.type !== 'RichText') continue;
-
-      const localizedValue = entry.fields[field.id];
-      if (!localizedValue || typeof localizedValue !== 'object') continue;
-
-      // Check all locales
-      for (const value of Object.values(localizedValue)) {
-        if (typeof value !== 'string') continue;
-
-        // Reset regex state
-        IMAGE_TOKEN_REGEX.lastIndex = 0;
-        for (const match of value.matchAll(IMAGE_TOKEN_REGEX)) {
-          const altText = (match[1] || '').trim();
-          const url = String(match[2]).replace(/\s+/g, '').trim();
-
-          if (!url) continue;
-
-          // Extract filename from URL
-          let fileName = 'image';
-          try {
-            const urlObj = new URL(url);
-            const pathname = urlObj.pathname.toLowerCase();
-            const pathParts = pathname.split('/').filter(Boolean);
-            fileName = pathParts[pathParts.length - 1] || 'image';
-            // Remove query params if present
-            fileName = fileName.split('?')[0];
-          } catch {
-            // If URL parsing fails, use default
-          }
-
-          // Use URL as key to avoid duplicates
-          if (!assetsMap.has(url)) {
-            assetsMap.set(url, {
-              url,
-              altText: altText || fileName,
-              fileName: fileName || 'image',
-            });
-          }
-        }
-      }
-    }
-  }
-
-  return Array.from(assetsMap.values());
-}
-
 /**
  * Create Preview
  *
@@ -102,9 +32,7 @@ export const handler: FunctionEventHandler<
   context: FunctionEventContext
 ) => {
   const { contentTypeIds, documentJson } = event.body;
-  console.log('Content types:', contentTypeIds);
   const { openAiApiKey } = context.appInstallationParameters as AppInstallationParameters;
-  console.log('Open AI API Key:', openAiApiKey);
   if (!documentJson) {
     throw new Error('Document JSON is required');
   }
@@ -115,26 +43,20 @@ export const handler: FunctionEventHandler<
 
   const cma = initContentfulManagementClient(context);
   const contentTypes = await fetchContentTypes(cma, new Set<string>(contentTypeIds));
-  console.log('Content types:', contentTypes);
 
   // Use the same AI agent to analyze the document and generate proposed entries
   const aiDocumentResponse = await createPreviewWithAgent({
     documentJson,
     openAiApiKey,
     contentTypes,
   });
-  console.log('AI document response:', aiDocumentResponse);
-  // Extract asset information from entries
-  const assets = extractAssetsFromEntries(aiDocumentResponse.entries, contentTypes);
 
-  console.log('Assets:', assets);
-  // Return plan data without creating entries
   return {
     success: true,
     response: {
-      ...aiDocumentResponse,
-      assets,
-      totalAssets: assets.length,
+      entries: aiDocumentResponse.entries,
+      summary: aiDocumentResponse.summary,
+      totalEntries: aiDocumentResponse.totalEntries,
     },
   };
 };

apps/google-docs/package.json

@@ -30,6 +30,7 @@
     "upload:app-dev": "contentful-app-scripts upload --bundle-dir ./build --organization-id 6xdLsz6lCsk0yPOccSsDK7 --definition-id 653vTnuQw3j5onU1tUoH6t --token $CONTENTFUL_ACCESS_TOKEN",
     "deploy:sync-dev": "aws s3 sync ./build ${STATIC_S3_BASE}/google-docs-dev && aws cloudfront create-invalidation --distribution-id $GOOGLE_DOCS_TEST_CLOUDFRONT_DIST_ID --paths \"/*\" > /dev/null 2>&1",
     "deploy:dev": "npm run build && npm run upload:app-dev && npm run deploy:sync-dev",
+    "upload:app-staging": "contentful-app-scripts upload --bundle-dir ./build --organization-id 6xdLsz6lCsk0yPOccSsDK7 --definition-id 4i0mp5lQtgNsHYVrD5jIkj --token $CONTENTFUL_ACCESS_TOKEN",
     "deploy:staging": "npm run build && npm run upload:app-staging && npm run deploy:sync-dev",
     "deploy:sync-prod": "aws s3 sync ./build ${STATIC_S3_BASE}/google-docs && aws cloudfront create-invalidation --distribution-id $GOOGLE_DOCS_PROD_CLOUDFRONT_DIST_ID --paths \"/*\" > /dev/null 2>&1",
     "upload": "contentful-app-scripts upload --bundle-dir ./build --organization-id 5EJGHo8tYJcjnEhYWDxivp --definition-id 3EaGZUMKRKVZUyrcoNJ4o4 --token $CONTENTFUL_ACCESS_TOKEN",