moose-lib 0.6.113__tar.gz → 0.6.115__tar.gz

{moose_lib-0.6.113 → moose_lib-0.6.115}/PKG-INFO

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

{moose_lib-0.6.113 → moose_lib-0.6.115}/moose_lib/__init__.py

@@ -19,6 +19,10 @@ from .blocks import (
     ReplacingMergeTreeEngine, 
     AggregatingMergeTreeEngine,
     SummingMergeTreeEngine,
+    ReplicatedMergeTreeEngine,
+    ReplicatedReplacingMergeTreeEngine,
+    ReplicatedAggregatingMergeTreeEngine,
+    ReplicatedSummingMergeTreeEngine,
     S3QueueEngine,
     EngineConfig,
     # Legacy enum (already exported via .blocks import, but explicit for clarity)

{moose_lib-0.6.113 → moose_lib-0.6.115}/moose_lib/blocks.py

@@ -14,6 +14,10 @@ class ClickHouseEngines(Enum):
     VersionedCollapsingMergeTree = "VersionedCollapsingMergeTree"
     GraphiteMergeTree = "GraphiteMergeTree"
     S3Queue = "S3Queue"
+    ReplicatedMergeTree = "ReplicatedMergeTree"
+    ReplicatedReplacingMergeTree = "ReplicatedReplacingMergeTree"
+    ReplicatedAggregatingMergeTree = "ReplicatedAggregatingMergeTree"
+    ReplicatedSummingMergeTree = "ReplicatedSummingMergeTree"
 
 # ==========================
 # New Engine Configuration Classes
@@ -51,8 +55,100 @@ class AggregatingMergeTreeEngine(EngineConfig):
 
 @dataclass
 class SummingMergeTreeEngine(EngineConfig):
-    """Configuration for SummingMergeTree engine"""
-    pass
+    """Configuration for SummingMergeTree engine
+    
+    Args:
+        columns: Optional list of column names to sum
+    """
+    columns: Optional[List[str]] = None
+
+@dataclass
+class ReplicatedMergeTreeEngine(EngineConfig):
+    """Configuration for ReplicatedMergeTree engine (replicated version of MergeTree)
+    
+    Args:
+        keeper_path: Keeper path for replication (e.g., '/clickhouse/tables/{database}/{shard}/table_name')
+                     Optional: omit for ClickHouse Cloud which manages replication automatically
+        replica_name: Replica name (e.g., '{replica}')
+                      Optional: omit for ClickHouse Cloud which manages replication automatically
+    
+    Note: Both keeper_path and replica_name must be provided together, or both omitted.
+    """
+    keeper_path: Optional[str] = None
+    replica_name: Optional[str] = None
+    
+    def __post_init__(self):
+        # Both must be provided or both must be None
+        if (self.keeper_path is None) != (self.replica_name is None):
+            raise ValueError("keeper_path and replica_name must both be provided or both be None")
+
+@dataclass
+class ReplicatedReplacingMergeTreeEngine(EngineConfig):
+    """Configuration for ReplicatedReplacingMergeTree engine (replicated version with deduplication)
+    
+    Args:
+        keeper_path: Keeper path for replication (e.g., '/clickhouse/tables/{database}/{shard}/table_name')
+                     Optional: omit for ClickHouse Cloud which manages replication automatically
+        replica_name: Replica name (e.g., '{replica}')
+                      Optional: omit for ClickHouse Cloud which manages replication automatically
+        ver: Optional column name for version tracking
+        is_deleted: Optional column name for deletion marking (requires ver)
+    
+    Note: Both keeper_path and replica_name must be provided together, or both omitted.
+    """
+    keeper_path: Optional[str] = None
+    replica_name: Optional[str] = None
+    ver: Optional[str] = None
+    is_deleted: Optional[str] = None
+    
+    def __post_init__(self):
+        # Both must be provided or both must be None
+        if (self.keeper_path is None) != (self.replica_name is None):
+            raise ValueError("keeper_path and replica_name must both be provided or both be None")
+        if self.is_deleted and not self.ver:
+            raise ValueError("is_deleted requires ver to be specified")
+
+@dataclass
+class ReplicatedAggregatingMergeTreeEngine(EngineConfig):
+    """Configuration for ReplicatedAggregatingMergeTree engine (replicated version for aggregations)
+    
+    Args:
+        keeper_path: Keeper path for replication (e.g., '/clickhouse/tables/{database}/{shard}/table_name')
+                     Optional: omit for ClickHouse Cloud which manages replication automatically
+        replica_name: Replica name (e.g., '{replica}')
+                      Optional: omit for ClickHouse Cloud which manages replication automatically
+    
+    Note: Both keeper_path and replica_name must be provided together, or both omitted.
+    """
+    keeper_path: Optional[str] = None
+    replica_name: Optional[str] = None
+    
+    def __post_init__(self):
+        # Both must be provided or both must be None
+        if (self.keeper_path is None) != (self.replica_name is None):
+            raise ValueError("keeper_path and replica_name must both be provided or both be None")
+
+@dataclass
+class ReplicatedSummingMergeTreeEngine(EngineConfig):
+    """Configuration for ReplicatedSummingMergeTree engine (replicated version for summation)
+    
+    Args:
+        keeper_path: Keeper path for replication (e.g., '/clickhouse/tables/{database}/{shard}/table_name')
+                     Optional: omit for ClickHouse Cloud which manages replication automatically
+        replica_name: Replica name (e.g., '{replica}')
+                      Optional: omit for ClickHouse Cloud which manages replication automatically
+        columns: Optional list of column names to sum
+    
+    Note: Both keeper_path and replica_name must be provided together, or both omitted.
+    """
+    keeper_path: Optional[str] = None
+    replica_name: Optional[str] = None
+    columns: Optional[List[str]] = None
+    
+    def __post_init__(self):
+        # Both must be provided or both must be None
+        if (self.keeper_path is None) != (self.replica_name is None):
+            raise ValueError("keeper_path and replica_name must both be provided or both be None")
 
 @dataclass
 class S3QueueEngine(EngineConfig):

{moose_lib-0.6.113 → moose_lib-0.6.115}/moose_lib/data_models.py

@@ -16,17 +16,17 @@ type Key[T: (str, int)] = T
 type JWT[T] = T
 
 
-@dataclasses.dataclass  # a BaseModel in the annotations will confuse pydantic
+@dataclasses.dataclass(frozen=True)  # a BaseModel in the annotations will confuse pydantic
 class ClickhousePrecision:
     precision: int
 
 
-@dataclasses.dataclass
+@dataclasses.dataclass(frozen=True)
 class ClickhouseSize:
     size: int
 
 
-@dataclasses.dataclass
+@dataclasses.dataclass(frozen=True)
 class ClickhouseDefault:
     expression: str
 
@@ -53,13 +53,13 @@ def aggregated[T](
         agg_func: str,
         param_types: list[type | GenericAlias | _BaseGenericAlias]
 ) -> Type[T]:
-    return Annotated[result_type, AggregateFunction(agg_func=agg_func, param_types=param_types)]
+    return Annotated[result_type, AggregateFunction(agg_func=agg_func, param_types=tuple(param_types))]
 
 
-@dataclasses.dataclass
+@dataclasses.dataclass(frozen=True)
 class AggregateFunction:
     agg_func: str
-    param_types: list[type | GenericAlias | _BaseGenericAlias]
+    param_types: tuple[type | GenericAlias | _BaseGenericAlias, ...]
 
     def to_dict(self):
         return {

{moose_lib-0.6.113 → moose_lib-0.6.115}/moose_lib/internal.py

@@ -83,6 +83,38 @@ class AggregatingMergeTreeConfigDict(BaseEngineConfigDict):
 class SummingMergeTreeConfigDict(BaseEngineConfigDict):
     """Configuration for SummingMergeTree engine."""
     engine: Literal["SummingMergeTree"] = "SummingMergeTree"
+    columns: Optional[List[str]] = None
+
+
+class ReplicatedMergeTreeConfigDict(BaseEngineConfigDict):
+    """Configuration for ReplicatedMergeTree engine."""
+    engine: Literal["ReplicatedMergeTree"] = "ReplicatedMergeTree"
+    keeper_path: Optional[str] = None
+    replica_name: Optional[str] = None
+
+
+class ReplicatedReplacingMergeTreeConfigDict(BaseEngineConfigDict):
+    """Configuration for ReplicatedReplacingMergeTree engine."""
+    engine: Literal["ReplicatedReplacingMergeTree"] = "ReplicatedReplacingMergeTree"
+    keeper_path: Optional[str] = None
+    replica_name: Optional[str] = None
+    ver: Optional[str] = None
+    is_deleted: Optional[str] = None
+
+
+class ReplicatedAggregatingMergeTreeConfigDict(BaseEngineConfigDict):
+    """Configuration for ReplicatedAggregatingMergeTree engine."""
+    engine: Literal["ReplicatedAggregatingMergeTree"] = "ReplicatedAggregatingMergeTree"
+    keeper_path: Optional[str] = None
+    replica_name: Optional[str] = None
+
+
+class ReplicatedSummingMergeTreeConfigDict(BaseEngineConfigDict):
+    """Configuration for ReplicatedSummingMergeTree engine."""
+    engine: Literal["ReplicatedSummingMergeTree"] = "ReplicatedSummingMergeTree"
+    keeper_path: Optional[str] = None
+    replica_name: Optional[str] = None
+    columns: Optional[List[str]] = None
 
 
 class S3QueueConfigDict(BaseEngineConfigDict):
@@ -102,6 +134,10 @@ EngineConfigDict = Union[
     ReplacingMergeTreeConfigDict,
     AggregatingMergeTreeConfigDict,
     SummingMergeTreeConfigDict,
+    ReplicatedMergeTreeConfigDict,
+    ReplicatedReplacingMergeTreeConfigDict,
+    ReplicatedAggregatingMergeTreeConfigDict,
+    ReplicatedSummingMergeTreeConfigDict,
     S3QueueConfigDict
 ]
 
@@ -318,6 +354,110 @@ def _map_sql_resource_ref(r: Any) -> InfrastructureSignatureJson:
         raise TypeError(f"Object {r} lacks a 'kind' attribute for dependency mapping.")
 
 
+def _convert_basic_engine_instance(engine: "EngineConfig") -> Optional[EngineConfigDict]:
+    """Convert basic MergeTree engine instances to config dict.
+    
+    Args:
+        engine: An EngineConfig instance
+        
+    Returns:
+        EngineConfigDict if matched, None otherwise
+    """
+    from moose_lib.blocks import (
+        MergeTreeEngine, ReplacingMergeTreeEngine,
+        AggregatingMergeTreeEngine, SummingMergeTreeEngine
+    )
+    
+    if isinstance(engine, MergeTreeEngine):
+        return MergeTreeConfigDict()
+    elif isinstance(engine, ReplacingMergeTreeEngine):
+        return ReplacingMergeTreeConfigDict(
+            ver=engine.ver,
+            is_deleted=engine.is_deleted
+        )
+    elif isinstance(engine, AggregatingMergeTreeEngine):
+        return AggregatingMergeTreeConfigDict()
+    elif isinstance(engine, SummingMergeTreeEngine):
+        return SummingMergeTreeConfigDict(columns=engine.columns)
+    return None
+
+
+def _convert_replicated_engine_instance(engine: "EngineConfig") -> Optional[EngineConfigDict]:
+    """Convert replicated MergeTree engine instances to config dict.
+    
+    Args:
+        engine: An EngineConfig instance
+        
+    Returns:
+        EngineConfigDict if matched, None otherwise
+    """
+    from moose_lib.blocks import (
+        ReplicatedMergeTreeEngine, ReplicatedReplacingMergeTreeEngine,
+        ReplicatedAggregatingMergeTreeEngine, ReplicatedSummingMergeTreeEngine
+    )
+    
+    if isinstance(engine, ReplicatedMergeTreeEngine):
+        return ReplicatedMergeTreeConfigDict(
+            keeper_path=engine.keeper_path,
+            replica_name=engine.replica_name
+        )
+    elif isinstance(engine, ReplicatedReplacingMergeTreeEngine):
+        return ReplicatedReplacingMergeTreeConfigDict(
+            keeper_path=engine.keeper_path,
+            replica_name=engine.replica_name,
+            ver=engine.ver,
+            is_deleted=engine.is_deleted
+        )
+    elif isinstance(engine, ReplicatedAggregatingMergeTreeEngine):
+        return ReplicatedAggregatingMergeTreeConfigDict(
+            keeper_path=engine.keeper_path,
+            replica_name=engine.replica_name
+        )
+    elif isinstance(engine, ReplicatedSummingMergeTreeEngine):
+        return ReplicatedSummingMergeTreeConfigDict(
+            keeper_path=engine.keeper_path,
+            replica_name=engine.replica_name,
+            columns=engine.columns
+        )
+    return None
+
+
+def _convert_engine_instance_to_config_dict(engine: "EngineConfig") -> EngineConfigDict:
+    """Convert an EngineConfig instance to config dict format.
+    
+    Args:
+        engine: An EngineConfig instance
+        
+    Returns:
+        EngineConfigDict with engine-specific configuration
+    """
+    from moose_lib.blocks import S3QueueEngine
+    
+    # Try S3Queue first
+    if isinstance(engine, S3QueueEngine):
+        return S3QueueConfigDict(
+            s3_path=engine.s3_path,
+            format=engine.format,
+            aws_access_key_id=engine.aws_access_key_id,
+            aws_secret_access_key=engine.aws_secret_access_key,
+            compression=engine.compression,
+            headers=engine.headers
+        )
+    
+    # Try basic engines
+    basic_config = _convert_basic_engine_instance(engine)
+    if basic_config:
+        return basic_config
+    
+    # Try replicated engines
+    replicated_config = _convert_replicated_engine_instance(engine)
+    if replicated_config:
+        return replicated_config
+    
+    # Fallback for any other EngineConfig subclass
+    return BaseEngineConfigDict(engine=engine.__class__.__name__.replace("Engine", ""))
+
+
 def _convert_engine_to_config_dict(engine: Union[ClickHouseEngines, EngineConfig],
                                    table: OlapTable) -> EngineConfigDict:
     """Convert engine enum or EngineConfig instance to new engine config format.
@@ -330,38 +470,12 @@ def _convert_engine_to_config_dict(engine: Union[ClickHouseEngines, EngineConfig
         EngineConfigDict with engine-specific configuration
     """
     from moose_lib import ClickHouseEngines
-    from moose_lib.blocks import (
-        EngineConfig, S3QueueEngine, MergeTreeEngine,
-        ReplacingMergeTreeEngine, AggregatingMergeTreeEngine,
-        SummingMergeTreeEngine
-    )
+    from moose_lib.blocks import EngineConfig
     from moose_lib.commons import Logger
 
     # Check if engine is an EngineConfig instance (new API)
     if isinstance(engine, EngineConfig):
-        if isinstance(engine, S3QueueEngine):
-            return S3QueueConfigDict(
-                s3_path=engine.s3_path,
-                format=engine.format,
-                aws_access_key_id=engine.aws_access_key_id,
-                aws_secret_access_key=engine.aws_secret_access_key,
-                compression=engine.compression,
-                headers=engine.headers
-            )
-        elif isinstance(engine, ReplacingMergeTreeEngine):
-            return ReplacingMergeTreeConfigDict(
-                ver=engine.ver,
-                is_deleted=engine.is_deleted
-            )
-        elif isinstance(engine, AggregatingMergeTreeEngine):
-            return AggregatingMergeTreeConfigDict()
-        elif isinstance(engine, SummingMergeTreeEngine):
-            return SummingMergeTreeConfigDict()
-        elif isinstance(engine, MergeTreeEngine):
-            return MergeTreeConfigDict()
-        else:
-            # Fallback for any other EngineConfig subclass - use base class
-            return BaseEngineConfigDict(engine=engine.__class__.__name__.replace("Engine", ""))
+        return _convert_engine_instance_to_config_dict(engine)
 
     # Handle legacy enum-based engine configuration
     if isinstance(engine, ClickHouseEngines):
@@ -393,6 +507,10 @@ def _convert_engine_to_config_dict(engine: Union[ClickHouseEngines, EngineConfig
         "ReplacingMergeTree": ReplacingMergeTreeConfigDict,
         "AggregatingMergeTree": AggregatingMergeTreeConfigDict,
         "SummingMergeTree": SummingMergeTreeConfigDict,
+        "ReplicatedMergeTree": ReplicatedMergeTreeConfigDict,
+        "ReplicatedReplacingMergeTree": ReplicatedReplacingMergeTreeConfigDict,
+        "ReplicatedAggregatingMergeTree": ReplicatedAggregatingMergeTreeConfigDict,
+        "ReplicatedSummingMergeTree": ReplicatedSummingMergeTreeConfigDict,
     }
 
     config_class = engine_map.get(engine_name)

{moose_lib-0.6.113 → moose_lib-0.6.115}/moose_lib.egg-info/PKG-INFO

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