liminal-orm 2.0.2__tar.gz → 2.0.3a1__tar.gz

{liminal_orm-2.0.2 → liminal_orm-2.0.3a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: liminal-orm
-Version: 2.0.2
+Version: 2.0.3a1
 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

{liminal_orm-2.0.2 → liminal_orm-2.0.3a1}/liminal/validation/__init__.py

@@ -101,21 +101,36 @@ class BenchlingValidatorReport(BaseModel):
         )
 
 
-def _liminal_decorator(
-    func: Callable[[type["BenchlingBaseModel"]], BenchlingValidatorReport | None],
-    validator_level: ValidationSeverity,
-    validator_name: str | None,
+def liminal_validator(
+    func: Callable[[type["BenchlingBaseModel"]], BenchlingValidatorReport | None]
+    | None = None,
+    *,
+    validator_level: ValidationSeverity = ValidationSeverity.LOW,
+    validator_name: str | None = None,
 ) -> Callable:
-    """Core decorator logic for liminal_validator."""
-    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 be defined in a schema class, where the only argument to this validator must be 'self'."
-        )
+    """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.
 
-    if validator_name is None:
-        validator_name = pascalize(func.__name__)
+    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[[["BenchlingBaseModel"]], BenchlingValidatorReport | None]
+    ):
+        raise ValueError(
+            "Parameters passed to liminal_validator must be keyword arguments, not positional arguments."
+        )
 
     @wraps(func)
     def wrapper(self: type["BenchlingBaseModel"]) -> BenchlingValidatorReport:
@@ -129,36 +144,15 @@ def _liminal_decorator(
                 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,
+            validator_name=validator_name or pascalize(func.__name__),
         )
 
     setattr(wrapper, "_is_liminal_validator", True)
     return wrapper
-
-
-def liminal_validator(
-    validator_level: ValidationSeverity = ValidationSeverity.LOW,
-    validator_name: str | None = None,
-) -> Callable:
-    """A decorator for a function that validates a Benchling entity, defined on a schema class.
-    Wraps around any exceptions raised by the validator function, and returns a BenchlingValidatorReport.
-
-    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.
-    """
-    return partial(
-        _liminal_decorator,
-        validator_level=validator_level,
-        validator_name=validator_name,
-    )

{liminal_orm-2.0.2 → liminal_orm-2.0.3a1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "liminal-orm"
-version = "2.0.2"
+version = "2.0.3a1"
 description = "An ORM and toolkit that builds on top of Benchling's platform to keep your schemas and downstream code dependencies in sync."
 authors = ["DynoTx Open Source <opensource@dynotx.com>"]
 readme = "README.md"