freeplay 0.3.6__tar.gz → 0.3.8__tar.gz

{freeplay-0.3.6 → freeplay-0.3.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: freeplay
-Version: 0.3.6
+Version: 0.3.8
 Summary: 
 License: MIT
 Author: FreePlay Engineering
@@ -13,6 +13,7 @@ Classifier: Programming Language :: Python :: 3.9
 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: dacite (>=1.8.0,<2.0.0)
 Requires-Dist: pystache (>=0.6.5,<0.7.0)

{freeplay-0.3.6 → freeplay-0.3.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "freeplay"
-version = "0.3.6"
+version = "0.3.8"
 description = ""
 authors = ["FreePlay Engineering <engineering@freeplay.ai>"]
 license = "MIT"
@@ -16,7 +16,7 @@ pystache = "^0.6.5"
 [tool.poetry.group.dev.dependencies]
 mypy = "^1"
 types-requests = "^2.31"
-anthropic = { version="^0.20.0", extras = ["bedrock"] }
+anthropic = {extras = ["bedrock"], version = "^0.39.0"}
 openai = "^1"
 boto3 = "^1.34.97"
 google-cloud-aiplatform = "1.51.0"

{freeplay-0.3.6 → freeplay-0.3.8}/src/freeplay/resources/prompts.py

@@ -1,18 +1,21 @@
 import copy
 import json
 from abc import ABC, abstractmethod
-from dataclasses import dataclass
+from dataclasses import asdict, dataclass
+import logging
 from pathlib import Path
-from typing import Dict, Optional, List, cast, Any, Union
+from typing import Dict, Optional, List, cast, Any, Union, overload
+from anthropic.types.message import Message as AnthropicMessage
+from openai.types.chat import ChatCompletionMessage as OpenAIMessage
 
 from freeplay.errors import FreeplayConfigurationError, FreeplayClientError, log_freeplay_client_warning
 from freeplay.llm_parameters import LLMParameters
 from freeplay.model import InputVariables
-from freeplay.support import CallSupport
+from freeplay.support import CallSupport, ToolSchema
 from freeplay.support import PromptTemplate, PromptTemplates, PromptTemplateMetadata
 from freeplay.utils import bind_template_variables
 
-
+logger = logging.getLogger(__name__)
 class MissingFlavorError(FreeplayConfigurationError):
     def __init__(self, flavor_name: str):
         super().__init__(
@@ -20,6 +23,12 @@ class MissingFlavorError(FreeplayConfigurationError):
             'a different model in the Freeplay UI.'
         )
 
+class UnsupportedToolSchemaError(FreeplayConfigurationError):
+    def __init__(self) -> None:
+        super().__init__(
+            f'Tool schema not supported for this model and provider.'
+        )
+
 
 # SDK-Exposed Classes
 @dataclass
@@ -42,10 +51,12 @@ class FormattedPrompt:
             prompt_info: PromptInfo,
             messages: List[Dict[str, str]],
             formatted_prompt: Optional[List[Dict[str, str]]] = None,
-            formatted_prompt_text: Optional[str] = None
+            formatted_prompt_text: Optional[str] = None,
+            tool_schema: Optional[List[Dict[str, Any]]] = None
     ):
         self.prompt_info = prompt_info
         self.llm_prompt = formatted_prompt
+        self.tool_schema = tool_schema
         if formatted_prompt_text:
             self.llm_prompt_text = formatted_prompt_text
 
@@ -58,19 +69,23 @@ class FormattedPrompt:
 
     def all_messages(
             self,
-            new_message: Dict[str, str]
-    ) -> List[Dict[str, str]]:
-        return self.messages + [new_message]
-
+            new_message: Union[Dict[str, str], AnthropicMessage, OpenAIMessage]
+    ) -> List[Dict[str, Any]]:
+        if isinstance(new_message, AnthropicMessage) or isinstance(new_message, OpenAIMessage):
+            return self.messages + [new_message.to_dict()]
+        elif isinstance(new_message, dict):
+            return self.messages + [new_message]
 
 class BoundPrompt:
     def __init__(
             self,
             prompt_info: PromptInfo,
-            messages: List[Dict[str, str]]
+            messages: List[Dict[str, str]],
+            tool_schema: Optional[List[ToolSchema]] = None
     ):
         self.prompt_info = prompt_info
         self.messages = messages
