sera-2 1.19.1__py3-none-any.whl → 1.19.3__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)
@@ -740,6 +749,7 @@ def make_python_data_model(
                 # skip private fields as this is for APIs exchange
                 continue
 
+            propname = prop.name
             if isinstance(prop, DataProperty):
                 pytype = prop.get_data_model_datatype().get_python_type()
                 if prop.is_optional:
@@ -751,6 +761,7 @@ def make_python_data_model(
                 cls_ast(stmt.DefClassVarStatement(prop.name, pytype.type))
             elif isinstance(prop, ObjectProperty):
                 if prop.target.db is not None:
+                    propname = prop.name + "_id"
                     pytype = (
                         assert_not_null(prop.target.get_id_property())
                         .get_data_model_datatype()
@@ -772,7 +783,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))
 
         cls_ast(
             stmt.LineBreak(),

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/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_2-1.19.1.dist-info → sera_2-1.19.3.dist-info}/METADATA

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

{sera_2-1.19.1.dist-info → sera_2-1.19.3.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=RfUATMs6d_glxbKnpLum9tsU2pNOyifvJX76S8pI_DY,62964
+sera/make/make_python_model.py,sha256=UJ1rD-caGH5t-B-UrNkib0okwQtR4OC3uMWOD-b1ot4,63387
 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=_-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
@@ -42,6 +42,6 @@ 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=m4rir-fB6Cgcm7_ZSXXcNdla2LJgq96WXxtTTrDaJno,1058
-sera_2-1.19.1.dist-info/METADATA,sha256=vhXuNeYXDuvLW_dW_7jStIcyq0OhEqV9XXp74taTQzY,936
-sera_2-1.19.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-sera_2-1.19.1.dist-info/RECORD,,
+sera_2-1.19.3.dist-info/METADATA,sha256=zyrJH3__kBkyI9VrpNbK5j31dmOUucvlXppfgrkKkPI,936
+sera_2-1.19.3.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+sera_2-1.19.3.dist-info/RECORD,,