sera-2 1.20.12__py3-none-any.whl → 1.20.14__py3-none-any.whl

sera/libs/api_helper.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import re
-from typing import Callable, Collection, Generic, TypeVar, cast
+from typing import Callable, Collection, Generic, Mapping, TypeVar, cast
 
 from litestar import Request, status_codes
 from litestar.connection import ASGIConnection
@@ -40,7 +40,7 @@ class TypeConversion:
 
 def parse_query(
     request: Request,
-    fields: dict[str, Callable[[str], str | int | bool | float]],
+    fields: Mapping[str, Callable[[str], str | int | bool | float]],
     debug: bool,
 ) -> Query:
     """Parse query for retrieving records that match a query.
@@ -91,7 +91,7 @@ def parse_query(
                     v = [norm_func(x) for x in v]
                 else:
                     v = norm_func(v)
-            except ValueError:
+            except (ValueError, KeyError):
                 if debug:
                     raise HTTPException(
                         status_code=status_codes.HTTP_400_BAD_REQUEST,

sera/misc/__init__.py

@@ -8,6 +8,7 @@ from sera.misc._utils import (
     get_classpath,
     identity,
     load_data,
+    load_data_from_dir,
     to_camel_case,
     to_pascal_case,
     to_snake_case,
@@ -28,4 +29,5 @@ __all__ = [
     "get_classpath",
     "LoadTableDataArgs",
     "RelTableIndex",
+    "load_data_from_dir",
 ]

sera/misc/_utils.py

@@ -1,14 +1,28 @@
 from __future__ import annotations
 
+import importlib
 import inspect
 import re
 from collections import defaultdict
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Any, Callable, Iterable, Optional, Sequence, Type, TypedDict, TypeVar
-
+from typing import (
+    Any,
+    Callable,
+    Iterable,
+    Optional,
+    Sequence,
+    Type,
+    TypedDict,
+    TypeVar,
+    cast,
+)
+
+import msgspec
+import orjson
 import serde.csv
 import serde.json
+from loguru import logger
 from sqlalchemy import Engine, text
 from sqlalchemy.orm import Session
 from tqdm import tqdm
@@ -57,6 +71,13 @@ reserved_keywords = {
 }
 
 
+def import_attr(attr_ident: str):
+    lst = attr_ident.rsplit(".", 1)
+    module, cls = lst
+    module = importlib.import_module(module)
+    return getattr(module, cls)
+
+
 def to_snake_case(camelcase: str) -> str:
     """Convert camelCase to snake_case."""
     snake = re.sub(r"([A-Z]+)([A-Z][a-z])", r"\1_\2", camelcase)
@@ -123,10 +144,10 @@ class LoadTableDataArgs(TypedDict, total=False):
     file: Path
     files: Sequence[Path]
     file_deser: Callable[[Path], list[Any]]
-    record_deser: (
+    record_deser: Optional[
         Callable[[dict], Any | list[Any]]
         | Callable[[dict, RelTableIndex], Any | list[Any]]
-    )
+    ]
     table_unique_index: dict[type, list[str]]
 
 
@@ -134,7 +155,7 @@ class RelTableIndex:
     """An index of relational tables to find a record by its unique property."""
 
     def __init__(self, cls2index: Optional[dict[str, list[str]]] = None):
-        self.table2rows: dict[str, dict[str, Any]] = defaultdict(dict)
+        self.table2rows: dict[str, dict[int, Any]] = defaultdict(dict)
         self.table2uniqindex2id: dict[str, dict[str, int]] = defaultdict(dict)
         self.cls2index = cls2index or {}
 
@@ -177,7 +198,7 @@ def load_data(
 
         reltable_index = RelTableIndex()
 
-        for args in tqdm(table_data, disable=not verbose, desc="Loading data"):
+        for args in table_data:
             if "table" in args:
                 tbls = [args["table"]]
             elif "tables" in args:
@@ -217,18 +238,23 @@ def load_data(
 
             assert "record_deser" in args
             deser = args["record_deser"]
+            if deser is None:
+                assert len(tbls) == 1
+                deser = get_dbclass_deser_func(tbls[0])
 
             sig = inspect.signature(deser)
             param_count = len(sig.parameters)
             if param_count == 1:
-                records = [deser(row) for row in raw_records]
+                _deser = cast(Callable[[dict], Any], deser)
+                records = [_deser(row) for row in raw_records]
             else:
                 assert param_count == 2
-                records = [deser(row, reltable_index) for row in raw_records]
+                _deser = cast(Callable[[dict, RelTableIndex], Any], deser)
+                records = [_deser(row, reltable_index) for row in raw_records]
 
             for r in tqdm(
                 records,
-                desc=f"load {', '.join(tbl.__name__ for tbl in tbls)}",
+                desc=f"Load {', '.join(tbl.__tablename__ for tbl in tbls)}",
                 disable=not verbose,
             ):
                 if isinstance(r, Sequence):
@@ -263,6 +289,40 @@ def load_data(
         session.commit()
 
 
+def load_data_from_dir(
+    engine: Engine,
+    create_db_and_tables: Callable[[], None],
+    data_dir: Path,
+    tables: Sequence[type | tuple[type, Callable[[dict], Any]]],
+    verbose: bool = False,
+):
+    """Load data into the database from a directory"""
+
+    load_args = []
+
+    for tbl in tables:
+        if isinstance(tbl, tuple):
+            tbl, record_deser = tbl
+        else:
+            record_deser = None
+
+        file = data_dir / (tbl.__tablename__ + ".json")
+        if not file.exists():
+            logger.warning(
+                "File {} does not exist, skipping loading for {}", file, tbl.__name__
+            )
+
+        load_args.append(
+            LoadTableDataArgs(
+                table=tbl,
+                file=file,
+                record_deser=record_deser,
+            )
+        )
+
+    load_data(engine, create_db_and_tables, load_args, verbose)
+
+
 def identity(x: T) -> T:
     """Identity function that returns the input unchanged."""
     return x
@@ -287,3 +347,23 @@ def get_classpath(type: Type | Callable) -> str:
         raise NotImplementedError(type)
 
     return path
+
+
+def get_dbclass_deser_func(type: type[T]) -> Callable[[dict], T]:
+    """Get a deserializer function for a class in models.db."""
+    module, clsname = (
+        get_classpath(type)
+        .replace(".models.db.", ".models.data.")
+        .rsplit(".", maxsplit=1)
+    )
+    StructType = getattr(importlib.import_module(module), f"Create{clsname}")
+
+    def deser_func(obj: dict):
+        record = msgspec.json.decode(orjson.dumps(obj), type=StructType)
+        if hasattr(record, "_is_scp_updated"):
+            # Skip updating system-controlled properties
+            record._is_scp_updated = True
+
+        return record.to_db()
+
+    return deser_func

sera/models/_datatype.py

@@ -78,6 +78,19 @@ class PyTypeWithDep:
             return ("TypeConversion.to_float", "sera.libs.api_helper.TypeConversion")
         if self.type == "bool":
             return ("TypeConversion.to_bool", "sera.libs.api_helper.TypeConversion")
+        if any(
+            dep.find(".models.enums.") != -1 and dep.endswith(self.type)
+            for dep in self.deps
+        ):
+            # This is an enum type, we directly use the enum constructor as the conversion function
+            return (
+                self.type,
+                [
+                    dep
+                    for dep in self.deps
+                    if dep.find(".models.enums.") != -1 and dep.endswith(self.type)
+                ][0],
+            )
         else:
             raise NotImplementedError()
 
@@ -159,6 +172,8 @@ class TsTypeWithDep:
             return value
         if self.type == "Date":
             return expr.ExprRawTypescript(f"{value.to_typescript()}.toISOString()")
+        if self.type == "Date | undefined":
+            return expr.ExprRawTypescript(f"{value.to_typescript()}?.toISOString()")
         if any(x.startswith("@.models.enum") for x in self.deps):
             # enum type, we don't need to do anything as we use strings for enums
             return value

{sera_2-1.20.12.dist-info → sera_2-1.20.14.dist-info}/METADATA

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

{sera_2-1.20.12.dist-info → sera_2-1.20.14.dist-info}/RECORD

@@ -4,7 +4,7 @@ sera/exports/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sera/exports/schema.py,sha256=wEBUrDOyuCoCJC8X4RlmoWpeqSugaboG-9Q1UQ8HEzk,7824
 sera/exports/test.py,sha256=jK1EJmLGiy7eREpnY_68IIVRH43uH8S_u5Z7STPbXOM,2002
 sera/libs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sera/libs/api_helper.py,sha256=-75GzGNboJnFUp45pxckDSBvOrnrA2Tw_UAZBnSK_20,6665
+sera/libs/api_helper.py,sha256=lWg_-2N8cLU4jCV-lSebO2o1b2gI4Tal0ThUlYkN0nA,6689
 sera/libs/api_test_helper.py,sha256=3tRr8sLN4dBSrHgKAHMmyoENI0xh7K_JLel8AvujU7k,1323
 sera/libs/base_orm.py,sha256=5hOH_diUeaABm3cpE2-9u50VRqG1QW2osPQnvVHIhIA,3365
 sera/libs/base_service.py,sha256=V6wug1QA5KD0FsQU9r1XQmLUTB85E6oIR2e12Fi1IE0,6457
@@ -26,14 +26,14 @@ sera/make/make_python_api.py,sha256=aOm8QSiXNLe4akiOx_KKsDCwLVwetRzuxOgZaWqEj0w,
 sera/make/make_python_model.py,sha256=t_2RUaO6WL4b5FtYj-Ly70njmcGGYwoddbL_oim9378,63479
 sera/make/make_python_services.py,sha256=0ZpWLwQ7Nwfn8BXAikAB4JRpNknpSJyJgY5b1cjtxV4,2073
 sera/make/make_typescript_model.py,sha256=CZc_LMigy7e6tP-6bJ5gHZlHYeyRtU_CNR4s64x51xE,71369
-sera/misc/__init__.py,sha256=BuwDvVl0nYAA_pYM0MAbRl8DqmuasZzidO46kNiu-5A,601
+sera/misc/__init__.py,sha256=wj59TDqHMQUehdYChO179_NqjZmpqykfkoHaVOtNm_Y,651
 sera/misc/_formatter.py,sha256=aCGYL08l8f3aLODHxSocxBBwkRYEo3K1QzCDEn3suj0,1685
-sera/misc/_utils.py,sha256=bum84Eh6gVsax0Gl4SxkmD6hUWazEljxsV16Q3BNcN8,9019
+sera/misc/_utils.py,sha256=yuWnlFA1LbiVKSS4RgnD18EtGCVCzQBj0vRZjxrbcEc,11072
 sera/models/__init__.py,sha256=vJC5Kzo_N7wd16ocNPy1VvAZDGNiWeiAhWJ4ihATKvA,780
 sera/models/_class.py,sha256=1J4Bd_LanzhhDWwZFHWGtFYD7lupe_alaB3D02ebNDI,2862
 sera/models/_collection.py,sha256=nLlP85OfEhfj4pFAYxB5ZvtBN6EdPSWPJ5ZFh5SSEC4,2686
 sera/models/_constraints.py,sha256=RpWDU-TfCslXaMUaTG9utWbl5z8Z6nzvF_fhqlek6ew,1987
-sera/models/_datatype.py,sha256=Whfdyt3X0-T_eLi-K38P8V-87AMna69R_1yeqWwjjXI,10611
+sera/models/_datatype.py,sha256=_pmhCu3e1qQQuOio5joRzAkPOpIDoVRoDJ4_OrZl0Pw,11224
 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
@@ -42,6 +42,6 @@ sera/models/_parse.py,sha256=9iaW-8Ajq8e440FrTJ-X9oivHJJ447kPU-ZqffFxSvw,12649
 sera/models/_property.py,sha256=9yMDxrmbyuF6-29lQjiq163Xzwbk75TlmGBpu0NLpkI,7485
 sera/models/_schema.py,sha256=VxJEiqgVvbXgcSUK4UW6JnRcggk4nsooVSE6MyXmfNY,1636
 sera/typing.py,sha256=m4rir-fB6Cgcm7_ZSXXcNdla2LJgq96WXxtTTrDaJno,1058
-sera_2-1.20.12.dist-info/METADATA,sha256=KspmNESywYnx1I-C6I_QzElaqC3-07W11VyQ6a9CbrE,937
-sera_2-1.20.12.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-sera_2-1.20.12.dist-info/RECORD,,
+sera_2-1.20.14.dist-info/METADATA,sha256=nCwKDJULbmdtdp-eXbklxPV1UHUUa1owIzuB8zLhpwo,937
+sera_2-1.20.14.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+sera_2-1.20.14.dist-info/RECORD,,