sera-2 1.16.0__py3-none-any.whl → 1.17.0__py3-none-any.whl

sera/exports/schema.py

@@ -54,6 +54,20 @@ def export_tbls(schema: Schema, outfile: Path):
                             "columns": [prop.name],
                         }
                     )
+
+                    if prop.db.foreign_key is not None:
+                        idprop = assert_not_null(prop.db.foreign_key.get_id_property())
+                        out["relations"].append(
+                            {
+                                "table": cls.name,
+                                "columns": [prop.name],
+                                "cardinality": "zero_or_one",
+                                "parent_table": prop.db.foreign_key.name,
+                                "parent_columns": [idprop_name],
+                                "parent_cardinality": "zero_or_one",
+                                "def": f"FOREIGN KEY ({prop.name}) REFERENCES {prop.db.foreign_key.name}({idprop_name})",
+                            }
+                        )
             else:
                 if prop.cardinality == Cardinality.MANY_TO_MANY:
                     # For many-to-many relationships, we need to create a join table

sera/make/make_python_model.py

@@ -1079,12 +1079,10 @@ def make_python_relational_model(
 
         target_pkg.module("base").write(program)
 
-    custom_types: list[ObjectProperty] = []
-
-    for cls in schema.topological_sort():
+    def make_orm(cls: Class):
         if cls.db is None or cls.name in reference_classes:
             # skip classes that are not stored in the database
-            continue
+            return
 
         program = Program()
         program.import_("__future__.annotations", True)
@@ -1093,6 +1091,11 @@ def make_python_relational_model(
         program.import_("sqlalchemy.orm.Mapped", True)
         program.import_(f"{target_pkg.path}.base.Base", True)
 
+        ident_manager = ImportHelper(
+            program,
+            GLOBAL_IDENTS,
+        )
+
         index_stmts = []
         if len(cls.db.indices) > 0:
             program.import_("sqlalchemy.Index", True)
@@ -1159,6 +1162,32 @@ def make_python_relational_model(
                     proptype = f"Mapped[{sqltype.mapped_pytype}]"
 
                 propvalargs: list[expr.Expr] = [expr.ExprIdent(sqltype.type)]
+                if prop.db.foreign_key is not None:
+                    assert (
+                        prop.db.foreign_key.db is not None
+                    ), f"Foreign key {prop.db.foreign_key.name} must have a database mapping"
+                    foreign_key_idprop = prop.db.foreign_key.get_id_property()
+                    assert (
+                        foreign_key_idprop is not None
+                    ), f"Foreign key {prop.db.foreign_key.name} must have an id property"
+                    propvalargs.append(
+                        expr.ExprFuncCall(
+                            ident_manager.use("ForeignKey"),
+                            [
+                                expr.ExprConstant(
+                                    f"{prop.db.foreign_key.db.table_name}.{foreign_key_idprop.name}"
+                                ),
+                                PredefinedFn.keyword_assignment(
+                                    "ondelete",
+                                    expr.ExprConstant("CASCADE"),
+                                ),
+                                PredefinedFn.keyword_assignment(
+                                    "onupdate",
+                                    expr.ExprConstant("CASCADE"),
+                                ),
+                            ],
+                        )
+                    )
                 if prop.db.is_primary_key:
                     propvalargs.append(
                         PredefinedFn.keyword_assignment(
@@ -1208,6 +1237,11 @@ def make_python_relational_model(
 
         target_pkg.module(cls.get_pymodule_name()).write(program)
 
+    custom_types: list[ObjectProperty] = []
+
+    for cls in schema.topological_sort():
+        make_orm(cls)
+
     # make a base class that implements the mapping for custom types
     custom_types = filter_duplication(
         custom_types, lambda p: (p.target.name, p.cardinality, p.is_optional, p.is_map)

sera/models/_parse.py

@@ -160,6 +160,7 @@ def _parse_property(
                     is_indexed=db.get("is_indexed", False)
                     or db.get("is_unique", False)
                     or db.get("is_primary_key", False),
+                    foreign_key=schema.classes.get(db.get("foreign_key")),
                 )
                 if "db" in prop
                 else None

sera/models/_property.py

@@ -150,6 +150,12 @@ class DataPropDBInfo:
     is_unique: bool = False
     # whether this property is indexed or not
     is_indexed: bool = False
+    # this is used in conjunction with is_primary_key = True for the case of
+    # extending a table with frequently updated properties. The value for the `foreign_key`
+    # will be a target class. The cardinality is one-to-one, on target class deletion,
+    # this class will be deleted as well (because it's an extended table of the target class).
+    # on source (this class) deletion, the target class will not be deleted.
+    foreign_key: Optional[Class] = None
 
 
 @dataclass(kw_only=True)

sera/typing.py

@@ -37,4 +37,5 @@ GLOBAL_IDENTS = {
     "AsyncSession": "sqlalchemy.ext.asyncio.AsyncSession",
     "ASGIConnection": "litestar.connection.ASGIConnection",
     "UNSET": "sera.typing.UNSET",
+    "ForeignKey": "sqlalchemy.ForeignKey",
 }

{sera_2-1.16.0.dist-info → sera_2-1.17.0.dist-info}/METADATA

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

{sera_2-1.16.0.dist-info → sera_2-1.17.0.dist-info}/RECORD

@@ -1,7 +1,7 @@
 sera/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sera/constants.py,sha256=mzAaMyIx8TJK0-RYYJ5I24C4s0Uvj26OLMJmBo0pxHI,123
 sera/exports/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sera/exports/schema.py,sha256=EAFKwULu8Nmb3IUBMCyt7M6YM4TGPo8yRRRu_KxBTxs,7045
+sera/exports/schema.py,sha256=wEBUrDOyuCoCJC8X4RlmoWpeqSugaboG-9Q1UQ8HEzk,7824
 sera/exports/test.py,sha256=jK1EJmLGiy7eREpnY_68IIVRH43uH8S_u5Z7STPbXOM,2002
 sera/libs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sera/libs/api_helper.py,sha256=47y1kcwk3Xd2ZEMnUj_0OwCuUmgwOs5kYrE95BDVUn4,5411
@@ -17,7 +17,7 @@ sera/make/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sera/make/__main__.py,sha256=HRfOR53p351h6KblVvYm3DLhDIfEtk6R0kjl78_S_S8,1453
 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=cRb-fuHX0WH7XPAAliu6lycC0iEjE5kcKg4bBU40GwQ,61275
+sera/make/make_python_model.py,sha256=Nc4vDGgM8icgWBqzNnMgEkLadf5EsZwbbHs3WLW9_co,62778
 sera/make/make_python_services.py,sha256=0ZpWLwQ7Nwfn8BXAikAB4JRpNknpSJyJgY5b1cjtxV4,2073
 sera/make/make_typescript_model.py,sha256=1ouYFCeqOlwEzsGBiXUn4VZtLJjJW7GSacdOSlQzhjI,67012
 sera/misc/__init__.py,sha256=mPKkik00j3tO_m45VPDJBjm8K85NpymRPl36Kh4hBn8,473
@@ -32,10 +32,10 @@ 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
 sera/models/_multi_lingual_string.py,sha256=JETN6k00VH4wrA4w5vAHMEJV8fp3SY9bJebskFTjQLA,1186
-sera/models/_parse.py,sha256=MaGZty29lsVUFumWqNanIjAwptBNOMbVZMXLZ2A9_2g,12317
-sera/models/_property.py,sha256=2rSLs9JjSesrxrEugE7krYaBQOivKU882I8mZN94FlI,7017
+sera/models/_parse.py,sha256=ciTLzCkO0q6xA1R_rHbnYJYK3Duo2oh56WeuwxXwJaI,12392
+sera/models/_property.py,sha256=9yMDxrmbyuF6-29lQjiq163Xzwbk75TlmGBpu0NLpkI,7485
 sera/models/_schema.py,sha256=VxJEiqgVvbXgcSUK4UW6JnRcggk4nsooVSE6MyXmfNY,1636
-sera/typing.py,sha256=Fl4-UzLJu1GdLLk_g87fA7nT9wQGelNnGzag6dg_0gs,980
-sera_2-1.16.0.dist-info/METADATA,sha256=wZvclB-3wd_K5sN9Q64s832aMVXueS3p2xbDJKCplnk,852
-sera_2-1.16.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-sera_2-1.16.0.dist-info/RECORD,,
+sera/typing.py,sha256=o_DKfSvs8JpNRQ0kdaTc3BbfdkvibY3uY4tJRt-n2fQ,1023
+sera_2-1.17.0.dist-info/METADATA,sha256=aIaXid2dkyX8P9nty-1eFHFBuH0Cpy34vOGDi1wTFkI,852
+sera_2-1.17.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+sera_2-1.17.0.dist-info/RECORD,,