sera-2 1.14.3__py3-none-any.whl → 1.14.4__py3-none-any.whl

sera/make/make_python_model.py

@@ -370,25 +370,24 @@ def make_python_data_model(
                 continue
 
             if isinstance(prop, DataProperty):
-                pytype = prop.get_data_model_datatype().get_python_type()
-                if prop.is_optional:
-                    pytype = pytype.as_optional_type()
-
-                for dep in pytype.deps:
-                    program.import_(dep, True)
-
-                pytype_type = pytype.type
+                pytype = prop.get_data_model_datatype().get_python_type().clone()
                 if len(prop.data.constraints) > 0:
                     # if the property has constraints, we need to figure out
                     program.import_("typing.Annotated", True)
                     if len(prop.data.constraints) == 1:
-                        pytype_type = f"Annotated[%s, %s]" % (
-                            pytype_type,
+                        pytype.type = "Annotated[%s, %s]" % (
+                            pytype.type,
                             prop.data.constraints[0].get_msgspec_constraint(),
                         )
                     else:
                         raise NotImplementedError(prop.data.constraints)
 
+                if prop.is_optional:
+                    pytype = pytype.as_optional_type()
+
+                for dep in pytype.deps:
+                    program.import_(dep, True)
+
                 # private property are available for creating, but not for updating.
                 # so we do not need to skip it.
                 # if prop.data.is_private:
@@ -416,7 +415,7 @@ def make_python_data_model(
 
                 cls_ast(
                     stmt.DefClassVarStatement(
-                        prop.name, pytype_type, prop_default_value
+                        prop.name, pytype.type, prop_default_value
                     )
                 )
             elif isinstance(prop, ObjectProperty):
@@ -440,12 +439,10 @@ def make_python_data_model(
                 elif prop.is_optional:
                     pytype = pytype.as_optional_type()
 
-                pytype_type = pytype.type
-
                 for dep in pytype.deps:
                     program.import_(dep, True)
 
-                cls_ast(stmt.DefClassVarStatement(prop.name, pytype_type))
+                cls_ast(stmt.DefClassVarStatement(prop.name, pytype.type))
 
         if is_on_create_value_updated:
             program.import_("typing.Optional", True)
@@ -558,30 +555,30 @@ def make_python_data_model(
                 continue
 
             if isinstance(prop, DataProperty):
-                pytype = prop.get_data_model_datatype().get_python_type()
-                if prop.is_optional:
-                    pytype = pytype.as_optional_type()
+                pytype = prop.get_data_model_datatype().get_python_type().clone()
 
-                for dep in pytype.deps:
-                    program.import_(dep, True)
-
-                pytype_type = pytype.type
                 if len(prop.data.constraints) > 0:
                     # if the property has constraints, we need to figure out
                     program.import_("typing.Annotated", True)
                     if len(prop.data.constraints) == 1:
-                        pytype_type = f"Annotated[%s, %s]" % (
-                            pytype_type,
+                        pytype.type = "Annotated[%s, %s]" % (
+                            pytype.type,
                             prop.data.constraints[0].get_msgspec_constraint(),
                         )
                     else:
                         raise NotImplementedError(prop.data.constraints)
 
+                if prop.is_optional:
+                    pytype = pytype.as_optional_type()
+
+                for dep in pytype.deps:
+                    program.import_(dep, True)
+
                 if prop.data.is_private:
                     program.import_("typing.Union", True)
                     program.import_("sera.typing.UnsetType", True)
                     program.import_("sera.typing.UNSET", True)
-                    pytype_type = f"Union[{pytype_type}, UnsetType]"
+                    pytype.type = f"Union[{pytype.type}, UnsetType]"
 
                 prop_default_value = None
                 if prop.data.is_private:
@@ -602,7 +599,7 @@ def make_python_data_model(
 
                 cls_ast(
                     stmt.DefClassVarStatement(
-                        prop.name, pytype_type, prop_default_value
+                        prop.name, pytype.type, prop_default_value
                     )
                 )
             elif isinstance(prop, ObjectProperty):
@@ -626,12 +623,10 @@ def make_python_data_model(
                 elif prop.is_optional:
                     pytype = pytype.as_optional_type()
 
-                pytype_type = pytype.type
-
                 for dep in pytype.deps:
                     program.import_(dep, True)
 
-                cls_ast(stmt.DefClassVarStatement(prop.name, pytype_type))
+                cls_ast(stmt.DefClassVarStatement(prop.name, pytype.type))
 
         if is_on_update_value_updated:
             program.import_("typing.Optional", True)

sera/models/_datatype.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 
 import datetime
 from dataclasses import dataclass, field
-from enum import Enum
 from typing import Literal
 
 from codegen.models import expr
@@ -64,6 +63,10 @@ class PyTypeWithDep:
             )
         return PyTypeWithDep(type=f"Optional[{self.type}]", deps=deps)
 
+    def clone(self) -> PyTypeWithDep:
+        """Clone the type with the same dependencies."""
+        return PyTypeWithDep(type=self.type, deps=list(self.deps))
+
 
 @dataclass
 class TsTypeWithDep:

{sera_2-1.14.3.dist-info → sera_2-1.14.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: sera-2
-Version: 1.14.3
+Version: 1.14.4
 Summary: 
 Author: Binh Vu
 Author-email: bvu687@gmail.com

{sera_2-1.14.3.dist-info → sera_2-1.14.4.dist-info}/RECORD

@@ -17,7 +17,7 @@ sera/make/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sera/make/__main__.py,sha256=bt-gDF8E026OWc2zqr9_a3paMOiDkFd3ybWn8ltL2g0,1448
 sera/make/make_app.py,sha256=n9NtW73O3s_5Q31VHIRmnd-jEIcpDO7ksAsOdovde2s,5999
 sera/make/make_python_api.py,sha256=iXGbKQ3IJvsY1ur_fhurr_THFNnH66E3Wl85o0emUbw,26853
-sera/make/make_python_model.py,sha256=pv8gkWE4kIexjTfmtc5GG4Pg2kR9yA3Urnqal1RJ6WI,61430
+sera/make/make_python_model.py,sha256=cRb-fuHX0WH7XPAAliu6lycC0iEjE5kcKg4bBU40GwQ,61275
 sera/make/make_python_services.py,sha256=0ZpWLwQ7Nwfn8BXAikAB4JRpNknpSJyJgY5b1cjtxV4,2073
 sera/make/make_typescript_model.py,sha256=ugDdSTw_1ayHLuL--92RQ8hf_D-dpJtnvmUZNxcwcDs,63687
 sera/misc/__init__.py,sha256=Dh4uDq0D4N53h3zhvmwfa5a0TPVRSUvLzb0hkFuPirk,411
@@ -27,7 +27,7 @@ sera/models/__init__.py,sha256=vJC5Kzo_N7wd16ocNPy1VvAZDGNiWeiAhWJ4ihATKvA,780
 sera/models/_class.py,sha256=9XSnJli2SGF-jm-v0swsfY6-omiQ5Xeh33R2pM9Kg_g,2526
 sera/models/_collection.py,sha256=ZnQEriKC4X88Zz48Kn1AVZKH-1_l8OgWa-zf2kcQOOE,1414
 sera/models/_constraints.py,sha256=RpWDU-TfCslXaMUaTG9utWbl5z8Z6nzvF_fhqlek6ew,1987
-sera/models/_datatype.py,sha256=y5kfim0G3gLhnGjiokFBr8leU1Y6as_Vw7oK-caOo68,7140
+sera/models/_datatype.py,sha256=Lq1iEGqQaNHiG5NlRTcOTWROiUFjoiPoTeSJKFU6lSE,7281
 sera/models/_default.py,sha256=ABggW6qdPR4ZDqIPJdJ0GCGQ-7kfsfZmQ_DchgZEa-I,137
 sera/models/_enum.py,sha256=sy0q7E646F-APsqrVQ52r1fAQ_DCAeaNq5YM5QN3zIk,2070
 sera/models/_module.py,sha256=I-GfnTgAa-5R87qTAvEzOt-VVEGeFBBwubGCgUkXVSw,5159
@@ -36,6 +36,6 @@ sera/models/_parse.py,sha256=ohexBbjFv6A1wZsEtokfw0zMVoR-RGXYrXa_tAub_Vs,12147
 sera/models/_property.py,sha256=Y98bYIjuCQDcSWpDxERNIFgmxXIaJiwBNFtYeGbDYRE,6812
 sera/models/_schema.py,sha256=VxJEiqgVvbXgcSUK4UW6JnRcggk4nsooVSE6MyXmfNY,1636
 sera/typing.py,sha256=Fl4-UzLJu1GdLLk_g87fA7nT9wQGelNnGzag6dg_0gs,980
-sera_2-1.14.3.dist-info/METADATA,sha256=-PIatY73pPVkjplx7zJAXHmtRcyQFIMEMIu9Manov6M,852
-sera_2-1.14.3.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-sera_2-1.14.3.dist-info/RECORD,,
+sera_2-1.14.4.dist-info/METADATA,sha256=PTLgXrXqoFQ74mPm4mgMK3DaBGMh0A45FNuUd40tb94,852
+sera_2-1.14.4.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+sera_2-1.14.4.dist-info/RECORD,,