sera-2 1.6.1__py3-none-any.whl → 1.6.2__py3-none-any.whl

sera/libs/base_orm.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 from typing import Optional
 
 import orjson
+from sera.typing import UNSET
 from sqlalchemy import LargeBinary, TypeDecorator
 from sqlalchemy import create_engine as sqlalchemy_create_engine
 from sqlalchemy import update
@@ -15,6 +16,8 @@ class BaseORM:
         args = {}
         for col in self.__table__.columns:  # type: ignore
             val = getattr(self, col.name)
+            if val is UNSET:
+                continue
             if col.primary_key:
                 q = q.where(getattr(self.__class__, col.name) == val)
             args[col.name] = val
@@ -22,7 +25,12 @@ class BaseORM:
         return q.values(**args)
 
     def get_update_args(self):
-        return {col.name: getattr(self, col.name) for col in self.__table__.columns}  # type: ignore
+        table = self.__table__  # type: ignore
+        return {
+            col.name: val
+            for col in table.columns
+            if (val := getattr(self, col.name)) is not UNSET
+        }
 
     @classmethod
     def from_dict(cls, data: dict):

sera/libs/base_service.py

@@ -114,7 +114,7 @@ class BaseService(Generic[ID, R]):
 
     def update(self, record: R, session: Session) -> R:
         """Update an existing record."""
-        session.add(record)
+        session.execute(record.get_update_query())
         session.commit()
         return record
 

sera/make/make_app.py

@@ -7,7 +7,6 @@ from typing import Annotated
 
 from codegen.models import DeferredVar, PredefinedFn, Program, expr, stmt
 from loguru import logger
-
 from sera.make.make_python_api import make_python_api
 from sera.make.make_python_model import (
     make_python_data_model,
@@ -83,6 +82,7 @@ def make_config(app: App):
             expr.ExprFuncCall(
                 expr.ExprIdent("parse_schema"),
                 [
+                    expr.ExprConstant(app.name),
                     PredefinedFn.list(
                         [
                             expr.ExprDivision(
@@ -93,7 +93,7 @@ def make_config(app: App):
                             )
                             for path in app.schema_files
                         ]
-                    )
+                    ),
                 ],
             ),
         ),

sera/make/make_python_model.py

