Remove unreachable code path, change 200 to 204 for delete, more tests

Author: pamelafox

app/backend/chat_history/cosmosdb.py

@@ -113,9 +113,6 @@ async def get_chat_history_session(auth_claims: Dict[str, Any], item_id: str):
     if not container:
         return jsonify({"error": "Chat history not enabled"}), 400
 
-    if not item_id:
-        return jsonify({"error": "Invalid item ID specifier"}), 400
-
     entra_oid = auth_claims.get("oid")
     if not entra_oid:
         return jsonify({"error": "User OID not found"}), 401
@@ -148,16 +145,13 @@ async def delete_chat_history_session(auth_claims: Dict[str, Any], item_id: str)
     if not container:
         return jsonify({"error": "Chat history not enabled"}), 400
 
-    if not item_id:
-        return jsonify({"error": "Invalid path"}), 400
-
     entra_oid = auth_claims.get("oid")
     if not entra_oid:
         return jsonify({"error": "User OID not found"}), 401
 
     try:
         await container.delete_item(item=item_id, partition_key=entra_oid)
-        return jsonify({}), 200
+        return jsonify({}), 204
     except Exception as error:
         return error_response(error, f"/chat_history/items/{item_id}")
 

tests/snapshots/test_cosmosdb/test_chathistory_getitem/auth_public_documents_client0/result.json

@@ -0,0 +1,11 @@
+{
+    "answers": [
+        [
+            "This is a test message"
+        ]
+    ],
+    "entra_oid": "OID_X",
+    "id": "123",
+    "timestamp": 123456789,
+    "title": "This is a test message"
+}

tests/snapshots/test_cosmosdb/test_chathistory_query_continuation/auth_public_documents_client0/result.json

@@ -0,0 +1,4 @@
+{
+    "continuation_token": null,
+    "items": []
+}

tests/test_cosmosdb.py

@@ -7,18 +7,21 @@
 
 
 class MockCosmosDBResultsIterator:
