liminal-orm 2.0.1__py3-none-any.whl → 2.0.3a0__py3-none-any.whl

liminal/validation/__init__.py

@@ -1,7 +1,7 @@
 import inspect
 from datetime import datetime
-from functools import wraps
-from typing import TYPE_CHECKING, Callable
+from functools import partial, wraps
+from typing import TYPE_CHECKING, Any, Callable
 
 from pydantic import BaseModel, ConfigDict
 
@@ -67,6 +67,7 @@ class BenchlingValidatorReport(BaseModel):
         entity: type["BenchlingBaseModel"],
         validator_name: str,
         message: str | None = None,
+        **kwargs: Any,
     ) -> "BenchlingValidatorReport":
         """Creates a BenchlingValidatorReport with the given parameters.
 
@@ -96,59 +97,62 @@ class BenchlingValidatorReport(BaseModel):
             creator_email=entity.creator.email if entity.creator else None,
             updated_date=entity.modified_at,
             message=message,
+            **kwargs,
         )
 
 
 def liminal_validator(
+    func: Callable[[type["BenchlingBaseModel"]], BenchlingValidatorReport | None]
+    | None = None,
+    *,
     validator_level: ValidationSeverity = ValidationSeverity.LOW,
     validator_name: str | None = None,
 ) -> Callable:
-    """A decorator that validates a function that takes a Benchling entity as an argument and returns None.
+    """A decorator for a function that validates a Benchling entity, defined on a schema class.
+    Can be used with or without parameters. Wraps around any exceptions raised by the validator function,
+    and returns a BenchlingValidatorReport.
 
-    Parameters:
-        validator_level: ValidationSeverity
-            The level of the validator.
-        validator_name: str | None
-            The name of the validator. Defaults to the pascalized name of the function.
+    Parameters
+    ----------
+    validator_level: ValidationSeverity
+        The severity level of the validation report. Defaults to ValidationSeverity.LOW.
+    validator_name: str | None
+        The name of the validator. Defaults to the PascalCase version of the function name.
     """
+    if func is None:
+        return partial(
+            liminal_validator,
+            validator_level=validator_level,
+            validator_name=validator_name,
+        )
+    elif not isinstance(
+        func, Callable[[type["BenchlingBaseModel"]], BenchlingValidatorReport | None]
+    ):
+        raise ValueError(
+            "Parameters passed to liminal_validator must be keyword arguments, not positional arguments."
+        )
 
-    def decorator(func: Callable[[type["BenchlingBaseModel"]], None]) -> Callable:
-        """Decorator that validates a function that takes a Benchling entity as an argument and returns None."""
-        sig = inspect.signature(func)
-        params = list(sig.parameters.values())
-        if not params or params[0].name != "self" or len(params) > 1:
-            raise TypeError(
-                "Validator must defined in a schema class, where the only argument to this validator must be 'self'."
-            )
-
-        if sig.return_annotation is not None:
-            raise TypeError("The return type must be None.")
-
-        nonlocal validator_name
-        if validator_name is None:
-            validator_name = pascalize(func.__name__)
-
-        @wraps(func)
-        def wrapper(self: type["BenchlingBaseModel"]) -> BenchlingValidatorReport:
-            """Wrapper that runs the validator function and returns a BenchlingValidatorReport."""
-            try:
-                func(self)
-            except Exception as e:
-                return BenchlingValidatorReport.create_validation_report(
-                    valid=False,
-                    level=validator_level,
-                    entity=self,
-                    validator_name=validator_name,
-                    message=str(e),
-                )
+    @wraps(func)
+    def wrapper(self: type["BenchlingBaseModel"]) -> BenchlingValidatorReport:
+        """Wrapper that runs the validator function and returns a BenchlingValidatorReport."""
+        try:
+            ret_val = func(self)
+            if type(ret_val) is BenchlingValidatorReport:
+                return ret_val
+        except Exception as e:
             return BenchlingValidatorReport.create_validation_report(
-                valid=True,
+                valid=False,
                 level=validator_level,
                 entity=self,
-                validator_name=validator_name,
+                validator_name=validator_name or pascalize(func.__name__),
+                message=str(e),
             )
