sera-2 1.14.2__py3-none-any.whl → 1.14.4__py3-none-any.whl

sera/make/make_python_api.py

@@ -6,7 +6,7 @@ from codegen.models import DeferredVar, ImportHelper, PredefinedFn, Program, exp
 from loguru import logger
 
 from sera.misc import assert_not_null, to_snake_case
-from sera.models import App, DataCollection, Module, Package, SystemControlledMode
+from sera.models import App, DataCollection, Module, Package
 from sera.typing import GLOBAL_IDENTS
 
 

sera/make/make_python_model.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-import sys
-from ast import Not
 from typing import Callable, Literal, Optional, Sequence
 
 from codegen.models import (
@@ -29,7 +27,6 @@ from sera.models import (
     PyTypeWithDep,
     Schema,
 )
-from sera.models._property import SystemControlledMode
 from sera.typing import GLOBAL_IDENTS, ObjectPath
 
 
@@ -373,25 +370,24 @@ def make_python_data_model(
                 continue
 
             if isinstance(prop, DataProperty):
-                pytype = prop.get_data_model_datatype().get_python_type()
-                if prop.is_optional:
-                    pytype = pytype.as_optional_type()
-
-                for dep in pytype.deps:
-                    program.import_(dep, True)
-
-                pytype_type = pytype.type
+                pytype = prop.get_data_model_datatype().get_python_type().clone()
                 if len(prop.data.constraints) > 0:
                     # if the property has constraints, we need to figure out
                     program.import_("typing.Annotated", True)
                     if len(prop.data.constraints) == 1:
-                        pytype_type = f"Annotated[%s, %s]" % (
-                            pytype_type,
+                        pytype.type = "Annotated[%s, %s]" % (
+                            pytype.type,
                             prop.data.constraints[0].get_msgspec_constraint(),
                         )
                     else:
                         raise NotImplementedError(prop.data.constraints)
 
+                if prop.is_optional:
+                    pytype = pytype.as_optional_type()
+
+                for dep in pytype.deps:
+                    program.import_(dep, True)
+
                 # private property are available for creating, but not for updating.
                 # so we do not need to skip it.
                 # if prop.data.is_private:
@@ -419,7 +415,7 @@ def make_python_data_model(
 
                 cls_ast(
                     stmt.DefClassVarStatement(
-                        prop.name, pytype_type, prop_default_value
+                        prop.name, pytype.type, prop_default_value
                     )
                 )
             elif isinstance(prop, ObjectProperty):
@@ -443,12 +439,10 @@ def make_python_data_model(
                 elif prop.is_optional:
                     pytype = pytype.as_optional_type()
 
-                pytype_type = pytype.type
-
                 for dep in pytype.deps:
                     program.import_(dep, True)
 
-                cls_ast(stmt.DefClassVarStatement(prop.name, pytype_type))
+                cls_ast(stmt.DefClassVarStatement(prop.name, pytype.type))
 
         if is_on_create_value_updated:
             program.import_("typing.Optional", True)
@@ -561,30 +555,30 @@ def make_python_data_model(
                 continue
 
             if isinstance(prop, DataProperty):
-                pytype = prop.get_data_model_datatype().get_python_type()
-                if prop.is_optional:
-                    pytype = pytype.as_optional_type()
-
-                for dep in pytype.deps:
-                    program.import_(dep, True)
+                pytype = prop.get_data_model_datatype().get_python_type().clone()
 
-                pytype_type = pytype.type
                 if len(prop.data.constraints) > 0:
                     # if the property has constraints, we need to figure out
                     program.import_("typing.Annotated", True)
                     if len(prop.data.constraints) == 1:
-                        pytype_type = f"Annotated[%s, %s]" % (
-                            pytype_type,
+                        pytype.type = "Annotated[%s, %s]" % (
+                            pytype.type,
                             prop.data.constraints[0].get_msgspec_constraint(),
                         )
                     else:
                         raise NotImplementedError(prop.data.constraints)
 
+                if prop.is_optional:
+                    pytype = pytype.as_optional_type()
+
+                for dep in pytype.deps:
+                    program.import_(dep, True)
+
                 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]"
+                    pytype.type = f"Union[{pytype.type}, UnsetType]"
 
                 prop_default_value = None
                 if prop.data.is_private:
@@ -605,7 +599,7 @@ def make_python_data_model(
 
                 cls_ast(
                     stmt.DefClassVarStatement(
-                        prop.name, pytype_type, prop_default_value
+                        prop.name, pytype.type, prop_default_value
                     )
                 )
             elif isinstance(prop, ObjectProperty):
@@ -629,12 +623,10 @@ def make_python_data_model(
                 elif prop.is_optional:
                     pytype = pytype.as_optional_type()
 
-                pytype_type = pytype.type
-
                 for dep in pytype.deps:
                     program.import_(dep, True)
 
-                cls_ast(stmt.DefClassVarStatement(prop.name, pytype_type))
+                cls_ast(stmt.DefClassVarStatement(prop.name, pytype.type))
 
         if is_on_update_value_updated:
             program.import_("typing.Optional", True)
@@ -937,14 +929,12 @@ def make_python_relational_model(
 
             if custom_type.cardinality.is_star_to_many():
                 if custom_type.is_map:
-                    program.import_("typing.Mapping", True)
                     program.import_("sera.libs.base_orm.DictDataclassType", True)
-                    type = f"Mapping[str, {custom_type.target.name}]"
+                    type = f"dict[str, {custom_type.target.name}]"
                     maptype = f"DictDataclassType({custom_type.target.name})"
                 else:
-                    program.import_("typing.Sequence", True)
                     program.import_("sera.libs.base_orm.ListDataclassType", True)
-                    type = f"Sequence[str, {custom_type.target.name}]"
+                    type = f"list[{custom_type.target.name}]"
                     maptype = f"ListDataclassType({custom_type.target.name})"
             else:
                 program.import_("sera.libs.base_orm.DataclassType", True)
@@ -957,7 +947,7 @@ def make_python_relational_model(
 
             type_map.append((expr.ExprIdent(type), expr.ExprIdent(maptype)))
 
-        cls_ast = program.root.class_(
+        program.root.class_(
             "Base", [expr.ExprIdent("DeclarativeBase"), expr.ExprIdent("BaseORM")]
         )(
             stmt.DefClassVarStatement(
@@ -1246,7 +1236,7 @@ def make_python_relational_object_property(
             return
 
         if prop.cardinality.is_star_to_many():
-            raise NotImplementedError()
+            raise NotImplementedError((cls.name, prop.name))
 
         # we store this class in the database
         propname = f"{prop.name}_id"
@@ -1291,7 +1281,13 @@ def make_python_relational_object_property(
         is_import_attr=True,
     )
     propname = prop.name
-    proptype = f"Mapped[{prop.target.name}]"
+    if prop.cardinality.is_star_to_many():
+        if prop.is_map:
+            proptype = f"Mapped[dict[str, {prop.target.name}]]"
+        else:
+            proptype = f"Mapped[list[{prop.target.name}]]"
+    else:
+        proptype = f"Mapped[{prop.target.name}]"
 
     # we have two choices, one is to create a composite class, one is to create a custom field
     if prop.db.is_embedded == "composite":

sera/models/__init__.py

@@ -5,13 +5,7 @@ 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,
-    SystemControlledMode,
-)
+from sera.models._property import Cardinality, DataProperty, ObjectProperty, Property
 from sera.models._schema import Schema
 
 __all__ = [
@@ -31,5 +25,4 @@ __all__ = [
     "PyTypeWithDep",
     "TsTypeWithDep",
     "Enum",
-    "SystemControlledMode",
 ]

sera/models/_class.py

@@ -63,7 +63,7 @@ class Class:
                 return prop
         assert (
             self.db is None
-        ), "This class is stored in the database and thus, must have a primary key"
+        ), f"The class {self.name} is stored in the database and thus, must have a primary key"
         return None
 
     def get_pymodule_name(self) -> str:

sera/models/_constraints.py

@@ -4,6 +4,7 @@ from dataclasses import dataclass
 from typing import Literal
 
 ConstraintName = Literal[
+    "url",
     "phone_number",
     "email",
     "not_empty",
@@ -37,6 +38,8 @@ class Constraint:
             return "msgspec.Meta(ge=0)"
         elif self.name == "positive_number":
             return "msgspec.Meta(gt=0)"
+        elif self.name == "url":
+            return r"msgspec.Meta(pattern=r'^(https?|ftp)://[^\s/$.?#].[^\s]*$')"
 
         raise NotImplementedError()
 
@@ -57,4 +60,5 @@ predefined_constraints: dict[ConstraintName, Constraint] = {
     "password": Constraint("password", ()),
     "whole_number": Constraint("whole_number", ()),
     "positive_number": Constraint("positive_number", ()),
+    "url": Constraint("url", ()),
 }

sera/models/_datatype.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 
 import datetime
 from dataclasses import dataclass, field
-from enum import Enum
 from typing import Literal
 
 from codegen.models import expr
@@ -64,6 +63,10 @@ class PyTypeWithDep:
             )
         return PyTypeWithDep(type=f"Optional[{self.type}]", deps=deps)
 
+    def clone(self) -> PyTypeWithDep:
+        """Clone the type with the same dependencies."""
+        return PyTypeWithDep(type=self.type, deps=list(self.deps))
+
 
 @dataclass
 class TsTypeWithDep:

sera/models/_parse.py

@@ -34,7 +34,6 @@ from sera.models._property import (
     ObjectProperty,
     PropDataAttrs,
     SystemControlledAttrs,
-    SystemControlledMode,
 )
 from sera.models._schema import Schema
 
@@ -94,11 +93,14 @@ def _parse_enum(schema: Schema, enum_name: str, enum: dict) -> Enum:
                 name=k, value=v, description=MultiLingualString.en("")
             )
         else:
-            values[k] = EnumValue(
-                name=k,
-                value=v["value"],
-                description=_parse_multi_lingual_string(v.get("desc", "")),
-            )
+            try:
+                values[k] = EnumValue(
+                    name=k,
+                    value=v["value"],
+                    description=_parse_multi_lingual_string(v.get("desc", "")),
+                )
+            except KeyError as e:
+                raise ValueError(f"Invalid enum value definition for {k}: {v}") from e
     return Enum(name=enum_name, values=values)
 
 

sera/models/_property.py

@@ -56,19 +56,6 @@ class Cardinality(str, Enum):
         ]
 
 
-class SystemControlledMode(str, Enum):
-    """Indicates if this property is controlled by the system.
-
-    There are two modes:
-    1. The system automatically sets the value, and users cannot modify it.
-    2. Users with special roles are allowed to set the value and other users cannot modify it
-    """
-
-    AUTO = "auto"
-    RESTRICTED = "restricted"
-    NO = "no"
-
-
 @dataclass(kw_only=True)
 class GetSCPropValueFunc:
 

{sera_2-1.14.2.dist-info → sera_2-1.14.4.dist-info}/METADATA

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

{sera_2-1.14.2.dist-info → sera_2-1.14.4.dist-info}/RECORD

@@ -16,26 +16,26 @@ sera/libs/middlewares/uscp.py,sha256=H5umW8iEQSCdb_MJ5Im49kxg1E7TpxSg1p2_2A5zI1U
 sera/make/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sera/make/__main__.py,sha256=bt-gDF8E026OWc2zqr9_a3paMOiDkFd3ybWn8ltL2g0,1448
 sera/make/make_app.py,sha256=n9NtW73O3s_5Q31VHIRmnd-jEIcpDO7ksAsOdovde2s,5999
-sera/make/make_python_api.py,sha256=9Pr5IxhC5iFkNq8DEh8Wfqa01AGm9YUxf9qdLmMdf_Y,26875
-sera/make/make_python_model.py,sha256=Q9lirILQS_J00FfRBE8JZvMZTsfkZ6iziHknwxpU-fo,61420
+sera/make/make_python_api.py,sha256=iXGbKQ3IJvsY1ur_fhurr_THFNnH66E3Wl85o0emUbw,26853
+sera/make/make_python_model.py,sha256=cRb-fuHX0WH7XPAAliu6lycC0iEjE5kcKg4bBU40GwQ,61275
 sera/make/make_python_services.py,sha256=0ZpWLwQ7Nwfn8BXAikAB4JRpNknpSJyJgY5b1cjtxV4,2073
 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
-sera/models/__init__.py,sha256=VcC7HvqXuYrkgXwzs2vOH6LJPpzFBkeDvYVNrd3P-6E,855
-sera/models/_class.py,sha256=Wf0e8x6-szG9TzoFkAlqj7_dG0SCICMBw_333n3paxk,2514
+sera/models/__init__.py,sha256=vJC5Kzo_N7wd16ocNPy1VvAZDGNiWeiAhWJ4ihATKvA,780
+sera/models/_class.py,sha256=9XSnJli2SGF-jm-v0swsfY6-omiQ5Xeh33R2pM9Kg_g,2526
 sera/models/_collection.py,sha256=ZnQEriKC4X88Zz48Kn1AVZKH-1_l8OgWa-zf2kcQOOE,1414
-sera/models/_constraints.py,sha256=PsSOX94b9-73wZTcUif9KTzV9uTfoF0WN87g4GZXQmU,1827
-sera/models/_datatype.py,sha256=y5kfim0G3gLhnGjiokFBr8leU1Y6as_Vw7oK-caOo68,7140
+sera/models/_constraints.py,sha256=RpWDU-TfCslXaMUaTG9utWbl5z8Z6nzvF_fhqlek6ew,1987
+sera/models/_datatype.py,sha256=Lq1iEGqQaNHiG5NlRTcOTWROiUFjoiPoTeSJKFU6lSE,7281
 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/_multi_lingual_string.py,sha256=JETN6k00VH4wrA4w5vAHMEJV8fp3SY9bJebskFTjQLA,1186
-sera/models/_parse.py,sha256=OpTnLC8tg_gCzsjMAAqgR_TbYNS7kmPjkHGRNERziBQ,12015
-sera/models/_property.py,sha256=ZAxTuQ4BVf1Vsfk4dFkYwH_UsP9mFLTPyUkTcBaTajY,7183
+sera/models/_parse.py,sha256=ohexBbjFv6A1wZsEtokfw0zMVoR-RGXYrXa_tAub_Vs,12147
+sera/models/_property.py,sha256=Y98bYIjuCQDcSWpDxERNIFgmxXIaJiwBNFtYeGbDYRE,6812
 sera/models/_schema.py,sha256=VxJEiqgVvbXgcSUK4UW6JnRcggk4nsooVSE6MyXmfNY,1636
 sera/typing.py,sha256=Fl4-UzLJu1GdLLk_g87fA7nT9wQGelNnGzag6dg_0gs,980
-sera_2-1.14.2.dist-info/METADATA,sha256=YoTV3zBXfa_8HQ9WU0dOZ2U5fGIIWzu_F70HsJTIqxg,852
-sera_2-1.14.2.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-sera_2-1.14.2.dist-info/RECORD,,
+sera_2-1.14.4.dist-info/METADATA,sha256=PTLgXrXqoFQ74mPm4mgMK3DaBGMh0A45FNuUd40tb94,852
+sera_2-1.14.4.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+sera_2-1.14.4.dist-info/RECORD,,