sera-2 1.6.1__tar.gz → 1.6.3__tar.gz

{sera_2-1.6.1 → sera_2-1.6.3}/PKG-INFO

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

{sera_2-1.6.1 → sera_2-1.6.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "sera-2"
-version = "1.6.1"
+version = "1.6.3"
 description = ""
 authors = ["Binh Vu <bvu687@gmail.com>"]
 readme = "README.md"

{sera_2-1.6.1 → sera_2-1.6.3}/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_2-1.6.1 → sera_2-1.6.3}/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_2-1.6.1 → sera_2-1.6.3}/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_2-1.6.1 → sera_2-1.6.3}/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_2-1.6.1 → sera_2-1.6.3}/sera/make/make_typescript_model.py

@@ -5,7 +5,6 @@ from typing import Any, Callable
 from codegen.models import AST, PredefinedFn, Program, expr, stmt
 from codegen.models.var import DeferredVar
 from loguru import logger
-
 from sera.misc import (
     assert_isinstance,
     assert_not_null,
@@ -723,9 +722,10 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
         prop_defs: list[tuple[expr.Expr, expr.Expr]] = []
 
         for prop in cls.properties.values():
-            if prop.data.is_private:
-                # skip private fields as this is for APIs exchange
-                continue
+            # we must include private properties that are needed during upsert for our forms.
+            # if prop.data.is_private:
+            #     # skip private fields as this is for APIs exchange
+            #     continue
             propname = to_camel_case(prop.name)
             tsprop = {}
 
@@ -821,11 +821,24 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
             )
 
         program.import_("sera-db.Schema", True)
-        program.import_(f"@.models.{pkg.dir.name}.{cls.name}.{cls.name}", True)
+        program.import_(
+            f"@.models.{pkg.dir.name}.Draft{cls.name}.Draft{cls.name}", True
+        )
         program.root(
             stmt.LineBreak(),
             stmt.TypescriptStatement(
-                f"export const {cls.name}Schema: Schema<{cls.name}> = "
+                f"export type {cls.name}Properties = "
+                + " | ".join(
+                    [
+                        expr.ExprConstant(to_camel_case(prop.name)).to_typescript()
+                        for prop in cls.properties.values()
+                    ]
+                )
+                + ";"
+            ),
+            stmt.LineBreak(),
+            stmt.TypescriptStatement(
+                f"export const {cls.name}Schema: Schema<Draft{cls.name}, {cls.name}Properties> = "
                 + PredefinedFn.dict(
                     [
                         (expr.ExprIdent("properties"), PredefinedFn.dict(prop_defs)),

{sera_2-1.6.1 → sera_2-1.6.3}/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_2-1.6.1 → sera_2-1.6.3}/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_2-1.6.1 → sera_2-1.6.3}/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