sera-2 1.20.16__py3-none-any.whl → 1.21.1__py3-none-any.whl

sera/libs/base_service.py

@@ -128,8 +128,6 @@ class BaseAsyncService(Generic[ID, R]):
                         func.to_tsvector(getattr(self.orm_cls, field)).match(value)
                     )
 
-        print(">>>", q)
-
         cq = select(func.count()).select_from(q.subquery())
         rq = q.limit(limit).offset(offset)
         records = self._process_result(await session.execute(rq)).scalars().all()

sera/libs/directed_computing_graph/_dcg.py

@@ -1,18 +1,6 @@
 from __future__ import annotations
 
-import asyncio
-import inspect
-from dataclasses import dataclass
-from enum import Enum
-from typing import (
-    Annotated,
-    Any,
-    Awaitable,
-    Callable,
-    MutableSequence,
-    Optional,
-    Sequence,
-)
+from typing import Annotated, Any, Callable, MutableSequence, Optional, Sequence
 
 from graph.retworkx import RetworkXStrDiGraph
 
@@ -201,7 +189,7 @@ class DirectedComputingGraph:
 
         Args:
             input: A dictionary mapping function identifiers to their input arguments.
-            output: A set of function identifiers that should be executed.
+            output: A set of function identifiers that their output should be captured.
             context: An optional context that can be a dictionary of functions or a single function.
         """
         assert all(
@@ -296,7 +284,7 @@ class DirectedComputingGraph:
     async def execute_async(
         self,
         input: dict[ComputeFnId, tuple],
-        output: set[str],
+        output: Optional[set[str]] = None,
         context: Optional[
             dict[str, Callable | Any] | Callable[[], dict[str, Any]]
         ] = None,
@@ -307,7 +295,7 @@ class DirectedComputingGraph:
 
         Args:
             input: A dictionary mapping function identifiers to their input arguments.
-            output: A set of function identifiers that should be executed.
+            output: A set of function identifiers that their output should be captured.
             context: An optional context that can be a dictionary of functions or a single function.
         """
         assert all(
@@ -321,6 +309,9 @@ class DirectedComputingGraph:
         else:
             context = {k: v() if callable(v) else v for k, v in context.items()}
 
+        if output is None:
+            output = set()
+
         # This is a quick reactive algorithm, we may be able to do it better.
         # The idea is when all inputs of a function is available, we can execute a function.
         # We assume that the memory is large enough to hold all the functions and their inputs

sera/misc/__init__.py

@@ -4,11 +4,13 @@ from sera.misc._utils import (
     RelTableIndex,
     assert_isinstance,
     assert_not_null,
+    auto_import,
     filter_duplication,
     get_classpath,
     identity,
     load_data,
     load_data_from_dir,
+    replay_events,
     to_camel_case,
     to_pascal_case,
     to_snake_case,
@@ -30,4 +32,6 @@ __all__ = [
     "LoadTableDataArgs",
     "RelTableIndex",
     "load_data_from_dir",
+    "replay_events",
+    "auto_import",
 ]

sera/misc/_utils.py

@@ -1,12 +1,12 @@
 from __future__ import annotations
 
-import importlib
 import inspect
 import re
 from collections import defaultdict
-from dataclasses import dataclass
+from importlib import import_module
 from pathlib import Path
 from typing import (
+    TYPE_CHECKING,
     Any,
     Callable,
     Iterable,
@@ -23,10 +23,14 @@ import orjson
 import serde.csv
 import serde.json
 from loguru import logger
-from sqlalchemy import Engine, text
+from sqlalchemy import Engine, select, text
+from sqlalchemy.ext.asyncio import AsyncEngine, AsyncSession
 from sqlalchemy.orm import Session
 from tqdm import tqdm
 
+if TYPE_CHECKING:
+    from sera.libs.directed_computing_graph import DirectedComputingGraph
+
 T = TypeVar("T")
 
 TYPE_ALIASES = {"typing.List": "list", "typing.Dict": "dict", "typing.Set": "set"}
@@ -74,7 +78,7 @@ reserved_keywords = {
 def import_attr(attr_ident: str):
     lst = attr_ident.rsplit(".", 1)
     module, cls = lst
-    module = importlib.import_module(module)
+    module = import_module(module)
     return getattr(module, cls)
 
 
@@ -138,6 +142,75 @@ def filter_duplication(
     return new_lst
 
 
+def identity(x: T) -> T:
+    """Identity function that returns the input unchanged."""
+    return x
+
+
+def get_classpath(type: Type | Callable) -> str:
+    if hasattr(type, "__module__") and type.__module__ == "builtins":
+        return type.__qualname__
+
+    if hasattr(type, "__qualname__"):
+        return type.__module__ + "." + type.__qualname__
+
+    # typically a class from the typing module
+    if hasattr(type, "_name") and type._name is not None:
+        path = type.__module__ + "." + type._name
+        if path in TYPE_ALIASES:
+            path = TYPE_ALIASES[path]
+    elif hasattr(type, "__origin__") and hasattr(type.__origin__, "_name"):
+        # found one case which is typing.Union
+        path = type.__module__ + "." + type.__origin__._name
+    else:
+        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(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
+
+
+def auto_import(module: type):
+    """Auto-import all submodules of a given module."""
+    mdir = Path(module.__path__[0])
+    for py_file in mdir.rglob("*.py"):
+        if py_file.name == "__init__.py":
+            continue
+
+        # Get the path of the submodule relative to the parent module's directory
+        relative_path = py_file.relative_to(mdir)
+
+        # Create the module import string from the file path
+        # e.g., for a file like `sub/module.py`, this creates `sub.module`
+        module_parts = list(relative_path.parts)
+        module_parts[-1] = relative_path.stem  # remove .py extension
+        relative_module_name = ".".join(module_parts)
+
+        # Construct the full module path
+        full_module_path = f"{module.__name__}.{relative_module_name}"
+
+        # Dynamically import the module
+        import_module(full_module_path)
+
+
 class LoadTableDataArgs(TypedDict, total=False):
     table: type
     tables: Sequence[type]
@@ -324,47 +397,23 @@ def load_data_from_dir(
     load_data(engine, create_db_and_tables, load_args, verbose)
 
 
-def identity(x: T) -> T:
-    """Identity function that returns the input unchanged."""
-    return x
-
-
-def get_classpath(type: Type | Callable) -> str:
-    if type.__module__ == "builtins":
-        return type.__qualname__
-
-    if hasattr(type, "__qualname__"):
-        return type.__module__ + "." + type.__qualname__
-
-    # typically a class from the typing module
-    if hasattr(type, "_name") and type._name is not None:
-        path = type.__module__ + "." + type._name
-        if path in TYPE_ALIASES:
-            path = TYPE_ALIASES[path]
-    elif hasattr(type, "__origin__") and hasattr(type.__origin__, "_name"):
-        # found one case which is typing.Union
-        path = type.__module__ + "." + type.__origin__._name
-    else:
-        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
+async def replay_events(
+    engine: AsyncEngine,
+    dcg: DirectedComputingGraph,
+    tables: Sequence[type],
+    verbose: bool = False,
+):
+    """Replay the events in the DirectedComputingGraph. This is useful to re-run the workflows
+    that computes derived data after initial data loading.
+    """
+    async with AsyncSession(engine, expire_on_commit=False) as session:
+        for tbl in tables:
+            innode = f"{tbl.__tablename__}.create"
+            for record in tqdm(
+                (await session.execute(select(tbl))).scalars(),
+                desc=f"Replaying events for {tbl.__tablename__}",
+                disable=not verbose,
+            ):
+                await dcg.execute_async(
+                    input={innode: (record,)}, context={"session": session}
+                )

sera/models/_constraints.py

@@ -10,8 +10,8 @@ ConstraintName = Literal[
     "not_empty",
     "username",
     "password",
-    "whole_number",
     "positive_number",
+    "non_negative_number",
 ]
 
 
@@ -34,7 +34,7 @@ class Constraint:
             )
         elif self.name == "password":
             return "msgspec.Meta(min_length=8, max_length=40)"
-        elif self.name == "whole_number":
+        elif self.name == "non_negative_number":
             return "msgspec.Meta(ge=0)"
         elif self.name == "positive_number":
             return "msgspec.Meta(gt=0)"
@@ -58,7 +58,7 @@ predefined_constraints: dict[ConstraintName, Constraint] = {
     "not_empty": Constraint("not_empty", ()),
     "username": Constraint("username", ()),
     "password": Constraint("password", ()),
-    "whole_number": Constraint("whole_number", ()),
+    "non_negative_number": Constraint("non_negative_number", ()),
     "positive_number": Constraint("positive_number", ()),
     "url": Constraint("url", ()),
 }

{sera_2-1.20.16.dist-info → sera_2-1.21.1.dist-info}/METADATA

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

{sera_2-1.20.16.dist-info → sera_2-1.21.1.dist-info}/RECORD

@@ -7,9 +7,9 @@ sera/libs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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
+sera/libs/base_service.py,sha256=NY-PLiaS1SXs2Pp3yVsdGnpJGUxKbHb0qzCCguhgPP4,6432
 sera/libs/directed_computing_graph/__init__.py,sha256=xiF5_I1y9HtQ-cyq02iwkRYgEZvxBB8YIvysCHCLBco,1290
-sera/libs/directed_computing_graph/_dcg.py,sha256=AGTzKVSl-EsSOJlNKPOA1Io7pIxfq0SMXuumq1IExl0,14902
+sera/libs/directed_computing_graph/_dcg.py,sha256=miclcxik67CbJpb8slvUOcdWLQH67msqder7JpOoiTw,14870
 sera/libs/directed_computing_graph/_edge.py,sha256=iBq6cpLWWyuD99QWTHVEh8naWUJrR4WJJuq5iuCrwHo,1026
 sera/libs/directed_computing_graph/_flow.py,sha256=6v39yKPIDYrQ3KvFqjeAWs88-oQSnDTaED2F3LF2z_I,478
 sera/libs/directed_computing_graph/_fn_signature.py,sha256=73iPUITcRKW0-l6sqjwMSk_FZnJESaKOmUKDGHTOh9Q,1598
@@ -26,13 +26,13 @@ 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=wj59TDqHMQUehdYChO179_NqjZmpqykfkoHaVOtNm_Y,651
+sera/misc/__init__.py,sha256=L70kdXM5WmtMpgLlQISnGmrLgn241TQF0zFXFPi3Xzk,727
 sera/misc/_formatter.py,sha256=aCGYL08l8f3aLODHxSocxBBwkRYEo3K1QzCDEn3suj0,1685
-sera/misc/_utils.py,sha256=dYl1HqiqO4FWpef6jGKNjyjk03jfDvtQH0K6VJrk-8s,11093
+sera/misc/_utils.py,sha256=7vDhG1_hEdA4enTtL6gg5evBEg397kuxZ5ZtXC9PBWo,12939
 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/_constraints.py,sha256=oRniaFXUsnQ_Q8lwXVcnBhvHG-Gw6eY31eIkFd1UXI4,2015
 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
@@ -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.16.dist-info/METADATA,sha256=f8-UFa7OKC_NkgMMQSdiM-LaHM78f3m18r1ge3z3tlk,937
-sera_2-1.20.16.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-sera_2-1.20.16.dist-info/RECORD,,
+sera_2-1.21.1.dist-info/METADATA,sha256=ojxFGoSzu_QLUSvtKfl6pE86Qd2eCg6QStYYiFbykGw,936
+sera_2-1.21.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+sera_2-1.21.1.dist-info/RECORD,,