moose-lib 0.6.11__py3-none-any.whl → 0.6.13__py3-none-any.whl

moose_lib/data_models.py

@@ -26,6 +26,15 @@ class ClickhouseSize:
     size: int
 
 
+@dataclasses.dataclass
+class ClickhouseDefault:
+    expression: str
+
+
+def clickhouse_default(expression: str) -> ClickhouseDefault:
+    return ClickhouseDefault(expression=expression)
+
+
 def clickhouse_decimal(precision: int, scale: int) -> Type[Decimal]:
     return Annotated[Decimal, Field(max_digits=precision, decimal_places=scale)]
 
@@ -135,6 +144,7 @@ class Column(BaseModel):
     required: bool
     unique: Literal[False]
     primary_key: bool
+    default: str | None = None
     annotations: list[Tuple[str, Any]] = []
 
 
@@ -255,6 +265,12 @@ def _to_columns(model: type[BaseModel]) -> list[Column]:
 
         column_name = field_name if field_info.alias is None else field_info.alias
 
+        # Extract default expression from metadata, if provided
+        default_expr = next(
+            (md.expression for md in mds if isinstance(md, ClickhouseDefault)),
+            None,
+        )
+
         columns.append(
             Column(
                 name=column_name,
@@ -262,6 +278,7 @@ def _to_columns(model: type[BaseModel]) -> list[Column]:
                 required=not optional,
                 unique=False,
                 primary_key=primary_key,
+                default=default_expr,
                 annotations=annotations,
             )
         )

moose_lib/dmv2/materialized_view.py

@@ -5,29 +5,33 @@ This module provides classes for defining Materialized Views,
 including their SQL statements, target tables, and dependencies.
 """
 from typing import Any, Optional, Union, Generic, TypeVar
-from pydantic import BaseModel, ConfigDict
+from pydantic import BaseModel, ConfigDict, model_validator
 
 from moose_lib import ClickHouseEngines
 from .types import BaseTypedResource, T
 from .olap_table import OlapTable, OlapConfig
 from .sql_resource import SqlResource
 
+
 class MaterializedViewOptions(BaseModel):
     """Configuration options for creating a Materialized View.
 
     Attributes:
         select_statement: The SQL SELECT statement defining the view's data.
         select_tables: List of source tables/views the select statement reads from.
-        table_name: The name of the underlying target table storing the materialized data.
+        table_name: (Deprecated in favor of target_table) Optional name of the underlying
+                    target table storing the materialized data.
         materialized_view_name: The name of the MATERIALIZED VIEW object itself.
-        engine: Optional ClickHouse engine for the target table.
+        engine: Optional ClickHouse engine for the target table (used when creating
+                a target table via table_name or inline config).
         order_by_fields: Optional ordering key for the target table (required for
                          engines like ReplacingMergeTree).
         model_config: ConfigDict for Pydantic validation
     """
     select_statement: str
     select_tables: list[Union[OlapTable, SqlResource]]
-    table_name: str
+    # Backward-compatibility: allow specifying just the table_name and engine
+    table_name: Optional[str] = None
     materialized_view_name: str
     engine: Optional[ClickHouseEngines] = None
     order_by_fields: Optional[list[str]] = None
@@ -35,6 +39,7 @@ class MaterializedViewOptions(BaseModel):
     # Ensure arbitrary types are allowed for Pydantic validation
     model_config = ConfigDict(arbitrary_types_allowed=True)
 
+
 class MaterializedView(SqlResource, BaseTypedResource, Generic[T]):
     """Represents a ClickHouse Materialized View.
 
@@ -62,25 +67,38 @@ class MaterializedView(SqlResource, BaseTypedResource, Generic[T]):
     def __init__(
             self,
             options: MaterializedViewOptions,
+            target_table: Optional[OlapTable[T]] = None,
             **kwargs
     ):
         self._set_type(options.materialized_view_name, self._get_type(kwargs))
 
+        # Resolve target table from options
+        if target_table:
+            self.target_table = target_table
+            if self._t != target_table._t:
+                raise ValueError("Target table must have the same type as the materialized view")
+        else:
+            # Backward-compatibility path using table_name/engine/order_by_fields
+            if not options.table_name:
+                raise ValueError("Name of target table is not specified. Provide 'target_table' or 'table_name'.")
+            target_table = OlapTable(
+                name=options.table_name,
+                config=OlapConfig(
+                    order_by_fields=options.order_by_fields or [],
+                    engine=options.engine
+                ),
+                t=self._t
+            )
+        
+        if target_table.name == options.materialized_view_name:
+            raise ValueError("Target table name cannot be the same as the materialized view name")
+
         setup = [
-            f"CREATE MATERIALIZED VIEW IF NOT EXISTS {options.materialized_view_name} TO {options.table_name} AS {options.select_statement}",
-            f"INSERT INTO {options.table_name} {options.select_statement}"
+            f"CREATE MATERIALIZED VIEW IF NOT EXISTS {options.materialized_view_name} TO {target_table.name} AS {options.select_statement}",
+            f"INSERT INTO {target_table.name} {options.select_statement}"
         ]
         teardown = [f"DROP VIEW IF EXISTS {options.materialized_view_name}"]
 
