simplify model

Author: phenobarbital

datamodel/base.py

@@ -11,10 +11,10 @@
 from enum import EnumMeta
 from uuid import UUID
 from orjson import OPT_INDENT_2
-from datamodel.converters import parse_type, slugify_camelcase
-from datamodel.fields import Field
-from datamodel.types import JSON_TYPES, Text
-from datamodel.validation import validator, is_callable, is_empty, is_dataclass
+from .converters import parse_type, slugify_camelcase
+from .fields import Field
+from .types import JSON_TYPES, Text
+from .validation import validator, is_callable, is_empty, is_dataclass
 from .exceptions import ValidationError
 from .parsers.encoders import json_encoder
 from .abstract import ModelMeta, Meta

datamodel/converters.pyx

@@ -3,19 +3,19 @@
 #
 import re
 import inspect
-import logging
+import logging # migrate to use cprint
 from typing import Union
-from dataclasses import _MISSING_TYPE
+from dataclasses import _MISSING_TYPE, _FIELDS, fields
 import orjson
 from decimal import Decimal
 from cpython cimport datetime
 import pendulum
 from pendulum.parsing.exceptions import ParserError
 from uuid import UUID
 from cpython.ref cimport PyObject
-
 from .validation import is_dataclass
 
+
 cdef object to_uuid(object obj):
     """Returns a UUID version of a str column.
     """

datamodel/models.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
-from typing import Any, ClassVar, Callable
+from typing import Any
 # Dataclass
-from dataclasses import asdict
+from dataclasses import asdict as as_dict
 from operator import attrgetter
 from datamodel.fields import fields
 from .abstract import ModelMeta, Meta
@@ -49,12 +49,12 @@ def remove_nulls(self, obj: Any) -> dict[str, Any]:
 
     def to_dict(self):
         if self.Meta.remove_nulls is True:
-            return self.remove_nulls(asdict(self, dict_factory=dict))
-        return asdict(self)
+            return self.remove_nulls(as_dict(self, dict_factory=dict))
+        return as_dict(self)
 
     def json(self, **kwargs):
         encoder = self.__encoder__(**kwargs)
-        return encoder(asdict(self))
+        return encoder(as_dict(self))
 
     to_json = json