sera-2 1.21.2__py3-none-any.whl → 1.24.1__py3-none-any.whl

sera/models/_datatype.py

@@ -2,12 +2,10 @@ from __future__ import annotations
 
 import datetime
 from dataclasses import dataclass, field
-from typing import Callable, Literal
+from typing import Literal
 
 from codegen.models import expr
 
-from sera.misc import identity
-
 PyDataType = Literal["str", "int", "datetime", "float", "bool", "bytes", "dict"]
 TypescriptDataType = Literal["string", "number", "boolean"]
 SQLAlchemyDataType = Literal[
@@ -69,30 +67,8 @@ class PyTypeWithDep:
         """Clone the type with the same dependencies."""
         return PyTypeWithDep(type=self.type, deps=list(self.deps))
 
-    def get_string_conversion_func(self) -> tuple[str, str]:
-        if self.type == "str":
-            return ("identity", "sera.misc.identity")
-        if self.type == "int":
-            return ("TypeConversion.to_int", "sera.libs.api_helper.TypeConversion")
-        if self.type == "float":
-            return ("TypeConversion.to_float", "sera.libs.api_helper.TypeConversion")
-        if self.type == "bool":
-            return ("TypeConversion.to_bool", "sera.libs.api_helper.TypeConversion")
-        if any(
-            dep.find(".models.enums.") != -1 and dep.endswith(self.type)
-            for dep in self.deps
-        ):
-            # This is an enum type, we directly use the enum constructor as the conversion function
-            return (
-                self.type,
-                [
-                    dep
-                    for dep in self.deps
-                    if dep.find(".models.enums.") != -1 and dep.endswith(self.type)
-                ][0],
-            )
-        else:
-            raise NotImplementedError()
+    def is_enum_type(self) -> bool:
+        return any(x.find(".models.enums.") != -1 for x in self.deps)
 
 
 @dataclass
@@ -153,7 +129,7 @@ class TsTypeWithDep:
             return value
         if self.type == "Date":
             return expr.ExprRawTypescript(f"new Date({value.to_typescript()})")
-        if any(x.startswith("@.models.enum") for x in self.deps):
+        if self.is_enum_type():
             # enum type, we don't need to do anything as we use strings for enums
             return value
         raise ValueError(f"Unknown type: {self.type}")
@@ -174,11 +150,14 @@ class TsTypeWithDep:
             return expr.ExprRawTypescript(f"{value.to_typescript()}.toISOString()")
         if self.type == "Date | undefined":
             return expr.ExprRawTypescript(f"{value.to_typescript()}?.toISOString()")
-        if any(x.startswith("@.models.enum") for x in self.deps):
+        if self.is_enum_type():
             # enum type, we don't need to do anything as we use strings for enums
             return value
         raise ValueError(f"Unknown type: {self.type}")
 
+    def is_enum_type(self) -> bool:
+        return any(x.startswith("@.models.enums.") for x in self.deps)
+
 
 @dataclass
 class SQLTypeWithDep:

sera/models/_enum.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from collections import Counter
 from dataclasses import dataclass
 
-from sera.misc import to_snake_case
+from sera.misc import to_kebab_case, to_snake_case
 from sera.models._multi_lingual_string import MultiLingualString
 
 
@@ -11,6 +11,7 @@ from sera.models._multi_lingual_string import MultiLingualString
 class EnumValue:
     name: str
     value: str | int
+    label: MultiLingualString
     description: MultiLingualString
 
 
@@ -44,7 +45,7 @@ class Enum:
 
     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:]
+        return self.name
 
     def is_str_enum(self) -> bool:
         """Check if this enum is a string enum."""

sera/models/_module.py

@@ -39,6 +39,13 @@ class Package:
         """Create a module in this package"""
         return Module(self, name, self.language)
 
+    def parent(self) -> Package:
+        """Get the parent package"""
+        assert self.path.count(".") > 0, "Cannot get parent of top-level package"
+        return Package(
+            self.app, self.path.rsplit(".", 1)[0], self.dir.parent, self.language
+        )
+
 
 @dataclass
 class Module:

sera/models/_parse.py

@@ -91,13 +91,17 @@ def _parse_enum(schema: Schema, enum_name: str, enum: dict) -> Enum:
     for k, v in enum.items():
         if isinstance(v, (str, int)):
             values[k] = EnumValue(
-                name=k, value=v, description=MultiLingualString.en("")
+                name=k,
+                value=v,
+                label=MultiLingualString.en(""),
+                description=MultiLingualString.en(""),
             )
         else:
             try:
                 values[k] = EnumValue(
                     name=k,
                     value=v["value"],
+                    label=_parse_multi_lingual_string(v.get("label", "")),
                     description=_parse_multi_lingual_string(v.get("desc", "")),
                 )
             except KeyError as e:

