fix issue when "default" is a function or a MISSING TYPE

Author: phenobarbital

datamodel/models.py

@@ -3,7 +3,7 @@
 from enum import Enum, EnumMeta
 # Dataclass
 import inspect
-from dataclasses import asdict as as_dict, dataclass, make_dataclass
+from dataclasses import asdict as as_dict, dataclass, make_dataclass, _MISSING_TYPE
 from operator import attrgetter
 from orjson import OPT_INDENT_2
 from datamodel.fields import fields
@@ -427,9 +427,8 @@ def _apply_extra_metadata(cls, field_schema: dict, _metadata: dict):
             'label', 'validator', 'encoder', 'decoder',
             'default_factory', 'type'
         ]
-        _meta = {k: v for k, v in _metadata.items() if k not in _rejected}
 
-        if _meta:
+        if _meta := {k: v for k, v in _metadata.items() if k not in _rejected}:
             field_schema["attrs"] = {
                 **field_schema["attrs"],
                 **_meta
@@ -447,11 +446,9 @@ def _apply_defaults_and_constraints(
     ):
         """Handle default values, secret fields, and min/max constraints."""
         if field.default:
-            d = field.default
-            if is_callable(d):
-                field_schema['default'] = f"fn:{d!r}"
-            else:
-                field_schema['default'] = f"{d!s}"
+            if not isinstance(field.default, _MISSING_TYPE) and not callable(field.default):
+                d = field.default
+                field_schema['default'] = f"fn:{d!r}" if is_callable(d) else f"{d!s}"
 
         if secret is not None:
             field_schema['secret'] = secret
@@ -565,8 +562,8 @@ def schema(cls, as_dict=False, locale: Any = None):
         Args:
             as_dict (bool, optional): If True,
                 returns the schema as a Python dictionary.
-                                      If False,
-                returns the schema as a JSON-encoded string. Defaults to False.
+                If False, returns the schema as a JSON-encoded string.
+                Defaults to False.
             locale (Any, optional):
                 The locale to use for internationalization of schema
                 elements like descriptions and labels. Defaults to None.
@@ -616,9 +613,7 @@ def schema(cls, as_dict=False, locale: Any = None):
         # Cache the computed schema for subsequent calls
         cls.__computed_schema__ = base_schema
 
-        if as_dict:
-            return base_schema
-        return json_encoder(base_schema)
+        return base_schema if as_dict else json_encoder(base_schema)
 
     def as_schema(self, top_level: bool = True) -> dict:
         """as_schema.
@@ -693,7 +688,7 @@ def model(cls, dialect: str = "json", **kwargs) -> Any:
         result = None
         clsname = cls.__name__
         schema = cls.Meta.schema
-        table = cls.Meta.name if cls.Meta.name else clsname.lower()
+        table = cls.Meta.name or clsname.lower()
         columns = cls.columns(cls).items()
         if dialect == 'json':
             cols = {}

datamodel/version.py

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

examples/form_schema.py

@@ -68,7 +68,10 @@ class Meta:
 
 class BadgeAssign(BaseModel):
     reward_id: Reward = Field(
-        required=True, fk='reward_id|reward', api='rewards', label="Badge"
+        required=True,
+        fk='reward_id|reward',
+        api='rewards',
+        label="Badge"
     )
     reward: str = Field(repr=False)
     receiver_email: Employee = Field(
@@ -81,7 +84,8 @@ class BadgeAssign(BaseModel):
             "url": "api/v1/adp_employees",
             "key": "job_code",
             "value": "job_code_title"
-        }
+        },
+        default="Job Code"
     )
     # receiver_user: User = Field(
     #     required=True,
@@ -105,5 +109,6 @@ class Meta:
         strict = True
 
 schema = BadgeAssign.schema(as_dict=False)
+print('\n================================')
 print(schema)
 # pp.pprint(schema)