@@ -159,11 +159,24 @@ def make_python_data_model(
                 else:
                     value = expr.ExprMethodCall(value, "to_db", [])
         elif isinstance(prop, DataProperty) and prop.is_diff_data_model_datatype():
-            # convert the value to the python type used in db.
-            value = get_data_conversion(
+            # convert the value to the python type used in db
+            converted_value = get_data_conversion(
                 prop.get_data_model_datatype().get_python_type().type,
                 prop.datatype.get_python_type().type,
             )(value)
+
+            if prop.data.is_private:
+                # if the property is private and it's UNSET, we cannot transform it to the database type
+                # and has to use the UNSET value (the update query will ignore this field)
+                program.import_("sera.typing.UNSET", True)
+                program.import_("sera.typing.is_set", True)
+                value = expr.ExprTernary(
+                    expr.ExprFuncCall(expr.ExprIdent("is_set"), [value]),
+                    converted_value,
+                    expr.ExprIdent("UNSET"),
+                )
+            else:
+                value = converted_value
         return value
 
     def make_upsert(program: Program, cls: Class):
@@ -177,11 +190,13 @@ def make_python_data_model(
                 alias=f"{cls.name}DB",
             )
         cls_ast = program.root.class_(
-            "Upsert" + cls.name, [expr.ExprIdent("msgspec.Struct")]
+            "Upsert" + cls.name,
+            [expr.ExprIdent("msgspec.Struct"), expr.ExprIdent("kw_only=True")],
         )
         for prop in cls.properties.values():
             # this is a create object, so users can create private field
-            # hence, we do not check for prop.is_private
+            # hence, we do not check for prop.is_private -- however, this field can be omitted
+            # during update, so we need to mark it as optional
             # if prop.data.is_private:
             #     continue
 
@@ -189,7 +204,14 @@ def make_python_data_model(
                 pytype = prop.get_data_model_datatype().get_python_type()
                 if pytype.dep is not None:
                     program.import_(pytype.dep, True)
+
                 pytype_type = pytype.type
+                if prop.data.is_private:
+                    program.import_("typing.Union", True)
+                    program.import_("sera.typing.UnsetType", True)
+                    program.import_("sera.typing.UNSET", True)
+                    pytype_type = f"Union[{pytype_type}, UnsetType]"
+
                 if len(prop.data.constraints) > 0:
                     # if the property has constraints, we need to figure out
                     program.import_("typing.Annotated", True)
@@ -202,7 +224,9 @@ def make_python_data_model(
                         raise NotImplementedError(prop.data.constraints)
 
                 prop_default_value = None
-                if prop.default_value is not None:
+                if prop.data.is_private:
+                    prop_default_value = expr.ExprIdent("UNSET")
+                elif prop.default_value is not None:
                     prop_default_value = expr.ExprConstant(prop.default_value)
                 elif prop.default_factory is not None:
                     program.import_(prop.default_factory.pyfunc, True)
@@ -215,6 +239,7 @@ def make_python_data_model(
                             )
                         ],
                     )
+
                 cls_ast(
                     stmt.DefClassVarStatement(
                         prop.name, pytype_type, prop_default_value

sera/misc/_formatter.py

@@ -5,9 +5,8 @@ from concurrent.futures import ThreadPoolExecutor
 from dataclasses import dataclass
 from pathlib import Path
 
-from tqdm import tqdm
-
 from sera.typing import Language
+from tqdm import tqdm
 
 
 @dataclass
@@ -49,6 +48,9 @@ class Formatter:
                     f"Formatting not implemented for {file.language}"
                 )
 
+        if len(self.pending_files) == 0:
+            return
+
         with ThreadPoolExecutor() as executor:
             list(
                 tqdm(

sera/models/_module.py

@@ -10,7 +10,6 @@ import black.mode
 import isort
 from codegen.models import Program
 from loguru import logger
-
 from sera.misc import File, Formatter
 from sera.typing import Language
 
@@ -169,3 +168,8 @@ class App:
         self.schema_files = schema_files
 
         self.language = language
+
+    @property
+    def name(self) -> str:
+        """Get the name of the application"""
+        return self.root.dir.name

sera/typing.py

@@ -1,7 +1,9 @@
 from __future__ import annotations
 
 from enum import Enum
-from typing import Annotated, TypeVar
+from typing import Annotated, Any, TypeGuard, TypeVar, Union
+
+import msgspec
 
 
 class doc(str):
@@ -18,3 +20,13 @@ ObjectPath = Annotated[
 class Language(str, Enum):
     Python = "python"
     Typescript = "typescript"
+
+
+# re-export msgspec.UnsetType & msgspec.UNSET, so that we are consistent with ORM & data modules
+UnsetType = msgspec.UnsetType
+UNSET: Any = msgspec.UNSET
+
+
+def is_set(value: Union[T, UnsetType]) -> TypeGuard[T]:
+    """Typeguard to check if a value is set (not UNSET)"""
+    return value is not UNSET

{sera_2-1.6.1.dist-info → sera_2-1.6.2.dist-info}/METADATA

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

{sera_2-1.6.1.dist-info → sera_2-1.6.2.dist-info}/RECORD

@@ -2,17 +2,17 @@ sera/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sera/constants.py,sha256=mzAaMyIx8TJK0-RYYJ5I24C4s0Uvj26OLMJmBo0pxHI,123
 sera/libs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sera/libs/api_helper.py,sha256=hUEy0INHM18lxTQ348tgbXNceOHcjiAnqmuL_8CRpLQ,2509
-sera/libs/base_orm.py,sha256=Fte-NOq62-4ulpjKmdO4V5pQKy9JfaL3ryBqpRRKkNQ,2913
-sera/libs/base_service.py,sha256=CNAdOPxgXfvdANj75qd4GW5EC0WYW-L5Utm0ozfBbio,4075
+sera/libs/base_orm.py,sha256=sTiHvbvLALSFygCITKFTXK1w-8UtxXGT_Te-1PEAiCI,3094
+sera/libs/base_service.py,sha256=l5D4IjxIiz8LBRranUYddb8J0Y6SwSyetKYTLrCUdQA,4098
 sera/make/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sera/make/__main__.py,sha256=G5O7s6135-708honwqMFn2yPTs06WbGQTHpupID0eZ4,1417
-sera/make/make_app.py,sha256=3Crq-Y-VzeHKKAaxfrEqguqTZEtdNPOuGojBQpC9QHw,5950
+sera/make/make_app.py,sha256=n9NtW73O3s_5Q31VHIRmnd-jEIcpDO7ksAsOdovde2s,5999
 sera/make/make_python_api.py,sha256=RuJUm9z-4plBEtjobeOPr12o27OT-0tSeXI4ZlM3IY0,29433
-sera/make/make_python_model.py,sha256=8U3fmIK_ahpxyMsCypQvISBVoncRUspYEppWX-_MLtU,35402
+sera/make/make_python_model.py,sha256=xf4revAwVWEnF6QhxbbqPyUGgXOOB--Gu3jPxsESg0Y,36593
 sera/make/make_python_services.py,sha256=RsinYZdfkrTlTn9CT50VgqGs9w6IZawsJx-KEmqfnEY,2062
 sera/make/make_typescript_model.py,sha256=dT1ZHpsDvegX07jxDRncd_iu4FAiaV_7xyioWBJdbes,36999
 sera/misc/__init__.py,sha256=Dh4uDq0D4N53h3zhvmwfa5a0TPVRSUvLzb0hkFuPirk,411
-sera/misc/_formatter.py,sha256=_m1lK2__wD0I0xnZ7JpjQeaxyf6ygYOZdrYzaYJd4s4,1625
+sera/misc/_formatter.py,sha256=aCGYL08l8f3aLODHxSocxBBwkRYEo3K1QzCDEn3suj0,1685
 sera/misc/_utils.py,sha256=V5g4oLGHOhUCR75Kkcn1w01pAvGvaepK-T8Z3pIgHjI,1450
 sera/models/__init__.py,sha256=vJC5Kzo_N7wd16ocNPy1VvAZDGNiWeiAhWJ4ihATKvA,780
 sera/models/_class.py,sha256=Wf0e8x6-szG9TzoFkAlqj7_dG0SCICMBw_333n3paxk,2514
@@ -21,12 +21,12 @@ sera/models/_constraints.py,sha256=lZmCh6Py0UVMdhTR7zUOPPzGqJGbmDCzf7xH7yITcbQ,1
 sera/models/_datatype.py,sha256=uMxK_8wBLowaIMIAYCb3V17YmkzJrKKc5orjImzqWbA,5818
 sera/models/_default.py,sha256=ABggW6qdPR4ZDqIPJdJ0GCGQ-7kfsfZmQ_DchgZEa-I,137
 sera/models/_enum.py,sha256=sy0q7E646F-APsqrVQ52r1fAQ_DCAeaNq5YM5QN3zIk,2070
-sera/models/_module.py,sha256=CAk8CCuo3hs_mBkmfXDV-BsMQhv4Wgtp0tcY78JLjUE,4922
+sera/models/_module.py,sha256=8QRSCubZmdDP9rL58rGAS6X5VCrkc1ZHvuMu1I1KrWk,5043
 sera/models/_multi_lingual_string.py,sha256=JETN6k00VH4wrA4w5vAHMEJV8fp3SY9bJebskFTjQLA,1186
 sera/models/_parse.py,sha256=sJYfQtwek96ltpgxExG4xUbiLnU3qvNYhTP1CeyXGjs,9746
 sera/models/_property.py,sha256=CmEmgOShtSyNFq05YW3tGupwCIVRzPMKudXWld8utPk,5530
 sera/models/_schema.py,sha256=r-Gqg9Lb_wR3UrbNvfXXgt_qs5bts0t2Ve7aquuF_OI,1155
-sera/typing.py,sha256=Ak0Su0EhjFirWOOwbIW8u4YpEwP8apfpIH5Tv9foTRo,430
-sera_2-1.6.1.dist-info/METADATA,sha256=GuYpBmAl_5gq9go1LZ7AcjVsXi3Nx5a21dDYIpEokzg,856
-sera_2-1.6.1.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-sera_2-1.6.1.dist-info/RECORD,,
+sera/typing.py,sha256=Q4QMfbtfrCjC9tFfsZPhsAnbNX4lm4NHQ9lmjNXYdV0,772
+sera_2-1.6.2.dist-info/METADATA,sha256=B_Brp3KBIu2C0iqX-5cjwdWAfen1DttoeUyj0ms_7-4,856
+sera_2-1.6.2.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+sera_2-1.6.2.dist-info/RECORD,,