{sera_2-1.21.2.dist-info → sera_2-1.24.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: sera-2
-Version: 1.21.2
+Version: 1.24.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)
-Requires-Dist: codegen-2 (>=2.12.2,<3.0.0)
+Requires-Dist: codegen-2 (>=2.14.0,<3.0.0)
 Requires-Dist: graph-wrapper (>=1.7.3,<2.0.0)
 Requires-Dist: isort (==6.0.1)
 Requires-Dist: litestar (>=2.15.1,<3.0.0)

{sera_2-1.21.2.dist-info → sera_2-1.24.1.dist-info}/RECORD

@@ -4,10 +4,10 @@ sera/exports/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sera/exports/schema.py,sha256=wEBUrDOyuCoCJC8X4RlmoWpeqSugaboG-9Q1UQ8HEzk,7824
 sera/exports/test.py,sha256=jK1EJmLGiy7eREpnY_68IIVRH43uH8S_u5Z7STPbXOM,2002
 sera/libs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sera/libs/api_helper.py,sha256=lWg_-2N8cLU4jCV-lSebO2o1b2gI4Tal0ThUlYkN0nA,6689
-sera/libs/api_test_helper.py,sha256=3tRr8sLN4dBSrHgKAHMmyoENI0xh7K_JLel8AvujU7k,1323
+sera/libs/api_helper.py,sha256=SkdgZkoYlX6HCyD_D6EiBvE0dWH0QW40xh4opIy737M,3237
+sera/libs/api_test_helper.py,sha256=SVGhl9UXPyCOw3IRK2znV6_c5tl1lTYYsb9qXJnJHoE,1344
 sera/libs/base_orm.py,sha256=5hOH_diUeaABm3cpE2-9u50VRqG1QW2osPQnvVHIhIA,3365
-sera/libs/base_service.py,sha256=NY-PLiaS1SXs2Pp3yVsdGnpJGUxKbHb0qzCCguhgPP4,6432
+sera/libs/base_service.py,sha256=wJ1x0xrxjczRU6Y43EjQb7RlkZ0tAY58tFayDXWBzLs,10773
 sera/libs/directed_computing_graph/__init__.py,sha256=xiF5_I1y9HtQ-cyq02iwkRYgEZvxBB8YIvysCHCLBco,1290
 sera/libs/directed_computing_graph/_dcg.py,sha256=nQf9MhnTkFU2-dxhv_PFThz9L61Nn8cvYIOoMq0OVb8,15352
 sera/libs/directed_computing_graph/_edge.py,sha256=iBq6cpLWWyuD99QWTHVEh8naWUJrR4WJJuq5iuCrwHo,1026
@@ -19,29 +19,34 @@ 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=G7wig3K-mT0xWtn1lkG_YffZq8SzlBkot3H42HUz1sw,13675
 sera/make/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sera/make/__main__.py,sha256=HRfOR53p351h6KblVvYm3DLhDIfEtk6R0kjl78_S_S8,1453
-sera/make/make_app.py,sha256=n9NtW73O3s_5Q31VHIRmnd-jEIcpDO7ksAsOdovde2s,5999
-sera/make/make_python_api.py,sha256=aOm8QSiXNLe4akiOx_KKsDCwLVwetRzuxOgZaWqEj0w,27172
-sera/make/make_python_model.py,sha256=t_2RUaO6WL4b5FtYj-Ly70njmcGGYwoddbL_oim9378,63479
-sera/make/make_python_services.py,sha256=0ZpWLwQ7Nwfn8BXAikAB4JRpNknpSJyJgY5b1cjtxV4,2073
-sera/make/make_typescript_model.py,sha256=CZc_LMigy7e6tP-6bJ5gHZlHYeyRtU_CNR4s64x51xE,71369
-sera/misc/__init__.py,sha256=L70kdXM5WmtMpgLlQISnGmrLgn241TQF0zFXFPi3Xzk,727
+sera/make/make_app.py,sha256=dTzpJRPGoCojCdJr1TAzwbaquctwwitrGPxkRm9skpo,6033
+sera/make/make_python_api.py,sha256=sfaYnX6Vwj0xWPpvpWbBhq8GyNHgNkvwlyZr7NDCO0k,24770
+sera/make/make_python_model.py,sha256=YHtZtHWN9X6s8IFiG-5w8sZSbsVWhU_sHtqVrkZkfgA,69686
+sera/make/make_python_services.py,sha256=SvdU--QF23FN_d-Ao07CeXIK9d5eL_-mdXYwXx69dRE,2102
+sera/make/make_typescript_model.py,sha256=Ax6xVrZ-x3xaKCsv6X4NKLdaMsAOau_GDrZK1TJ8NL8,57543
+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=7FILT_RO5ZCByMlYorr3OaOqFGnVtG1y6jFJqFpk_XM,3110
+sera/make/ts_frontend/misc.py,sha256=R96Tm4Sz05YPVk-gJ8vGW_GbMoUM7sLStar1LVnEn-I,1138
+sera/misc/__init__.py,sha256=ee7OODdWPKP8pCDxsfg1EOdxxKFMJCoNMljgV0NCxBw,767
 sera/misc/_formatter.py,sha256=aCGYL08l8f3aLODHxSocxBBwkRYEo3K1QzCDEn3suj0,1685
