moose-lib 0.6.164__py3-none-any.whl → 0.6.166__py3-none-any.whl

moose_lib/dmv2/olap_table.py

@@ -155,9 +155,10 @@ class OlapConfig(BaseModel):
         if self.engine:
             from ..blocks import S3Engine, S3QueueEngine, BufferEngine, DistributedEngine
 
-            # All non-MergeTree engines don't support ORDER BY
-            non_mergetree_engines = (S3Engine, S3QueueEngine, BufferEngine, DistributedEngine)
-            if isinstance(self.engine, non_mergetree_engines):
+            # S3QueueEngine, BufferEngine, and DistributedEngine don't support ORDER BY
+            # Note: S3Engine DOES support ORDER BY (unlike S3Queue)
+            engines_without_order_by = (S3QueueEngine, BufferEngine, DistributedEngine)
+            if isinstance(self.engine, engines_without_order_by):
                 engine_name = type(self.engine).__name__
 
                 if has_fields or has_expr:
@@ -166,6 +167,11 @@ class OlapConfig(BaseModel):
                         f"Remove order_by_fields or order_by_expression from your configuration."
                     )
 
+            # All non-MergeTree engines don't support SAMPLE BY
+            engines_without_sample_by = (S3Engine, S3QueueEngine, BufferEngine, DistributedEngine)
+            if isinstance(self.engine, engines_without_sample_by):
+                engine_name = type(self.engine).__name__
+
                 if self.sample_by_expression:
                     raise ValueError(
                         f"{engine_name} does not support SAMPLE BY clause. "

{moose_lib-0.6.164.dist-info → moose_lib-0.6.166.dist-info}/METADATA

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

{moose_lib-0.6.164.dist-info → moose_lib-0.6.166.dist-info}/RECORD

@@ -20,7 +20,7 @@ moose_lib/dmv2/ingest_api.py,sha256=XhvHHgGPXp-BuRpAALth-FRhanwy-zJQ_83Cg_RLolM,
 moose_lib/dmv2/ingest_pipeline.py,sha256=R8NRrfD9zkEzwWEJKIrNL9Nk18DdGc7wdAakae_2-7o,8459
 moose_lib/dmv2/life_cycle.py,sha256=wl0k6yzwU1MJ_fO_UkN29buoY5G6ChYZvfwigP9fVfM,1254
 moose_lib/dmv2/materialized_view.py,sha256=wTam1V5CC2rExt7YrdK_Cz4rRTONm2keKOF951LlCP4,4875
-moose_lib/dmv2/olap_table.py,sha256=AfKTH6kabyE2qzrz-9C9BdDHyQor_JOTfIqplAkP56k,37474
+moose_lib/dmv2/olap_table.py,sha256=gYVuKRIKooDNFsyS9FFydbvHWpxkc716nDSw2FwXrFc,37851
 moose_lib/dmv2/registry.py,sha256=5V8HRKBJXKLIi5tdIC2tKEmsGELQ1C2fBrMjns8a3ao,2947
 moose_lib/dmv2/sql_resource.py,sha256=kUZoGqxhZMHMthtBZGYJBxTFjXkspXiWLXhJRYXgGUM,1864
 moose_lib/dmv2/stream.py,sha256=pDryS1x5zMkDSJsFlGqm8quwKTl1ctAL-a_U8ySgqQI,18043
@@ -39,11 +39,11 @@ tests/test_moose.py,sha256=mBsx_OYWmL8ppDzL_7Bd7xR6qf_i3-pCIO3wm2iQNaA,2136
 tests/test_olap_table_versioning.py,sha256=ffuJsO5TYKBd2aWV0GWDmosCwL4j518Y_MqYJdrfgDY,7041
 tests/test_query_builder.py,sha256=O3imdFSaqU13kbK1jSQaHbBgynhVmJaApT8DlRqYwJU,1116
 tests/test_redis_client.py,sha256=d9_MLYsJ4ecVil_jPB2gW3Q5aWnavxmmjZg2uYI3LVo,3256
-tests/test_s3queue_config.py,sha256=TSXSTAjcAVpZuvQza2i0XWGQTeaNs4mRZeH4pFCujNY,14728
+tests/test_s3queue_config.py,sha256=A-17Lir2kvYoUA0qEaNczOkLKhHPzyp3glka7YqnPws,14490
 tests/test_secrets.py,sha256=g5ZjtOyT7vTz_sRUB71Vd6s715u0gMc4C-_8m_59Mtg,8347
 tests/test_simple_aggregate.py,sha256=yyFSYHUXskA1aTcwC-KQ9XmgOikeQ8wKXzntsUBIC6w,4055
 tests/test_web_app.py,sha256=iL86sg0NS2k6nP8jIGKZvrtg0BjvaqNTRp7-4T1TTck,6557
-moose_lib-0.6.164.dist-info/METADATA,sha256=PVwuy8RcAsf6zD6GARk1NQYQGnuqqC0L1eX2rB_pJtE,827
-moose_lib-0.6.164.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-moose_lib-0.6.164.dist-info/top_level.txt,sha256=XEns2-4aCmGp2XjJAeEH9TAUcGONLnSLy6ycT9FSJh8,16
-moose_lib-0.6.164.dist-info/RECORD,,
+moose_lib-0.6.166.dist-info/METADATA,sha256=qWGgN_bNUqQBhH1_41epqkL7iUI2yVYV1M74r3bgte4,827
+moose_lib-0.6.166.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+moose_lib-0.6.166.dist-info/top_level.txt,sha256=XEns2-4aCmGp2XjJAeEH9TAUcGONLnSLy6ycT9FSJh8,16
+moose_lib-0.6.166.dist-info/RECORD,,

tests/test_s3queue_config.py

@@ -291,18 +291,12 @@ def test_non_mergetree_engines_reject_unsupported_clauses():
     """Test that non-MergeTree engines reject unsupported ORDER BY and SAMPLE BY clauses."""
     from moose_lib.blocks import S3Engine, S3QueueEngine, BufferEngine, DistributedEngine
 
-    # Test S3Engine rejects ORDER BY
-    with pytest.raises(ValueError, match="S3Engine does not support ORDER BY clauses"):
-        OlapConfig(
-            engine=S3Engine(path="s3://bucket/file.json", format="JSONEachRow"),
-            order_by_fields=["id"]
-        )
-
-    with pytest.raises(ValueError, match="S3Engine does not support ORDER BY clauses"):
-        OlapConfig(
-            engine=S3Engine(path="s3://bucket/file.json", format="JSONEachRow"),
-            order_by_expression="(id, name)"
-        )
+    # Test S3Engine DOES support ORDER BY (should not raise)
+    config_s3_with_order_by = OlapConfig(
+        engine=S3Engine(path="s3://bucket/file.json", format="JSONEachRow"),
+        order_by_fields=["id"]
+    )
+    assert config_s3_with_order_by.order_by_fields == ["id"]
 
     # Test S3Engine rejects SAMPLE BY
     with pytest.raises(ValueError, match="S3Engine does not support SAMPLE BY clause"):