sera-2 1.14.6__py3-none-any.whl → 1.15.0__py3-none-any.whl

sera/make/make_typescript_model.py

@@ -1104,7 +1104,19 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
                 for dep in tstype.deps:
                     program.import_(dep, True)
                 tsprop = [
-                    (expr.ExprIdent("datatype"), expr.ExprConstant(tstype.type)),
+                    (
+                        expr.ExprIdent("datatype"),
+                        (
+                            expr.ExprConstant(tstype.type)
+                            if tstype.type not in schema.enums
+                            else expr.ExprConstant("enum")
+                        ),
+                    ),
+                    *(
+                        [(expr.ExprIdent("enumType"), expr.ExprIdent(tstype.type))]
+                        if tstype.type in schema.enums
+                        else []
+                    ),
                     (
                         expr.ExprIdent("isRequired"),
                         expr.ExprConstant(

sera/misc/__init__.py

@@ -3,6 +3,7 @@ from sera.misc._utils import (
     assert_isinstance,
     assert_not_null,
     filter_duplication,
+    load_data,
     to_camel_case,
     to_pascal_case,
     to_snake_case,
@@ -18,4 +19,5 @@ __all__ = [
     "to_pascal_case",
     "Formatter",
     "File",
+    "load_data",
 ]

sera/misc/_utils.py

@@ -1,8 +1,14 @@
 from __future__ import annotations
 
 import re
+from pathlib import Path
 from typing import Any, Callable, Iterable, Optional, TypeVar
 
+import serde.csv
+from sqlalchemy import Engine, text
+from sqlalchemy.orm import Session
+from tqdm import tqdm
+
 T = TypeVar("T")
 reserved_keywords = {
     "and",
@@ -102,3 +108,43 @@ def filter_duplication(
             keys.add(k)
             new_lst.append(k)
     return new_lst
+
+
+def load_data(
+    engine: Engine,
+    create_db_and_tables: Callable[[], None],
+    table_files: list[tuple[type, Path]],
+    table_desers: dict[type, Callable[[dict], Any]],
+    verbose: bool = False,
+):
+    """
+    Load data into the database from specified CSV files.
+
+    Args:
+        engine: SQLAlchemy engine to connect to the database.
+        create_db_and_tables: Function to create database and tables.
+        table_files: List of tuples containing the class type and the corresponding CSV file path.
+        table_desers: Dictionary mapping class types to their deserializer functions.
+        verbose: If True, show progress bars during loading.
+    """
+    with Session(engine) as session:
+        create_db_and_tables()
+
+        for tbl, file in tqdm(table_files, disable=not verbose, desc="Loading data"):
+            if file.name.endswith(".csv"):
+                records = serde.csv.deser(file, deser_as_record=True)
+            else:
+                raise ValueError(f"Unsupported file format: {file.name}")
+            deser = table_desers[tbl]
+            records = [deser(row) for row in records]
+            for r in tqdm(records, desc=f"load {tbl.__name__}", disable=not verbose):
+                session.merge(r)
+            session.flush()
+
+            # Reset the sequence for each table
+            session.execute(
+                text(
+                    f"SELECT setval('{tbl.__tablename__}_id_seq', (SELECT MAX(id) FROM \"{tbl.__tablename__}\"));"
+                )
+            )
+        session.commit()

{sera_2-1.14.6.dist-info → sera_2-1.15.0.dist-info}/METADATA

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

{sera_2-1.14.6.dist-info → sera_2-1.15.0.dist-info}/RECORD

@@ -19,10 +19,10 @@ sera/make/make_app.py,sha256=n9NtW73O3s_5Q31VHIRmnd-jEIcpDO7ksAsOdovde2s,5999
 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=4yLCLIzP2jeXfmOeee6nNS_qd7_7iPinV2vQh1IfbLs,64000
-sera/misc/__init__.py,sha256=Dh4uDq0D4N53h3zhvmwfa5a0TPVRSUvLzb0hkFuPirk,411
+sera/make/make_typescript_model.py,sha256=3F-1TAbVb2-vidj5wKIi_U442JkBXZU3UYCZkodWRRM,64466
+sera/misc/__init__.py,sha256=t-Z3Zv-a_W0n59RSBoeGMqNEiavjc4vCoRdz-GCKp3Q,443
 sera/misc/_formatter.py,sha256=aCGYL08l8f3aLODHxSocxBBwkRYEo3K1QzCDEn3suj0,1685
-sera/misc/_utils.py,sha256=vBfbEChf7IMdLDj3CbdOXTUAdWNQTLLpAWwBoUcF3u0,2315
+sera/misc/_utils.py,sha256=EvWCHquEkqMq6C4vCy9kXsirD9Nuq3KmNMjWTKjPuts,3993
 sera/models/__init__.py,sha256=vJC5Kzo_N7wd16ocNPy1VvAZDGNiWeiAhWJ4ihATKvA,780
 sera/models/_class.py,sha256=1J4Bd_LanzhhDWwZFHWGtFYD7lupe_alaB3D02ebNDI,2862
 sera/models/_collection.py,sha256=ZnQEriKC4X88Zz48Kn1AVZKH-1_l8OgWa-zf2kcQOOE,1414
@@ -36,6 +36,6 @@ sera/models/_parse.py,sha256=MaGZty29lsVUFumWqNanIjAwptBNOMbVZMXLZ2A9_2g,12317
 sera/models/_property.py,sha256=2rSLs9JjSesrxrEugE7krYaBQOivKU882I8mZN94FlI,7017
 sera/models/_schema.py,sha256=VxJEiqgVvbXgcSUK4UW6JnRcggk4nsooVSE6MyXmfNY,1636
 sera/typing.py,sha256=Fl4-UzLJu1GdLLk_g87fA7nT9wQGelNnGzag6dg_0gs,980
-sera_2-1.14.6.dist-info/METADATA,sha256=XuXxkDt84tayCblVI10S594d0t3e0eg5j66iUCB-PKQ,852
-sera_2-1.14.6.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-sera_2-1.14.6.dist-info/RECORD,,
+sera_2-1.15.0.dist-info/METADATA,sha256=KhiL3wTbAKSWXp40eoNTpZ86X8DFgPvIDloXnBGU1tQ,852
+sera_2-1.15.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+sera_2-1.15.0.dist-info/RECORD,,