freeplay 0.2.38__py3-none-any.whl → 0.2.40__py3-none-any.whl

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/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/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/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
         ]
 

{freeplay-0.2.38.dist-info → freeplay-0.2.40.dist-info}/METADATA

@@ -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.dist-info → freeplay-0.2.40.dist-info}/RECORD

@@ -1,5 +1,5 @@
 freeplay/__init__.py,sha256=74A9S9hmLq9BNHsdx0-37yDxlSukudNl9bJ0TE60Z30,61
-freeplay/api_support.py,sha256=u8b1e9prlR4_qOcqmFduU7U35ubQt1tWJ6bXhUdsv0c,2240
+freeplay/api_support.py,sha256=Tmc6VRcmPcIgXrDNJXz0VbBD969t5QHAyV3yZlMsYRI,2331
 freeplay/completions.py,sha256=F1rMBtQaCtn0rBQqvCurkV25g8gLtwnEod5rRvf-txY,1176
 freeplay/errors.py,sha256=bPqsw32YX-xSr7O-G49M0sSFF7mq-YF1WGq928UV47s,631
 freeplay/flavors.py,sha256=9jVvhym9L5zyWM3RTBViibIgG6f6Fh1_63uMEVZAFT4,17259
@@ -10,18 +10,18 @@ freeplay/model.py,sha256=7BRAuyxsLl8X-ue8wXPmAiKYp4OaYI-HkaGc3t5qtMU,534
 freeplay/provider_config.py,sha256=hruf3Khusrwb76_-hv7ouuxmvJuaRyC1UxIw7XlJx8A,1416
 freeplay/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 freeplay/record.py,sha256=69vO9vYGFL8gLrvRqLzlvodVNo05GOzKDJnCyhUha08,3615
-freeplay/support.py,sha256=tipac902gW1TRICUgxGhO4X645XRglxHHmaqYvqfifo,14197
+freeplay/support.py,sha256=ERXFKxZHl-TfgjJJYW-ssAFdSz_CJIs25wFlCPp4DWc,14535
 freeplay/thin/__init__.py,sha256=XgU_eMmTpOPCa9w5mVOyxPgwAgRFfVdRWDazYGYZtQ0,351
 freeplay/thin/freeplay_thin.py,sha256=0w_ECjassczsHJUcpzPxEHUDbiGo7Ey7Ba7vIaWc5ds,1619
 freeplay/thin/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 freeplay/thin/resources/customer_feedback.py,sha256=aTM7Eez7iYmjXSpRqkHxf4pi6xBrzVnMiQCEJVfPGvg,527
 freeplay/thin/resources/prompts.py,sha256=3sfH1k1AAXRfgHxfV6Acws0fAiMswgE93auRKWLGVIQ,10135
-freeplay/thin/resources/recordings.py,sha256=utrGTjPPiNt1btI0Hiti9s7VvCYFWqitAx35zrXrOfg,5047
+freeplay/thin/resources/recordings.py,sha256=H_l5_J7nhoL5p0P37JsEC1_XROKc0PDsrV1UomNhy3E,5670
 freeplay/thin/resources/sessions.py,sha256=ioWdeTM9BSrEWKrFH66ysQIw5kCTlCVopJDmWtFgHz0,868
-freeplay/thin/resources/test_runs.py,sha256=L8A1tQHzYg9UmLgbNFtFa8pGXqyrcoyTtSE0sSnd9UE,1267
+freeplay/thin/resources/test_runs.py,sha256=mhRFjR-7z_1wGAkwRjDjALBjT1E6pen91DF8kZHjbLg,1457
 freeplay/utils.py,sha256=cRCCIzVqWNDKlTI-DDhXGyCkplbd-X4qzDs__aUpvww,1840
-freeplay-0.2.38.dist-info/LICENSE,sha256=_jzIw45hB1XHGxiQ8leZ0GH_X7bR_a8qgxaqnHbCUOo,1064
-freeplay-0.2.38.dist-info/METADATA,sha256=N9DOEBhiTSyDMCBm9MYBK7XserJj0JxlPhYN96NhrnI,1676
-freeplay-0.2.38.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-freeplay-0.2.38.dist-info/entry_points.txt,sha256=32s3rf2UUCqiJT4jnClEXZhdXlvl30uwpcxz-Gsy4UU,54
-freeplay-0.2.38.dist-info/RECORD,,
+freeplay-0.2.40.dist-info/LICENSE,sha256=_jzIw45hB1XHGxiQ8leZ0GH_X7bR_a8qgxaqnHbCUOo,1064
+freeplay-0.2.40.dist-info/METADATA,sha256=nLiaDUCGVR0uvEG-HPL0XOUPFTsQgdZ16XT-LQ5357E,1676
+freeplay-0.2.40.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+freeplay-0.2.40.dist-info/entry_points.txt,sha256=32s3rf2UUCqiJT4jnClEXZhdXlvl30uwpcxz-Gsy4UU,54
+freeplay-0.2.40.dist-info/RECORD,,