Merge pull request #245 from phenobarbital/new-exports

New exports

Author: phenobarbital

datamodel/converters.pyx

@@ -882,6 +882,7 @@ cdef object _parse_union_type(
                 non_none_arg = arg
                 break
         is_typing = hasattr(non_none_arg, '__module__') and non_none_arg.__module__ == 'typing'
+
         if non_none_arg is not None and is_typing is True:
             # Invoke the parse_typing_type
             field.args = get_args(non_none_arg)
@@ -899,6 +900,14 @@ cdef object _parse_union_type(
     for arg_type in targs:
         try:
             if isinstance(data, list):
+                if arg_type is str:
+                    # Ensure all elements in the list are strings
+                    if all(isinstance(item, str) for item in data):
+                        return data
+                    else:
+                        raise ValueError(
+                            f"Expected List[str], but found invalid element type in {data}"
+                        )
                 result = _parse_list_type(field, arg_type, data, encoder, targs)
             else:
                 # fallback to builtin parse
@@ -1271,9 +1280,9 @@ cpdef dict processing_fields(object obj, list columns):
             obj.__dict__[name] = value
         if _default is not None:
             value = _handle_default_value(obj, name, value, _default, f._default_callable)
-
         try:
             _encoder = metadata.get('encoder')
+            newval = value
             if f.parser is not None:
                 # If a custom parser is attached to Field, use it
                 try:
@@ -1358,6 +1367,16 @@ cpdef dict processing_fields(object obj, list columns):
                                 None, name, value, f._inner_type, as_objects, None
                             )
                         obj.__dict__[name] = newval
+                    else:
+                        newval = _parse_typing(
+                            f,
+                            _type,
+                            value,
+                            _encoder,
+                            as_objects,
+                            obj
+                        )
+                        obj.__dict__[name] = newval
                 else:
                     try:
                         newval = _parse_typing(

datamodel/version.py

@@ -6,7 +6,7 @@
     'simple library based on python +3.8 to use Dataclass-syntax'
     'for interacting with Data'
 )
-__version__ = '0.10.4'
+__version__ = '0.10.5'
 __copyright__ = 'Copyright (c) 2020-2024 Jesus Lara'
 __author__ = 'Jesus Lara'
 __author_email__ = '[email protected]'

examples/test_qsmodel.py

@@ -71,7 +71,7 @@ class QueryModel(BaseModel):
     dwh_driver: str = Field(required=False, default=None)
     dwh_info: Optional[dict] = Field(required=False, db_type='jsonb')
     dwh_scheduler: Optional[dict] = Field(required=False, db_type='jsonb')
-    host_info: Tuple[str, int] = Field(required=True)
+    host_info: Tuple[str, int] = Field(required=False)
     # Creation Information:
     created_at: datetime = Field(
         required=False,
@@ -100,5 +100,55 @@ class Meta:
 try:
     slug = QueryModel(**data)
     print(slug)
+    print('MAPPING > ', slug.more_nested, type(slug.more_nested))
 except ValidationError as e:
     print(e.payload)
+
+
+data_new = {
+    "query_slug": "vision_form_data",
+    "description": None,
+    "source": None,
+    "params": None,
+    "attributes": None,
+    "conditions": {
+        "orgid": "106",
+        "formid": "2681",
+        "lastdate": "CURRENT_DATE",
+        "firstdate": "CURRENT_DATE"
+    },
+    "cond_definition": {
+        "orgid": "integer",
+        "formid": "integer",
+        "lastdate": "date",
+        "firstdate": "date"
+    },
+    "fields": [],
+    "filtering": None,
+    "ordering": [],
+    "grouping": [],
+    "qry_options": None,
+    "h_filtering": False,
+    "query_raw": "-- Insert New query_slug:vision_form_date\nSELECT  fd.*, fv.FormId, f.OrgId, fv.FormVisitId, VV.VisitDateLocal AS VisitDateLocal --in store TZ\nFROM dbo._FormView_{formid}({orgid},16558) fd\nINNER JOIN dbo.FormVisit fv on fv.FormVisitId = fd.FormVisitId\nINNER JOIN vwVisitView VV ON FV.FormVisitId = VV.FormVisitId\nINNER JOIN forms f on fv.FormId = f.FormId\nWHERE ISNULL([000_055],[000_003]) BETWEEN {firstdate} and {lastdate}\n--- end form data",
+    "is_raw": False,
+    "is_cached": False,
+    "cache_timeout": 3600,
+    "cache_refresh": None,
+    "cache_options": None,
+    "program_id": 1,
+    "program_slug": "troc",
+    "provider": "sqlserver",
+    "parser": "SQLParser",
+    "dwh": False,
+    "dwh_driver": None,
+    "dwh_info": None,
+    "dwh_scheduler": None,
+    "created_at": "2021-08-28 15:09:00",
+    "created_by": None,
+    "updated_at": "2023-01-05 11:26:00",
+    "updated_by": None
+}
+
+if __name__ == '__main__':
+    slug = QueryModel(**data_new)
+    print(slug)

examples/test_validations.py

@@ -2,6 +2,7 @@
 import uuid
 from datetime import datetime
 from datamodel import BaseModel, Column
+from datamodel.exceptions import ValidationError
 
 
 def auto_uuid(*args, **kwargs):
@@ -25,7 +26,7 @@ class Account(BaseModel):
     provider: str = Column(required=True, default='dummy')
     enabled: bool = Column(required=True, default=True)
     address: Union[str, list] = Column(required=False, default='')
-    phone: Union[str, list] = Column(required=False, default='')
+    phone: Union[str, List[str]] = Column(required=False, default='')
 
     def set_address(self, address: str):
         self.address = address
@@ -36,7 +37,7 @@ class Actor(BaseModel):
     """
     userid: uuid.UUID = Column(required=True, primary_key=True, default=auto_uuid)
     age: int = Column(default=def_age)
-    name: str
+    name: str = Column(required=True)
     account: Union[Account, List[Account]]
     is_employee: str = Column(required=True, default='F', encoder=is_employee)
     created_at: datetime = Column(required=False, default=datetime.now)
@@ -63,6 +64,59 @@ def __str__(self) -> str:
         }
     ]
 }
-user = Actor(**user)
-print(f"User: ID: {user.userid}, Name: {user.name}, age: {user.age}, accounts: {user.account!r}, created: {user.created_at}")
-print(f'Types: {type(user.created_at)}')
+
+
+if __name__ == '__main__':
+    user = Actor(**user)
+    print(f"User: ID: {user.userid}, Name: {user.name}, age: {user.age}, accounts: {user.account!r}, created: {user.created_at}")
+    print(f'Types: {type(user.created_at)}')
+    try:
+        # Test if name is required:
+        missing_data = {
+        "userid": "f47ac10b-58cc-4372-a567-0e02b2c3d479",
+            "account": [
+                {"provider": "twilio", "phone": "+343317871"},
+            ]
+        }
+        user = Actor(**missing_data)
+    except (ValueError, AttributeError) as ex:
+        print(f"Error: {ex}", type(ex))
+    except ValidationError as ex:
+        print(f"Error: {ex}", type(ex))
+        print(f"ValidationError: {ex.payload}")
+    # Test Account for Invalid Data:
+    invalid_data = {
+        "userid": "f47ac10b-58cc-4372-a567-0e02b2c3d479",
+        "name": "Invalid User",
+        "account": [
+            {"provider": "twilio", "phone": {"phone": 343317871}},  # Expecting a string for `phone`
+        ]
+    }
+    try:
+        Account(**invalid_data["account"][0])
+    except (ValueError, AttributeError) as ex:
+        print(
+            f"Error: {ex}", type(ex)
+        )
+    except ValidationError as ex:
+        print(
+            f"Error: {ex}", type(ex)
+        )
+        print(
+            f"ValidationError: {ex.payload}"
+        )
+    # Test for Invalid Data:
+    try:
+        user = Actor(**invalid_data)
+        print(user.account, type(user.account[0]['phone']))
+    except (ValueError, AttributeError) as ex:
+        print(
+            f"Error: {ex}", type(ex)
+        )
+    except ValidationError as ex:
+        print(
+            f"Error: {ex}", type(ex)
+        )
+        print(
+            f"ValidationError: {ex.payload}"
+        )

tests/test_data.py

@@ -1,6 +1,5 @@
 from typing import Optional, List, Union
 from datetime import datetime, date
-from pendulum.date import Date as PDate
 from dataclasses import dataclass
 import pytest
 from datamodel import BaseModel, Field

tests/test_validations.py

@@ -212,7 +212,7 @@ def test_actor_with_accounts_validation(as_objects):
         "userid": pgproto.UUID("f47ac10b-58cc-4372-a567-0e02b2c3d479"),
         "name": "Invalid User",
         "account": [
-            {"provider": "twilio", "phone": {"phone": "343317871"}},  # Expecting a string for `phone`
+            {"provider": "twilio", "phone": {"phone": 343317871}},  # Expecting a string for `phone`
         ]
     }
     with pytest.raises(ValueError, match="Invalid type.*phone"):
@@ -238,6 +238,7 @@ def test_actor_with_accounts_validation(as_objects):
             {"provider": "email", "address": "[email protected]"},
         ]
     }
+    # Validate an Account:
     actor = Actor(**valid_data)
     assert actor.name == "Valid User"
     assert isinstance(actor.account, list)