Merge pull request #134 from microsoft/dev

chore: Dev to Main Merge

Author: Roopan-Microsoft

infra/scripts/agent_scripts/01_create_agents.py

@@ -56,8 +56,15 @@ async def create_agents():
 
                                     If you don't find any information in the knowledge source, please say no data found.
 
-                                    IMPORTANT: Always include the product image in your response using markdown format: ![Product Name](image_url)
+                                    IMPORTANT: For each product, you MUST use this exact format:
+
+                                    1. **Product Name**
+                                       - **Description:** description text
+                                       - **Price:** $price
+                                       - ![Product Name](image_url)
+
                                     The image URL is available in the 'image' field of each product from the search results.
+                                    Always include every product's description, price, and image. Never omit any of these fields.
                                 """
         product_agent = await provider.create_agent(
             name=f"product-agent-{solutionName}",

infra/scripts/data_scripts/03_write_products_to_cosmos.py

@@ -46,7 +46,7 @@ def get_or_create_database(db_name: str):
         print(f"Database '{db_name}' ready.")
         return database
     except exceptions.CosmosHttpResponseError as e:
-        sys.exit(f"Error creating database: {e}")
+        raise SystemExit(f"Error creating database: {e}")
 
 
 def get_or_create_container(database, container_name: str, partition_key_path: str):
@@ -61,7 +61,7 @@ def get_or_create_container(database, container_name: str, partition_key_path: s
         )
         return container
     except exceptions.CosmosHttpResponseError as e:
-        sys.exit(f"Error creating container: {e}")
+        raise SystemExit(f"Error creating container: {e}")
 
 
 def normalize_row(row: Dict[str, Any]) -> Dict[str, Any]:

tests/e2e-test/pages/webUserPage.py

@@ -1,4 +1,5 @@
 from base.base import BasePage
+from playwright.sync_api import TimeoutError as PlaywightTimeoutError
 
 
 class WebUserPage(BasePage):
@@ -240,7 +241,7 @@ def ask_question_and_verify(self, question, expected_keywords):
                 arg=initial_response_count,
                 timeout=60000
             )
-        except:
+        except PlaywightTimeoutError:
             pass
 
         # Wait extra time to ensure new response has fully loaded
@@ -287,7 +288,7 @@ def get_latest_ai_response(self):
                         # Validate this looks like an AI text response, not a product card
                         if not self._is_product_card_text(cleaned):
                             return cleaned
-            except:
+            except Exception:
                 continue
 
         # Method 2: Parse the full page and extract the latest AI response by timestamp