Merge remote-tracking branch 'origin/dev' into psl-chathistorythreadname

Author: Shubhangi-Microsoft

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

@@ -118,6 +118,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;
@@ -325,13 +339,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,
@@ -345,8 +366,21 @@ function App() {
 
                 // Update generatedContent with new image
                 if (parsedContent.image_url || parsedContent.image_base64) {
+                  // Replace old color/product name in text_content when switching products
+                  const oldName = selectedProducts[0]?.product_name;
+                  const newName = mentionedProduct?.product_name;
+                  const nameRegex = oldName
+                    ? new RegExp(oldName.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'), 'gi')
+                    : undefined;
+                  const swapName = (s?: string) => {
+                    if (!s || !oldName || !newName || oldName === newName || !nameRegex) return s;
+                    return s.replace(nameRegex, () => newName);
+                  };
+                  const tc = generatedContent.text_content;
+
                   responseData = {
                     ...generatedContent,
+                    text_content: mentionedProduct ? { ...tc, headline: swapName(tc?.headline), body: swapName(tc?.body), tagline: swapName(tc?.tagline), cta_text: swapName(tc?.cta_text) } : tc,
                     image_content: {
                       ...generatedContent.image_content,
                       image_url: parsedContent.image_url || generatedContent.image_content?.image_url,
@@ -356,6 +390,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 = {
@@ -552,7 +591,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/app/frontend/src/components/ChatHistory.tsx

@@ -417,6 +417,20 @@ function ConversationItem({
   const handleRenameConfirm = async () => {
     const trimmedValue = renameValue.trim();
 
+    // Validate before API call
+    if (trimmedValue.length < 5) {
+      setRenameError('Conversation name must be at least 5 characters');
+      return;
+    }
+    if (trimmedValue.length > 50) {
+      setRenameError('Conversation name cannot exceed 50 characters');
+      return;
+    }
+    if (!/[a-zA-Z0-9]/.test(trimmedValue)) {
+      setRenameError('Conversation name must contain at least one letter or number');
+      return;
+    }
+    
     if (trimmedValue === conversation.title) {
       setIsRenameDialogOpen(false);
       setRenameError('');
@@ -536,11 +550,18 @@ function ConversationItem({
               <Input
                 ref={renameInputRef}
                 value={renameValue}
+                maxLength={50}
                 onChange={(e) => {
                   const newValue = e.target.value;
                   setRenameValue(newValue);
                   if (newValue.trim() === '') {
                     setRenameError('Conversation name cannot be empty or contain only spaces');
+                  } else if (newValue.trim().length < 5) {
+                    setRenameError('Conversation name must be at least 5 characters');
+                  } else if (!/[a-zA-Z0-9]/.test(newValue)) {
+                    setRenameError('Conversation name must contain at least one letter or number');
+                  } else if (newValue.length > 50) {
+                    setRenameError('Conversation name cannot exceed 50 characters');
                   } else {
                     setRenameError('');
                   }
@@ -555,6 +576,16 @@ function ConversationItem({
                 placeholder="Enter conversation name"
                 style={{ width: '100%' }}
               />
+              <Text 
+                size={200} 
+                style={{ 
+                  color: tokens.colorNeutralForeground3, 
+                  marginTop: '4px',
+                  display: 'block'
+                }}
+              >
+                Maximum 50 characters ({renameValue.length}/50)
+              </Text>
               {renameError && (
                 <Text 
                   size={200} 
@@ -579,7 +610,7 @@ function ConversationItem({
             <Button 
               appearance="primary" 
               onClick={handleRenameConfirm}
-              disabled={!renameValue.trim()}
+              disabled={renameValue.trim().length < 5 || !/[a-zA-Z0-9]/.test(renameValue) || renameValue.length > 50}
             >
               Rename
             </Button>

content-gen/src/backend/app.py

@@ -9,6 +9,7 @@
 import json
 import logging
 import os
+import re
 import uuid
 from datetime import datetime, timezone
 from typing import Dict, Any
@@ -995,7 +996,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(
@@ -1008,6 +1009,47 @@ 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")
+
+                # Replace old color/product name in text_content when product changes
+                old_products = existing_content.get("selected_products", [])
+                old_name = old_products[0].get("product_name", "") if old_products else ""
+                new_name = products_data[0].get("product_name", "") if products_data else ""
+                existing_text = existing_content.get("text_content")
+                if existing_text and old_name and new_name and old_name != new_name:
+                    pat = re.compile(re.escape(old_name), re.IGNORECASE)
+                    if isinstance(existing_text, dict):
+                        existing_text = {
+                            k: pat.sub(lambda _m: new_name, v) if isinstance(v, str) else v
+                            for k, v in existing_text.items()
+                        }
+                    elif isinstance(existing_text, str):
+                        existing_text = pat.sub(lambda _m: new_name, existing_text)
+
+                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", []),
+                    **(({"text_content": existing_text} if existing_text is not None else {})),
+                }
+
+                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}")
 

content-gen/src/backend/requirements-dev.txt

@@ -6,6 +6,7 @@
 pytest>=8.0.0
 pytest-asyncio>=0.23.0
 pytest-cov>=5.0.0
+pytest-mock>=3.14.0
 
 # Code Quality
 black>=24.0.0

content-gen/src/pytest.ini

@@ -0,0 +1,55 @@
+[pytest]
+# Pytest configuration for backend tests
+
+# Test discovery patterns
+python_files = test_*.py
+python_classes = Test*
+python_functions = test_*
+
+# Asyncio configuration
+asyncio_mode = auto
+
+# Output configuration
+addopts = 
+    -v
+    --strict-markers
+    --tb=short
+    --cov=backend
+    --cov-report=term-missing
+    --cov-report=html:coverage_html
+    --cov-report=xml:coverage.xml
+    --cov-fail-under=20
+
+# Filter warnings
+filterwarnings =
+    ignore::DeprecationWarning
+    ignore::PendingDeprecationWarning
+    ignore:Unclosed client session:ResourceWarning
+    ignore:Unclosed connector:ResourceWarning
+
+# Test paths
+testpaths = tests
+
+# Coverage configuration
+[coverage:run]
+source = backend
+omit = 
+    tests/*
+    */tests/*
+    */test_*
+    */__pycache__/*
+    */site-packages/*
+    conftest.py
+    */hypercorn.conf.py
+    */ApiApp.Dockerfile
+    */WebApp.Dockerfile
+    
+[coverage:report]
+exclude_lines =
+    pragma: no cover
+    def __repr__
+    raise AssertionError
+    raise NotImplementedError
+    if __name__ == "__main__":
+    if TYPE_CHECKING:
+    @abstract