sera-2 1.14.1__tar.gz → 1.14.3__tar.gz

{sera_2-1.14.1 → sera_2-1.14.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: sera-2
-Version: 1.14.1
+Version: 1.14.3
 Summary: 
 Author: Binh Vu
 Author-email: bvu687@gmail.com
@@ -8,9 +8,9 @@ Requires-Python: >=3.12,<4.0
 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: black (==25.1.0)
 Requires-Dist: codegen-2 (>=2.11.1,<3.0.0)
-Requires-Dist: isort (>=6.0.1,<7.0.0)
+Requires-Dist: isort (==6.0.1)
 Requires-Dist: litestar (>=2.15.1,<3.0.0)
 Requires-Dist: loguru (>=0.7.0,<0.8.0)
 Requires-Dist: msgspec (>=0.19.0,<0.20.0)

{sera_2-1.14.1 → sera_2-1.14.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "sera-2"
-version = "1.14.1"
+version = "1.14.3"
 description = ""
 authors = ["Binh Vu <bvu687@gmail.com>"]
 readme = "README.md"
@@ -14,9 +14,9 @@ msgspec = "^0.19.0"
 litestar = "^2.15.1"
 loguru = "^0.7.0"
 typer = "^0.12.3"
-black = "^25.1.0"
+black = "==25.1.0"
 sqlalchemy = { extras = ["asyncio"], version = "^2.0.41" }
-isort = "^6.0.1"
+isort = "==6.0.1"
 serde2 = "^1.9.0"
 
 [build-system]

{sera_2-1.14.1 → sera_2-1.14.3}/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_2-1.14.1 → sera_2-1.14.3}/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
 
 
@@ -937,14 +934,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 +952,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 +1241,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 +1286,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_2-1.14.1 → sera_2-1.14.3}/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_2-1.14.1 → sera_2-1.14.3}/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_2-1.14.1 → sera_2-1.14.3}/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_2-1.14.1 → sera_2-1.14.3}/sera/models/_module.py

@@ -10,6 +10,7 @@ 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
 
@@ -62,7 +63,9 @@ class Module:
                         target_versions={black.mode.TargetVersion.PY312},
                     ),
                 )
-                code = isort.code(code, profile="black")
+                code = isort.code(
+                    code, profile="black", known_first_party=[self.package.app.name]
+                )
             except:
                 logger.error("Error writing module {}", self.path)
                 print(">>> Program")
@@ -173,3 +176,4 @@ class App:
     def name(self) -> str:
         """Get the name of the application"""
         return self.root.dir.name
+        return self.root.dir.name

{sera_2-1.14.1 → sera_2-1.14.3}/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_2-1.14.1 → sera_2-1.14.3}/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: