moose-lib 0.4.304__py3-none-any.whl → 0.4.306__py3-none-any.whl

moose_lib/query_param.py

@@ -1,12 +1,13 @@
 import dataclasses
 from dataclasses import dataclass, fields, is_dataclass
 from datetime import datetime
-from typing import Optional, Literal, Union, Any
+from typing import Optional, Union, Any
 import inspect
 
 from pydantic import BaseModel
+from .data_models import DataEnum, py_type_to_column_type, ArrayType as DataModelArrayType
 
-scalar_types = Literal['String', 'Float', 'Int', 'Boolean', 'DateTime']
+scalar_types = Union[str, DataEnum]
 
 
 @dataclass
@@ -23,30 +24,27 @@ class QueryField:
 
 
 def to_scalar_type(t: type) -> scalar_types:
-    if t == str:
-        return 'String'
-    elif t == int:
-        return 'Int'
-    elif t == float:
-        return 'Float'
-    elif t == bool:
-        return 'Boolean'
-    elif t == datetime:
-        return 'DateTime'
-    raise ValueError(f"Unsupported type: {t}")
+    optional, mds, data_type = py_type_to_column_type(t, [])
+
+    # Check if the result is a scalar type (str or DataEnum)
+    if isinstance(data_type, str) or isinstance(data_type, DataEnum):
+        return data_type
+    else:
+        raise ValueError(f"Type {t} maps to non-scalar ClickHouse type: {data_type}")
 
 
 def unwrap_optional(union_type):
     return Union[*[arg for arg in union_type.__args__ if arg is not type(None)]]
 
 
+# dmV1 code, won't upgrade to include the rich types
 def parse_scalar_value(value: str, t: scalar_types) -> Any:
     match t:
         case 'String':
             return value
         case 'Int':
             return int(value)
-        case 'Float':
+        case 'Float' | 'Float64' | 'Float32':
             return float(value)
         case 'Boolean':
             value_lower = value.lower()
@@ -56,7 +54,8 @@ def parse_scalar_value(value: str, t: scalar_types) -> Any:
         case 'DateTime':
             return datetime.fromisoformat(value)
         case _:
-            raise ValueError(f"Unsupported type: {t}")
+            # enum parsing will not be added to dmV1 code
+            return value
 
 
 def convert_pydantic_definition(cls: type) -> list[QueryField]:

{moose_lib-0.4.304.dist-info → moose_lib-0.4.306.dist-info}/METADATA

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

{moose_lib-0.4.304.dist-info → moose_lib-0.4.306.dist-info}/RECORD

@@ -5,7 +5,7 @@ moose_lib/data_models.py,sha256=FjFNd88WWCGMG5p5gV-Vjgp1cXARBeFapEHqDy0-WX8,9792
 moose_lib/dmv2-serializer.py,sha256=CL_Pvvg8tJOT8Qk6hywDNzY8MYGhMVdTOw8arZi3jng,49
 moose_lib/internal.py,sha256=ezqTTWS3T6nAPAxcjMPGYs-6ZwZwxOTZVuVFHiSkEmw,14269
 moose_lib/main.py,sha256=uyHkaPaKMOZGAgZrj8T4thRVC4cuPxP5CC0em2m83G8,16482
-moose_lib/query_param.py,sha256=AB5BKu610Ji-h1iYGMBZKfnEFqt85rS94kzhDwhWJnc,6288
+moose_lib/query_param.py,sha256=FWhMXsdIexuJv57nG1YcepD-OZp7k4dNG4LkGVN1q-g,6486
 moose_lib/tasks.py,sha256=6MXA0j7nhvQILAJVTQHCAsquwrSOi2zAevghAc_7kXs,1554
 moose_lib/clients/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 moose_lib/clients/redis_client.py,sha256=UBCdxwgZpIOIOy2EnPyxJIAYjw_qmNwGsJQCQ66SxUI,8117
@@ -31,7 +31,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.4.304.dist-info/METADATA,sha256=-0dHQIPTw7j6qDnG2pjxpiwNYcCQx8f0x7ilugWxTLk,731
-moose_lib-0.4.304.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-moose_lib-0.4.304.dist-info/top_level.txt,sha256=XEns2-4aCmGp2XjJAeEH9TAUcGONLnSLy6ycT9FSJh8,16
-moose_lib-0.4.304.dist-info/RECORD,,
+moose_lib-0.4.306.dist-info/METADATA,sha256=grr5i2PVmf1luQ27A7Ppxw7Sa_lU-XvOa7MLRehAaQA,731
+moose_lib-0.4.306.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+moose_lib-0.4.306.dist-info/top_level.txt,sha256=XEns2-4aCmGp2XjJAeEH9TAUcGONLnSLy6ycT9FSJh8,16
+moose_lib-0.4.306.dist-info/RECORD,,