sera-2 1.12.0__py3-none-any.whl → 1.12.2__py3-none-any.whl

sera/make/make_python_model.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from operator import is_
-from typing import Callable, Sequence
+from typing import Callable, Optional, Sequence
 
 from codegen.models import AST, DeferredVar, PredefinedFn, Program, expr, stmt
 
@@ -83,9 +83,25 @@ def make_python_data_model(
     app = target_pkg.app
 
     def from_db_type_conversion(
-        record: expr.ExprIdent, prop: DataProperty | ObjectProperty
+        record: expr.ExprIdent,
+        prop: DataProperty | ObjectProperty,
+        value_pass_as_args: Optional[expr.Expr] = None,
     ):
-        value = PredefinedFn.attr_getter(record, expr.ExprIdent(prop.name))
+        """Convert the value from the database to the data model type.
+
+        Args:
+            record: The record to convert from.
+            prop: The property to convert.
+            value_pass_as_args: If provided, this value will be used instead of getting the value from the record. This is useful for functions that
+                receive the column value as an argument, such as the `as_composite` function.
+        """
+        if value_pass_as_args is not None:
+            value = value_pass_as_args
+            assert record == expr.ExprIdent(
+                ""
+            ), "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))
         if isinstance(prop, ObjectProperty) and prop.target.db is not None:
             if prop.cardinality.is_star_to_many():
                 value = PredefinedFn.map_list(
@@ -95,6 +111,9 @@ def make_python_data_model(
                     ),
                 )
             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")
                 )
@@ -500,6 +519,69 @@ def make_python_data_model(
             ),
         )
 
