freeplay 0.4.1__py3-none-any.whl → 0.5.0a2__py3-none-any.whl

freeplay/resources/prompts.py

@@ -8,7 +8,6 @@ from typing import (
     Any,
     Dict,
     List,
-    Literal,
     Optional,
     Protocol,
     Sequence,
@@ -56,7 +55,12 @@ logger = logging.getLogger(__name__)
 class UnsupportedToolSchemaError(FreeplayConfigurationError):
     def __init__(self) -> None:
         super().__init__(
-            f'Tool schema not supported for this model and provider.'
+            'Tool schema not supported for this model and provider.'
+        )
+class VertexAIToolSchemaError(FreeplayConfigurationError):
+    def __init__(self) -> None:
+        super().__init__(
+            'Vertex AI SDK not found. Install google-cloud-aiplatform to get proper Tool objects.'
         )
 
 
@@ -100,8 +104,6 @@ class PromptInfo:
     provider: str
     model: str
     flavor_name: str
-    project_id: str
-
 
 class FormattedPrompt:
     def __init__(
@@ -187,6 +189,21 @@ class BoundPrompt:
                     for tool_schema in tool_schema
                 ]
             }
+        elif flavor_name == "gemini_chat":
+            try:
+                from vertexai.generative_models import Tool, FunctionDeclaration  # type: ignore[import-untyped]
+                
+                function_declarations = [
+                    FunctionDeclaration(
+                        name=tool_schema.name,
+                        description=tool_schema.description,
+                        parameters=tool_schema.parameters
+                    )
+                    for tool_schema in tool_schema
+                ]
+                return [Tool(function_declarations=function_declarations)]
+            except ImportError:
+                raise VertexAIToolSchemaError()
 
         raise UnsupportedToolSchemaError()
 
@@ -540,7 +557,6 @@ class Prompts:
             model=model,
             flavor_name=prompt.metadata.flavor,
             provider_info=prompt.metadata.provider_info,
-            project_id=prompt.project_id
         )
 
         return TemplatePrompt(prompt_info, prompt.content, prompt.tool_schema)
@@ -576,7 +592,6 @@ class Prompts:
             model=model,
             flavor_name=prompt.metadata.flavor,
             provider_info=prompt.metadata.provider_info,
-            project_id=prompt.project_id
         )
 
         return TemplatePrompt(prompt_info, prompt.content, prompt.tool_schema)

freeplay/resources/recordings.py

@@ -1,8 +1,8 @@
 import json
 import logging
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 from typing import Any, Dict, List, Literal, Optional, Union
-from uuid import UUID
+from uuid import UUID, uuid4
 
 from requests import HTTPError
 
@@ -22,6 +22,7 @@ from freeplay.resources.prompts import (
 )
 from freeplay.resources.sessions import SessionInfo, TraceInfo
 from freeplay.support import CallSupport
+from freeplay.utils import convert_provider_message_to_dict
 
 logger = logging.getLogger(__name__)
 
@@ -37,11 +38,11 @@ ApiStyle = Union[Literal['batch'], Literal['default']]
 
 @dataclass
 class CallInfo:
-    provider: str
-    model: str
-    start_time: float
-    end_time: float
-    model_parameters: LLMParameters
+    provider: Optional[str] = None
+    model: Optional[str] = None
+    start_time: Optional[float] = None
+    end_time: Optional[float] = None
+    model_parameters: Optional[LLMParameters] = None
     provider_info: Optional[Dict[str, Any]] = None
     usage: Optional[UsageTokens] = None
     api_style: Optional[ApiStyle] = None
@@ -77,12 +78,15 @@ class ResponseInfo:
 
 @dataclass
 class RecordPayload:
+    project_id: str
     all_messages: List[Dict[str, Any]]
-    inputs: InputVariables
 
-    session_info: SessionInfo
-    prompt_info: PromptInfo
-    call_info: CallInfo
+    session_info: SessionInfo = field(
+        default_factory=lambda: SessionInfo(session_id=str(uuid4()), custom_metadata=None)
+    )
+    inputs: Optional[InputVariables] = None
+    prompt_info: Optional[PromptInfo] = None
+    call_info: Optional[CallInfo] = None
     media_inputs: Optional[MediaInputMap] = None
     tool_schema: Optional[List[Dict[str, Any]]] = None
     response_info: Optional[ResponseInfo] = None
@@ -126,25 +130,34 @@ class Recordings:
         if len(record_payload.all_messages) < 1:
             raise FreeplayClientError("Messages list must have at least one message. "
                                       "The last message should be the current response.")
+        
+        if record_payload.tool_schema is not None:
+            record_payload.tool_schema = [convert_provider_message_to_dict(tool) for tool in record_payload.tool_schema]
 
         record_api_payload: Dict[str, Any] = {
             "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": {
+            
+        }
+
+        if record_payload.prompt_info is not None:
+            record_api_payload["prompt_info"] = {
                 "environment": record_payload.prompt_info.environment,
                 "prompt_template_version_id": record_payload.prompt_info.prompt_template_version_id,
-            },
-            "call_info": {
+            }
+        
+        if record_payload.call_info is not None:
+            record_api_payload["call_info"] = {
                 "start_time": record_payload.call_info.start_time,
                 "end_time": record_payload.call_info.end_time,
                 "model": record_payload.call_info.model,
                 "provider": record_payload.call_info.provider,
                 "provider_info": record_payload.call_info.provider_info,
                 "llm_parameters": record_payload.call_info.model_parameters,
+                "api_style": record_payload.call_info.api_style,
             }
-        }
 
         if record_payload.completion_id is not None:
             record_api_payload['completion_id'] = str(record_payload.completion_id)
@@ -175,15 +188,12 @@ class Recordings:
                 "trace_id": record_payload.trace_info.trace_id
             }
 
