REDBOX 337 chat file selection

core_api/src/routes/chat.py

@@ -108,8 +108,9 @@ async def build_retrieval_chain(
 
     search_kwargs = {"filter": {"bool": {"must": [{"term": {"creator_user_uuid.keyword": str(user_uuid)}}]}}}
 
-    if chat_request.selected_files is not None:
-        search_kwargs["filter"]["bool"]["should"] = [
+    if chat_request.selected_files:
+        logging.info("chat_request.selected_files: %s", str(chat_request.selected_files))
+        search_kwargs["filter"]["bool"]["must"] = [
             {"term": {"parent_file_uuid.keyword": str(file.uuid)}} for file in chat_request.selected_files
         ]
 
@@ -152,6 +153,8 @@ async def rag_chat(
         StreamingResponse: a stream of the chain response
     """
 
+    logging.info("chat_request: %s", chat_request)
+
     question = chat_request.message_history[-1].text
     route = route_layer(question)
 

infrastructure/aws/ecs.tf

@@ -47,7 +47,7 @@ module "django-app" {
   create_networking          = true
   source                     = "../../../i-ai-core-infrastructure//modules/ecs"
   name                       = "${local.name}-django-app"
-  image_tag                  = var.image_tag
+  image_tag                  = "9a4a3bbeda7e464bfe87a0588b7ee0d310e8e98d"
   ecr_repository_uri         = "${var.ecr_repository_uri}/${var.project_name}-django-app"
   ecs_cluster_id             = module.cluster.ecs_cluster_id
   ecs_cluster_name           = module.cluster.ecs_cluster_name
@@ -80,7 +80,7 @@ module "core_api" {
   create_networking             = false
   source                        = "../../../i-ai-core-infrastructure//modules/ecs"
   name                          = "${local.name}-core-api"
-  image_tag                     = var.image_tag
+  image_tag                     = "9a4a3bbeda7e464bfe87a0588b7ee0d310e8e98d"
   ecr_repository_uri            = "${var.ecr_repository_uri}/redbox-core-api"
   ecs_cluster_id                = module.cluster.ecs_cluster_id
   ecs_cluster_name              = module.cluster.ecs_cluster_name
@@ -111,7 +111,7 @@ module "worker" {
   create_networking            = false
   source                       = "../../../i-ai-core-infrastructure//modules/ecs"
   name                         = "${local.name}-worker"
-  image_tag                    = var.image_tag
+  image_tag                    = "9a4a3bbeda7e464bfe87a0588b7ee0d310e8e98d"
   ecr_repository_uri           = "${var.ecr_repository_uri}/redbox-worker"
   ecs_cluster_id               = module.cluster.ecs_cluster_id
   ecs_cluster_name             = module.cluster.ecs_cluster_name

tests/test_e2e.py

@@ -123,6 +123,32 @@ def test_post_rag(self, user_uuid):
         assert TestEndToEnd.file_uuids[user_uuid] in source_document_file_uuids
         TestEndToEnd.source_document_file_uuids[user_uuid] = source_document_file_uuids
 
+    @pytest.mark.parametrize("user_uuid", USER_UUIDS)
+    def test_post_rag_fail(self, user_uuid):
+        """
+        Given that I have POSTed a file key to core-api/file
+        And the file status is complete
+        When I POST a question to the rag endpoint with the wrong file selected
+        I Expect an answer and for no cited documents to be returned
+        """
+        rag_response = requests.post(
+            "http://localhost:5002/chat/rag",
+            json={
+                "message_history": [
+                    {"role": "user", "text": "what is routing?"},
+                ],
+                "selected_files": [{"uuid": "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"}],
+            },
+            headers=make_headers(user_uuid),
+            timeout=30,
+        )
+        assert rag_response.status_code == HTTPStatus.OK
+
+        source_document_file_uuids = {
+            source_document["file_uuid"] for source_document in rag_response.json()["source_documents"]
+        }
+        assert TestEndToEnd.file_uuids[user_uuid] not in source_document_file_uuids
+
     @pytest.mark.parametrize("user_uuid", USER_UUIDS)
     def test_permissions(self, user_uuid):
         """