sera-2 1.1.0__py3-none-any.whl → 1.2.1__py3-none-any.whl

sera/models/_datatype.py

@@ -5,12 +5,29 @@ from dataclasses import dataclass
 from enum import Enum
 from typing import Literal
 
+PyDataType = Literal["str", "int", "datetime", "float", "bool", "bytes", "dict"]
+TypescriptDataType = Literal["string", "number", "boolean"]
+SQLAlchemyDataType = Literal[
+    "String",
+    "Integer",
+    "Float",
+    "Boolean",
+    "DateTime",
+    "JSON",
+    "Text",
+    "LargeBinary",
+]
+
 
 @dataclass
 class TypeWithDep:
     type: str
     dep: str | None = None
 
+
+@dataclass
+class PyTypeWithDep(TypeWithDep):
+
     def get_python_type(self) -> type:
         """Get the Python type from the type string for typing annotation in Python."""
         if self.type == "str":
@@ -33,22 +50,43 @@ class TypeWithDep:
 
 @dataclass
 class DataType:
-    type: Literal["str", "int", "datetime", "float", "bool", "bytes", "dict"]
+    pytype: PyDataType
+    sqltype: SQLAlchemyDataType
+    tstype: TypescriptDataType
+
     is_list: bool = False
-    parent: DataType | None = None
 
     def get_python_type(self) -> TypeWithDep:
-        if self.type in ["str", "int", "float", "bool", "bytes", "dict"]:
-            return TypeWithDep(type=self.type)
-        if self.type == "datetime":
+        if self.pytype in ["str", "int", "float", "bool", "bytes", "dict"]:
+            return TypeWithDep(type=self.pytype)
+        if self.pytype == "datetime":
             return TypeWithDep(type="datetime", dep="datetime.datetime")
-        raise NotImplementedError(self.type)
+        raise NotImplementedError(self.pytype)
 
     def get_sqlalchemy_type(self) -> TypeWithDep:
-        if self.type in ["str", "int", "float", "bool", "bytes"]:
-            return TypeWithDep(type=self.type)
-        if self.type == "dict":
+        if self.pytype in ["str", "int", "float", "bool", "bytes"]:
+            return TypeWithDep(type=self.pytype)
+        if self.pytype == "dict":
             return TypeWithDep(type="JSON")
-        if self.type == "datetime":
+        if self.pytype == "datetime":
             return TypeWithDep(type="datetime", dep="datetime.datetime")
-        raise NotImplementedError(self.type)
+        raise NotImplementedError(self.pytype)
+
+
+predefined_datatypes = {
+    "string": DataType(pytype="str", sqltype="String", tstype="string", is_list=False),
+    "integer": DataType(
+        pytype="int", sqltype="Integer", tstype="number", is_list=False
+    ),
+    "datetime": DataType(
+        pytype="datetime", sqltype="DateTime", tstype="string", is_list=False
+    ),
+    "float": DataType(pytype="float", sqltype="Float", tstype="number", is_list=False),
+    "boolean": DataType(
+        pytype="bool", sqltype="Boolean", tstype="boolean", is_list=False
+    ),
+    "bytes": DataType(
+        pytype="bytes", sqltype="LargeBinary", tstype="string", is_list=False
+    ),
+    "dict": DataType(pytype="dict", sqltype="JSON", tstype="string", is_list=False),
+}

sera/models/_module.py

@@ -8,6 +8,7 @@ from typing import Sequence
 
 import black
 import black.mode
+import isort
 from codegen.models import Program
 from loguru import logger
 
@@ -63,9 +64,9 @@ class Module:
                     program.root.to_python(),
                     mode=black.Mode(
                         target_versions={black.mode.TargetVersion.PY312},
-                        line_length=120,
                     ),
                 )
+                code = isort.code(code, profile="black")
             except:
                 logger.error("Error writing module {}", self.path)
                 print(">>> Program")
@@ -76,8 +77,16 @@ class Module:
             assert self.language == Language.Typescript
             raise NotImplementedError()
 
-        copyright_statement = f"# Generated automatically at {datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')}. All rights reserved.\n\n"
-        (self.package.dir / f"{self.name}.py").write_text(copyright_statement + code)
+        outfile = self.package.dir / f"{self.name}.py"
+        if outfile.exists():
+            if outfile.read_text().startswith("# sera:skip"):
+                logger.info(
+                    "`{}` already exists and is in manual edit mode. Skip updating it.",
+                    outfile,
+                )
+                return
+        copyright_statement = f"# Generated by SERA \n\n"
+        outfile.write_text(copyright_statement + code)
 
     def exists(self) -> bool:
         """Check if the module exists"""

sera/models/_parse.py

@@ -1,11 +1,12 @@
 from __future__ import annotations
 
+from copy import deepcopy
 from pathlib import Path
 from typing import Sequence
 
 import serde.yaml
 from sera.models._class import Class, ClassDBMapInfo
