freeplay 0.3.0a11__py3-none-any.whl → 0.3.1__py3-none-any.whl

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/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/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()

{freeplay-0.3.0a11.dist-info → freeplay-0.3.1.dist-info}/METADATA

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

{freeplay-0.3.0a11.dist-info → freeplay-0.3.1.dist-info}/RECORD

@@ -1,6 +1,6 @@
 freeplay/__init__.py,sha256=oseuUqIVAi-2a_ns4ZbbFqkZez6KGGwI6fPkA0AKt6I,374
 freeplay/api_support.py,sha256=Kn2x3g6yloHQl3NwFRjbZE9BnIh7d1sgwGwC0mHuvw4,2483
-freeplay/errors.py,sha256=bPqsw32YX-xSr7O-G49M0sSFF7mq-YF1WGq928UV47s,631
+freeplay/errors.py,sha256=vwotUBldxDzREZOmLUeoiDoZjcvDwgH1AMwKBLhLooE,807
 freeplay/freeplay.py,sha256=cj0TGxIziS5tEL12czMJrrKrCKRoYR_Qxsipg3ClpsU,1496
 freeplay/freeplay_cli.py,sha256=lmdsYwzdpWmUKHz_ieCzB-e6j1EnDHlVw3XIEyP_NEk,3460
 freeplay/llm_parameters.py,sha256=bQbfuC8EICF0XMZQa5pwI3FkQqxmCUVqHO3gYHy3Tg8,898
@@ -8,14 +8,14 @@ freeplay/model.py,sha256=pC24wUsedD4RTI4k1BcYuDjizroeEHINH6FtEa_RLCk,384
 freeplay/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 freeplay/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 freeplay/resources/customer_feedback.py,sha256=aTM7Eez7iYmjXSpRqkHxf4pi6xBrzVnMiQCEJVfPGvg,527
-freeplay/resources/prompts.py,sha256=V57JsLsWiMe4hAmysT8flKve7RPR8cxrxehmgUJPSeg,17537
+freeplay/resources/prompts.py,sha256=HTxD_jD6ovfQCil5zrnSGwIGK5Y-FdX_upW56cJWpQI,18758
 freeplay/resources/recordings.py,sha256=kUElo6Yvc6lyo221ghbElx75uxftw7HpgBV_R9gYlE4,5938
 freeplay/resources/sessions.py,sha256=pgfqCBa-qGwwdfym9nnHizEg0Jf4sd_chLAfunwtMCQ,2787
 freeplay/resources/test_runs.py,sha256=cwhm4s1dj2FqPQN86W6rsFTcay1M-Ip6DAbXp7Utl8c,2370
-freeplay/support.py,sha256=Fc7v8SQ1y62S08tuLAQfUI_qR2ZgLgah9kdL8sTbFMs,7848
+freeplay/support.py,sha256=oh8KkKHYtVZdrZ9v5VJNrw_I9fqZZZWNQInHOfHjW0s,7848
 freeplay/utils.py,sha256=8ZncuwCnzsAhRsaoxOMGa0Py8kXqGHlB9Avr3n79fk0,2064
-freeplay-0.3.0a11.dist-info/LICENSE,sha256=_jzIw45hB1XHGxiQ8leZ0GH_X7bR_a8qgxaqnHbCUOo,1064
-freeplay-0.3.0a11.dist-info/METADATA,sha256=Wo8u_ihnXH4S_963icBvw9CK_AeDrPAC8bfujKBbXLg,1605
-freeplay-0.3.0a11.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-freeplay-0.3.0a11.dist-info/entry_points.txt,sha256=32s3rf2UUCqiJT4jnClEXZhdXlvl30uwpcxz-Gsy4UU,54
-freeplay-0.3.0a11.dist-info/RECORD,,
+freeplay-0.3.1.dist-info/LICENSE,sha256=_jzIw45hB1XHGxiQ8leZ0GH_X7bR_a8qgxaqnHbCUOo,1064
+freeplay-0.3.1.dist-info/METADATA,sha256=rTBnS0EWPCIboV43KNYlFb5_ogwtNZ1JaWZrtEJEodk,1602
+freeplay-0.3.1.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+freeplay-0.3.1.dist-info/entry_points.txt,sha256=32s3rf2UUCqiJT4jnClEXZhdXlvl30uwpcxz-Gsy4UU,54
+freeplay-0.3.1.dist-info/RECORD,,

{freeplay-0.3.0a11.dist-info → freeplay-0.3.1.dist-info}/WHEEL

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