Working tools calls on AWS.

Add adapter instructions to the Adapter and instructions.

libs/core/kiln_ai/adapters/base_adapter.py

@@ -31,10 +31,17 @@ async def invoke(self, input: str) -> Dict | str:
     async def _run(self, input: str) -> Dict | str:
         pass
 
+    # override for provider specific instructions (e.g. json format instead of tool call)
+    def adapter_specific_instructions(self) -> str | None:
+        if self._is_structured:
+            return "Always respond with a tool call. Never respond with a human readable message."
+        return None
+
 
 class BasePromptBuilder(metaclass=ABCMeta):
-    def __init__(self, task: Task):
+    def __init__(self, task: Task, adapter: BaseAdapter | None = None):
         self.task = task
+        self.adapter = adapter
 
     @abstractmethod
     def build_prompt(self, input: str) -> str:

libs/core/kiln_ai/adapters/langchain_adapters.py

@@ -1,4 +1,3 @@
-import json
 from typing import Dict
 
 import kiln_ai.datamodel.models as models
@@ -47,8 +46,9 @@ def __init__(
                 output_schema, include_raw=True
             )
         if prompt_builder is None:
-            self.prompt_builder = SimplePromptBuilder(kiln_task)
+            self.prompt_builder = SimplePromptBuilder(task=kiln_task, adapter=self)
         else:
+            prompt_builder.adapter = self
             self.prompt_builder = prompt_builder
 
     async def _run(self, input: str) -> Dict | str:

libs/core/kiln_ai/adapters/prompt_builders.py

@@ -14,6 +14,11 @@ def build_prompt(self, input: str) -> str:
             for i, requirement in enumerate(self.task.requirements()):
                 base_prompt += f"{i+1}) {requirement.instruction}\n"
 
+        if self.adapter is not None:
+            adapter_instructions = self.adapter.adapter_specific_instructions()
+            if adapter_instructions is not None:
+                base_prompt += f"\n\n{adapter_instructions}\n\n"
+
         # TODO: should be another message, not just appended to prompt
         base_prompt += f"\n\nThe input is:\n{input}"
         return base_prompt

libs/core/kiln_ai/adapters/test_structured_output.py

@@ -19,7 +19,7 @@ async def test_structured_output_groq(tmp_path):
 
 @pytest.mark.paid
 async def test_structured_output_bedrock(tmp_path):
-    await run_structured_output_test(tmp_path, "mistral_large", "amazon_bedrock")
+    await run_structured_output_test(tmp_path, "llama_3_1_8b", "amazon_bedrock")
 
 
 @pytest.mark.ollama

libs/core/kiln_ai/datamodel/models.py

@@ -1,4 +1,3 @@
-import json
 from enum import Enum, IntEnum
 from typing import Dict