-from sera.models._datatype import DataType
+from sera.models._datatype import DataType, predefined_datatypes
 from sera.models._multi_lingual_string import MultiLingualString
 from sera.models._property import (
     Cardinality,
@@ -111,8 +112,18 @@ def _parse_property(
         db=(
             ObjectPropDBInfo(
                 is_embedded=db.get("is_embedded", None),
-                on_delete=ForeignKeyOnDelete(db.get("on_delete", "restrict")),
-                on_update=ForeignKeyOnUpdate(db.get("on_update", "restrict")),
+                on_target_delete=ForeignKeyOnDelete(
+                    db.get("on_target_delete", "restrict")
+                ),
+                on_target_update=ForeignKeyOnUpdate(
+                    db.get("on_target_update", "restrict")
+                ),
+                on_source_delete=ForeignKeyOnDelete(
+                    db.get("on_source_delete", "restrict")
+                ),
+                on_source_update=ForeignKeyOnUpdate(
+                    db.get("on_source_update", "restrict")
+                ),
             )
             if "db" in prop
             else None
@@ -135,19 +146,9 @@ def _parse_datatype(datatype: str) -> DataType:
     else:
         is_list = False
 
-    if datatype == "string":
-        return DataType("str", is_list=is_list, parent=None)
-    if datatype == "integer":
-        return DataType("int", is_list=is_list, parent=None)
-    if datatype == "datetime":
-        return DataType("datetime", is_list=is_list, parent=None)
-    if datatype == "bool":
-        return DataType("bool", is_list=is_list, parent=None)
-    if datatype == "float":
-        return DataType("float", is_list=is_list, parent=None)
-    if datatype == "bytes":
-        return DataType("bytes", is_list=is_list, parent=None)
-    if datatype == "dict":
-        return DataType("dict", is_list=is_list, parent=None)
-
-    raise NotImplementedError(datatype)
+    if datatype not in predefined_datatypes:
+        raise NotImplementedError(datatype)
+
+    dt = deepcopy(predefined_datatypes[datatype])
+    dt.is_list = is_list
+    return dt

sera/models/_property.py

@@ -103,8 +103,12 @@ class ObjectPropDBInfo:
     is_embedded: Optional[Literal["composite", "json"]] = None
 
     # if the target class is stored in the database, control the cascade behavior
-    on_delete: ForeignKeyOnDelete = ForeignKeyOnDelete.RESTRICT
-    on_update: ForeignKeyOnUpdate = ForeignKeyOnUpdate.RESTRICT
+    on_target_delete: ForeignKeyOnDelete = ForeignKeyOnDelete.RESTRICT
+    on_target_update: ForeignKeyOnUpdate = ForeignKeyOnUpdate.RESTRICT
+
+    # this is the case for many-to-many relationships
+    on_source_delete: ForeignKeyOnDelete = ForeignKeyOnDelete.RESTRICT
+    on_source_update: ForeignKeyOnUpdate = ForeignKeyOnUpdate.RESTRICT
 
 
 @dataclass(kw_only=True)

{sera_2-1.1.0.dist-info → sera_2-1.2.1.dist-info}/METADATA

@@ -1,7 +1,8 @@
 Metadata-Version: 2.1
 Name: sera-2
-Version: 1.1.0
+Version: 1.2.1
 Summary: 
+Home-page: https://github.com/binh-vu/sera
 Author: Binh Vu
 Author-email: bvu687@gmail.com
 Requires-Python: >=3.12,<4.0
@@ -12,6 +13,7 @@ Requires-Dist: black (>=25.0.1,<26.0.0)
 Requires-Dist: codegen-2 (>=2.1.4,<3.0.0)
 Requires-Dist: litestar (>=2.15.1,<3.0.0)
 Requires-Dist: msgspec (>=0.19.0,<0.20.0)
+Project-URL: Repository, https://github.com/binh-vu/sera
 Description-Content-Type: text/markdown
 
 # Overview

{sera_2-1.1.0.dist-info → sera_2-1.2.1.dist-info}/RECORD

@@ -1,29 +1,29 @@
 sera/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sera/libs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sera/libs/api_helper.py,sha256=hUEy0INHM18lxTQ348tgbXNceOHcjiAnqmuL_8CRpLQ,2509
-sera/libs/base_orm.py,sha256=IxsHjNPjF60YbLyTsMTOhQbjQX-L30UZtvE_vJDgZfo,2950
-sera/libs/base_service.py,sha256=nVHODZjdTqC8rrDKxYUWrK95APrtdMSCYzflePNxXns,2379
+sera/libs/base_orm.py,sha256=Xs1rx_c3FfCQ2EUA8plqBLvZEABqsscLTaCYRhXbIas,2913
+sera/libs/base_service.py,sha256=mC4s2SREWoOtr3JcHPHQ_MvcFaguNEKZ0CmqvBqlnBw,2729
 sera/make/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sera/make/__main__.py,sha256=TLHA3e9QVoE0Nic6HSQDNiAe1MrTTw5IdYlNSNxjN5Q,912
-sera/make/make_app.py,sha256=e0DQpx6ilB76lxg2BYF6wjL7RFRQzvmOXq2322xm2SQ,4398
-sera/make/make_python_api.py,sha256=ikZfJrJ4B606td4os1QgX-7G5QJypmR-3qgLvGOIRh0,8765
-sera/make/make_python_model.py,sha256=1zC_NaFkyLYpZ3ytT-ZV6d8xmxtQHUpEFsqd0PkJ6x4,12031
+sera/make/make_app.py,sha256=QDMN1wwfIKu3d68ovapMZWig24hDKJ4hJilNHjJq4EU,4598
+sera/make/make_python_api.py,sha256=lYNitE1a1Es29fB7p5ryD6X_NASBlwNYAbH-rZ5pBbI,28337
+sera/make/make_python_model.py,sha256=2KFgATb1DRZ3M8_cVVuhAZWuGamkO4HMfAqqr5fVUEs,25688
 sera/make/make_python_services.py,sha256=RsinYZdfkrTlTn9CT50VgqGs9w6IZawsJx-KEmqfnEY,2062
 sera/make/make_typescript_model.py,sha256=U4S_2y3zgLZVfMenHRaJFBW8yqh2mUBuI291LGQVOJ8,35
 sera/misc/__init__.py,sha256=hjW2Lf1itdqlDjf1X8hwSZZfmE0XKDFlYtMMC1AXkT4,300
 sera/misc/_rdf.py,sha256=G0ekWLUSw-eiKUOaPSGkELbZld19S9d36gWwiswjrrs,1671
 sera/misc/_utils.py,sha256=MY85CZruRLYI2bf44d-a8g4lJibznD2MnAfd9VY1UdQ,1094
-sera/models/__init__.py,sha256=3ooJQulUc7oyUoMM89KT5f6nsoYagCjYEyC0AmyYyzY,661
-sera/models/_class.py,sha256=vFCuzG0vfAHYBjk1HQMFszT7zUAqGex-VAVJ2CUPIaE,1824
+sera/models/__init__.py,sha256=1B3b-MOMh6_Xe3CsPouOjXLDuJg5G6NcRDPXcA0sQjA,687
+sera/models/_class.py,sha256=saWzNGtw0BIuisgd_6PI5-0pFN690TBHp_7KCTMoh28,1923
 sera/models/_collection.py,sha256=u3k4t7Z38FiZj9CstPArnf9KsIGr05zbwUn2ZrbQVJE,1078
-sera/models/_datatype.py,sha256=JkD3aRQ11DWicS2xaiNPwhBzJNJPwSkktBunx3EVr1s,1714
-sera/models/_module.py,sha256=-XW4bJ3v4QZPYPRMnbUW2zp0F5aJVH8uve_MrnwYz7w,3736
+sera/models/_datatype.py,sha256=tGpgZhFeHMA6sJdG5lyMQon2OC1r-fxo_IRGA1GyRtc,2762
+sera/models/_module.py,sha256=YB2w9CZR7d_rF_W09dNZ9Pr4HXW2thXaWMgof1yYo8c,3982
 sera/models/_multi_lingual_string.py,sha256=cVoxge1SW68dVmOjDZJU93tUq2ccJse3kSPqxrNkmgc,1091
-sera/models/_parse.py,sha256=l106WMAFTLjKio5L3rBK3B0NtwjnXh-sLF4Ofk2uFHE,5072
-sera/models/_property.py,sha256=lrI6V2zEblUVuEy9lahbLPLFisFRX6zrkO8wFWzU35k,4018
+sera/models/_parse.py,sha256=1WKiiU_P46ynWqGNYhU6KqCX7p0s6wq7mwPqFSiGfAQ,4986
+sera/models/_property.py,sha256=uOVP154lafx10GFsdKuETHdho2SDm663BvO5umHEMlE,4229
 sera/models/_schema.py,sha256=1F_Ict1NLvDcQDUZwcvnRS5MtsOTv584y3ChymUeUYA,1046
 sera/namespace.py,sha256=5NJ0A7weZwblqkncpgY2Vfcat04mNtigNcVrqu7TGOc,123
 sera/typing.py,sha256=CsazgVptDN-far3yISogTtA2KBJlFFOn0lK_WyZFDv8,230
-sera_2-1.1.0.dist-info/METADATA,sha256=zmJ_UdY6SLvr7d6pkcQL-oCo9DYB8gxpiM3CikxzySU,599
-sera_2-1.1.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-sera_2-1.1.0.dist-info/RECORD,,
+sera_2-1.2.1.dist-info/METADATA,sha256=qXSlZLBNmIQgGSckMb5MfnP5fCuGEViVI4JgwpYiS0A,699
+sera_2-1.2.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+sera_2-1.2.1.dist-info/RECORD,,