freeplay 0.3.0a1__py3-none-any.whl → 0.3.0a2__py3-none-any.whl

freeplay/model.py

@@ -1,16 +1,8 @@
 from dataclasses import dataclass
 from typing import List, Union, Any, Dict, Mapping, TypedDict
 
-from pydantic import RootModel
-
 InputValue = Union[str, int, bool, Dict[str, Any], List[Any]]
-InputVariable = RootModel[Union[Dict[str, "InputVariable"], List["InputVariable"], str, int, bool, float]]
-InputVariable.model_rebuild()
-
 InputVariables = Mapping[str, InputValue]
-
-PydanticInputVariables = RootModel[Dict[str, InputVariable]]
-
 TestRunInput = Mapping[str, InputValue]
 
 

freeplay/utils.py

@@ -1,19 +1,27 @@
-from typing import Dict, Union, Optional
+from typing import Dict, Union, Optional, Any
 import importlib.metadata
 import platform
 
 import pystache  # type: ignore
-from pydantic import ValidationError
 
 from .errors import FreeplayError, FreeplayConfigurationError
-from .model import PydanticInputVariables, InputVariables
+from .model import InputVariables
+
+
+# Validate that the variables are of the correct type, and do not include functions, dates, classes or None values.
+def all_valid(obj: Any) -> bool:
+    if isinstance(obj, (int, str, bool)):
+        return True
+    elif isinstance(obj, list):
+        return all(all_valid(item) for item in obj)
+    elif isinstance(obj, dict):
+        return all(isinstance(key, str) and all_valid(value) for key, value in obj.items())
+    else:
+        return False
 
 
 def bind_template_variables(template: str, variables: InputVariables) -> str:
-    # Validate that the variables are of the correct type, and do not include functions or None values.
-    try:
-        PydanticInputVariables.model_validate(variables)
-    except ValidationError as err:
+    if not all_valid(variables):
         raise FreeplayError(
             'Variables must be a string, number, bool, or a possibly nested'
             ' list or dict of strings, numbers and booleans.'

{freeplay-0.3.0a1.dist-info → freeplay-0.3.0a2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: freeplay
-Version: 0.3.0a1
+Version: 0.3.0a2
 Summary: 
 License: MIT
 Author: FreePlay Engineering
@@ -15,7 +15,6 @@ 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: pydantic (>=2.6.3,<3.0.0)
 Requires-Dist: pystache (>=0.6.5,<0.7.0)
 Requires-Dist: requests (>=2.20.0,<3.0.0dev)
 Description-Content-Type: text/markdown

{freeplay-0.3.0a1.dist-info → freeplay-0.3.0a2.dist-info}/RECORD

@@ -4,7 +4,7 @@ freeplay/errors.py,sha256=bPqsw32YX-xSr7O-G49M0sSFF7mq-YF1WGq928UV47s,631
 freeplay/freeplay.py,sha256=vwtgLNcHnXTAjyuXU1cOjvYuLBqcZ-RQDAjdFAKh7q0,1479
 freeplay/freeplay_cli.py,sha256=lmdsYwzdpWmUKHz_ieCzB-e6j1EnDHlVw3XIEyP_NEk,3460
 freeplay/llm_parameters.py,sha256=bQbfuC8EICF0XMZQa5pwI3FkQqxmCUVqHO3gYHy3Tg8,898
-freeplay/model.py,sha256=O_Zk5W7gKgmkZ3_CvgP42nREM1irEFaRi8dCqOOfJe8,617
+freeplay/model.py,sha256=pC24wUsedD4RTI4k1BcYuDjizroeEHINH6FtEa_RLCk,384
 freeplay/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 freeplay/resources/customer_feedback.py,sha256=aTM7Eez7iYmjXSpRqkHxf4pi6xBrzVnMiQCEJVfPGvg,527
 freeplay/resources/prompts.py,sha256=MvrB7rAuHMzRyz6kH9NqfD5Yt33g-pmK7x0tVlyM2Cs,12476
@@ -12,9 +12,9 @@ freeplay/resources/recordings.py,sha256=6hrunYZtWFgGBZx4HzZRKcEYCzHbmaBVH48lBcXr
 freeplay/resources/sessions.py,sha256=ioWdeTM9BSrEWKrFH66ysQIw5kCTlCVopJDmWtFgHz0,868
 freeplay/resources/test_runs.py,sha256=2NAwoW_Yx7K8YM7QyQ3sv9dN6p0gjNgUAR7wSzLYP6w,1452
 freeplay/support.py,sha256=7BizelIEIaSRFj2IL53-RQkjncUNlUS-DPUln2VxoJg,4532
-freeplay/utils.py,sha256=cRCCIzVqWNDKlTI-DDhXGyCkplbd-X4qzDs__aUpvww,1840
-freeplay-0.3.0a1.dist-info/LICENSE,sha256=_jzIw45hB1XHGxiQ8leZ0GH_X7bR_a8qgxaqnHbCUOo,1064
-freeplay-0.3.0a1.dist-info/METADATA,sha256=DXjd1Vm-1d1NZxgpicUltqAvUA8WuCDlHA4HBhj4-Rw,1645
-freeplay-0.3.0a1.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-freeplay-0.3.0a1.dist-info/entry_points.txt,sha256=32s3rf2UUCqiJT4jnClEXZhdXlvl30uwpcxz-Gsy4UU,54
-freeplay-0.3.0a1.dist-info/RECORD,,
+freeplay/utils.py,sha256=8ZncuwCnzsAhRsaoxOMGa0Py8kXqGHlB9Avr3n79fk0,2064
+freeplay-0.3.0a2.dist-info/LICENSE,sha256=_jzIw45hB1XHGxiQ8leZ0GH_X7bR_a8qgxaqnHbCUOo,1064
+freeplay-0.3.0a2.dist-info/METADATA,sha256=btKL7QhbCkbZKOo_EplzS33-fsoSH8q66iAnaYI_1iY,1604
+freeplay-0.3.0a2.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+freeplay-0.3.0a2.dist-info/entry_points.txt,sha256=32s3rf2UUCqiJT4jnClEXZhdXlvl30uwpcxz-Gsy4UU,54
+freeplay-0.3.0a2.dist-info/RECORD,,