moose-lib 0.6.172__tar.gz → 0.6.173__tar.gz

{moose_lib-0.6.172 → moose_lib-0.6.173}/PKG-INFO

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

{moose_lib-0.6.172 → moose_lib-0.6.173}/moose_lib/__init__.py

@@ -30,7 +30,7 @@ from .blocks import (
     # Legacy enum (already exported via .blocks import, but explicit for clarity)
     ClickHouseEngines
 )
-from .data_models import Key, AggregateFunction, StringToEnumMixin
+from .data_models import Key, AggregateFunction, StringToEnumMixin, FixedString, ClickhouseFixedStringSize
 from .commons import Logger
 
 from .query_builder import *

{moose_lib-0.6.172 → moose_lib-0.6.173}/moose_lib/data_models.py

@@ -26,6 +26,11 @@ class ClickhouseSize:
     size: int
 
 
+@dataclasses.dataclass(frozen=True)
+class ClickhouseFixedStringSize:
+    size: int
+
+
 @dataclasses.dataclass(frozen=True)
 class ClickhouseDefault:
     expression: str
@@ -61,6 +66,23 @@ def clickhouse_datetime64(precision: int) -> Type[datetime]:
     return Annotated[datetime, ClickhousePrecision(precision=precision)]
 
 
+def FixedString(size: int) -> ClickhouseFixedStringSize:
+    """
+    Creates a FixedString(N) annotation for fixed-length strings.
+
+    ClickHouse stores exactly N bytes, padding shorter values with null bytes.
+    Values exceeding N bytes will raise an exception.
+
+    Use for fixed-length data like hashes, IPs, UUIDs, MAC addresses.
+
+    Example:
+        md5_hash: Annotated[str, FixedString(16)]  # 16-byte MD5
+        sha256: Annotated[str, FixedString(32)]    # 32-byte SHA256
+        ipv6: Annotated[str, FixedString(16)]      # 16-byte IPv6
+    """
+    return ClickhouseFixedStringSize(size=size)
+
+
 type Point = Annotated[tuple[float, float], "Point"]
 type Ring = Annotated[list[tuple[float, float]], "Ring"]
 type LineString = Annotated[list[tuple[float, float]], "LineString"]
@@ -279,7 +301,26 @@ def py_type_to_column_type(t: type, mds: list[Any]) -> Tuple[bool, list[Any], Da
     data_type: DataType
 
     if t is str:
-        data_type = "String"
+        # Check for FixedString annotation
+        fixed_string_size = next(
+            (md.size for md in mds if isinstance(md, ClickhouseFixedStringSize)),
+            None
+        )
+        if fixed_string_size:
+            data_type = f"FixedString({fixed_string_size})"
+        else:
+            data_type = "String"
+    elif t is bytes:
+        # Check for FixedString annotation
+        fixed_string_size = next(
+            (md.size for md in mds if isinstance(md, ClickhouseFixedStringSize)),
+            None
+        )
+        if fixed_string_size:
+            data_type = f"FixedString({fixed_string_size})"
+        else:
+            # Regular bytes without FixedString annotation
+            data_type = "String"
     elif t is int:
         # Check for int size annotations
         int_size = next((md for md in mds if isinstance(md, str) and re.match(r'^u?int\d+$', md)), None)
@@ -437,9 +478,13 @@ def py_type_to_column_type(t: type, mds: list[Any]) -> Tuple[bool, list[Any], Da
 def _to_columns(model: type[BaseModel]) -> list[Column]:
     """Convert Pydantic model fields to Column definitions."""
     columns = []
+    # Get raw annotations from the model class to preserve type aliases
+    raw_annotations = getattr(model, '__annotations__', {})
+
     for field_name, field_info in model.model_fields.items():
-        # Get the field type annotation
-        field_type = field_info.annotation
+        # Use raw annotation if available (preserves type aliases and their metadata)
+        # Fall back to field_info.annotation if not found in __annotations__
+        field_type = raw_annotations.get(field_name, field_info.annotation)
         if field_type is None:
             raise ValueError(f"Missing type for {field_name}")
         primary_key, field_type = handle_key(field_type)

{moose_lib-0.6.172 → moose_lib-0.6.173}/moose_lib.egg-info/PKG-INFO

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

{moose_lib-0.6.172 → moose_lib-0.6.173}/moose_lib.egg-info/SOURCES.txt

@@ -42,6 +42,7 @@ moose_lib/utilities/__init__.py
 moose_lib/utilities/sql.py
 tests/__init__.py
 tests/conftest.py
+tests/test_fixedstring.py
 tests/test_moose.py
 tests/test_olap_table_versioning.py
 tests/test_query_builder.py

moose_lib-0.6.173/tests/test_fixedstring.py

@@ -0,0 +1,43 @@
+from datetime import datetime
+from typing import Annotated
+from pydantic import BaseModel
+from moose_lib import Key, FixedString
+from moose_lib.data_models import _to_columns
+
+
+def test_fixedstring_annotation():
+    """Test FixedString annotation converts to correct ClickHouse type with str base type."""
+
+    class FixedStringTest(BaseModel):
+        id: Key[str]
+        created_at: datetime
+        md5_hash: Annotated[str, FixedString(16)]
+        sha256_hash: Annotated[str, FixedString(32)]
+        ipv6_address: Annotated[str, FixedString(16)]
+
+    columns = _to_columns(FixedStringTest)
+    by_name = {col.name: col for col in columns}
+
+    assert by_name["md5_hash"].data_type == "FixedString(16)"
+    assert by_name["sha256_hash"].data_type == "FixedString(32)"
+    assert by_name["ipv6_address"].data_type == "FixedString(16)"
+
+    # Verify other fields still work
+    assert by_name["id"].data_type == "String"
+    assert by_name["created_at"].data_type == "DateTime"
+
+
+def test_fixedstring_different_sizes():
+    """Test various FixedString sizes."""
+
+    class FixedStringSizes(BaseModel):
+        mac_address: Annotated[str, FixedString(6)]
+        uuid_binary: Annotated[str, FixedString(16)]
+        sha512_hash: Annotated[str, FixedString(64)]
+
+    columns = _to_columns(FixedStringSizes)
+    by_name = {col.name: col for col in columns}
+
+    assert by_name["mac_address"].data_type == "FixedString(6)"
+    assert by_name["uuid_binary"].data_type == "FixedString(16)"
+    assert by_name["sha512_hash"].data_type == "FixedString(64)"