Merge pull request #258 from phenobarbital/new-exports

fix compatibility for python 3.10

Author: phenobarbital

datamodel/models.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 import contextlib
-from typing import Any, Dict, get_args
+from typing import Any, Dict, Optional, get_args
 from enum import Enum, EnumMeta
 # Dataclass
 import inspect
@@ -210,10 +210,13 @@ def to_dict(
         self,
         remove_nulls: bool = False,
         convert_enums: bool = False,
-        as_values: bool = False
+        as_values: bool = False,
+        exclude: Optional[set] = None
     ) -> dict[str, Any]:
+        exclude = exclude or set()
+        exclude.add('_pgoutput')  # Always exclude _pgoutput
         if as_values:
-            return self.__collapse_as_values__(remove_nulls, convert_enums, as_values)
+            return self.__collapse_as_values__(remove_nulls, convert_enums, as_values, exclude)
         d = as_dict(self, dict_factory=dict)
         if convert_enums:
             d = self.__convert_enums__(d)
@@ -226,12 +229,21 @@ def __collapse_as_values__(
         self,
         remove_nulls: bool = False,
         convert_enums: bool = False,
-        as_values: bool = False
+        as_values: bool = False,
+        exclude: Optional[set] = None
     ) -> dict[str, Any]:
         """Recursively converts any BaseModel instances to their primary key value."""
         out = {}
         _fields = self.columns()
         for name, field in _fields.items():
+            if name in exclude:
+                continue
+            # Skip internal or error fields
+            if name.startswith('__') or name == '__errors__':
+                continue
+            # Skip fields marked for exclusion
+            if field.metadata.get('exclude', False):
+                continue
             # datatype = field.type
             value = getattr(self, name)
             if value is None and remove_nulls:

datamodel/parsers/json.pyx

@@ -25,7 +25,11 @@ from cpython.object cimport (
 from dataclasses import _MISSING_TYPE, MISSING, InitVar
 from typing import Any, Union
 from decimal import Decimal
-from enum import Enum, EnumType
+from enum import Enum
+try:
+    from enum import EnumType
+except ImportError:
+    from enum import EnumMeta as EnumType
 import orjson
 from ..exceptions cimport ParserError
 from ..fields import Field
@@ -71,7 +75,6 @@ cdef inline bint is_objid(object obj):
 ORJSON_DEFAULT_OPTIONS = (
     orjson.OPT_SERIALIZE_NUMPY |
     orjson.OPT_UTC_Z
-    # orjson.OPT_NON_STR_KEYS
 )
 
 

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.17'
+__version__ = '0.10.19'
 __copyright__ = 'Copyright (c) 2020-2024 Jesus Lara'
 __author__ = 'Jesus Lara'
 __author_email__ = 'jesuslarag@gmail.com'