+        return BenchlingValidatorReport.create_validation_report(
+            valid=True,
+            level=validator_level,
+            entity=self,
+            validator_name=validator_name or pascalize(func.__name__),
+        )
 
-        setattr(wrapper, "_is_liminal_validator", True)
-        return wrapper
-
-    return decorator
+    setattr(wrapper, "_is_liminal_validator", True)
+    return wrapper

{liminal_orm-2.0.1.dist-info → liminal_orm-2.0.3a0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: liminal-orm
-Version: 2.0.1
+Version: 2.0.3a0
 Summary: An ORM and toolkit that builds on top of Benchling's platform to keep your schemas and downstream code dependencies in sync.
 Home-page: https://github.com/dynotx/liminal-orm
 Author: DynoTx Open Source
@@ -88,7 +88,7 @@ With your schemas defined in code, you can now take advantage of the additional
     class Pizza(BaseModel, CustomEntityMixin):
         ...
 
-        @liminal_validator(ValidationSeverity.MED)
+        @liminal_validator
         def cook_time_and_temp_validator(self) -> None:
             if self.cook_time is not None and self.cook_temp is None:
                 raise ValueError("Cook temp is required if cook time is set")

{liminal_orm-2.0.1.dist-info → liminal_orm-2.0.3a0.dist-info}/RECORD

@@ -59,10 +59,10 @@ liminal/tests/from benchling_sdk.py,sha256=CjRUHFB3iaa4rUPLGOqDiBq5EPKldm-Fd8aQQ
 liminal/tests/test_dropdown_compare.py,sha256=yHB0ovQlBLRu8-qYkqIPd8VtYEOmOft_93FQM86g_z8,8198
 liminal/tests/test_entity_schema_compare.py,sha256=-26Bu5eYIuHRswB5kYjGDo5Wed5LUWjm1e6IRI1Q-lE,18952
 liminal/utils.py,sha256=radRtRsZmCiNblMvxOX1DH0rcO5TR09kFlp6OONIPBU,2951
-liminal/validation/__init__.py,sha256=HOjBHCwxvQao6SN_Q5B-JbabG7Z6ff44JIDKLeK96l8,5458
+liminal/validation/__init__.py,sha256=p9VoX4rYnDE1DHr2BOnZmRklX6LBNeerlVLPvvr6y0Y,5562
 liminal/validation/validation_severity.py,sha256=ib03PTZCQHcbBDc01v4gJF53YtA-ANY6QSFnhTV-FbU,259
-liminal_orm-2.0.1.dist-info/LICENSE.md,sha256=oVA877F_D1AV44dpjsv4f-4k690uNGApX1EtzOo3T8U,11353
-liminal_orm-2.0.1.dist-info/METADATA,sha256=axM6tXYgSWVWjPGQ_dYDOhNkPEtECVvcB6UHPaB_h8o,11056
-liminal_orm-2.0.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-liminal_orm-2.0.1.dist-info/entry_points.txt,sha256=atIrU63rrzH81dWC2sjUbFLlc5FWMmYRdMxXEWexIZA,47
-liminal_orm-2.0.1.dist-info/RECORD,,
+liminal_orm-2.0.3a0.dist-info/LICENSE.md,sha256=oVA877F_D1AV44dpjsv4f-4k690uNGApX1EtzOo3T8U,11353
+liminal_orm-2.0.3a0.dist-info/METADATA,sha256=ANm_kbsM-VMU2lpUnbHutpmlWDyrOYmU1Rg_Zkhsq0c,11034
+liminal_orm-2.0.3a0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+liminal_orm-2.0.3a0.dist-info/entry_points.txt,sha256=atIrU63rrzH81dWC2sjUbFLlc5FWMmYRdMxXEWexIZA,47
+liminal_orm-2.0.3a0.dist-info/RECORD,,