-        if record_payload.call_info.usage is not None:
+        if record_payload.call_info is not None and record_payload.call_info.usage is not None:
             record_api_payload['call_info']['usage'] = {
                 "prompt_tokens": record_payload.call_info.usage.prompt_tokens,
                 "completion_tokens": record_payload.call_info.usage.completion_tokens,
             }
 
-        if record_payload.call_info.api_style is not None:
-            record_api_payload['call_info']['api_style'] = record_payload.call_info.api_style
-
         if record_payload.media_inputs is not None:
             record_api_payload['media_inputs'] = {
                 name: media_inputs_to_json(media_input)
@@ -193,7 +203,7 @@ class Recordings:
         try:
             recorded_response = api_support.post_raw(
                 api_key=self.call_support.freeplay_api_key,
-                url=f'{self.call_support.api_base}/v2/projects/{record_payload.prompt_info.project_id}/sessions/{record_payload.session_info.session_id}/completions',
+                url=f'{self.call_support.api_base}/v2/projects/{record_payload.project_id}/sessions/{record_payload.session_info.session_id}/completions',
                 payload=record_api_payload
             )
             recorded_response.raise_for_status()

freeplay/utils.py

@@ -75,7 +75,10 @@ def get_user_agent() -> str:
 # Recursively convert Pydantic models, lists, and dicts to dict compatible format -- used to allow us to accept
 # provider message shapes (usually generated types) or the default {'content': ..., 'role': ...} shape.
 def convert_provider_message_to_dict(obj: Any) -> Any:
-    if hasattr(obj, 'model_dump'):
+    if hasattr(obj, 'to_dict') and callable(getattr(obj, 'to_dict')):
+        # Vertex AI has a to_dict method
+        return obj.to_dict()
+    elif hasattr(obj, 'model_dump'):
         # Pydantic v2
         return obj.model_dump(mode='json')
     elif hasattr(obj, 'dict'):

{freeplay-0.4.1.dist-info → freeplay-0.5.0a2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: freeplay
-Version: 0.4.1
+Version: 0.5.0a2
 Summary: 
 License: MIT
 Author: FreePlay Engineering

{freeplay-0.4.1.dist-info → freeplay-0.5.0a2.dist-info}/RECORD

@@ -9,15 +9,15 @@ freeplay/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 freeplay/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 freeplay/resources/adapters.py,sha256=6ZAPpoLeOkUkV1s9VNQNsYrnupV0-sy11zFfKfctM1Y,9296
 freeplay/resources/customer_feedback.py,sha256=6AUgHyOcXIpHvrxGAhsQgmDERvRHKutB6J-GkhkGH6s,928
-freeplay/resources/prompts.py,sha256=83OPxdyCodxLSIhxL8MVEjlKsT6eHwnn_2DErMXyi5A,23299
-freeplay/resources/recordings.py,sha256=pzX7SeEipAMSeiC8RoNekTpMep4APBaoveAh8OCmUlU,9190
+freeplay/resources/prompts.py,sha256=pkZa_b3HSrZoPqhcKCXsb26w2In-ETKydclbkXU_hus,24093
+freeplay/resources/recordings.py,sha256=OOSgSkQO7CVnOA2y7eSl5B2eMHZv5E3_-3J2XILwKUo,9811
 freeplay/resources/sessions.py,sha256=dZtd9nq2nH8pmXxQOJitBnN5Jl3kjggDItDcjC69TYo,3883
 freeplay/resources/test_cases.py,sha256=nXL_976RwSJDT6OWDM4GEzbcOzcGkJ9ulvb0XOzCRDM,2240
 freeplay/resources/test_runs.py,sha256=IkqW2LrVrLzFcGtalwP4FV-DeQKKb6Nekvy02FfoH8k,5007
 freeplay/support.py,sha256=9X-utKyM9BkhCLJbPT184ud26Dc69f3DiHjyN8qq0vQ,15266
-freeplay/utils.py,sha256=Xvt4mNLXLL7E6MI2hTuDLV5cl5Y83DgdjCZSyDGMjR0,3187
-freeplay-0.4.1.dist-info/LICENSE,sha256=_jzIw45hB1XHGxiQ8leZ0GH_X7bR_a8qgxaqnHbCUOo,1064
-freeplay-0.4.1.dist-info/METADATA,sha256=BqYvmeKI3Ae6rXuOqvx1Y2GNqOI3JV38BdyR4pG2U-8,1660
-freeplay-0.4.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-freeplay-0.4.1.dist-info/entry_points.txt,sha256=32s3rf2UUCqiJT4jnClEXZhdXlvl30uwpcxz-Gsy4UU,54
-freeplay-0.4.1.dist-info/RECORD,,
+freeplay/utils.py,sha256=5mNC3NTHDlzltyUDF8q2wNddgGy6-MhI8ldnRvtAl7U,3329
+freeplay-0.5.0a2.dist-info/LICENSE,sha256=_jzIw45hB1XHGxiQ8leZ0GH_X7bR_a8qgxaqnHbCUOo,1064
+freeplay-0.5.0a2.dist-info/METADATA,sha256=pzFZ1UFoEM-rCaL11UHjH_pMjYg20tRGog0zptc5cnQ,1662
+freeplay-0.5.0a2.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+freeplay-0.5.0a2.dist-info/entry_points.txt,sha256=32s3rf2UUCqiJT4jnClEXZhdXlvl30uwpcxz-Gsy4UU,54
+freeplay-0.5.0a2.dist-info/RECORD,,

{freeplay-0.4.1.dist-info → freeplay-0.5.0a2.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.1.3
+Generator: poetry-core 2.1.2
 Root-Is-Purelib: true
 Tag: py3-none-any