-    def __init__(self):
-        self.data = [
-            [
-                {
-                    "id": "123",
-                    "entra_oid": "OID_X",
-                    "title": "This is a test message",
-                    "timestamp": 123456789,
-                    "answers": [["This is a test message"]],
-                }
+    def __init__(self, empty=False):
+        if empty:
+            self.data = []
+        else:
+            self.data = [
+                [
+                    {
+                        "id": "123",
+                        "entra_oid": "OID_X",
+                        "title": "This is a test message",
+                        "timestamp": 123456789,
+                        "answers": [["This is a test message"]],
+                    }
+                ]
             ]
-        ]
 
     def __aiter__(self):
         return self
@@ -141,6 +144,24 @@ def mock_query_items(container_proxy, query, **kwargs):
     snapshot.assert_match(json.dumps(result, indent=4), "result.json")
 
 
+@pytest.mark.asyncio
+async def test_chathistory_query_continuation(auth_public_documents_client, monkeypatch, snapshot):
+
+    def mock_query_items(container_proxy, query, **kwargs):
+        return MockCosmosDBResultsIterator(empty=True)
+
+    monkeypatch.setattr(ContainerProxy, "query_items", mock_query_items)
+
+    response = await auth_public_documents_client.post(
+        "/chat_history/items",
+        headers={"Authorization": "Bearer MockToken"},
+        json={"count": 20},
+    )
+    assert response.status_code == 200
+    result = await response.get_json()
+    snapshot.assert_match(json.dumps(result, indent=4), "result.json")
+
+
 @pytest.mark.asyncio
 async def test_chathistory_query_error_disabled(client, monkeypatch):
 
@@ -198,3 +219,131 @@ def mock_query_items(container_proxy, query, **kwargs):
     assert (await response.get_json()) == {
         "error": "The app encountered an error processing your request.\nIf you are an administrator of the app, view the full error in the logs. See aka.ms/appservice-logs for more information.\nError type: <class 'Exception'>\n"
     }
+
+
+# Tests for getting an individual chat history item
+@pytest.mark.asyncio
+async def test_chathistory_getitem(auth_public_documents_client, monkeypatch, snapshot):
+
+    async def mock_read_item(container_proxy, item, partition_key, **kwargs):
+        return {
+            "id": "123",
+            "entra_oid": "OID_X",
+            "title": "This is a test message",
+            "timestamp": 123456789,
+            "answers": [["This is a test message"]],
+        }
+
+    monkeypatch.setattr(ContainerProxy, "read_item", mock_read_item)
+
+    response = await auth_public_documents_client.get(
+        "/chat_history/items/123",
+        headers={"Authorization": "Bearer MockToken"},
+    )
+    assert response.status_code == 200
+    result = await response.get_json()
+    snapshot.assert_match(json.dumps(result, indent=4), "result.json")
+
+
+# Error handling tests for getting an individual chat history item
+@pytest.mark.asyncio
+async def test_chathistory_getitem_error_disabled(client, monkeypatch):
+
+    response = await client.get(
+        "/chat_history/items/123",
+        headers={"Authorization": "BearerMockToken"},
+    )
+    assert response.status_code == 400
+
+
+@pytest.mark.asyncio
+async def test_chathistory_getitem_error_container(auth_public_documents_client, monkeypatch):
+    auth_public_documents_client.app.config["cosmos_history_container"] = None
+    response = await auth_public_documents_client.get(
+        "/chat_history/items/123",
+        headers={"Authorization": "BearerMockToken"},
+    )
+    assert response.status_code == 400
+
+
+@pytest.mark.asyncio
+async def test_chathistory_getitem_error_entra(auth_public_documents_client, monkeypatch):
+    response = await auth_public_documents_client.get(
+        "/chat_history/items/123",
+    )
+    assert response.status_code == 401
+
+
+@pytest.mark.asyncio
+async def test_chathistory_getitem_error_runtime(auth_public_documents_client, monkeypatch):
+
+    async def mock_read_item(container_proxy, item, partition_key, **kwargs):
+        raise Exception("Test Exception")
+
+    monkeypatch.setattr(ContainerProxy, "read_item", mock_read_item)
+
+    response = await auth_public_documents_client.get(
+        "/chat_history/items/123",
+        headers={"Authorization": "Bearer MockToken"},
+    )
+    assert response.status_code == 500
+
+
+# Tests for deleting an individual chat history item
+@pytest.mark.asyncio
+async def test_chathistory_deleteitem(auth_public_documents_client, monkeypatch):
+
+    async def mock_delete_item(container_proxy, item, partition_key, **kwargs):
+        assert item == "123"
+        assert partition_key == "OID_X"
+
+    monkeypatch.setattr(ContainerProxy, "delete_item", mock_delete_item)
+
+    response = await auth_public_documents_client.delete(
+        "/chat_history/items/123",
+        headers={"Authorization": "Bearer MockToken"},
+    )
+    assert response.status_code == 204
+
+
+@pytest.mark.asyncio
+async def test_chathistory_deleteitem_error_disabled(client, monkeypatch):
+
+    response = await client.delete(
+        "/chat_history/items/123",
+        headers={"Authorization": "Bearer MockToken"},
+    )
+    assert response.status_code == 400
+
+
+@pytest.mark.asyncio
+async def test_chathistory_deleteitem_error_container(auth_public_documents_client, monkeypatch):
+    auth_public_documents_client.app.config["cosmos_history_container"] = None
+    response = await auth_public_documents_client.delete(
+        "/chat_history/items/123",
+        headers={"Authorization": "Bearer MockToken"},
+    )
+    assert response.status_code == 400
+
+
+@pytest.mark.asyncio
+async def test_chathistory_deleteitem_error_entra(auth_public_documents_client, monkeypatch):
+    response = await auth_public_documents_client.delete(
+        "/chat_history/items/123",
+    )
+    assert response.status_code == 401
+
+
+@pytest.mark.asyncio
+async def test_chathistory_deleteitem_error_runtime(auth_public_documents_client, monkeypatch):
+
+    async def mock_delete_item(container_proxy, item, partition_key, **kwargs):
+        raise Exception("Test Exception")
+
+    monkeypatch.setattr(ContainerProxy, "delete_item", mock_delete_item)
+
+    response = await auth_public_documents_client.delete(
+        "/chat_history/items/123",
+        headers={"Authorization": "Bearer MockToken"},
+    )
+    assert response.status_code == 500