freeplay 0.3.0a1__tar.gz → 0.3.0a2__tar.gz

{freeplay-0.3.0a1 → freeplay-0.3.0a2}/PKG-INFO

@@ -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 → freeplay-0.3.0a2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "freeplay"
-version = "0.3.0-alpha.1"
+version = "0.3.0-alpha.2"
 description = ""
 authors = ["FreePlay Engineering <engineering@freeplay.ai>"]
 license = "MIT"
@@ -12,7 +12,6 @@ requests = ">=2.20.0,<3.0.0dev"
 dacite = "^1.8.0"
 click = "8.1.7"
 pystache = "^0.6.5"
-pydantic = "^2.6.3"
 
 [tool.poetry.group.dev.dependencies]
 mypy = "^1"

{freeplay-0.3.0a1 → freeplay-0.3.0a2}/src/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-0.3.0a1 → freeplay-0.3.0a2}/src/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.'