sera-2 1.19.0__py3-none-any.whl → 1.19.2__py3-none-any.whl

sera/make/make_python_model.py

@@ -146,7 +146,11 @@ def make_python_data_model(
         mode: Literal["create", "update"],
         prop: DataProperty | ObjectProperty,
     ):
-        value = PredefinedFn.attr_getter(slf, expr.ExprIdent(prop.name))
+        if isinstance(prop, ObjectProperty) and prop.target.db is not None:
+            propname = prop.name + "_id"
+        else:
+            propname = prop.name
+        value = PredefinedFn.attr_getter(slf, expr.ExprIdent(propname))
         if isinstance(prop, ObjectProperty):
             if (
                 prop.target.db is not None
@@ -421,12 +425,14 @@ def make_python_data_model(
             elif isinstance(prop, ObjectProperty):
                 if prop.target.db is not None:
                     # if the target class is in the database, we expect the user to pass the foreign key for it.
+                    propname = prop.name + "_id"
                     pytype = (
                         assert_not_null(prop.target.get_id_property())
                         .get_data_model_datatype()
                         .get_python_type()
                     )
                 else:
+                    propname = prop.name
                     pytype = PyTypeWithDep(
                         f"Create{prop.target.name}",
                         [
@@ -442,7 +448,7 @@ def make_python_data_model(
                 for dep in pytype.deps:
                     program.import_(dep, True)
 
-                cls_ast(stmt.DefClassVarStatement(prop.name, pytype.type))
+                cls_ast(stmt.DefClassVarStatement(propname, pytype.type))
 
         if is_on_create_value_updated:
             program.import_("typing.Optional", True)
@@ -604,13 +610,16 @@ def make_python_data_model(
                 )
             elif isinstance(prop, ObjectProperty):
                 if prop.target.db is not None:
+                    propname = prop.name + "_id"
                     # if the target class is in the database, we expect the user to pass the foreign key for it.
                     pytype = (
                         assert_not_null(prop.target.get_id_property())
                         .get_data_model_datatype()
                         .get_python_type()
                     )
+
                 else:
+                    propname = prop.name
                     pytype = PyTypeWithDep(
                         f"Update{prop.target.name}",
                         [
@@ -626,7 +635,7 @@ def make_python_data_model(
                 for dep in pytype.deps:
                     program.import_(dep, True)
 
-                cls_ast(stmt.DefClassVarStatement(prop.name, pytype.type))
+                cls_ast(stmt.DefClassVarStatement(propname, pytype.type))
 
         if is_on_update_value_updated:
             program.import_("typing.Optional", True)
@@ -720,6 +729,12 @@ def make_python_data_model(
 
         program.import_("__future__.annotations", True)
         program.import_("msgspec", False)
+
+        ident_manager = ImportHelper(
+            program,
+            GLOBAL_IDENTS,
+        )
+
         if cls.db is not None:
             # if the class is stored in the database, we need to import the database module
             program.import_(
@@ -824,7 +839,9 @@ def make_python_data_model(
                 lambda ast: ast.func(
                     "as_composite",
                     vars=as_composite_args,
-                    return_type=expr.ExprIdent(f"Optional[{cls.name}]"),
+                    return_type=PredefinedFn.item_getter(
+                        ident_manager.use("Optional"), expr.ExprIdent(cls.name)
+                    ),
                     comment="Create an embedded instance from the embedded columns in the database table. If all properties of this embedded class are None (indicating that the parent field is None), then this function will return None.",
                 )(
                     lambda ast_l1: ast_l1.if_(

sera/make/make_typescript_model.py

@@ -98,6 +98,7 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
                 assert isinstance(prop, ObjectProperty)
                 if prop.target.db is not None:
                     # this class is stored in the database, we store the id instead
+                    propname = propname + "Id"
                     tstype = TsTypeWithDep(
                         f"{prop.target.name}Id",
                         [
@@ -113,7 +114,8 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
                         (
                             expr.ExprIdent(propname),
                             PredefinedFn.attr_getter(
-                                expr.ExprIdent("data"), expr.ExprIdent(prop.name)
+                                expr.ExprIdent("data"),
+                                expr.ExprIdent(prop.name + "_id"),
                             ),
                         )
                     )
@@ -300,6 +302,8 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
             #     continue
 
             propname = to_camel_case(prop.name)
+            if isinstance(prop, ObjectProperty) and prop.target.db is not None:
+                propname = propname + "Id"
             prop2tsname[prop.name] = propname
 
             def _update_field_func(
@@ -544,7 +548,7 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
                     )
                     ser_args.append(
                         (
-                            expr.ExprIdent(prop.name),
+                            expr.ExprIdent(prop.name + "_id"),
                             PredefinedFn.attr_getter(
                                 expr.ExprIdent("this"), expr.ExprIdent(propname)
                             ),
@@ -784,7 +788,7 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
                     )
                 )
 
-                # TODO: fix me!
+                # TODO: fix me! fix me what?? next time give more context.
                 prop_validators.append(
                     (
                         expr.ExprIdent(propname),
@@ -1079,12 +1083,18 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
 
         query_args = []
         for prop in cls.properties.values():
-            propname = to_camel_case(prop.name)
-            if propname != prop.name:
+            pypropname = prop.name
+            tspropname = to_camel_case(prop.name)
+
+            if isinstance(prop, ObjectProperty) and prop.target.db is not None:
+                tspropname = tspropname + "Id"
+                pypropname = prop.name + "_id"
+
+            if tspropname != pypropname:
                 query_args.append(
                     (
-                        expr.ExprIdent(propname),
-                        expr.ExprConstant(prop.name),
+                        expr.ExprIdent(tspropname),
+                        expr.ExprConstant(pypropname),
                     )
                 )
 

sera/misc/_utils.py

@@ -191,6 +191,18 @@ def load_data(
 
             # Reset the sequence for each table
             for tbl in tbls:
+                # Check if the table has an auto-incrementing primary key
+                if not hasattr(tbl, "__table__") or not tbl.__table__.primary_key:
+                    continue
+
+                pk_columns = tbl.__table__.primary_key.columns
+                has_foreign_key = any(len(col.foreign_keys) > 0 for col in pk_columns)
+                has_auto_increment = any(
+                    col.autoincrement and col.type.python_type in (int,)
+                    for col in pk_columns
+                )
+                if has_foreign_key or not has_auto_increment:
+                    continue
                 session.execute(
                     text(
                         f"SELECT setval('{tbl.__tablename__}_id_seq', (SELECT MAX(id) FROM \"{tbl.__tablename__}\"));"

sera/models/_collection.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from dataclasses import dataclass
 
 from sera.models._class import Class
-from sera.models._property import DataProperty
+from sera.models._property import DataProperty, ObjectProperty
 
 
 @dataclass
@@ -35,7 +35,17 @@ class DataCollection:
             ):
                 # This property is not indexed, so we skip it
                 continue
-            field_names.add(prop.name)
+            if isinstance(prop, ObjectProperty) and prop.target.db is None:
+                # TODO: Implement this! This property is an embedded object property, we need to figure out
+                # which necessary properties are queryable and add them to the field names
+                continue
+            if isinstance(prop, ObjectProperty) and prop.target.db is not None:
+                # This property is an object property stored in the database, "_id" is added to the property name
+                propname = prop.name + "_id"
+            else:
+                # This property is a data property or an object property not stored in the database, so we use its name
+                propname = prop.name
+            field_names.add(propname)
         return field_names
 
     def get_service_name(self):

sera/typing.py

@@ -38,4 +38,5 @@ GLOBAL_IDENTS = {
     "ASGIConnection": "litestar.connection.ASGIConnection",
     "UNSET": "sera.typing.UNSET",
     "ForeignKey": "sqlalchemy.ForeignKey",
+    "Optional": "typing.Optional",
 }

{sera_2-1.19.0.dist-info → sera_2-1.19.2.dist-info}/METADATA

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

{sera_2-1.19.0.dist-info → sera_2-1.19.2.dist-info}/RECORD

@@ -23,15 +23,15 @@ 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=Nc4vDGgM8icgWBqzNnMgEkLadf5EsZwbbHs3WLW9_co,62778
+sera/make/make_python_model.py,sha256=3qz1OUg2n4QPt31mZHMncU5v9riXUAoQwIpXCa4Fyv4,63306
 sera/make/make_python_services.py,sha256=0ZpWLwQ7Nwfn8BXAikAB4JRpNknpSJyJgY5b1cjtxV4,2073
-sera/make/make_typescript_model.py,sha256=1ouYFCeqOlwEzsGBiXUn4VZtLJjJW7GSacdOSlQzhjI,67012
+sera/make/make_typescript_model.py,sha256=laW27gFYGFhvLY5DfcVgh8tPlDqvmS824r-fbBnG7JI,67493
 sera/misc/__init__.py,sha256=rOmGMv7QNzpSKZSyxChbRmEnBr3O443UlLGS0FIs3AI,561
 sera/misc/_formatter.py,sha256=aCGYL08l8f3aLODHxSocxBBwkRYEo3K1QzCDEn3suj0,1685
-sera/misc/_utils.py,sha256=O0Qh_BZXX7kmzhFBTnnxJT4BUxQbwNovhepSwhh33Ow,6532
+sera/misc/_utils.py,sha256=_-17XbK6qp3HobcI9iLF4xfaATvFg1ckUzgg7r7Ctmw,7135
 sera/models/__init__.py,sha256=vJC5Kzo_N7wd16ocNPy1VvAZDGNiWeiAhWJ4ihATKvA,780
 sera/models/_class.py,sha256=1J4Bd_LanzhhDWwZFHWGtFYD7lupe_alaB3D02ebNDI,2862
-sera/models/_collection.py,sha256=ZnQEriKC4X88Zz48Kn1AVZKH-1_l8OgWa-zf2kcQOOE,1414
+sera/models/_collection.py,sha256=AmEy6SoTTaxqFU4mBFVfFMGyutJuNnUGBaIV7xzGxbc,2143
 sera/models/_constraints.py,sha256=RpWDU-TfCslXaMUaTG9utWbl5z8Z6nzvF_fhqlek6ew,1987
 sera/models/_datatype.py,sha256=cC6Wm0IvobDF5Tq9Jy_ncbjPWBRl3ECGBy0wJyDDMzU,7281
 sera/models/_default.py,sha256=ABggW6qdPR4ZDqIPJdJ0GCGQ-7kfsfZmQ_DchgZEa-I,137
@@ -41,7 +41,7 @@ sera/models/_multi_lingual_string.py,sha256=JETN6k00VH4wrA4w5vAHMEJV8fp3SY9bJebs
 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=o_DKfSvs8JpNRQ0kdaTc3BbfdkvibY3uY4tJRt-n2fQ,1023
-sera_2-1.19.0.dist-info/METADATA,sha256=22HLRJ7LXZYcBduEokfXaTnePGNCUIyARqVDZFP404k,936
-sera_2-1.19.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-sera_2-1.19.0.dist-info/RECORD,,
+sera/typing.py,sha256=m4rir-fB6Cgcm7_ZSXXcNdla2LJgq96WXxtTTrDaJno,1058
+sera_2-1.19.2.dist-info/METADATA,sha256=yv6pv0XvFLzt1CqYP5u38CCVGHLInOCB1AflthDV5_g,936
+sera_2-1.19.2.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+sera_2-1.19.2.dist-info/RECORD,,