Merge pull request #3 from rohit-ganguly/mergemain

Merge from main

Author: pamelafox

.devcontainer/devcontainer.json

@@ -29,11 +29,15 @@
 			"extensions": [
 				"ms-python.python",
 				"ms-python.vscode-pylance",
+				"ms-python.vscode-python-envs",
 				"charliermarsh.ruff",
 				"mtxr.sqltools",
 				"mtxr.sqltools-driver-pg",
+				"esbenp.prettier-vscode",
+				"mechatroner.rainbow-csv",
 				"ms-vscode.vscode-node-azure-pack",
-                "esbenp.prettier-vscode"
+				"teamsdevapp.vscode-ai-foundry",
+				"ms-windows-ai-studio.windows-ai-studio"
 			],
 			// Set *default* container specific settings.json values on container create.
 			"settings": {

.github/workflows/app-tests.yaml

@@ -123,7 +123,7 @@ jobs:
             key: mypy${{ matrix.os }}-${{ matrix.python_version }}-${{ hashFiles('requirements-dev.txt', 'src/backend/requirements.txt', 'src/backend/pyproject.toml') }}
 
         - name: Run MyPy
-          run: python3 -m mypy .
+          run: python3 -m mypy . --python-version ${{ matrix.python_version }}
 
         - name: Run Pytest
           run: python3 -m pytest -s -vv --cov --cov-fail-under=85

pyproject.toml

@@ -7,7 +7,6 @@ lint.isort.known-first-party = ["fastapi_app"]
 
 [tool.mypy]
 check_untyped_defs = true
-python_version = 3.9
 exclude = [".venv/*"]
 
 [tool.pytest.ini_options]

requirements-dev.txt

@@ -14,4 +14,3 @@ pytest-snapshot
 locust
 psycopg2
 dotenv-azd
-freezegun

src/backend/fastapi_app/api_models.py

@@ -1,9 +1,8 @@
 from enum import Enum
-from typing import Any, Optional, Union
+from typing import Any, Optional
 
-from openai.types.chat import ChatCompletionMessageParam
+from openai.types.responses import ResponseInputItemParam
 from pydantic import BaseModel, Field
-from pydantic_ai.messages import ModelRequest, ModelResponse
 
 
 class AIChatRoles(str, Enum):
@@ -37,7 +36,7 @@ class ChatRequestContext(BaseModel):
 
 
 class ChatRequest(BaseModel):
-    messages: list[ChatCompletionMessageParam]
+    messages: list[ResponseInputItemParam]
     context: ChatRequestContext
     sessionState: Optional[Any] = None
 
@@ -103,7 +102,7 @@ class ChatParams(ChatRequestOverrides):
     enable_text_search: bool
     enable_vector_search: bool
     original_user_query: str
-    past_messages: list[Union[ModelRequest, ModelResponse]]
+    past_messages: list[ResponseInputItemParam]
 
 
 class Filter(BaseModel):

src/backend/fastapi_app/prompts/query_fewshots.json

@@ -1,76 +1,36 @@
 [
   {
-    "parts": [
-      {
-        "content": "good options for ethiopian restaurants?",
-        "timestamp": "2025-05-07T19:02:46.977501Z",
-        "part_kind": "user-prompt"
-      }
-    ],
-    "instructions": null,
-    "kind": "request"
+    "role": "user",
+    "content": "good options for ethiopian restaurants?"
   },
   {
-    "parts": [
-      {
-        "tool_name": "search_database",
-        "args": "{\"search_query\":\"ethiopian\"}",
-        "tool_call_id": "call_4HeBCmo2uioV6CyoePEGyZPc",
-        "part_kind": "tool-call"
-      }
-    ],
-    "model_name": "gpt-4o-mini-2024-07-18",
-    "timestamp": "2025-05-07T19:02:47Z",
-    "kind": "response"
+    "id": "madeup",
+    "call_id": "call_abc123",
+    "name": "search_database",
+    "arguments": "{\"search_query\":\"ethiopian\"}",
+    "type": "function_call"
   },
   {
-    "parts": [
-      {
-        "tool_name": "search_database",
-        "content": "Search results for ethiopian: ...",
-        "tool_call_id": "call_4HeBCmo2uioV6CyoePEGyZPc",
-        "timestamp": "2025-05-07T19:02:48.242408Z",
-        "part_kind": "tool-return"
-      }
-    ],
-    "instructions": null,
-    "kind": "request"
+    "id": "madeupoutput",
+    "call_id": "call_abc123",
+    "output": "Search results for ethiopian: ...",
+    "type": "function_call_output"
   },
   {
-    "parts": [
-      {
-        "content": "are there any inexpensive chinese restaurants?",
-        "timestamp": "2025-05-07T19:02:46.977501Z",
-        "part_kind": "user-prompt"
-      }
-    ],
-    "instructions": null,
-    "kind": "request"
+    "role": "user",
+    "content": "are there any inexpensive japanese restaurants?"
   },
   {
-    "parts": [
-      {
-        "tool_name": "search_database",
-        "args": "{\"search_query\":\"chinese\",\"price_level_filter\":{\"comparison_operator\":\"<\",\"value\":3}}",
-        "tool_call_id": "call_4HeBCmo2uioV6CyoePEGyZPc",
-        "part_kind": "tool-call"
-      }
-    ],
-    "model_name": "gpt-4o-mini-2024-07-18",
-    "timestamp": "2025-05-07T19:02:47Z",
-    "kind": "response"
+    "id": "madeup",
+    "call_id": "call_abc456",
+    "name": "search_database",
+    "arguments": "{\"search_query\":\"japanese\",\"price_level_filter\":{\"comparison_operator\":\"<\",\"value\":3}}",
+    "type": "function_call"
   },
   {
-    "parts": [
-      {
-        "tool_name": "search_database",
-        "content": "Search results for chinese: ...",
-        "tool_call_id": "call_4HeBCmo2uioV6CyoePEGyZPc",
-        "timestamp": "2025-05-07T19:02:48.242408Z",
-        "part_kind": "tool-return"
-      }
-    ],
-    "instructions": null,
-    "kind": "request"
+    "id": "madeupoutput",
+    "call_id": "call_abc456",
+    "output": "Search results for japanese: ...",
+    "type": "function_call_output"
   }
 ]