+        if cls.db is None:
+            as_composite_args = [DeferredVar.simple("cls")]
+            as_composite_null_condition = []
+            for prop in cls.properties.values():
+                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))
+                as_composite_null_condition.append(
+                    expr.ExprIs(expr.ExprIdent(prop.name), 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).
+            # However, we could be more efficient by checking if there are any other classes that use this class as a composite and are non-optional,
+            # and eliminate the None check because we know that the class will always be re-created.
+            cls_ast(
+                stmt.LineBreak(),
+                stmt.PythonDecoratorStatement(
+                    expr.ExprFuncCall(expr.ExprIdent("classmethod"), [])
+                ),
+                lambda ast: ast.func(
+                    "as_composite",
+                    vars=as_composite_args,
+                    return_type=expr.ExprIdent(f"Optional[{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_(
+                        expr.ExprLogicalAnd(as_composite_null_condition)
+                    )(lambda ast_l2: ast_l2.return_(expr.ExprConstant(None))),
+                    lambda ast_l1: ast_l1.return_(
+                        expr.ExprFuncCall(
+                            expr.ExprIdent("cls"),
+                            [
+                                from_db_type_conversion(
+                                    expr.ExprIdent(""), prop, expr.ExprIdent(prop.name)
+                                )
+                                for prop in cls.properties.values()
+                            ],
+                        )
+                    ),
+                ),
+                stmt.LineBreak(),
+                lambda ast: ast.func(
+                    "__composite_values__",
+                    [
+                        DeferredVar.simple("self"),
+                    ],
+                    return_type=expr.ExprIdent("tuple"),
+                    comment="Return the values of the properties of this embedded class as a tuple. This is used to create a composite object in SQLAlchemy.",
+                )(
+                    lambda ast_l1: ast_l1.return_(
+                        PredefinedFn.tuple(
+                            [
+                                to_db_type_conversion(
+                                    program, expr.ExprIdent("self"), cls, prop
+                                )
+                                for prop in cls.properties.values()
+                            ]
+                        )
+                    )
+                ),
+            )
+
     for cls in schema.topological_sort():
         if cls.name in reference_classes:
             continue

sera/make/make_typescript_model.py

@@ -1138,7 +1138,7 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
                     (
                         expr.ExprIdent("datatype"),
                         expr.ExprConstant(
-                            tstype.type if prop.target.db is not None else "embedded"
+                            tstype.type if prop.target.db is not None else "undefined"
                         ),
                     ),
                     (

{sera_2-1.12.0.dist-info → sera_2-1.12.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: sera-2
-Version: 1.12.0
+Version: 1.12.2
 Summary: 
 Author: Binh Vu
 Author-email: bvu687@gmail.com
@@ -9,7 +9,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: black (>=25.1.0,<26.0.0)
-Requires-Dist: codegen-2 (>=2.6.0,<3.0.0)
+Requires-Dist: codegen-2 (>=2.10.0,<3.0.0)
 Requires-Dist: isort (>=6.0.1,<7.0.0)
 Requires-Dist: litestar (>=2.15.1,<3.0.0)
 Requires-Dist: loguru (>=0.7.0,<0.8.0)

{sera_2-1.12.0.dist-info → sera_2-1.12.2.dist-info}/RECORD

@@ -13,9 +13,9 @@ sera/make/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sera/make/__main__.py,sha256=G5O7s6135-708honwqMFn2yPTs06WbGQTHpupID0eZ4,1417
 sera/make/make_app.py,sha256=n9NtW73O3s_5Q31VHIRmnd-jEIcpDO7ksAsOdovde2s,5999
 sera/make/make_python_api.py,sha256=kq5DClmEeeNgg-a3Bb_8GN9jxvjnhjmW3RfBHNzynO8,25407
-sera/make/make_python_model.py,sha256=AlNJyyovb99TWocS2jtfTxy0C5YaFizx-Bhwdw1mUNw,41923
+sera/make/make_python_model.py,sha256=ldaDnuwudkq81w2hwKZIuRqFnqhxOAaIT_VhYandXG4,46128
 sera/make/make_python_services.py,sha256=RsinYZdfkrTlTn9CT50VgqGs9w6IZawsJx-KEmqfnEY,2062
-sera/make/make_typescript_model.py,sha256=-Z3vHblUcEpWvMMdzQGZ9XWhUjLv99PBJGqZHsF0m1o,63686
+sera/make/make_typescript_model.py,sha256=ugDdSTw_1ayHLuL--92RQ8hf_D-dpJtnvmUZNxcwcDs,63687
 sera/misc/__init__.py,sha256=Dh4uDq0D4N53h3zhvmwfa5a0TPVRSUvLzb0hkFuPirk,411
 sera/misc/_formatter.py,sha256=aCGYL08l8f3aLODHxSocxBBwkRYEo3K1QzCDEn3suj0,1685
 sera/misc/_utils.py,sha256=V5g4oLGHOhUCR75Kkcn1w01pAvGvaepK-T8Z3pIgHjI,1450
@@ -32,6 +32,6 @@ sera/models/_parse.py,sha256=uw6fvvh1ucGqE2jFTCCr-e6_qMfZfSVpaPolNxmrHww,9897
 sera/models/_property.py,sha256=SJSm5fZJimd2rQuL4UH_aZuNyp9v7x64xMbEVbtYx8Q,5633
 sera/models/_schema.py,sha256=r-Gqg9Lb_wR3UrbNvfXXgt_qs5bts0t2Ve7aquuF_OI,1155
 sera/typing.py,sha256=Q4QMfbtfrCjC9tFfsZPhsAnbNX4lm4NHQ9lmjNXYdV0,772
-sera_2-1.12.0.dist-info/METADATA,sha256=9OsTsh39Me41u3v-tRUiddDVkLKE-Qra7eMQLa8Kt2k,857
-sera_2-1.12.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-sera_2-1.12.0.dist-info/RECORD,,
+sera_2-1.12.2.dist-info/METADATA,sha256=724nMBYqD82HxkFzUWLora6vu5V-BA7wjfou6AEHM30,858
+sera_2-1.12.2.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+sera_2-1.12.2.dist-info/RECORD,,