freeplay 0.3.0a3__tar.gz → 0.3.0a5__tar.gz

{freeplay-0.3.0a3 → freeplay-0.3.0a5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: freeplay
-Version: 0.3.0a3
+Version: 0.3.0a5
 Summary: 
 License: MIT
 Author: FreePlay Engineering

{freeplay-0.3.0a3 → freeplay-0.3.0a5}/pyproject.toml

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

{freeplay-0.3.0a3 → freeplay-0.3.0a5}/src/freeplay/resources/prompts.py

@@ -1,14 +1,15 @@
+import copy
 import json
 from abc import ABC, abstractmethod
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Dict, Optional, List, Union, cast, Any
+from typing import Dict, Optional, List, cast, Any
 
 from freeplay.errors import FreeplayConfigurationError, FreeplayClientError
 from freeplay.llm_parameters import LLMParameters
 from freeplay.model import InputVariables
-from freeplay.support import PromptTemplate, PromptTemplates, PromptTemplateMetadata
 from freeplay.support import CallSupport
+from freeplay.support import PromptTemplate, PromptTemplates, PromptTemplateMetadata
 from freeplay.utils import bind_template_variables
 
 
@@ -39,12 +40,18 @@ class FormattedPrompt:
             self,
             prompt_info: PromptInfo,
             messages: List[Dict[str, str]],
-            formatted_prompt: Union[str, List[Dict[str, str]]]
+            formatted_prompt: List[Dict[str, str]]
     ):
         self.prompt_info = prompt_info
-        self.messages = messages
         self.llm_prompt = formatted_prompt
 
+        maybe_system_content = next(
+            (message['content'] for message in messages if message['role'] == 'system'), None)
+        self.system_content = maybe_system_content
+
+        # Note: messages are **not formatted** for the provider.
+        self.messages = messages
+
     def all_messages(
             self,
             new_message: Dict[str, str]
@@ -62,26 +69,16 @@ class BoundPrompt:
         self.messages = messages
 
     @staticmethod
-    def __to_anthropic_role(role: str) -> str:
-        if role == 'assistant' or role == 'Assistant':
-            return 'Assistant'
-        else:
-            # Anthropic does not support system role for now.
-            return 'Human'
-
-    @staticmethod
-    def __format_messages_for_flavor(flavor_name: str, messages: List[Dict[str, str]]) -> Union[
-        str, List[Dict[str, str]]]:
+    def __format_messages_for_flavor(
+            flavor_name: str,
+            messages: List[Dict[str, str]]
+    ) -> List[Dict[str, str]]:
         if flavor_name == 'azure_openai_chat' or flavor_name == 'openai_chat':
-            return messages
+            # We need a deepcopy here to avoid referential equality with the llm_prompt
+            return copy.deepcopy(messages)
         elif flavor_name == 'anthropic_chat':
-            formatted_messages = []
-            for message in messages:
-                role = BoundPrompt.__to_anthropic_role(message['role'])
-                formatted_messages.append(f"{role}: {message['content']}")
-            formatted_messages.append('Assistant:')
-
-            return "\n\n" + "\n\n".join(formatted_messages)
+            messages_without_system = [message for message in messages if message['role'] != 'system']
+            return messages_without_system
         raise MissingFlavorError(flavor_name)
 
     def format(
@@ -89,12 +86,12 @@ class BoundPrompt:
             flavor_name: Optional[str] = None
     ) -> FormattedPrompt:
         final_flavor = flavor_name or self.prompt_info.flavor_name
-        llm_format = BoundPrompt.__format_messages_for_flavor(final_flavor, self.messages)
+        formatted_prompt = BoundPrompt.__format_messages_for_flavor(final_flavor, self.messages)
 
         return FormattedPrompt(
             self.prompt_info,
             self.messages,
-            llm_format,
+            formatted_prompt
         )
 
 

{freeplay-0.3.0a3 → freeplay-0.3.0a5}/src/freeplay/resources/recordings.py

@@ -1,7 +1,7 @@
 import json
 import logging
 from dataclasses import dataclass
-from typing import Dict, Optional, List
+from typing import Any, Dict, List, Optional
 
 from requests import HTTPError
 
@@ -23,15 +23,17 @@ class CallInfo:
     start_time: float
     end_time: float
     model_parameters: LLMParameters
+    provider_info: Optional[Dict[str, Any]] = None
 
     @staticmethod
     def from_prompt_info(prompt_info: PromptInfo, start_time: float, end_time: float) -> 'CallInfo':
         return CallInfo(
-            prompt_info.provider,
-            prompt_info.model,
-            start_time,
-            end_time,
-            prompt_info.model_parameters
+            provider=prompt_info.provider,
+            model=prompt_info.model,
+            start_time=start_time,
+            end_time=end_time,
+            model_parameters=prompt_info.model_parameters,
+            provider_info=prompt_info.provider_info,
         )
 
 
@@ -94,6 +96,7 @@ class Recordings:
             "model": record_payload.call_info.model,
             "provider": record_payload.call_info.provider,
             "llm_parameters": record_payload.call_info.model_parameters,
+            "provider_info": record_payload.call_info.provider_info,
         }
 
         if record_payload.session_info.custom_metadata is not None: