Merge branch 'dev' of https://github.com/microsoft/content-generation-solution-accelerator into rc-rem-dalle3

Author: Ragini-Microsoft

content-gen/scripts/create_image_search_index.py

@@ -10,7 +10,6 @@
 """
 
 import asyncio
-import json
 import os
 import sys
 from pathlib import Path

content-gen/scripts/post_deploy.py

@@ -36,13 +36,11 @@
 import argparse
 import asyncio
 import base64
-import json
 import os
 import sys
-import time
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Optional, List, Dict, Any
+from typing import Dict
 
 try:
     import httpx

content-gen/scripts/sample_content_generation.py

@@ -28,7 +28,6 @@
 import asyncio
 import argparse
 import json
-import os
 import sys
 from datetime import datetime
 from pathlib import Path
@@ -288,7 +287,7 @@ async def main():
 
     # Generate content
     try:
-        result = await generate_content_sample(
+        await generate_content_sample(
             brief=brief,
             products=products,
             generate_images=not args.no_images,

content-gen/scripts/test_content_generation.py

@@ -12,7 +12,6 @@
 """
 
 import asyncio
-import json
 import sys
 import os
 from typing import Dict, Any

content-gen/src/backend/app.py

@@ -661,8 +661,6 @@ async def generate_content():
 
     Returns streaming response with generated content.
     """
-    import asyncio
-
     data = await request.get_json()
 
     brief_data = data.get("brief", {})
@@ -861,8 +859,6 @@ async def regenerate_content():
 
     Returns regenerated image with the modification applied.
     """
-    import asyncio
-
     data = await request.get_json()
 
     modification_request = data.get("modification_request", "")

content-gen/src/backend/orchestrator.py

@@ -1526,11 +1526,12 @@ async def generate_content(
                                     try:
                                         prompt_data = json.loads(json_match.group(1))
                                         prompt_text = prompt_data.get('prompt', prompt_data.get('image_prompt', prompt_text))
-                                    except Exception:
+                                    except Exception as parse_error:
+                                        # Best-effort JSON extraction from markdown code block; on failure,
+                                        # fall back to the original prompt_text without interrupting image generation.
                                         logger.debug(
-                                            "Failed to parse JSON image prompt from markdown code block; "
-                                            "continuing with original prompt_text.",
-                                            exc_info=True
+                                            "Failed to parse JSON from markdown code block for image prompt: %s",
+                                            parse_error,
                                         )
 
                         # Build product description for image generation context
@@ -1595,8 +1596,13 @@ async def generate_content(
                     for v in results["violations"]
                 )
             except (json.JSONDecodeError, KeyError):
-                # Failed to parse compliance response JSON; violations will remain empty
-                logger.debug("Could not parse compliance violations from response", exc_info=True)
+                # If the compliance response is not valid JSON or missing expected keys,
+                # continue without structured violations data but log for observability.
+                logger.debug(
+                    "Could not parse structured compliance violations from response; "
+                    "proceeding without 'violations' / 'requires_modification'.",
+                    exc_info=True,
+                )
 
         except Exception as e:
             logger.exception(f"Error generating content: {e}")
@@ -1764,13 +1770,10 @@ async def regenerate_image(
                                 prompt_data = json.loads(json_match.group(1))
                                 prompt_text = prompt_data.get('prompt', prompt_text)
                                 change_summary = prompt_data.get('change_summary', modification_request)
-                            except Exception:
-                                # If JSON extraction fails here, fall back to the original
-                                # prompt_text and change_summary values set earlier.
+                            except Exception as parse_error:
                                 logger.debug(
-                                    "Failed to parse JSON from markdown in regenerate_image; "
-                                    "using original prompt_text and modification_request.",
-                                    exc_info=True
+                                    "Failed to parse JSON from image modification response fallback: %s",
+                                    parse_error,
                                 )
 
                 results["image_prompt"] = prompt_text

content-gen/src/backend/services/cosmos_service.py

@@ -308,8 +308,13 @@ async def get_conversation(
                 max_item_count=1
             ):
                 return item
-        except Exception:
-            pass
+        except Exception as exc:
+            logger.warning(
+                "Cross-partition conversation lookup failed for id=%s, user_id=%s: %s",
+                conversation_id,
+                user_id,
+                exc,
+            )
 
         return None
 

content-gen/tests/rai_testing.py

@@ -26,11 +26,9 @@
 import argparse
 import asyncio
 import json
-import os
-import subprocess
 import sys
 import time
-from dataclasses import dataclass, asdict
+from dataclasses import dataclass
 from datetime import datetime
 from enum import Enum
 from pathlib import Path
@@ -41,9 +39,17 @@
 # Try to import Azure Identity for auth
 try:
     from azure.identity import AzureCliCredential, InteractiveBrowserCredential
-    AZURE_IDENTITY_AVAILABLE = True
 except ImportError:
-    AZURE_IDENTITY_AVAILABLE = False
+    # Azure Identity is optional; provide stubs that fail clearly if Azure auth is requested.
+    class _MissingAzureIdentityCredential:
+        def __init__(self, *args, **kwargs) -> None:
+            raise RuntimeError(
+                "The 'azure-identity' package is required to use '--use-azure-auth'. "
+                "Install it with 'pip install azure-identity' and try again."
+            )
+
+    AzureCliCredential = _MissingAzureIdentityCredential
+    InteractiveBrowserCredential = _MissingAzureIdentityCredential
 
 
 class TestCategory(Enum):
@@ -966,7 +972,7 @@ async def main():
 
     # Generate report
     report_path = runner.generate_report(args.output_dir)
-    print(f"\nReports saved to: {args.output_dir}")
+    print(f"\nReports saved to: {report_path}")
 
     return runner.print_summary()
 

content-gen/tests/test_agents.py

@@ -2,10 +2,7 @@
 Unit tests for the Content Generation agents.
 """
 
-import pytest
-from unittest.mock import AsyncMock, MagicMock, patch
-
-from backend.models import CreativeBrief, Product, ComplianceSeverity
+from backend.models import CreativeBrief, Product
 from backend.agents.text_content_agent import validate_text_compliance
 from backend.agents.compliance_agent import comprehensive_compliance_check
 

docs/generate_architecture.py

@@ -15,7 +15,7 @@
 from diagrams.azure.compute import ContainerInstances, AppServices, ContainerRegistries
 from diagrams.azure.database import CosmosDb, BlobStorage
 from diagrams.azure.ml import CognitiveServices
-from diagrams.azure.network import VirtualNetworks, PrivateEndpoint, DNSZones
+from diagrams.azure.network import PrivateEndpoint
 from diagrams.azure.analytics import AnalysisServices
 from diagrams.onprem.client import User