freeplay 0.2.38__tar.gz → 0.2.40__tar.gz

{freeplay-0.2.38 → freeplay-0.2.40}/PKG-INFO

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

{freeplay-0.2.38 → freeplay-0.2.40}/pyproject.toml

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

{freeplay-0.2.38 → freeplay-0.2.40}/src/freeplay/api_support.py

@@ -76,8 +76,13 @@ def get(target_type: t.Type[T], api_key: str, url: str) -> T:
     return maybe_object
 
 
-def get_raw(api_key: str, url: str) -> Response:
+def get_raw(
+        api_key: str,
+        url: str,
+        params: t.Optional[Dict[str, str]] = None
+) -> Response:
     return requests.get(
         url=url,
         headers=build_request_header(api_key),
+        params=params
     )

{freeplay-0.2.38 → freeplay-0.2.40}/src/freeplay/support.py

@@ -21,8 +21,9 @@ JsonDom = Dict[str, Any]
 
 class TestCaseTestRunResponse:
     def __init__(self, test_case: JsonDom):
-        self.variables: InputVariables = test_case['variables']
         self.id: str = test_case['id']
+        self.variables: InputVariables = test_case['variables']
+        self.output: Optional[str] = test_case.get('output')
 
 
 class TestRunResponse:
@@ -104,7 +105,10 @@ class CallSupport:
     def get_prompt(self, project_id: str, template_name: str, environment: str) -> PromptTemplate:
         response = api_support.get_raw(
             api_key=self.freeplay_api_key,
-            url=f'{self.api_base}/v2/projects/{project_id}/prompt-templates/name/{template_name}'
+            url=f'{self.api_base}/v2/projects/{project_id}/prompt-templates/name/{template_name}',
+            params={
+                'environment': environment
+            }
         )
 
         if response.status_code != 200:
@@ -138,11 +142,19 @@ class CallSupport:
 
         return maybe_prompts
 
-    def create_test_run(self, project_id: str, testlist: str) -> TestRunResponse:
+    def create_test_run(
+            self,
+            project_id: str,
+            testlist: str,
+            include_test_case_outputs: bool = False
+    ) -> TestRunResponse:
         response = api_support.post_raw(
             api_key=self.freeplay_api_key,
             url=f'{self.api_base}/projects/{project_id}/test-runs-cases',
-            payload={'testlist_name': testlist},
+            payload={
+                'testlist_name': testlist,
+                'include_test_case_outputs': include_test_case_outputs,
+            },
         )
 
         if response.status_code != 201:

{freeplay-0.2.38 → freeplay-0.2.40}/src/freeplay/thin/resources/recordings.py

@@ -3,6 +3,8 @@ import logging
 from dataclasses import dataclass
 from typing import Dict, Optional, List
 
+from requests import HTTPError
+
 from freeplay import api_support
 from freeplay.completions import PromptTemplateWithMetadata, OpenAIFunctionCall
 from freeplay.errors import FreeplayClientError, FreeplayError
@@ -125,12 +127,29 @@ class Recordings:
             recorded_response.raise_for_status()
             json_dom = recorded_response.json()
             return RecordResponse(completion_id=str(json_dom['completion_id']))
+        except HTTPError as e:
+            message = f'There was an error recording to Freeplay. Call will not be logged. ' \
+                      f'Status: {e.response.status_code}. '
+
+            if e.response.content:
+                try:
+                    content = e.response.content
+                    json_body = json.loads(content)
+                    if 'message' in json_body:
+                        message += json_body['message']
+                except:
+                    pass
+            else:
+                message += f'{e.__class__}'
+
+            raise FreeplayError(message) from e
+
         except Exception as e:
             status_code = -1
             if hasattr(e, 'response') and hasattr(e.response, 'status_code'):
                 status_code = e.response.status_code
-            logger.warning(
-                f'There was an error recording to Freeplay. Call will not be logged. '
-                f'Status: {status_code}. {e.__class__}'
-            )
-            raise FreeplayError from e
+
+            message = f'There was an error recording to Freeplay. Call will not be logged. ' \
+                      f'Status: {status_code}. {e.__class__}'
+
+            raise FreeplayError(message) from e

{freeplay-0.2.38 → freeplay-0.2.40}/src/freeplay/thin/resources/test_runs.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass
-from typing import List
+from typing import List, Optional
 
 from freeplay.model import InputVariables
 from freeplay.support import CallSupport
@@ -8,9 +8,15 @@ from freeplay.thin.resources.recordings import TestRunInfo
 
 @dataclass
 class TestCase:
-    def __init__(self, test_case_id: str, variables: InputVariables):
+    def __init__(
+            self,
+            test_case_id: str,
+            variables: InputVariables,
+            output: Optional[str],
+    ):
         self.id = test_case_id
         self.variables = variables
+        self.output = output
 
 
 @dataclass
@@ -34,10 +40,10 @@ class TestRuns:
     def __init__(self, call_support: CallSupport) -> None:
         self.call_support = call_support
 
-    def create(self, project_id: str, testlist: str) -> TestRun:
-        test_run = self.call_support.create_test_run(project_id, testlist)
+    def create(self, project_id: str, testlist: str, include_outputs: bool = False) -> TestRun:
+        test_run = self.call_support.create_test_run(project_id, testlist, include_outputs)
         test_cases = [
-            TestCase(test_case_id=test_case.id, variables=test_case.variables)
+            TestCase(test_case_id=test_case.id, variables=test_case.variables, output=test_case.output)
             for test_case in test_run.test_cases
         ]