-sera/misc/_utils.py,sha256=8J-2z_3n6VQB8DuDrm7wKEq880x3BZLz9kbukORMuas,12971
+sera/misc/_utils.py,sha256=_zWGjihxTEo3N1gzdxxB5CPCBBHxsviKWhQSCEonzVQ,13420
 sera/models/__init__.py,sha256=vJC5Kzo_N7wd16ocNPy1VvAZDGNiWeiAhWJ4ihATKvA,780
-sera/models/_class.py,sha256=1J4Bd_LanzhhDWwZFHWGtFYD7lupe_alaB3D02ebNDI,2862
-sera/models/_collection.py,sha256=nLlP85OfEhfj4pFAYxB5ZvtBN6EdPSWPJ5ZFh5SSEC4,2686
-sera/models/_constraints.py,sha256=oRniaFXUsnQ_Q8lwXVcnBhvHG-Gw6eY31eIkFd1UXI4,2015
-sera/models/_datatype.py,sha256=_pmhCu3e1qQQuOio5joRzAkPOpIDoVRoDJ4_OrZl0Pw,11224
+sera/models/_class.py,sha256=_jLbewobv0Q6KLNd_jH-Z8vnDfwkRBbhdJbRDtKyE6g,2865
+sera/models/_collection.py,sha256=72ZBdVa3UE8UyghJ8V-BPimO0f68zFRJvXdzfNaKDMo,2874
+sera/models/_constraints.py,sha256=SwUkvV8sESfuO3En6keA_r8GxKiarXYxMb5biml63lU,2021
+sera/models/_datatype.py,sha256=OlCnQlEpB4w9doz0hPhaZk5d4sF664CdGznSBvx0X9g,10293
 sera/models/_default.py,sha256=ABggW6qdPR4ZDqIPJdJ0GCGQ-7kfsfZmQ_DchgZEa-I,137
-sera/models/_enum.py,sha256=sy0q7E646F-APsqrVQ52r1fAQ_DCAeaNq5YM5QN3zIk,2070
-sera/models/_module.py,sha256=I-GfnTgAa-5R87qTAvEzOt-VVEGeFBBwubGCgUkXVSw,5159
+sera/models/_enum.py,sha256=FRtEfto2httDB308W8OAuHh2LSazV3v16DHixlz1IZA,2088
+sera/models/_module.py,sha256=r9_3nEbLaZKO-jvbZuFYy9DkM6E9jY8hBsBhQBULpVU,5428
 sera/models/_multi_lingual_string.py,sha256=JETN6k00VH4wrA4w5vAHMEJV8fp3SY9bJebskFTjQLA,1186
-sera/models/_parse.py,sha256=9iaW-8Ajq8e440FrTJ-X9oivHJJ447kPU-ZqffFxSvw,12649
+sera/models/_parse.py,sha256=GL1a5HAlH4S389AyioLjz_9QFpH2rDTMOfXYXFC3fB4,12806
 sera/models/_property.py,sha256=9yMDxrmbyuF6-29lQjiq163Xzwbk75TlmGBpu0NLpkI,7485
 sera/models/_schema.py,sha256=VxJEiqgVvbXgcSUK4UW6JnRcggk4nsooVSE6MyXmfNY,1636
 sera/typing.py,sha256=m4rir-fB6Cgcm7_ZSXXcNdla2LJgq96WXxtTTrDaJno,1058
-sera_2-1.21.2.dist-info/METADATA,sha256=8jE5v1c-64MjGwTRTiPto2OD5tjYlZEkGtkmMkyZ2tk,936
-sera_2-1.21.2.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-sera_2-1.21.2.dist-info/RECORD,,
+sera_2-1.24.1.dist-info/METADATA,sha256=1DHbHN_a6VlNhVu8xrWJNig7IZCE2WzGvsRLGPnstGM,936
+sera_2-1.24.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+sera_2-1.24.1.dist-info/RECORD,,