sera-2 1.5.1__tar.gz → 1.5.3__tar.gz

{sera_2-1.5.1 → sera_2-1.5.3}/PKG-INFO

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

{sera_2-1.5.1 → sera_2-1.5.3}/pyproject.toml

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

{sera_2-1.5.1 → sera_2-1.5.3}/sera/make/make_python_model.py

@@ -154,7 +154,25 @@ def make_python_data_model(
                     else:
                         raise NotImplementedError(prop.data.constraints)
 
-                cls_ast(stmt.DefClassVarStatement(prop.name, pytype_type))
+                prop_default_value = None
+                if 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)
+                    prop_default_value = expr.ExprFuncCall(
+                        expr.ExprIdent("msgspec.field"),
+                        [
+                            PredefinedFn.keyword_assignment(
+                                "default_factory",
+                                expr.ExprIdent(prop.default_factory.pyfunc),
+                            )
+                        ],
+                    )
+                cls_ast(
+                    stmt.DefClassVarStatement(
+                        prop.name, pytype_type, prop_default_value
+                    )
+                )
             elif isinstance(prop, ObjectProperty):
                 if prop.target.db is not None:
                     # if the target class is in the database, we expect the user to pass the foreign key for it.
@@ -501,7 +519,7 @@ def make_python_relational_model(
                                 "index", expr.ExprConstant(True)
                             )
                         )
-                if prop.db.is_nullable:
+                if prop.is_optional:
                     propvalargs.append(
                         PredefinedFn.keyword_assignment(
                             "nullable", expr.ExprConstant(True)
@@ -580,12 +598,12 @@ def make_python_relational_object_property(
                             "onupdate",
                             expr.ExprConstant(prop.db.on_target_update.to_sqlalchemy()),
                         ),
-                        PredefinedFn.keyword_assignment(
-                            "nullable",
-                            expr.ExprConstant(prop.is_optional),
-                        ),
                     ],
                 ),
+                PredefinedFn.keyword_assignment(
+                    "nullable",
+                    expr.ExprConstant(prop.is_optional),
+                ),
             ],
         )
 

{sera_2-1.5.1 → sera_2-1.5.3}/sera/make/make_typescript_model.py

@@ -711,9 +711,9 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
                     (
                         expr.ExprIdent("isRequired"),
                         expr.ExprConstant(
-                            # TODO: fix me.
-                            prop.db is None
-                            or not prop.db.is_nullable
+                            not prop.is_optional
+                            and prop.default_value is None
+                            and prop.default_factory is None
                         ),
                     ),
                 ]

sera_2-1.5.3/sera/models/_default.py

@@ -0,0 +1,9 @@
+from __future__ import annotations
+
+from dataclasses import dataclass
+
+
+@dataclass
+class DefaultFactory:
+    pyfunc: str
+    tsfunc: str

{sera_2-1.5.1 → sera_2-1.5.3}/sera/models/_parse.py

@@ -15,6 +15,7 @@ from sera.models._datatype import (
     predefined_sql_datatypes,
     predefined_ts_datatypes,
 )
+from sera.models._default import DefaultFactory
 from sera.models._multi_lingual_string import MultiLingualString
 from sera.models._property import (
     Cardinality,
@@ -121,11 +122,13 @@ def _parse_property(
                     is_indexed=db.get("is_indexed", False)
                     or db.get("is_unique", False)
                     or db.get("is_primary_key", False),
-                    is_nullable=db.get("is_nullable", False),
                 )
                 if "db" in prop
                 else None
             ),
+            is_optional=prop.get("is_optional", False),
+            default_value=_parse_default_value(prop.get("default_value", None)),
+            default_factory=_parse_default_factory(prop.get("default_factory", None)),
         )
 
     assert "target" in prop, prop
@@ -213,3 +216,21 @@ def _parse_datatype(datatype: dict | str) -> DataType:
         )
 
     raise NotImplementedError(datatype)
+
+
+def _parse_default_value(
+    default_value: str | int | bool | None,
+) -> str | int | bool | None:
+    if default_value is None:
+        return None
+    if not isinstance(default_value, (str, int, bool)):
+        raise NotImplementedError(default_value)
+    return default_value
+
+
+def _parse_default_factory(default_factory: str | None) -> str | None:
+    if default_factory is None:
+        return None
+    return DefaultFactory(
+        pyfunc=default_factory["pyfunc"], tsfunc=default_factory["tsfunc"]
+    )

{sera_2-1.5.1 → sera_2-1.5.3}/sera/models/_property.py

@@ -6,6 +6,7 @@ from typing import TYPE_CHECKING, Literal, Optional
 
 from sera.models._constraints import Constraint
 from sera.models._datatype import DataType
+from sera.models._default import DefaultFactory
 from sera.models._multi_lingual_string import MultiLingualString
 
 if TYPE_CHECKING:
@@ -87,6 +88,8 @@ class Property:
     description: MultiLingualString
     # other attributes for generating data model such as upsert and return.
     data: PropDataAttrs = field(default_factory=PropDataAttrs)
+    # whether this property is optional or not
+    is_optional: bool = False
 
 
 @dataclass(kw_only=True)
@@ -101,14 +104,17 @@ class DataPropDBInfo:
     is_unique: bool = False
     # whether this property is indexed or not
     is_indexed: bool = False
-    # whether this property is nullable or not
-    is_nullable: bool = False
 
 
 @dataclass(kw_only=True)
 class DataProperty(Property):
     # data type of the property
     datatype: DataType
+    # default value of this property if it is not provided (then optional is false by default)
+    default_value: Optional[str | int | bool] = None
+    # default value factory of this property if it is not provided
+    default_factory: Optional[DefaultFactory] = None
+
     # other database properties of this property
     db: Optional[DataPropDBInfo] = None
 
@@ -148,8 +154,6 @@ class ObjectProperty(Property):
     # to store the relationship -- users can overwrite this generated class by define the one with the same
     # name
     cardinality: Cardinality
-    # whether this property is optional or not
-    is_optional: bool = False
     # whether this property is stored as a mapping dic[str, Target] or not
     # only valid for *-to-many relationships
     is_map: bool = False