feat: Add orchestration prompt

Author: kieran-wilkinson-4

packages/slackBotFunction/app/services/bedrock.py

@@ -21,7 +21,7 @@ def query_bedrock(user_query: str, session_id: str = None) -> RetrieveAndGenerat
     """
 
     config = get_retrieve_generate_config()
-    generation_template = load_prompt(config.RAG_GENERATION_PROMPT_NAME, config.RAG_GENERATION_PROMPT_VERSION)
+    generation_template = load_prompt(config.RAG_RESPONSE_PROMPT_NAME, config.RAG_RESPONSE_PROMPT_VERSION)
     orchestration_template = load_prompt(config.RAG_ORCHESTRATION_PROMPT_NAME, config.RAG_ORCHESTRATION_PROMPT_VERSION)
     inference_config = generation_template.get("inference_config")
 
@@ -30,7 +30,7 @@ def query_bedrock(user_query: str, session_id: str = None) -> RetrieveAndGenerat
         inference_config = default_values
         logger.warning(
             "No inference configuration found in prompt template; using default values",
-            extra={"prompt_name": config.RAG_GENERATION_PROMPT_NAME, "default_inference_config": default_values},
+            extra={"prompt_name": config.RAG_RESPONSE_PROMPT_NAME, "default_inference_config": default_values},
         )
 
     client: AgentsforBedrockRuntimeClient = boto3.client(
@@ -42,7 +42,7 @@ def query_bedrock(user_query: str, session_id: str = None) -> RetrieveAndGenerat
         logger.error(
             "Prompt templates for RAG generation or orchestration not found",
             extra={
-                "generation_prompt_name": config.RAG_GENERATION_PROMPT_NAME,
+                "generation_prompt_name": config.RAG_RESPONSE_PROMPT_NAME,
                 "orchestration_prompt_name": config.RAG_ORCHESTRATION_PROMPT_NAME,
             },
         )
@@ -90,7 +90,7 @@ def query_bedrock(user_query: str, session_id: str = None) -> RetrieveAndGenerat
 
     logger.info(
         "Using prompt template for RAG response generation",
-        extra={"prompt_name": config.RAG_GENERATION_PROMPT_NAME},
+        extra={"prompt_name": config.RAG_RESPONSE_PROMPT_NAME},
     )
 
     # Include session ID for conversation continuity across messages

packages/slackBotFunction/tests/conftest.py

@@ -26,7 +26,7 @@ def mock_env():
         "QUERY_REFORMULATION_PROMPT_VERSION": "DRAFT",
         "RAG_RESPONSE_PROMPT_NAME": "test-rag-prompt",
         "RAG_RESPONSE_PROMPT_VERSION": "DRAFT",
-        "RAG_ORCHESTRATION_PROMPT_NAME": "test-rag-prompt",
+        "RAG_ORCHESTRATION_PROMPT_NAME": "test-orc-prompt",
         "RAG_ORCHESTRATION_PROMPT_VERSION": "DRAFT",
     }
     env_vars["AWS_DEFAULT_REGION"] = env_vars["AWS_REGION"]

packages/slackBotFunction/tests/test_bedrock_integration.py

@@ -1,4 +1,5 @@
 import sys
+from unittest import mock
 from unittest.mock import Mock, patch
 
 
@@ -20,8 +21,13 @@ def test_get_bedrock_knowledgebase_response(mock_boto_client: Mock, mock_load_pr
     result = query_bedrock("test query")
 
     # assertions
-    mock_load_prompt.assert_called_once_with("test-rag-prompt", "DRAFT")
-    mock_boto_client.assert_called_once_with(service_name="bedrock-agent-runtime", region_name="eu-west-2")
+    mock_load_prompt.assert_has_calls(
+        [
+            mock.call("test-rag-prompt", "DRAFT"),
+            mock.call("test-orc-prompt", "DRAFT"),
+        ]
+    )
+    mock_boto_client.assert_called_with(service_name="bedrock-agent-runtime", region_name="eu-west-2")
     mock_client.retrieve_and_generate.assert_called_once()
     assert result["output"]["text"] == "bedrock response"
 
@@ -45,7 +51,6 @@ def test_query_bedrock_with_session(mock_boto_client: Mock, mock_load_prompt: Mo
     result = query_bedrock("test query", session_id="existing_session")
 
     # assertions
-    mock_load_prompt.assert_called_once_with("test-rag-prompt", "DRAFT")
     assert result == mock_response
     call_args = mock_client.retrieve_and_generate.call_args[1]
     assert call_args["sessionId"] == "existing_session"
@@ -70,7 +75,6 @@ def test_query_bedrock_without_session(mock_boto_client: Mock, mock_load_prompt:
     result = query_bedrock("test query")
 
     # assertions
-    mock_load_prompt.assert_called_once_with("test-rag-prompt", "DRAFT")
     assert result == mock_response
     call_args = mock_client.retrieve_and_generate.call_args[1]
     assert "sessionId" not in call_args
@@ -95,7 +99,6 @@ def test_query_bedrock_check_prompt(mock_boto_client: Mock, mock_load_prompt: Mo
     result = query_bedrock("test query")
 
     # assertions
-    mock_load_prompt.assert_called_once_with("test-rag-prompt", "DRAFT")
     call_args = mock_client.retrieve_and_generate.call_args[1]
     prompt_template = call_args["retrieveAndGenerateConfiguration"]["knowledgeBaseConfiguration"][
         "generationConfiguration"