updated unit tests

Author: AjitPadhi-Microsoft

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

@@ -7,8 +7,6 @@ pytest>=8.0.0
 pytest-asyncio>=0.23.0
 pytest-cov>=5.0.0
 pytest-mock>=3.14.0
-httpx>=0.27.0
-quart-cors>=0.7.0
 
 # Code Quality
 black>=24.0.0

content-gen/src/tests/pytest.ini content-gen/src/pytest.inicontent-gen/src/tests/pytest.ini renamed to content-gen/src/pytest.ini

@@ -14,19 +14,25 @@ addopts =
     -v
     --strict-markers
     --tb=short
-    --cov=../backend
+    --cov=backend
     --cov-report=term-missing
     --cov-report=html:coverage_html
     --cov-report=xml:coverage.xml
     --cov-fail-under=20
-    -p no:warnings
+
+# Filter warnings
+filterwarnings =
+    ignore::DeprecationWarning
+    ignore::PendingDeprecationWarning
+    ignore:Unclosed client session:ResourceWarning
+    ignore:Unclosed connector:ResourceWarning
 
 # Test paths
-testpaths = .
+testpaths = tests
 
 # Coverage configuration
 [coverage:run]
-source = ../backend
+source = backend
 omit = 
     tests/*
     */tests/*
@@ -44,6 +50,6 @@ exclude_lines =
     def __repr__
     raise AssertionError
     raise NotImplementedError
-    if __name__ == .__main__.:
+    if __name__ == "__main__":
     if TYPE_CHECKING:
     @abstract

content-gen/src/tests/agents/test_image_content_agent.py

@@ -501,28 +501,67 @@ def test_truncate_with_eggshell_finish():
 
 @pytest.mark.asyncio
 async def test_generate_image_truncates_very_long_prompt():
-    """Test generate_image handles very long prompts by truncating."""
+    """Test that _generate_dalle_image truncates very long product descriptions.
+
+    Verifies that when a very long product description is passed, it gets
+    truncated before being sent to the OpenAI API.
+    """
     with patch("agents.image_content_agent.app_settings") as mock_settings, \
-         patch("agents.image_content_agent._generate_dalle_image") as mock_dalle:
+         patch("agents.image_content_agent.DefaultAzureCredential") as mock_cred, \
+         patch("agents.image_content_agent.AsyncAzureOpenAI") as mock_client:
 
+        # Setup settings (using correct attribute names matching settings.py)
         mock_settings.azure_openai.effective_image_model = "dall-e-3"
-        mock_settings.brand.primary_color = "#FF0000"
-        mock_settings.brand.secondary_color = "#00FF00"
-        mock_dalle.return_value = {"success": True, "image_base64": "abc123"}
+        mock_settings.azure_openai.image_endpoint = "https://test.openai.azure.com"
+        mock_settings.azure_openai.endpoint = "https://test.openai.azure.com"
+        mock_settings.azure_openai.preview_api_version = "2024-02-15-preview"
+        mock_settings.azure_openai.image_model = "dall-e-3"
+        mock_settings.azure_openai.image_size = "1024x1024"
+        mock_settings.azure_openai.image_quality = "standard"
+        mock_settings.base_settings.azure_client_id = None
+        mock_settings.brand_guidelines.get_image_generation_prompt.return_value = "Brand style"
+        mock_settings.brand_guidelines.primary_color = "#FF0000"
+        mock_settings.brand_guidelines.secondary_color = "#00FF00"
+
+        # Setup credential mock
+        mock_credential = AsyncMock()
+        mock_token = MagicMock()
+        mock_token.token = "test-token"
+        mock_credential.get_token = AsyncMock(return_value=mock_token)
+        mock_cred.return_value = mock_credential
+
+        # Setup OpenAI client mock - capture the prompt argument
+        mock_openai = AsyncMock()
+        mock_image_data = MagicMock()
+        mock_image_data.b64_json = base64.b64encode(b"fake-image").decode()
+        mock_image_data.revised_prompt = None
+        mock_response = MagicMock()
+        mock_response.data = [mock_image_data]
+        mock_openai.images.generate = AsyncMock(return_value=mock_response)
+        mock_openai.close = AsyncMock()
+        mock_client.return_value = mock_openai
 
         from agents.image_content_agent import generate_image
 
-        very_long_product_desc = "Product description. " * 500  # ~10000 chars
+        # Create very long product description (~10000 chars)
+        very_long_product_desc = "Product description with details. " * 300
 
-        _ = await generate_image(
+        result = await generate_image(
             prompt="Create marketing image",
             product_description=very_long_product_desc,
             scene_description="Modern kitchen"
         )
 
-        # Should still succeed despite long input
-        mock_dalle.assert_called_once()
-        # Verify prompt was truncated (check call args)
-        call_args = mock_dalle.call_args
-        actual_prompt = call_args[1]["prompt"] if call_args[1] else call_args[0][0]
-        assert len(actual_prompt) <= 4200  # Should be truncated
+        # Verify success
+        assert result["success"] is True
+
+        # Verify the prompt was truncated before being sent to OpenAI
+        call_kwargs = mock_openai.images.generate.call_args.kwargs
+        prompt_sent = call_kwargs["prompt"]
+
+        # The full prompt should be under DALL-E's limit (~4000 chars)
+        # despite the ~10000 char input
+        assert len(prompt_sent) < 4000, f"Prompt not truncated: {len(prompt_sent)} chars"
+
+        # Also verify via prompt_used in result
+        assert len(result["prompt_used"]) < 4000

content-gen/src/tests/api/test_admin.py

@@ -720,7 +720,11 @@ async def test_create_search_index_missing_endpoint(client):
 
 @pytest.mark.asyncio
 async def test_upload_images_validation_error(client):
-    """Test upload images endpoint validation."""
+    """Test upload images endpoint validation for missing data field.
+
+    The endpoint returns 200 with per-image results (not 400) for bulk operations,
+    allowing partial success. Images missing required fields are marked as failed.
+    """
     # Missing required data field
     response = await client.post(
         "/api/admin/upload-images",
@@ -732,5 +736,16 @@ async def test_upload_images_validation_error(client):
         }
     )
 
-    # Should handle validation error
-    assert response.status_code in [200, 400, 500]
+    # Endpoint returns 200 with per-image results for bulk operations
+    assert response.status_code == 200
+    data = await response.get_json()
+
+    # Should indicate failure at the operation level
+    assert data["success"] is False
+    assert data["failed"] == 1
+    assert data["uploaded"] == 0
+
+    # Should have detailed per-image failure info
+    assert len(data["results"]) == 1
+    assert data["results"][0]["status"] == "failed"
+    assert "Missing filename or data" in data["results"][0]["error"]

content-gen/src/tests/conftest.py

@@ -8,6 +8,7 @@
 """
 
 import asyncio
+import gc
 import os
 import sys
 from datetime import datetime, timezone
@@ -16,68 +17,96 @@
 import pytest
 from quart import Quart
 
-# Set environment variables BEFORE any backend imports
-# This prevents settings.py from failing during import
-os.environ.update({
-    # Base settings
-    "AZURE_OPENAI_ENDPOINT": "https://test-openai.openai.azure.com/",
-    "AZURE_OPENAI_API_VERSION": "2024-08-01-preview",
-    "AZURE_OPENAI_CHAT_DEPLOYMENT": "gpt-4o",
-    "AZURE_OPENAI_EMBEDDING_DEPLOYMENT": "text-embedding-3-large",
-    "AZURE_OPENAI_DALLE_DEPLOYMENT": "dall-e-3",
-    "AZURE_CLIENT_ID": "test-client-id",
-
-    # Cosmos DB
-    "AZURE_COSMOSDB_ENDPOINT": "https://test-cosmos.documents.azure.com:443/",
-    "AZURE_COSMOSDB_DATABASE_NAME": "test-db",
-    "AZURE_COSMOSDB_PRODUCTS_CONTAINER": "products",
-    "AZURE_COSMOSDB_CONVERSATIONS_CONTAINER": "conversations",
-
-    # Blob Storage
-    "AZURE_STORAGE_ACCOUNT_NAME": "teststorage",
-    "AZURE_STORAGE_CONTAINER": "test-container",
-    "AZURE_STORAGE_ACCOUNT_URL": "https://teststorage.blob.core.windows.net",
-    "AZURE_BLOB_PRODUCT_IMAGES_CONTAINER": "product-images",
-    "AZURE_BLOB_GENERATED_IMAGES_CONTAINER": "generated-images",
-
-    # Content Safety
-    "AZURE_CONTENT_SAFETY_ENDPOINT": "https://test-safety.cognitiveservices.azure.com/",
-    "AZURE_CONTENT_SAFETY_API_VERSION": "2024-09-01",
-
-    # Search Service
-    "AZURE_SEARCH_ENDPOINT": "https://test-search.search.windows.net",
-    "AZURE_SEARCH_INDEX_NAME": "products-index",
-
-    # Foundry (optional)
-    "USE_FOUNDRY": "false",
-    "AZURE_AI_PROJECT_CONNECTION_STRING": "",
-
-    # Admin - Empty for development mode (no authentication required)
-    "ADMIN_API_KEY": "",
-
-    # App Configuration
-    "ALLOWED_ORIGIN": "http://localhost:3000",
-    "LOG_LEVEL": "DEBUG",
-})
-
-# Add the backend directory to the Python path so we can import backend modules
-tests_dir = os.path.dirname(os.path.abspath(__file__))
-backend_dir = os.path.join(os.path.dirname(tests_dir), 'backend')
-if backend_dir not in sys.path:
-    sys.path.insert(0, backend_dir)
-
-# Set Windows event loop policy at module level (fixes pytest-asyncio auto mode compatibility)
-if sys.platform == "win32":
-    asyncio.set_event_loop_policy(asyncio.WindowsProactorEventLoopPolicy())
+
+def pytest_configure(config):
+    """Set minimal env vars required for backend imports before test collection.
+
+    Only sets variables absolutely required to import settings.py without errors.
+    All other test environment configuration is handled by the mock_environment fixture.
+    """
+    # AZURE_OPENAI_ENDPOINT is required by _AzureOpenAISettings validator
+    os.environ.setdefault("AZURE_OPENAI_ENDPOINT", "https://test.openai.azure.com/")
+
+    # Add the backend directory to the Python path
+    tests_dir = os.path.dirname(os.path.abspath(__file__))
+    backend_dir = os.path.join(os.path.dirname(tests_dir), 'backend')
+    if backend_dir not in sys.path:
+        sys.path.insert(0, backend_dir)
+
+    # Set Windows event loop policy (fixes pytest-asyncio auto mode compatibility)
+    if sys.platform == "win32":
+        asyncio.set_event_loop_policy(asyncio.WindowsProactorEventLoopPolicy())
+
+
+def pytest_sessionfinish(session, exitstatus):  # noqa: ARG001
+    """Clean up any remaining async resources after test session.
+
+    This helps prevent 'Unclosed client session' warnings from aiohttp
+    that can occur when Azure SDK or other async clients aren't fully closed.
+
+    Args:
+        session: pytest Session object (required by hook signature)
+        exitstatus: exit status code (required by hook signature)
+    """
+    del session, exitstatus  # Unused but required by pytest hook signature
+    # Force garbage collection to trigger cleanup of any unclosed sessions
+    gc.collect()
+
+    # Close any remaining event loops
+    try:
+        loop = asyncio.get_event_loop()
+        if loop.is_running():
+            loop.stop()
+        if not loop.is_closed():
+            loop.close()
+    except Exception:
+        pass
 
 
 # ==================== Environment Configuration ====================
 
 @pytest.fixture(scope="function", autouse=True)
-def mock_environment():
-    """Ensure environment variables are set for each test."""
-    # Environment variables are already set at module level
-    # This fixture exists for potential test-specific overrides
+def mock_environment(monkeypatch):
+    """Set test environment variables with correct names matching settings.py.
+
+    Uses monkeypatch for proper test isolation - each test starts with a clean
+    environment and changes are automatically reverted after the test.
+    """
+    env_vars = {
+        # Azure OpenAI (required - _AzureOpenAISettings)
+        "AZURE_OPENAI_ENDPOINT": "https://test-openai.openai.azure.com/",
+        "AZURE_OPENAI_API_VERSION": "2024-08-01-preview",
+
+        # Azure Cosmos DB (_CosmosSettings uses AZURE_COSMOS_ prefix)
+        "AZURE_COSMOS_ENDPOINT": "https://test-cosmos.documents.azure.com:443/",
+        "AZURE_COSMOS_DATABASE_NAME": "test-db",
+
+        # Chat History (_ChatHistorySettings uses AZURE_COSMOSDB_ prefix)
+        "AZURE_COSMOSDB_DATABASE": "test-db",
+        "AZURE_COSMOSDB_ACCOUNT": "test-cosmos",
+        "AZURE_COSMOSDB_CONVERSATIONS_CONTAINER": "conversations",
+        "AZURE_COSMOSDB_PRODUCTS_CONTAINER": "products",
+
+        # Azure Blob Storage (_StorageSettings uses AZURE_BLOB_ prefix)
+        "AZURE_BLOB_ACCOUNT_NAME": "teststorage",
+        "AZURE_BLOB_PRODUCT_IMAGES_CONTAINER": "product-images",
+        "AZURE_BLOB_GENERATED_IMAGES_CONTAINER": "generated-images",
+
+        # Azure AI Search (_SearchSettings uses AZURE_AI_SEARCH_ prefix)
+        "AZURE_AI_SEARCH_ENDPOINT": "https://test-search.search.windows.net",
+        "AZURE_AI_SEARCH_PRODUCTS_INDEX": "products",
+        "AZURE_AI_SEARCH_IMAGE_INDEX": "product-images",
+
+        # AI Foundry (disabled for tests)
+        "USE_FOUNDRY": "false",
+
+        # Admin API (empty = development mode, no auth required)
+        "ADMIN_API_KEY": "",
+    }
+
+    for key, value in env_vars.items():
+        monkeypatch.setenv(key, value)
+
     yield