+        self.tool_schema = tool_schema
 
     @staticmethod
     def __format_messages_for_flavor(
@@ -113,6 +128,25 @@ class BoundPrompt:
             return formatted
 
         raise MissingFlavorError(flavor_name)
+    
+    @staticmethod
+    def __format_tool_schema(flavor_name: str, tool_schema: List[ToolSchema]) -> List[Dict[str, Any]]:
+        if flavor_name == 'anthropic_chat':
+            return [{
+                'name': tool_schema.name,
+                'description': tool_schema.description,
+                'input_schema': tool_schema.parameters
+            } for tool_schema in tool_schema]
+        elif flavor_name in ['openai_chat', 'azure_openai_chat']:
+            return [
+                {
+                    'function': asdict(tool_schema),
+                    'type': 'function'
+                } for tool_schema in tool_schema
+            ]
+        
+        raise UnsupportedToolSchemaError()
+
 
     def format(
             self,
@@ -121,17 +155,24 @@ class BoundPrompt:
         final_flavor = flavor_name or self.prompt_info.flavor_name
         formatted_prompt = BoundPrompt.__format_messages_for_flavor(final_flavor, self.messages)
 
+        formatted_tool_schema = BoundPrompt.__format_tool_schema(
+            final_flavor, 
+            self.tool_schema
+        ) if self.tool_schema else None
+
         if isinstance(formatted_prompt, str):
             return FormattedPrompt(
                 prompt_info=self.prompt_info,
                 messages=self.messages,
-                formatted_prompt_text=formatted_prompt
+                formatted_prompt_text=formatted_prompt,
+                tool_schema=formatted_tool_schema
             )
         else:
             return FormattedPrompt(
                 prompt_info=self.prompt_info,
                 messages=self.messages,
-                formatted_prompt=formatted_prompt
+                formatted_prompt=formatted_prompt,
+                tool_schema=formatted_tool_schema
             )
 
 
@@ -139,9 +180,11 @@ class TemplatePrompt:
     def __init__(
             self,
             prompt_info: PromptInfo,
-            messages: List[Dict[str, str]]
+            messages: List[Dict[str, str]],
+            tool_schema: Optional[List[ToolSchema]] = None
     ):
         self.prompt_info = prompt_info
+        self.tool_schema = tool_schema
         self.messages = messages
 
     def bind(self, variables: InputVariables, history: Optional[List[Dict[str, str]]] = None) -> BoundPrompt:
@@ -172,7 +215,7 @@ class TemplatePrompt:
                     'content': bind_template_variables(msg['content'], variables)},
                 )
 
-        return BoundPrompt(self.prompt_info, bound_messages)
+        return BoundPrompt(self.prompt_info, bound_messages, self.tool_schema)
 
 
 class TemplateResolver(ABC):
@@ -410,7 +453,7 @@ class Prompts:
             project_id=prompt.project_id
         )
 
-        return TemplatePrompt(prompt_info, prompt.content)
+        return TemplatePrompt(prompt_info, prompt.content, prompt.tool_schema)
 
     def get_by_version_id(self, project_id: str, template_id: str, version_id: str) -> TemplatePrompt:
         prompt = self.template_resolver.get_prompt_version_id(project_id, template_id, version_id)
@@ -443,7 +486,7 @@ class Prompts:
             project_id=prompt.project_id
         )
 
-        return TemplatePrompt(prompt_info, prompt.content)
+        return TemplatePrompt(prompt_info, prompt.content, prompt.tool_schema)
 
     def get_formatted(
             self,

{freeplay-0.3.6 → freeplay-0.3.8}/src/freeplay/resources/recordings.py

@@ -9,7 +9,7 @@ from freeplay import api_support
 from freeplay.errors import FreeplayClientError, FreeplayError
 from freeplay.llm_parameters import LLMParameters
 from freeplay.model import InputVariables, OpenAIFunctionCall
-from freeplay.resources.prompts import PromptInfo
+from freeplay.resources.prompts import FormattedPrompt, PromptInfo
 from freeplay.resources.sessions import SessionInfo, TraceInfo
 from freeplay.support import CallSupport
 
@@ -59,6 +59,7 @@ class RecordPayload:
     session_info: SessionInfo
     prompt_info: PromptInfo
     call_info: CallInfo
+    tool_schema: Optional[List[Dict[str, Any]]] = None
     response_info: Optional[ResponseInfo] = None
     test_run_info: Optional[TestRunInfo] = None
     eval_results: Optional[Dict[str, Union[bool, float]]] = None
@@ -82,6 +83,7 @@ class Recordings:
         record_api_payload = {
             "messages": record_payload.all_messages,
             "inputs": record_payload.inputs,
+            "tool_schema": record_payload.tool_schema,
             "session_info": {"custom_metadata": record_payload.session_info.custom_metadata},
             "prompt_info": {
                 "environment": record_payload.prompt_info.environment,

{freeplay-0.3.6 → freeplay-0.3.8}/src/freeplay/support.py

@@ -16,6 +16,11 @@ class PromptTemplateMetadata:
     params: Optional[Dict[str, Any]] = None
     provider_info: Optional[Dict[str, Any]] = None
 
+@dataclass
+class ToolSchema:
+    name: str
+    description: str
+    parameters: Dict[str, Any]
 
 @dataclass
 class PromptTemplate:
@@ -27,6 +32,7 @@ class PromptTemplate:
     project_id: str
     format_version: int
     environment: Optional[str] = None
+    tool_schema: Optional[List[ToolSchema]] = None
 
 
 @dataclass

{freeplay-0.3.6 → freeplay-0.3.8}/src/freeplay/utils.py

@@ -1,3 +1,4 @@
+import json
 from typing import Dict, Union, Optional, Any
 import importlib.metadata
 import platform
@@ -20,6 +21,18 @@ def all_valid(obj: Any) -> bool:
         return False
 
 
+class StandardPystache(pystache.Renderer):  # type: ignore
+
+    def __init__(self) -> None:
+        super().__init__(escape=lambda s: s)
+
+    def str_coerce(self, val: Any) -> str:
+        if isinstance(val, dict) or isinstance(val, list):
+            # We hide spacing after punctuation so that the templating is the same across all SDKs.
+            return json.dumps(val, separators=(',', ':'))
+        return str(val)
+
+
 def bind_template_variables(template: str, variables: InputVariables) -> str:
     if not all_valid(variables):
         raise FreeplayError(
@@ -28,7 +41,7 @@ def bind_template_variables(template: str, variables: InputVariables) -> str:
         )
 
     # When rendering mustache, do not escape HTML special characters.
-    rendered: str = pystache.Renderer(escape=lambda s: s).render(template, variables)
+    rendered: str = StandardPystache().render(template, variables)
     return rendered