-        target_table = OlapTable(
-            name=options.table_name,
-            config=OlapConfig(
-                order_by_fields=options.order_by_fields or [],
-                engine=options.engine
-            ),
-            t=self._t
-        )
-
         super().__init__(
             options.materialized_view_name,
             setup,

{moose_lib-0.6.11.dist-info → moose_lib-0.6.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: moose_lib
-Version: 0.6.11
+Version: 0.6.13
 Home-page: https://www.fiveonefour.com/moose
 Author: Fiveonefour Labs Inc.
 Author-email: support@fiveonefour.com

{moose_lib-0.6.11.dist-info → moose_lib-0.6.13.dist-info}/RECORD

@@ -1,7 +1,7 @@
 moose_lib/__init__.py,sha256=_XXfHrzRl-M5M1e3CwBQGGblVQYKnU5QJkipghe4bXU,184
 moose_lib/blocks.py,sha256=_wdvC2NC_Y3MMEnB71WTgWbeQ--zPNHk19xjToJW0C0,3185
 moose_lib/commons.py,sha256=FUpRv8D3-LeGcjhcqtDyiimz5izwpCq53h50ydxC_uA,3711
-moose_lib/data_models.py,sha256=qXe0MuD1mojMGusocLn73d-HTtP4_ORPNwGQMQWtP0o,9817
+moose_lib/data_models.py,sha256=PgoFXTzf4C66FlKUowMT4VOrwSRR9_bk36P43ub4LzU,10274
 moose_lib/dmv2-serializer.py,sha256=CL_Pvvg8tJOT8Qk6hywDNzY8MYGhMVdTOw8arZi3jng,49
 moose_lib/internal.py,sha256=UYF42oFujLH1g9GDo_HdP-AYipKTf_lReyVi6qs945A,14397
 moose_lib/main.py,sha256=WAxrM39rp5leAtHxZQZlC8-a8pA8Ksy1TjVQnq12YeA,17354
@@ -18,7 +18,7 @@ moose_lib/dmv2/consumption.py,sha256=KJV9MKgrnVLIRhlFVZMDhTsXvOaZoMiHk4hnRePdPWA
 moose_lib/dmv2/ingest_api.py,sha256=Snek9NGwaJl_BuImSWGtQq91m9D3AJ4qBoGiKZ-9yTQ,2323
 moose_lib/dmv2/ingest_pipeline.py,sha256=q7k8B50Dp_jpJA86Rr9dOGl7-EaGF0LR81TuFXlktxc,7024
 moose_lib/dmv2/life_cycle.py,sha256=wl0k6yzwU1MJ_fO_UkN29buoY5G6ChYZvfwigP9fVfM,1254
-moose_lib/dmv2/materialized_view.py,sha256=kcx-sJFTM-cH3Uc1GoldgFGodjoz0AegAQEMmohdS38,3826
+moose_lib/dmv2/materialized_view.py,sha256=xlYNXiOHhjGq5pE8z0dMrVs-Db01DnOlY14CmLwMDGE,4851
 moose_lib/dmv2/olap_table.py,sha256=4DfF_KMCspCvQLf7DwmkmfyFswCv8J-3NhDcnNTWvKg,31304
 moose_lib/dmv2/registry.py,sha256=janjYszIXDnMfuwkNhoiBmMLar3umQ3Npw9Ms-u6p-8,2373
 moose_lib/dmv2/sql_resource.py,sha256=kUZoGqxhZMHMthtBZGYJBxTFjXkspXiWLXhJRYXgGUM,1864
@@ -32,7 +32,7 @@ tests/__init__.py,sha256=0Gh4yzPkkC3TzBGKhenpMIxJcRhyrrCfxLSfpTZnPMQ,53
 tests/conftest.py,sha256=ZVJNbnr4DwbcqkTmePW6U01zAzE6QD0kNAEZjPG1f4s,169
 tests/test_moose.py,sha256=mBsx_OYWmL8ppDzL_7Bd7xR6qf_i3-pCIO3wm2iQNaA,2136
 tests/test_redis_client.py,sha256=d9_MLYsJ4ecVil_jPB2gW3Q5aWnavxmmjZg2uYI3LVo,3256
-moose_lib-0.6.11.dist-info/METADATA,sha256=m8seJsJpeK7qnyiSlpcuINU7wRq7bktXSsi1_f-y4XQ,730
-moose_lib-0.6.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-moose_lib-0.6.11.dist-info/top_level.txt,sha256=XEns2-4aCmGp2XjJAeEH9TAUcGONLnSLy6ycT9FSJh8,16
-moose_lib-0.6.11.dist-info/RECORD,,
+moose_lib-0.6.13.dist-info/METADATA,sha256=eInIciZTxMqwB0xhk48O4L8eSXn-uNyiXmJV9kzrN6U,730
+moose_lib-0.6.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+moose_lib-0.6.13.dist-info/top_level.txt,sha256=XEns2-4aCmGp2XjJAeEH9TAUcGONLnSLy6ycT9FSJh8,16
+moose_lib-0.6.13.dist-info/RECORD,,