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

sera/make/__main__.py

@@ -4,8 +4,9 @@ from pathlib import Path
 from typing import Annotated
 
 import typer
+
 from sera.make.make_app import make_app
-from sera.models import Language
+from sera.typing import Language
 
 app = typer.Typer(pretty_exceptions_short=True, pretty_exceptions_enable=False)
 

sera/make/make_app.py

@@ -7,6 +7,7 @@ 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,
@@ -14,8 +15,13 @@ from sera.make.make_python_model import (
     make_python_relational_model,
 )
 from sera.make.make_python_services import make_python_service_structure
-from sera.make.make_typescript_model import make_typescript_data_model
-from sera.models import App, DataCollection, Language, parse_schema
+from sera.make.make_typescript_model import (
+    make_typescript_data_model,
+    make_typescript_enum,
+)
+from sera.misc import Formatter
+from sera.models import App, DataCollection, parse_schema
+from sera.typing import Language
 
 
 def make_config(app: App):
@@ -164,8 +170,10 @@ def make_app(
         # generate services
         make_python_service_structure(app, collections)
     elif language == Language.Typescript:
+        make_typescript_enum(schema, app.models)
         make_typescript_data_model(schema, app.models)
 
+    Formatter.get_instance().process()
     return app
 
 

sera/make/make_typescript_model.py

@@ -5,6 +5,7 @@ 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,
@@ -15,6 +16,7 @@ from sera.misc import (
 from sera.models import (
     Class,
     DataProperty,
+    Enum,
     ObjectProperty,
     Package,
     Schema,
@@ -26,6 +28,15 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
     """Generate TypeScript data model from the schema. The data model aligns with the public data model in Python, not the database model."""
     app = target_pkg.app
 
+    # mapping from type alias of idprop to its real type
+    idprop_aliases = {}
+    for cls in schema.classes.values():
+        idprop = cls.get_id_property()
+        if idprop is not None:
+            idprop_aliases[f"{cls.name}Id"] = (
+                idprop.get_data_model_datatype().get_typescript_type()
+            )
+
     def clone_prop(prop: DataProperty | ObjectProperty, value: expr.Expr):
         # detect all complex types is hard, we can assume that any update to this does not mutate
         # the original object, then it's okay.
@@ -38,7 +49,6 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
             return
 
         idprop = cls.get_id_property()
-
         program = Program()
 
         prop_defs = []
@@ -161,7 +171,8 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
                 else None
             ),
             stmt.LineBreak(),
-            lambda ast00: ast00.interface(
+            lambda ast00: ast00.class_like(
+                "interface",
                 cls.name + "ConstructorArgs",
             )(*prop_defs),
             stmt.LineBreak(),
@@ -230,9 +241,9 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
         update_field_funcs: list[Callable[[AST], Any]] = []
 
         for prop in cls.properties.values():
-            if prop.data.is_private:
-                # skip private fields as this is for APIs exchange
-                continue
+            # if prop.data.is_private:
+            #     # skip private fields as this is for APIs exchange
+            #     continue
 
             propname = to_camel_case(prop.name)
 
@@ -291,15 +302,23 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
                 ):
                     create_propvalue = expr.ExprConstant(-1)
                 else:
-                    create_propvalue = tstype.get_default()
+                    if tstype.type in idprop_aliases:
+                        create_propvalue = idprop_aliases[tstype.type].get_default()
+                    else:
+                        create_propvalue = tstype.get_default()
 
                 if prop.db is not None and prop.db.is_primary_key:
                     # for checking if the primary key is from the database or default (create_propvalue)
                     cls_pk = (expr.ExprIdent(propname), create_propvalue)
 
-                update_propvalue = PredefinedFn.attr_getter(
-                    expr.ExprIdent("record"), expr.ExprIdent(propname)
-                )
+                # if this field is private, we cannot get it from the normal record
+                # we have to create a default value for it.
+                if prop.data.is_private:
+                    update_propvalue = create_propvalue
+                else:
+                    update_propvalue = PredefinedFn.attr_getter(
+                        expr.ExprIdent("record"), expr.ExprIdent(propname)
+                    )
 
                 ser_args.append(
                     (
@@ -333,7 +352,22 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
                     )
                     if prop.cardinality.is_star_to_many():
                         tstype = tstype.as_list_type()
-                    create_propvalue = tstype.get_default()
+                        create_propvalue = expr.ExprConstant([])
+                    else:
+                        # if target class has an auto-increment primary key, we set a different default value
+                        # to be -1 to avoid start from 0
+                        target_idprop = prop.target.get_id_property()
+                        if (
+                            target_idprop is not None
+                            and target_idprop.db is not None
+                            and target_idprop.db.is_primary_key
+                            and target_idprop.db.is_auto_increment
+                        ):
+                            create_propvalue = expr.ExprConstant(-1)
+                        else:
+                            assert tstype.type in idprop_aliases
+                            create_propvalue = idprop_aliases[tstype.type].get_default()
+
                     update_propvalue = PredefinedFn.attr_getter(
                         expr.ExprIdent("record"), expr.ExprIdent(propname)
                     )
@@ -474,7 +508,8 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
         observable_args.sort(key=lambda x: {"observable": 0, "action": 1}[x[1].ident])
 
         program.root(
-            lambda ast00: ast00.interface(
+            lambda ast00: ast00.class_like(
+                "interface",
                 draft_clsname + "ConstructorArgs",
             )(*prop_defs),
             stmt.LineBreak(),
@@ -861,3 +896,44 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
         make_definition(cls, pkg)
 
         make_index(pkg)
+
+
+def make_typescript_enum(schema: Schema, target_pkg: Package):
+    """Make typescript enum for the schema"""
+    enum_pkg = target_pkg.pkg("enums")
+
+    def make_enum(enum: Enum, pkg: Package):
+        program = Program()
+        program.root(
+            stmt.LineBreak(),
+            lambda ast: ast.class_like("enum", enum.name)(
+                *[
+                    stmt.DefClassVarStatement(
+                        name=value.name,
+                        type=None,
+                        value=expr.ExprConstant(value.value),
+                    )
+                    for value in enum.values.values()
+                ]
+            ),
+            stmt.LineBreak(),
+            stmt.TypescriptStatement("export " + enum.name + ";"),
+        )
+        pkg.module(enum.get_tsmodule_name()).write(program)
+
+    for enum in schema.enums.values():
+        make_enum(enum, enum_pkg)
+
+    program = Program()
+    for enum in schema.enums.values():
+        program.import_(f"@.models.enums.{enum.get_tsmodule_name()}.{enum.name}", True)
+
+    program.root(
+        stmt.LineBreak(),
+        stmt.TypescriptStatement(
+            "export { "
+            + ", ".join([enum.name for enum in schema.enums.values()])
+            + "};"
+        ),
+    )
+    enum_pkg.module("index").write(program)

sera/misc/__init__.py

@@ -1,3 +1,4 @@
+from sera.misc._formatter import File, Formatter
 from sera.misc._utils import (
     assert_isinstance,
     assert_not_null,
@@ -14,4 +15,7 @@ __all__ = [
     "assert_not_null",
     "to_snake_case",
     "to_camel_case",
+    "to_pascal_case",
+    "Formatter",
+    "File",
 ]

sera/misc/_formatter.py

@@ -0,0 +1,61 @@
+from __future__ import annotations
+
+import subprocess
+from concurrent.futures import ThreadPoolExecutor
+from dataclasses import dataclass
+from pathlib import Path
+
+from tqdm import tqdm
+
+from sera.typing import Language
+
+
+@dataclass
+class File:
+    path: Path
+    language: Language
+
+
+class Formatter:
+    instance = None
+
+    def __init__(self):
+        self.pending_files: list[File] = []
+
+    @staticmethod
+    def get_instance():
+        if Formatter.instance is None:
+            Formatter.instance = Formatter()
+        return Formatter.instance
+
+    def register(self, file: File):
+        self.pending_files.append(file)
+
+    def process(self):
+        """Format pending files in parallel"""
+
+        def format_file(file: File):
+            if file.language == Language.Typescript:
+                try:
+                    subprocess.check_output(
+                        ["npx", "prettier", "--write", str(file.path.absolute())],
+                        cwd=file.path.parent,
+                    )
+                except subprocess.CalledProcessError as e:
+                    print(f"Error formatting {file.path}: {e}")
+                    raise
+            else:
+                raise NotImplementedError(
+                    f"Formatting not implemented for {file.language}"
+                )
+
+        with ThreadPoolExecutor() as executor:
+            list(
+                tqdm(
+                    executor.map(format_file, self.pending_files),
+                    total=len(self.pending_files),
+                    desc="Formatting files",
+                )
+            )
+
+        self.pending_files.clear()

sera/models/__init__.py

@@ -1,7 +1,8 @@
 from sera.models._class import Class
 from sera.models._collection import DataCollection
 from sera.models._datatype import DataType, PyTypeWithDep, TsTypeWithDep
-from sera.models._module import App, Language, Module, Package
+from sera.models._enum import Enum
+from sera.models._module import App, Module, Package
 from sera.models._multi_lingual_string import MultiLingualString
 from sera.models._parse import parse_schema
 from sera.models._property import Cardinality, DataProperty, ObjectProperty, Property
@@ -21,7 +22,7 @@ __all__ = [
     "DataCollection",
     "Module",
     "App",
-    "Language",
     "PyTypeWithDep",
     "TsTypeWithDep",
+    "Enum",
 ]

sera/models/_enum.py

@@ -39,9 +39,13 @@ class Enum:
             )
 
     def get_pymodule_name(self) -> str:
-        """Get the python module name of this class as if there is a python module created to store this class only."""
+        """Get the python module name of this enum as if there is a python module created to store this enum only."""
         return to_snake_case(self.name)
 
+    def get_tsmodule_name(self) -> str:
+        """Get the typescript module name of this enum as if there is a typescript module created to store this enum only."""
+        return self.name[0].lower() + self.name[1:]
+
     def is_str_enum(self) -> bool:
         """Check if this enum is a string enum."""
         return all(isinstance(value.value, str) for value in self.values.values())

sera/models/_module.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 
 import subprocess
 from dataclasses import dataclass
-from enum import Enum
 from pathlib import Path
 from typing import Sequence
 
@@ -12,10 +11,8 @@ import isort
 from codegen.models import Program
 from loguru import logger
 
-
-class Language(str, Enum):
-    Python = "python"
-    Typescript = "typescript"
+from sera.misc import File, Formatter
+from sera.typing import Language
 
 
 @dataclass
@@ -106,15 +103,9 @@ class Module:
         outfile.write_text(copyright_statement + code)
 
         if self.language == Language.Typescript:
-            # invoke prettier to format the code
-            try:
-                subprocess.check_output(
-                    ["npx", "prettier", "--write", str(outfile.absolute())],
-                    cwd=self.package.app.root.dir,
-                )
-            except Exception as e:
-                logger.error("Error formatting Typescript file: {}", e)
-                raise
+            Formatter.get_instance().register(
+                File(path=outfile, language=self.language)
+            )
 
     def exists(self) -> bool:
         """Check if the module exists"""

sera/typing.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from enum import Enum
 from typing import Annotated, TypeVar
 
 
@@ -12,3 +13,8 @@ FieldName = Annotated[str, doc("field name of a class")]
 ObjectPath = Annotated[
     str, doc("path of an object (e.g., can be function, class, etc.)")
 ]
+
+
+class Language(str, Enum):
+    Python = "python"
+    Typescript = "typescript"

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: sera-2
-Version: 1.6.0
+Version: 1.6.1
 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.5.1,<3.0.0)
+Requires-Dist: codegen-2 (>=2.6.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.6.0.dist-info → sera_2-1.6.1.dist-info}/RECORD

@@ -5,27 +5,28 @@ 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/make/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sera/make/__main__.py,sha256=EvskvcZ5BikA6c0QyUXMbHfKrjr44W0JTmW_-iXFEGg,1416
-sera/make/make_app.py,sha256=HB6zIi456FZiLDtNMmO1crsCs3GlMLLUH-aJXHHaZxE,5771
+sera/make/__main__.py,sha256=G5O7s6135-708honwqMFn2yPTs06WbGQTHpupID0eZ4,1417
+sera/make/make_app.py,sha256=3Crq-Y-VzeHKKAaxfrEqguqTZEtdNPOuGojBQpC9QHw,5950
 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_services.py,sha256=RsinYZdfkrTlTn9CT50VgqGs9w6IZawsJx-KEmqfnEY,2062
-sera/make/make_typescript_model.py,sha256=HMwiYjNSQwDNNVXZzzNGJE2wDOW51q4JXafIh03AW_I,34035
-sera/misc/__init__.py,sha256=G-vpwJtdS596Yle7W007vArHRwmK0QgGmLhzlqTiHMQ,311
+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/_utils.py,sha256=V5g4oLGHOhUCR75Kkcn1w01pAvGvaepK-T8Z3pIgHjI,1450
-sera/models/__init__.py,sha256=Kz3Cg7GIVzsM0qFG5ERB5gobLAxBy2SdxItIl73ui2g,759
+sera/models/__init__.py,sha256=vJC5Kzo_N7wd16ocNPy1VvAZDGNiWeiAhWJ4ihATKvA,780
 sera/models/_class.py,sha256=Wf0e8x6-szG9TzoFkAlqj7_dG0SCICMBw_333n3paxk,2514
 sera/models/_collection.py,sha256=ZnQEriKC4X88Zz48Kn1AVZKH-1_l8OgWa-zf2kcQOOE,1414
 sera/models/_constraints.py,sha256=lZmCh6Py0UVMdhTR7zUOPPzGqJGbmDCzf7xH7yITcbQ,1278
 sera/models/_datatype.py,sha256=uMxK_8wBLowaIMIAYCb3V17YmkzJrKKc5orjImzqWbA,5818
 sera/models/_default.py,sha256=ABggW6qdPR4ZDqIPJdJ0GCGQ-7kfsfZmQ_DchgZEa-I,137
-sera/models/_enum.py,sha256=n9e0Nde9RSsO0V5zIAQbY4-qur8Q2euDQJSa6yP_VV8,1853
-sera/models/_module.py,sha256=4xZO8Ey4La7JTiCRfU50pYw4V6ssECH6dGIuplodwQY,5215
+sera/models/_enum.py,sha256=sy0q7E646F-APsqrVQ52r1fAQ_DCAeaNq5YM5QN3zIk,2070
+sera/models/_module.py,sha256=CAk8CCuo3hs_mBkmfXDV-BsMQhv4Wgtp0tcY78JLjUE,4922
 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=QkzT07FtBwoiX2WHXDUrU1zSPLoRmKJgsXa2kLyLMxU,327
-sera_2-1.6.0.dist-info/METADATA,sha256=QF_GIRGrujh3P3FFhjE4F-eVuMy3qWEFiJ4SS5r9-QQ,856
-sera_2-1.6.0.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-sera_2-1.6.0.dist-info/RECORD,,
+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,,