freeplay 0.3.20__py3-none-any.whl → 0.3.22__py3-none-any.whl

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
@@ -221,6 +221,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 +251,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/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

{freeplay-0.3.20.dist-info → freeplay-0.3.22.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: freeplay
-Version: 0.3.20
+Version: 0.3.22
 Summary: 
 License: MIT
 Author: FreePlay Engineering
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Requires-Dist: click (==8.1.7)
+Requires-Dist: click (>=8.1.7,<9.0.0)
 Requires-Dist: dacite (>=1.8.0,<2.0.0)
 Requires-Dist: pystache (>=0.6.5,<0.7.0)
 Requires-Dist: requests (>=2.20.0,<3.0.0dev)

{freeplay-0.3.20.dist-info → freeplay-0.3.22.dist-info}/RECORD

@@ -7,17 +7,17 @@ freeplay/llm_parameters.py,sha256=bQbfuC8EICF0XMZQa5pwI3FkQqxmCUVqHO3gYHy3Tg8,89
 freeplay/model.py,sha256=o0de_RZ2WTJ4m5OJw1ZVfC2xG6zBq_XShBrRt1laEjc,1405
 freeplay/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 freeplay/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-freeplay/resources/adapters.py,sha256=BFqzLoJhLJeXfUyPOKDnllN_3jlbbBH0z32tXv20R20,8188
+freeplay/resources/adapters.py,sha256=0ZQdVNoa6JcWToaSyNLnK-WXRDk6UEksC9QBAkeFBiw,9102
 freeplay/resources/customer_feedback.py,sha256=bw8MfEOKbGgn4FOyvcADrcs9GhcpNXNTgxKjBjIzywE,899
-freeplay/resources/prompts.py,sha256=poLt48UG_3q6qDMvMqk0x6Y4QM66Mt6LyASpfcG0jwo,22843
+freeplay/resources/prompts.py,sha256=mnL1VscMGM7D4ulGf3CBGQKdsSj8I5Wf_6nJEYa7mZI,23353
 freeplay/resources/recordings.py,sha256=z2ARII1jCnmNh1GU3hGnXZUz5IF_KhyayQum71k-h9c,9213
 freeplay/resources/sessions.py,sha256=J5A3CjiV2MFqQyxN3TWTvJaa9jmMza58mRFRq2v9iAk,3746
 freeplay/resources/test_cases.py,sha256=nXL_976RwSJDT6OWDM4GEzbcOzcGkJ9ulvb0XOzCRDM,2240
 freeplay/resources/test_runs.py,sha256=Tp2N-odInT5XEEWrEsVhdgfnsclOE8n92_C8gTwO2MI,2623
 freeplay/support.py,sha256=kQMItnMGZT5TOdPQsSiKOlBbBqO4AyR91vito6wt4JM,12275
 freeplay/utils.py,sha256=Xvt4mNLXLL7E6MI2hTuDLV5cl5Y83DgdjCZSyDGMjR0,3187
-freeplay-0.3.20.dist-info/LICENSE,sha256=_jzIw45hB1XHGxiQ8leZ0GH_X7bR_a8qgxaqnHbCUOo,1064
-freeplay-0.3.20.dist-info/METADATA,sha256=3mkuwNZ5k_CGH3wtcIOCrI5lDPL2meBLE4_fqQW7vOc,1654
-freeplay-0.3.20.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-freeplay-0.3.20.dist-info/entry_points.txt,sha256=32s3rf2UUCqiJT4jnClEXZhdXlvl30uwpcxz-Gsy4UU,54
-freeplay-0.3.20.dist-info/RECORD,,
+freeplay-0.3.22.dist-info/LICENSE,sha256=_jzIw45hB1XHGxiQ8leZ0GH_X7bR_a8qgxaqnHbCUOo,1064
+freeplay-0.3.22.dist-info/METADATA,sha256=6wCrxA0QTHMq1JoLtxIfEsexI3lcRlxEFkwOHSvr8HM,1661
+freeplay-0.3.22.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+freeplay-0.3.22.dist-info/entry_points.txt,sha256=32s3rf2UUCqiJT4jnClEXZhdXlvl30uwpcxz-Gsy4UU,54
+freeplay-0.3.22.dist-info/RECORD,,