fix: regenerated image persistence (Cosmos) and update UI color/product state after successful regeneration

Author: Avijit-Microsoft

content-gen/src/app/frontend/src/App.tsx

@@ -116,6 +116,20 @@ function App() {
         setAwaitingClarification(false);
         setConfirmedBrief(data.brief || null);
 
+        // Restore availableProducts so product/color name detection works
+        // when regenerating images in a restored conversation
+        if (data.brief) {
+          try {
+            const productsResponse = await fetch('/api/products');
+            if (productsResponse.ok) {
+              const productsData = await productsResponse.json();
+              setAvailableProducts(productsData.products || []);
+            }
+          } catch (err) {
+            console.error('Error loading products for restored conversation:', err);
+          }
+        }
+        
         if (data.generated_content) {
           const gc = data.generated_content;
           let textContent = gc.text_content;
@@ -319,13 +333,20 @@ function App() {
           let responseData: GeneratedContent | null = null;
           let messageContent = '';
 
+          // Detect if the user's prompt mentions a different product/color name
+          // BEFORE the API call so the correct product is sent and persisted
+          const mentionedProduct = availableProducts.find(p =>
+            content.toLowerCase().includes(p.product_name.toLowerCase())
+          );
+          const productsForRequest = mentionedProduct ? [mentionedProduct] : selectedProducts;
+          
           // Get previous prompt from image_content if available
           const previousPrompt = generatedContent.image_content?.prompt_used;
 
           for await (const response of streamRegenerateImage(
             content,
             confirmedBrief,
-            selectedProducts,
+            productsForRequest,
             previousPrompt,
             conversationId,
             userId,
@@ -350,6 +371,11 @@ function App() {
                   };
                   setGeneratedContent(responseData);
 
+                  // Update the selected product/color name now that the new image is ready
+                  if (mentionedProduct) {
+                    setSelectedProducts([mentionedProduct]);
+                  }
+                  
                   // Update the confirmed brief to include the modification
                   // This ensures subsequent "Regenerate" clicks use the updated visual guidelines
                   const updatedBrief = {
@@ -541,7 +567,7 @@ function App() {
       // Trigger refresh of chat history after message is sent
       setHistoryRefreshTrigger(prev => prev + 1);
     }
-  }, [conversationId, userId, confirmedBrief, pendingBrief, selectedProducts, generatedContent]);
+  }, [conversationId, userId, confirmedBrief, pendingBrief, selectedProducts, generatedContent, availableProducts]);
 
   const handleBriefConfirm = useCallback(async () => {
     if (!pendingBrief) return;

content-gen/src/backend/app.py

@@ -967,7 +967,7 @@ async def generate():
                 except Exception as e:
                     logger.warning(f"Failed to save regenerated image to blob: {e}")
 
-            # Save assistant response
+            # Save assistant response and update persisted generated_content
             try:
                 cosmos_service = await get_cosmos_service()
                 await cosmos_service.add_message_to_conversation(
@@ -980,6 +980,31 @@ async def generate():
                         "timestamp": datetime.now(timezone.utc).isoformat()
                     }
                 )
+
+                # Persist the regenerated image and updated products to generated_content
+                # so the latest image and color/product name are restored on conversation reload
+                new_image_url = response.get("image_url")
+                new_image_prompt = response.get("image_prompt")
+                new_image_revised_prompt = response.get("image_revised_prompt")
+
+                existing_conversation = await cosmos_service.get_conversation(conversation_id, user_id)
+                raw_content = (existing_conversation or {}).get("generated_content")
+                existing_content = raw_content if isinstance(raw_content, dict) else {}
+                old_image_url = existing_content.get("image_url")
+
+                updated_content = {
+                    **existing_content,
+                    "image_url": new_image_url if new_image_url else old_image_url,
+                    "image_prompt": new_image_prompt if new_image_prompt else existing_content.get("image_prompt"),
+                    "image_revised_prompt": new_image_revised_prompt if new_image_revised_prompt else existing_content.get("image_revised_prompt"),
+                    "selected_products": products_data if products_data else existing_content.get("selected_products", []),
+                }
+
+                await cosmos_service.save_generated_content(
+                    conversation_id=conversation_id,
+                    user_id=user_id,
+                    generated_content=updated_content
+                )
             except Exception as e:
                 logger.warning(f"Failed to save regeneration response to CosmosDB: {e}")