freeplay 0.3.0a10__tar.gz → 0.3.0a12__tar.gz

{freeplay-0.3.0a10 → freeplay-0.3.0a12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: freeplay
-Version: 0.3.0a10
+Version: 0.3.0a12
 Summary: 
 License: MIT
 Author: FreePlay Engineering
@@ -12,6 +12,7 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 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.0a10 → freeplay-0.3.0a12}/pyproject.toml

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

{freeplay-0.3.0a10 → freeplay-0.3.0a12}/src/freeplay/api_support.py

@@ -60,6 +60,13 @@ def post_raw(api_key: str, url: str, payload: t.Optional[Dict[str, t.Any]] = Non
     )
 
 
+def delete_raw(api_key: str, url: str) -> Response:
+    return requests.delete(
+        url=url,
+        headers=build_request_header(api_key),
+    )
+
+
 def get(target_type: t.Type[T], api_key: str, url: str) -> T:
     response = requests.get(
         url=url,

{freeplay-0.3.0a10 → freeplay-0.3.0a12}/src/freeplay/errors.py

@@ -1,4 +1,5 @@
 from requests import Response
+import warnings
 
 
 class FreeplayError(Exception):
@@ -32,3 +33,11 @@ def freeplay_response_error(message: str, response: Response) -> FreeplayError:
         return FreeplayClientError(full_message)
     else:
         return FreeplayServerError(full_message)
+
+
+class FreeplayClientWarning(UserWarning):
+    pass
+
+
+def log_freeplay_client_warning(message: str) -> None:
+    warnings.warn(message, FreeplayClientWarning)

{freeplay-0.3.0a10 → freeplay-0.3.0a12}/src/freeplay/resources/prompts.py

@@ -5,7 +5,7 @@ from dataclasses import dataclass
 from pathlib import Path
 from typing import Dict, Optional, List, cast, Any, Union
 
-from freeplay.errors import FreeplayConfigurationError, FreeplayClientError
+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
@@ -144,11 +144,34 @@ class TemplatePrompt:
         self.prompt_info = prompt_info
         self.messages = messages
 
-    def bind(self, variables: InputVariables) -> BoundPrompt:
-        bound_messages = [
-            {'role': message['role'], 'content': bind_template_variables(message['content'], variables)}
-            for message in self.messages
-        ]
+    def bind(self, variables: InputVariables, history: Optional[List[Dict[str, str]]] = None) -> BoundPrompt:
+        # check history for a system message
+        history_clean = []
+        if history:
+            for msg in history:
+                if (msg.get('role') == 'system') & ('system' in [message.get('role') for message in self.messages]):
+                    log_freeplay_client_warning("System message found in history, and prompt template."
+                                                "Removing system message from the history")
+                else:
+                    history_clean.append(msg)
+
+        has_history_placeholder = {"kind": "history"} in self.messages
+        if history and not has_history_placeholder:
+            raise FreeplayClientError(
+                "History provided for prompt that does not expect history")
+        if has_history_placeholder and not history:
+            log_freeplay_client_warning("History missing for prompt that expects history")
+
+        bound_messages = []
+        for msg in self.messages:
+            if msg.get('kind') == 'history':
+                bound_messages.extend(history_clean)
+            else:
+                bound_messages.append({
+                    'role': msg['role'],
+                    'content': bind_template_variables(msg['content'], variables)},
+                )
+
         return BoundPrompt(self.prompt_info, bound_messages)
 
 
@@ -425,13 +448,14 @@ class Prompts:
             template_name: str,
             environment: str,
             variables: InputVariables,
+            history: Optional[List[Dict[str, str]]] = None,
             flavor_name: Optional[str] = None
     ) -> FormattedPrompt:
         bound_prompt = self.get(
             project_id=project_id,
             template_name=template_name,
             environment=environment
-        ).bind(variables=variables)
+        ).bind(variables=variables, history=history)
 
         return bound_prompt.format(flavor_name)
 

{freeplay-0.3.0a10 → freeplay-0.3.0a12}/src/freeplay/resources/sessions.py

@@ -81,6 +81,9 @@ class Sessions:
             _call_support=self.call_support,
         )
 
+    def delete(self, project_id: str, session_id: str) -> None:
+        self.call_support.delete_session(project_id, session_id)
+
     def restore_session(self, session_id: str, custom_metadata: CustomMetadata = None) -> Session:
         return Session(
             session_id=session_id,

{freeplay-0.3.0a10 → freeplay-0.3.0a12}/src/freeplay/support.py

@@ -198,7 +198,7 @@ class CallSupport:
             api_key=self.freeplay_api_key,
             url=f'{self.api_base}/v2/projects/{project_id}/test-runs/id/{test_run_id}'
         )
-        if response.status_code != 201:
+        if response.status_code != 200:
             raise freeplay_response_error('Error while retrieving test run results.', response)
 
         json_dom = response.json()
@@ -222,3 +222,11 @@ class CallSupport:
         if response.status_code != 201:
             raise freeplay_response_error('Error while recording trace.', response)
 
+    def delete_session(self, project_id: str, session_id: str) -> None:
+        response = api_support.delete_raw(
+            self.freeplay_api_key,
+            f'{self.api_base}/v2/projects/{project_id}/sessions/{session_id}'
+        )
+        if response.status_code != 201:
+            raise freeplay_response_error('Error while deleting session.', response)
+