sera-2 1.26.0__py3-none-any.whl → 1.26.2__py3-none-any.whl

sera/libs/search_helper.py

@@ -140,12 +140,20 @@ class Query(msgspec.Struct):
                 continue
 
             # normalize the value based on the field type.
-            prop = cls.properties[clause.field]
-            assert isinstance(prop, DataProperty)
-            if prop.datatype.pytype.is_enum_type():
-                # skip enum types -- we directly use it as string.
-                continue
-            clause.value = FieldTypeValidator.typemap[prop.datatype.pytype.type](
+            if clause.field not in cls.properties and clause.field.endswith("_id"):
+                # this should be a foreign key field
+                prop = cls.properties[clause.field[:-3]]
+                assert isinstance(prop, ObjectProperty)
+                field_type = prop.target.get_id_property().datatype.pytype.type
+            else:
+                prop = cls.properties[clause.field]
+                assert isinstance(prop, DataProperty)
+                if prop.datatype.pytype.is_enum_type():
+                    # skip enum types -- we directly use it as string.
+                    continue
+                field_type = prop.datatype.pytype.type
+
+            clause.value = FieldTypeValidator.typemap[field_type](
                 clause.field, clause.value
             )
 

sera/make/make_python_model.py

@@ -12,6 +12,7 @@ from codegen.models import (
     stmt,
 )
 
+from sera.make.py_backend.misc import get_python_property_name
 from sera.misc import (
     assert_isinstance,
     assert_not_null,
@@ -110,21 +111,21 @@ def make_python_data_model(
             ), "If value_pass_as_args is provided, record should not be used as a dummy value should be passed instead."
         else:
             value = PredefinedFn.attr_getter(record, expr.ExprIdent(prop.name))
+
+        propname = get_python_property_name(prop)
         if isinstance(prop, ObjectProperty) and prop.target.db is not None:
             if prop.cardinality.is_star_to_many():
                 value = PredefinedFn.map_list(
                     value,
                     lambda item: PredefinedFn.attr_getter(
-                        item, expr.ExprIdent(prop.name + "_id")
+                        item, expr.ExprIdent(propname)
                     ),
                 )
             else:
                 assert (
                     value_pass_as_args is None
                 ), "Cannot use value_pass_as_args for a single object property."
-                value = PredefinedFn.attr_getter(
-                    record, expr.ExprIdent(prop.name + "_id")
-                )
+                value = PredefinedFn.attr_getter(record, expr.ExprIdent(propname))
 
             target_idprop = assert_not_null(prop.target.get_id_property())
             conversion_fn = get_data_conversion(
@@ -147,10 +148,8 @@ def make_python_data_model(
         mode: Literal["create", "update"],
         prop: DataProperty | ObjectProperty,
     ):
-        if isinstance(prop, ObjectProperty) and prop.target.db is not None:
-            propname = prop.name + "_id"
-        else:
-            propname = prop.name
+        propname = get_python_property_name(prop)
+
         value = PredefinedFn.attr_getter(slf, expr.ExprIdent(propname))
         if isinstance(prop, ObjectProperty):
             if (
@@ -178,7 +177,7 @@ def make_python_data_model(
                         expr.ExprIdent(AssociationTable),
                         [
                             PredefinedFn.keyword_assignment(
-                                f"{prop.name}_id", conversion_fn(item)
+                                propname, conversion_fn(item)
                             )
                         ],
                     ),
@@ -236,6 +235,8 @@ def make_python_data_model(
             if prop.data.system_controlled is None:
                 continue
 
+            propname = get_python_property_name(prop)
+
             update_func = None
             if mode == "create":
                 if prop.data.system_controlled.on_create_bypass is not None:
@@ -294,7 +295,7 @@ def make_python_data_model(
 
             smt = stmt.AssignStatement(
                 PredefinedFn.attr_getter(
-                    expr.ExprIdent("self"), expr.ExprIdent(prop.name)
+                    expr.ExprIdent("self"), expr.ExprIdent(propname)
                 ),
                 epr,
             )
@@ -374,6 +375,7 @@ def make_python_data_model(
             ):
                 continue
 
+            propname = get_python_property_name(prop)
             if isinstance(prop, DataProperty):
                 pytype = prop.get_data_model_datatype().get_python_type().clone()
                 if len(prop.data.constraints) > 0:
@@ -419,21 +421,17 @@ def make_python_data_model(
                     )
 
                 cls_ast(
-                    stmt.DefClassVarStatement(
-                        prop.name, pytype.type, prop_default_value
-                    )
+                    stmt.DefClassVarStatement(propname, pytype.type, prop_default_value)
                 )
             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}",
                         [
@@ -561,6 +559,8 @@ def make_python_data_model(
             ):
                 continue
 
+            propname = get_python_property_name(prop)
+
             if isinstance(prop, DataProperty):
                 pytype = prop.get_data_model_datatype().get_python_type().clone()
 
@@ -605,13 +605,10 @@ def make_python_data_model(
                     )
 
                 cls_ast(
-                    stmt.DefClassVarStatement(
-                        prop.name, pytype.type, prop_default_value
-                    )
+                    stmt.DefClassVarStatement(propname, pytype.type, prop_default_value)
                 )
             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())
@@ -620,7 +617,6 @@ def make_python_data_model(
                     )
 
                 else:
-                    propname = prop.name
                     pytype = PyTypeWithDep(
                         f"Update{prop.target.name}",
                         [
@@ -686,7 +682,9 @@ def make_python_data_model(
                                     [
                                         PredefinedFn.attr_getter(
                                             expr.ExprIdent("self"),
-                                            expr.ExprIdent(prop.name),
+                                            expr.ExprIdent(
+                                                get_python_property_name(prop)
+                                            ),
                                         )
                                     ],
                                 )
@@ -750,7 +748,7 @@ def make_python_data_model(
                 # skip private fields as this is for APIs exchange
                 continue
 
-            propname = prop.name
+            propname = get_python_property_name(prop)
             if isinstance(prop, DataProperty):
                 pytype = prop.get_data_model_datatype().get_python_type()
                 if prop.is_optional:
@@ -759,10 +757,9 @@ 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))
             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()
@@ -823,12 +820,14 @@ def make_python_data_model(
             as_composite_args = [DeferredVar.simple("cls")]
             as_composite_null_condition = []
             for prop in cls.properties.values():
+                propname = get_python_property_name(prop)
+
                 assert (
                     not prop.data.is_private
-                ), f"Embedded classes should not have private properties: {cls.name}.{prop.name}"
-                as_composite_args.append(DeferredVar.simple(prop.name))
+                ), f"Embedded classes should not have private properties: {cls.name}.{propname}"
+                as_composite_args.append(DeferredVar.simple(propname))
                 as_composite_null_condition.append(
-                    expr.ExprIs(expr.ExprIdent(prop.name), expr.ExprConstant(None))
+                    expr.ExprIs(expr.ExprIdent(propname), expr.ExprConstant(None))
                 )
 
             # For simplicity, we assume that this embedded class can be used in a nullable field (check if all properties are None and return None).
@@ -855,7 +854,9 @@ def make_python_data_model(
                             expr.ExprIdent("cls"),
                             [
                                 from_db_type_conversion(
-                                    expr.ExprIdent(""), prop, expr.ExprIdent(prop.name)
+                                    expr.ExprIdent(""),
+                                    prop,
+                                    expr.ExprIdent(get_python_property_name(prop)),
                                 )
                                 for prop in cls.properties.values()
                             ],
@@ -946,12 +947,6 @@ def make_python_relational_model(
     """
     app = target_pkg.app
 
-    def get_property_name(prop: DataProperty | ObjectProperty):
-        if isinstance(prop, ObjectProperty):
-            if prop.target.db is not None:
-                return f"{prop.name}_id"
-        return prop.name
-
     def make_base(custom_types: Sequence[ObjectProperty]):
         """Make a base class for our database."""
         program = Program()
@@ -1229,19 +1224,20 @@ def make_python_relational_model(
                     or not prop.db.is_indexed
                 ):
                     continue
+                propname = get_python_property_name(prop)
                 if prop.db.index_type == IndexType.POSTGRES_FTS_SEVI:
                     fts_index.append(
                         expr.ExprFuncCall(
                             expr.ExprIdent("Index"),
                             [
                                 expr.ExprConstant(
-                                    f"ix_{cls.db.table_name}_{get_property_name(prop)}_gin"
+                                    f"ix_{cls.db.table_name}_{propname}_gin"
                                 ),
                                 expr.ExprFuncCall(
                                     ident_manager.use("text"),
                                     [
                                         expr.ExprConstant(
-                                            f"to_tsvector('sevi', {get_property_name(prop)})"
+                                            f"to_tsvector('sevi', {propname})"
                                         )
                                     ],
                                 ),
@@ -1257,13 +1253,13 @@ def make_python_relational_model(
                             expr.ExprIdent("Index"),
                             [
                                 expr.ExprConstant(
-                                    f"ix_{cls.db.table_name}_{get_property_name(prop)}_gist"
+                                    f"ix_{cls.db.table_name}_{propname}_gist"
                                 ),
                                 expr.ExprFuncCall(
                                     expr.ExprIdent("text"),
                                     [
                                         expr.ExprConstant(
-                                            f"f_unaccent({get_property_name(prop)}) gist_trgm_ops(siglen=256)"
+                                            f"f_unaccent({propname}) gist_trgm_ops(siglen=256)"
                                         )
                                     ],
                                 ),
@@ -1286,7 +1282,7 @@ def make_python_relational_model(
                                 [expr.ExprConstant(index.name)]
                                 + [
                                     expr.ExprConstant(
-                                        get_property_name(cls.properties[prop])
+                                        get_python_property_name(cls.properties[prop])
                                     )
                                     for prop in index.columns
                                 ]
@@ -1496,7 +1492,7 @@ def make_python_relational_object_property(
             )
 
         # we store this class in the database
-        propname = f"{prop.name}_id"
+        propname = get_python_property_name(prop)
         idprop = prop.target.get_id_property()
         assert idprop is not None
         idprop_pytype = idprop.datatype.get_sqlalchemy_type()

sera/make/py_backend/misc.py

@@ -0,0 +1,13 @@
+from __future__ import annotations
+
+from sera.models import DataProperty, ObjectProperty
+
+
+def get_python_property_name(prop: DataProperty | ObjectProperty) -> str:
+    """Get property name of a property in Python model"""
+    if isinstance(prop, ObjectProperty) and prop.target.db is not None:
+        # the property value is a foreign key to another table, we should add _id to
+        # the end of the property name
+        return prop.name + "_id"
+    else:
+        return prop.name

{sera_2-1.26.0.dist-info → sera_2-1.26.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sera-2
-Version: 1.26.0
+Version: 1.26.2
 Summary: 
 Author: Binh Vu
 Author-email: bvu687@gmail.com

{sera_2-1.26.0.dist-info → sera_2-1.26.2.dist-info}/RECORD

@@ -19,14 +19,16 @@ sera/libs/directed_computing_graph/_type_conversion.py,sha256=_XGvDidOJVmHS4gqdP
 sera/libs/middlewares/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sera/libs/middlewares/auth.py,sha256=r6aix1ZBwxMd1Jv5hMCTB8a_gFOJQ6egvxIrf3DWEOs,2323
 sera/libs/middlewares/uscp.py,sha256=DRy99nmS3qS5HLjRMIGP0oNUtQIci_a4hL5xQh-lXNY,2322
-sera/libs/search_helper.py,sha256=3ADhO6s6iIL3TWuH2zicAm_NmJfIm7wPY0cRQjESx2Y,13779
+sera/libs/search_helper.py,sha256=3ZAEw0QZAgRT-i6GB58wuPJvHTyVxhfILim0avEjGx4,14188
 sera/make/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sera/make/__main__.py,sha256=HRfOR53p351h6KblVvYm3DLhDIfEtk6R0kjl78_S_S8,1453
 sera/make/make_app.py,sha256=dTzpJRPGoCojCdJr1TAzwbaquctwwitrGPxkRm9skpo,6033
 sera/make/make_python_api.py,sha256=sfaYnX6Vwj0xWPpvpWbBhq8GyNHgNkvwlyZr7NDCO0k,24770
-sera/make/make_python_model.py,sha256=FYqtzfVMfJxRPuEVhFuYCG5-DzVOS2aW_5RUtgiQY7Y,72685
+sera/make/make_python_model.py,sha256=cW3RGVttuZWLVWrEg-NppSknWoTKCRE2mar9yyhj-gU,72545
 sera/make/make_python_services.py,sha256=SvdU--QF23FN_d-Ao07CeXIK9d5eL_-mdXYwXx69dRE,2102
 sera/make/make_typescript_model.py,sha256=SOuTojrMD3QQe_jW7cGpYdNV5upZwDYHR8QDW-wLOKc,56365
+sera/make/py_backend/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+sera/make/py_backend/misc.py,sha256=lZNkrniR2OZiyK4rei1Yl_mRYBR_QzOpqVO_gMWbJD4,487
 sera/make/ts_frontend/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sera/make/ts_frontend/make_class_schema.py,sha256=FHTNQOJl-Zz6CHRT6J2GOZxpIeyMDqMRNTK9XUiM578,14489
 sera/make/ts_frontend/make_enums.py,sha256=3U6Dt5Y4DM6D_ZiitcVHXtNQyA9cTE046WCDQCDOvSU,2596
@@ -48,6 +50,6 @@ sera/models/_parse.py,sha256=nihBEDni-jKwecSBagd6bupDOuCzGviuoD9u6-rT64Q,13203
 sera/models/_property.py,sha256=Qo23KZl5OQNbuceygicgC3_Yv5ve1KxiFiMoWq6Ljj0,7758
 sera/models/_schema.py,sha256=VxJEiqgVvbXgcSUK4UW6JnRcggk4nsooVSE6MyXmfNY,1636
 sera/typing.py,sha256=7S6Ah-Yfcl8a0xAJ4lxEcguq3rYVM7SBeOiuxyJhC04,1089
-sera_2-1.26.0.dist-info/METADATA,sha256=NhH3zPi7Ds4TERKJ_c6UBD2EwFZNlM7qIsUEv-Fypi0,987
-sera_2-1.26.0.dist-info/WHEEL,sha256=M5asmiAlL6HEcOq52Yi5mmk9KmTVjY2RDPtO4p9DMrc,88
-sera_2-1.26.0.dist-info/RECORD,,
+sera_2-1.26.2.dist-info/METADATA,sha256=vOrf5maMTAY8NaLVi_mAZEmiWwNWnWkNbAPnsEPz4LE,987
+sera_2-1.26.2.dist-info/WHEEL,sha256=M5asmiAlL6HEcOq52Yi5mmk9KmTVjY2RDPtO4p9DMrc,88
+sera_2-1.26.2.dist-info/RECORD,,