freeplay 0.3.10__py3-none-any.whl → 0.3.12__py3-none-any.whl

freeplay/resources/prompts.py

@@ -4,7 +4,7 @@ import logging
 from abc import ABC, abstractmethod
 from dataclasses import asdict, dataclass
 from pathlib import Path
-from typing import Dict, Optional, List, cast, Any, Union, runtime_checkable, Protocol
+from typing import Dict, Optional, List, Sequence, cast, Any, Union, runtime_checkable, Protocol
 
 from freeplay.errors import FreeplayConfigurationError, FreeplayClientError, log_freeplay_client_warning
 from freeplay.llm_parameters import LLMParameters
@@ -211,12 +211,15 @@ class TemplatePrompt:
         self.tool_schema = tool_schema
         self.messages = messages
 
-    def bind(self, variables: InputVariables, history: Optional[List[Dict[str, str]]] = None) -> BoundPrompt:
+    def bind(self, variables: InputVariables, history: Optional[Sequence[GenericProviderMessage]] = None) -> BoundPrompt:
         # check history for a system message
         history_clean = []
         if history:
-            for msg in history:
-                if (msg.get('role') == 'system') and ('system' in [message.get('role') for message in self.messages]):
+            template_messages_contain_system = any(message.get('role') == 'system' for message in self.messages)
+            history_dict = [convert_provider_message_to_dict(msg) for msg in history]
+            for msg in history_dict:
+                history_has_system = msg.get('role', None) == 'system'
+                if history_has_system and template_messages_contain_system:
                     log_freeplay_client_warning("System message found in history, and prompt template."
                                                 "Removing system message from the history")
                 else:
@@ -341,7 +344,12 @@ class FilesystemTemplateResolver(TemplateResolver):
                     params=metadata.get('params'),
                     provider_info=metadata.get('provider_info')
                 ),
-                project_id=str(json_dom.get('project_id'))
+                project_id=str(json_dom.get('project_id')),
+                tool_schema=[ToolSchema(
+                    name=schema.get('name'),
+                    description=schema.get('description'),
+                    parameters=schema.get('parameters')
+                ) for schema in json_dom.get('tool_schema', [])] if json_dom.get('tool_schema') else None
             )
         else:
             metadata = json_dom['metadata']
@@ -518,7 +526,7 @@ class Prompts:
             template_name: str,
             environment: str,
             variables: InputVariables,
-            history: Optional[List[Dict[str, str]]] = None,
+            history: Optional[Sequence[GenericProviderMessage]] = None,
             flavor_name: Optional[str] = None
     ) -> FormattedPrompt:
         bound_prompt = self.get(

freeplay/resources/recordings.py

@@ -2,6 +2,7 @@ import json
 import logging
 from dataclasses import dataclass
 from typing import Any, Dict, List, Optional, Union
+from uuid import UUID
 
 from requests import HTTPError
 
@@ -64,6 +65,7 @@ class RecordPayload:
     test_run_info: Optional[TestRunInfo] = None
     eval_results: Optional[Dict[str, Union[bool, float]]] = None
     trace_info: Optional[TraceInfo] = None
+    completion_id: Optional[UUID] = None
 
 
 @dataclass
@@ -80,7 +82,7 @@ class Recordings:
             raise FreeplayClientError("Messages list must have at least one message. "
                                       "The last message should be the current response.")
 
-        record_api_payload = {
+        record_api_payload: Dict[str, Any] = {
             "messages": record_payload.all_messages,
             "inputs": record_payload.inputs,
             "tool_schema": record_payload.tool_schema,
@@ -99,6 +101,9 @@ class Recordings:
             }
         }
 
+        if record_payload.completion_id is not None:
+            record_api_payload['completion_id'] = str(record_payload.completion_id)
+
         if record_payload.session_info.custom_metadata is not None:
             record_api_payload['custom_metadata'] = record_payload.session_info.custom_metadata
 

{freeplay-0.3.10.dist-info → freeplay-0.3.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: freeplay
-Version: 0.3.10
+Version: 0.3.12
 Summary: 
 License: MIT
 Author: FreePlay Engineering

{freeplay-0.3.10.dist-info → freeplay-0.3.12.dist-info}/RECORD

@@ -8,14 +8,14 @@ freeplay/model.py,sha256=bh3TmINOxvKFxeVO8Uz7ybX28eD1tmO0XLewwLOtS7I,436
 freeplay/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 freeplay/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 freeplay/resources/customer_feedback.py,sha256=bw8MfEOKbGgn4FOyvcADrcs9GhcpNXNTgxKjBjIzywE,899
-freeplay/resources/prompts.py,sha256=woSQcJ6QKpiVyhnrp-t9vx6UND6bxDtWjdbMHO3o9sk,21581
-freeplay/resources/recordings.py,sha256=nECoZb159POpOm-pZnJuFrmvFFWSrea665I5YXEYMFY,6048
+freeplay/resources/prompts.py,sha256=-N8djt8VzqGqGNZbG23a9e_dFQfK1RTd6oDyt7Lfgn0,22155
+freeplay/resources/recordings.py,sha256=1JLR82SdwkI7foB4rTGx_Mi6d4vtr5voFLlABALEKxs,6265
 freeplay/resources/sessions.py,sha256=Qz5v7VOf1DmQTd1wCOFXnrizlW5WFJT5V8-pq22Ifvg,2793
 freeplay/resources/test_runs.py,sha256=Tp2N-odInT5XEEWrEsVhdgfnsclOE8n92_C8gTwO2MI,2623
 freeplay/support.py,sha256=RgC-EDMdxKu7iQEHQ16gxt9VGmjHLUbaKi_k0U5YR1I,8686
 freeplay/utils.py,sha256=Xvt4mNLXLL7E6MI2hTuDLV5cl5Y83DgdjCZSyDGMjR0,3187
-freeplay-0.3.10.dist-info/LICENSE,sha256=_jzIw45hB1XHGxiQ8leZ0GH_X7bR_a8qgxaqnHbCUOo,1064
-freeplay-0.3.10.dist-info/METADATA,sha256=hxD6Q6S1B0KN52AxYHanuWOOog_foMudTjIQurIvrQk,1654
-freeplay-0.3.10.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-freeplay-0.3.10.dist-info/entry_points.txt,sha256=32s3rf2UUCqiJT4jnClEXZhdXlvl30uwpcxz-Gsy4UU,54
-freeplay-0.3.10.dist-info/RECORD,,
+freeplay-0.3.12.dist-info/LICENSE,sha256=_jzIw45hB1XHGxiQ8leZ0GH_X7bR_a8qgxaqnHbCUOo,1064
+freeplay-0.3.12.dist-info/METADATA,sha256=St91ojvaCRRtbnPnXk_XjWuBiZ1LWyzoo97OI3iymTM,1654
+freeplay-0.3.12.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+freeplay-0.3.12.dist-info/entry_points.txt,sha256=32s3rf2UUCqiJT4jnClEXZhdXlvl30uwpcxz-Gsy4UU,54
+freeplay-0.3.12.dist-info/RECORD,,