freeplay 0.3.21__tar.gz → 0.3.23__tar.gz

{freeplay-0.3.21 → freeplay-0.3.23}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: freeplay
-Version: 0.3.21
+Version: 0.3.23
 Summary: 
 License: MIT
 Author: FreePlay Engineering

{freeplay-0.3.21 → freeplay-0.3.23}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "freeplay"
-version = "0.3.21"
+version = "0.3.23"
 description = ""
 authors = ["FreePlay Engineering <engineering@freeplay.ai>"]
 license = "MIT"

{freeplay-0.3.21 → freeplay-0.3.23}/src/freeplay/resources/adapters.py

@@ -1,6 +1,6 @@
 import copy
 from dataclasses import dataclass
-from typing import Protocol, Dict, List, Union, Any
+from typing import Any, Dict, List, Protocol, Union
 
 from freeplay.errors import FreeplayConfigurationError
 from freeplay.support import MediaType
@@ -35,6 +35,7 @@ class MissingFlavorError(FreeplayConfigurationError):
 
 
 class LLMAdapter(Protocol):
+    # This method must handle BOTH prompt template messages and provider specific messages.
     def to_llm_syntax(self, messages: List[Dict[str, Any]]) -> Union[str, List[Dict[str, Any]]]:
         pass
 
@@ -187,11 +188,13 @@ class GeminiAdapter(LLMAdapter):
                     "role": self.__translate_role(message["role"]),
                     "parts": [self.__map_content(content) for content in message['content']]
                 })
-            else:
+            elif "content" in message:
                 gemini_messages.append({
                     "role": self.__translate_role(message["role"]),
                     "parts": [{"text": message["content"]}]
                 })
+            else:
+                gemini_messages.append(copy.deepcopy(message))
 
         return gemini_messages
 
@@ -221,6 +224,25 @@ class GeminiAdapter(LLMAdapter):
             raise ValueError(f"Gemini formatting found unexpected role {role}")
 
 
+class BedrockConverseAdapter(LLMAdapter):
+    def to_llm_syntax(self, messages: List[Dict[str, Any]]) -> List[Dict[str, Any]]:
+        converse_messages = []
+        for message in messages:
+            if message["role"] == "system":
+                continue
+            if "has_media" in message and message["has_media"]:
+                raise ValueError("Bedrock Converse does not support media content yet")
+
+            role = message["role"]
+            content = message["content"]
+            if role not in ["user", "assistant"]:
+                raise ValueError(f"Unexpected role for Bedrock Converse flavor: {role}")
+            if isinstance(content, str):
+                content = [{"text": content}]
+            converse_messages.append({"role": role, "content": content})
+        return converse_messages
+
+
 def adaptor_for_flavor(flavor_name: str) -> LLMAdapter:
     if flavor_name in ["baseten_mistral_chat", "mistral_chat", "perplexity_chat"]:
         return PassthroughAdapter()
@@ -232,5 +254,7 @@ def adaptor_for_flavor(flavor_name: str) -> LLMAdapter:
         return Llama3Adapter()
     elif flavor_name == "gemini_chat":
         return GeminiAdapter()
+    elif flavor_name == "amazon_bedrock_converse":
+        return BedrockConverseAdapter()
     else:
         raise MissingFlavorError(flavor_name)

{freeplay-0.3.21 → freeplay-0.3.23}/src/freeplay/resources/prompts.py

@@ -8,6 +8,7 @@ from typing import (
     Any,
     Dict,
     List,
+    Literal,
     Optional,
     Protocol,
     Sequence,
@@ -15,7 +16,6 @@ from typing import (
     Union,
     cast,
     runtime_checkable,
-    Literal,
 )
 
 from freeplay.errors import (
@@ -25,15 +25,24 @@ from freeplay.errors import (
 )
 from freeplay.llm_parameters import LLMParameters
 from freeplay.model import InputVariables
-from freeplay.resources.adapters import MissingFlavorError, adaptor_for_flavor, MediaContentBase64, MediaContentUrl, \
-    TextContent
+from freeplay.resources.adapters import (
+    MediaContentBase64,
+    MediaContentUrl,
+    MissingFlavorError,
+    TextContent,
+    adaptor_for_flavor,
+)
 from freeplay.support import (
     CallSupport,
+    HistoryTemplateMessage,
+    MediaSlot,
     PromptTemplate,
     PromptTemplateMetadata,
     PromptTemplates,
+    Role,
+    TemplateChatMessage,
     TemplateMessage,
-    ToolSchema, TemplateChatMessage, HistoryTemplateMessage, MediaSlot, Role,
+    ToolSchema,
 )
 from freeplay.utils import bind_template_variables, convert_provider_message_to_dict
 
@@ -147,7 +156,7 @@ class BoundPrompt:
         self.tool_schema = tool_schema
 
     @staticmethod
-    def __format_tool_schema(flavor_name: str, tool_schema: List[ToolSchema]) -> List[Dict[str, Any]]:
+    def __format_tool_schema(flavor_name: str, tool_schema: List[ToolSchema]) -> Any:
         if flavor_name == 'anthropic_chat':
             return [{
                 'name': tool_schema.name,
@@ -161,6 +170,19 @@ class BoundPrompt:
                     'type': 'function'
                 } for tool_schema in tool_schema
             ]
+        elif flavor_name == "amazon_bedrock_converse":
+            return {
+                "tools": [
+                    {
+                        "toolSpec": {
+                            "name": tool_schema.name,
+                            "description": tool_schema.description,
+                            "inputSchema": {"json": tool_schema.parameters},
+                        }
+                    }
+                    for tool_schema in tool_schema
+                ]
+            }
 
         raise UnsupportedToolSchemaError()
 
@@ -171,7 +193,6 @@ class BoundPrompt:
         final_flavor = flavor_name or self.prompt_info.flavor_name
         adapter = adaptor_for_flavor(final_flavor)
         formatted_prompt = adapter.to_llm_syntax(self.messages)
-
         formatted_tool_schema = BoundPrompt.__format_tool_schema(
             final_flavor,
             self.tool_schema