data-sitter 0.1.1__tar.gz → 0.1.3__tar.gz

{data_sitter-0.1.1 → data_sitter-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: data-sitter
-Version: 0.1.1
+Version: 0.1.3
 Summary: A Python library that reads data contracts and generates Pydantic models for seamless data validation.
 Author-email: Lázaro Pereira Candea <lazaro@candea.es>
 Requires-Dist: python-dotenv==1.0.1

{data_sitter-0.1.1 → data_sitter-0.1.3}/README.md

@@ -48,7 +48,7 @@ contract_dict = {
 }
 
 contract = Contract.from_dict(contract_dict)
-pydantic_contract = contract.get_pydantic_model()
+pydantic_contract = contract.pydantic_model
 ```
 
 ### Using Rule References

{data_sitter-0.1.1 → data_sitter-0.1.3}/data_sitter/Contract.py

@@ -3,6 +3,7 @@ from functools import cached_property
 
 from pydantic import BaseModel
 
+from .Validation import Validation
 from .field_types import BaseField
 from .FieldResolver import FieldResolver
 from .rules import MatchedRule, RuleRegistry, RuleParser
@@ -68,10 +69,13 @@ class Contract:
         return rules
 
     def model_validate(self, item: dict):
-        pydantic_model = self.get_pydantic_model()
-        return pydantic_model.model_validate(item).model_dump()
+        return self.pydantic_model.model_validate(item).model_dump()
 
-    def get_pydantic_model(self) -> BaseModel:
+    def validate(self, item: dict) -> Validation:
+        return Validation.validate(self.pydantic_model, item)
+
+    @cached_property
+    def pydantic_model(self) -> BaseModel:
         return type(self.name, (BaseModel,), {
             "__annotations__": {
                 field_name: field_validator.get_annotation()
@@ -97,5 +101,6 @@ class Contract:
                     ]
                 }
                 for field_name, field_validator in self.field_validators.items()
-            ]
+            ],
+            "values": self.rule_parser.values
         }

{data_sitter-0.1.1 → data_sitter-0.1.3}/data_sitter/FieldResolver.py

@@ -32,7 +32,8 @@ class FieldResolver:
         return matched_rules
 
     def get_field_validator(self, field_name: str, parsed_rules: List[str]) -> BaseField:
-        validator = self.field_class(field_name)
+        is_optional = "Validate Not Null" not in parsed_rules
+        validator = self.field_class(field_name, is_optional)
         matched_rules = self.get_matched_rules(parsed_rules)
         for matched_rule in matched_rules:
             matched_rule.add_to_instance(validator)

data_sitter-0.1.3/data_sitter/Validation.py

@@ -0,0 +1,30 @@
+
+from collections import defaultdict
+from typing import Any, Dict, List, Type
+
+from pydantic import BaseModel, ValidationError
+
+
+class Validation():
+    row: Dict[str, Any]
+    errors: Dict[str, List[str]]
+
+    def __init__(self, row: dict, errors: dict = None):
+        self.row = row
+        self.errors = errors or {}
+
+    def to_dict(self) -> dict:
+        return {"row": self.row, "errors": self.errors}
+    
+    @classmethod
+    def validate(cls, model: Type[BaseModel], item: dict) -> "Validation":
+        try:
+            row = model(**item)  # Validate the row
+            return Validation(row=row.model_dump())
+        except ValidationError as e:
+            errors = defaultdict(list)
+            for error in e.errors():
+                field = error['loc'][0]  # Extract the field name
+                msg = error['msg']
+                errors[field].append(msg)
+            return Validation(row=item, errors=dict(errors))

{data_sitter-0.1.1 → data_sitter-0.1.3}/data_sitter/cli.py

@@ -23,7 +23,7 @@ def main():
     contract_path = Path(args.contract)
     contract_dict = json.loads(contract_path.read_text(encoding))
     contract = Contract.from_dict(contract_dict)
-    pydantic_contract = contract.get_pydantic_model()
+    pydantic_contract = contract.pydantic_model
 
     if file_path.suffix == '.csv':
         with open(file_path, encoding=encoding) as f:

{data_sitter-0.1.1 → data_sitter-0.1.3}/data_sitter/field_types/BaseField.py

@@ -1,12 +1,14 @@
 from abc import ABC
-from typing import Annotated, List, Type
+from typing import Annotated, List, Optional, Type
 
 from pydantic import AfterValidator
 from ..rules import register_rule, register_field
 
 
-def aggregated_validator(validators: List[callable]):
+def aggregated_validator(validators: List[callable], is_optional: bool):
     def _validator(value):
+        if is_optional and value is None:
+            return value
         for validator_func in validators:
             validator_func(value)
         return value
@@ -15,18 +17,22 @@ def aggregated_validator(validators: List[callable]):
 @register_field
 class BaseField(ABC):
     name: str
+    is_optional: bool
     validators = None
     field_type = None
 
-    def __init__(self, name) -> None:
+    def __init__(self, name: str, is_optional: bool) -> None:
         self.name = name
+        self.is_optional = is_optional
         self.validators = []
 
     @register_rule("Validate Not Null")
     def validator_not_null(self):
         def _validator(value):
+            if self.is_optional:
+                return value
             if value is None:
-                raise ValueError()
+                raise ValueError("Value cannot be null")
             return value
 
         self.validators.append(_validator)
@@ -36,7 +42,8 @@ class BaseField(ABC):
             validator(value)
 
     def get_annotation(self):
-        return Annotated[self.field_type, AfterValidator(aggregated_validator(self.validators))]
+        field_type = Optional[self.field_type] if self.is_optional else self.field_type
+        return Annotated[field_type, AfterValidator(aggregated_validator(self.validators, self.is_optional))]
 
     @classmethod
     def get_parents(cls: Type["BaseField"]) -> List[Type["BaseField"]]:

{data_sitter-0.1.1 → data_sitter-0.1.3}/data_sitter.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: data-sitter
-Version: 0.1.1
+Version: 0.1.3
 Summary: A Python library that reads data contracts and generates Pydantic models for seamless data validation.
 Author-email: Lázaro Pereira Candea <lazaro@candea.es>
 Requires-Dist: python-dotenv==1.0.1

{data_sitter-0.1.1 → data_sitter-0.1.3}/data_sitter.egg-info/SOURCES.txt

@@ -3,6 +3,7 @@ pyproject.toml
 setup.py
 data_sitter/Contract.py
 data_sitter/FieldResolver.py
+data_sitter/Validation.py
 data_sitter/__init__.py
 data_sitter/cli.py
 data_sitter.egg-info/PKG-INFO

{data_sitter-0.1.1 → data_sitter-0.1.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = 'data-sitter'
-version = "0.1.1"
+version = "0.1.3"
 description = "A Python library that reads data contracts and generates Pydantic models for seamless data validation."
 authors = [
     {name = 'Lázaro Pereira Candea', email = 'lazaro@candea.es'},

{data_sitter-0.1.1 → data_sitter-0.1.3}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='data-sitter',
-    version='0.1.1',
+    version='0.1.3',
     packages=find_packages(),
     install_requires=[
         # Keep this in sync with pyproject.toml