mainsequence 8.1.20.dev7__tar.gz → 8.1.20.dev8__tar.gz

{mainsequence-8.1.20.dev7/mainsequence.egg-info → mainsequence-8.1.20.dev8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mainsequence
-Version: 8.1.20.dev7
+Version: 8.1.20.dev8
 Summary: Main Sequence SDK 
 Author-email: Main Sequence GmbH <dev@main-sequence.io>
 License-Expression: LicenseRef-MainSequence-Proprietary

{mainsequence-8.1.20.dev7 → mainsequence-8.1.20.dev8}/mainsequence/cli/cli.py

@@ -5912,7 +5912,9 @@ def _meta_table_run_query_impl(
     try:
         payload = run_meta_table_query(meta_table_uid, sql, timeout=timeout)
     except ApiError as e:
-        error(f"MetaTable query failed: {e}")
+        # The api layer already names the operation in the message; prefixing again
+        # produces "MetaTable query failed: MetaTable query failed: ...".
+        error(str(e))
         raise typer.Exit(1) from e
 
     ok = bool(payload.get("ok"))
@@ -5941,7 +5943,9 @@ def _time_index_table_run_query_impl(
     try:
         payload = run_time_index_table_query(table_uid, sql, timeout=timeout)
     except ApiError as e:
-        error(f"Time-index table query failed: {e}")
+        # The api layer already names the operation in the message; prefixing again
+        # produces "Time-index table query failed: Time-index table query failed: ...".
+        error(str(e))
         raise typer.Exit(1) from e
 
     ok = bool(payload.get("ok"))

{mainsequence-8.1.20.dev7 → mainsequence-8.1.20.dev8}/mainsequence/client/metatables/core.py

@@ -1904,35 +1904,18 @@ class MetaTable(
 
         cls = type(self)
         url = f"{cls.get_object_url().rstrip('/')}/{self._public_uid()}/run-query/"
-        if cls.ENDPOINT == "time-index-meta-tables":
-            session = cls.build_session()
-            old_content_type = session.headers.get("Content-Type")
-            session.headers["Content-Type"] = "text/plain"
-            try:
-                response = make_request(
-                    s=session,
-                    loaders=cls.LOADERS,
-                    r_type="POST",
-                    url=url,
-                    payload={"data": sql},
-                    time_out=timeout,
-                )
-            finally:
-                if old_content_type is None:
-                    session.headers.pop("Content-Type", None)
-                else:
-                    session.headers["Content-Type"] = old_content_type
-            error_payload = {"data": sql}
-        else:
-            response = make_request(
-                s=cls.build_session(),
-                loaders=cls.LOADERS,
-                r_type="POST",
-                url=url,
-                payload={"json": sql},
-                time_out=timeout,
-            )
-            error_payload = {"json": sql}
+        # The backend reads the request body as the raw SQL string and parses it with
+        # DRF's JSON parser, for every MetaTable endpoint. Sending a JSON string is the
+        # only transport it accepts; a text/plain body is rejected with HTTP 415.
+        payload = {"json": sql}
+        response = make_request(
+            s=cls.build_session(),
+            loaders=cls.LOADERS,
+            r_type="POST",
+            url=url,
+            payload=payload,
+            time_out=timeout,
+        )
 
         try:
             data = response.json()
@@ -1942,7 +1925,7 @@ class MetaTable(
         if isinstance(data, dict) and "ok" in data:
             return data
 
-        raise_for_response(response, payload=error_payload)
+        raise_for_response(response, payload=payload)
         return response.json()
 
     @classmethod

{mainsequence-8.1.20.dev7 → mainsequence-8.1.20.dev8/mainsequence.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mainsequence
-Version: 8.1.20.dev7
+Version: 8.1.20.dev8
 Summary: Main Sequence SDK 
 Author-email: Main Sequence GmbH <dev@main-sequence.io>
 License-Expression: LicenseRef-MainSequence-Proprietary

{mainsequence-8.1.20.dev7 → mainsequence-8.1.20.dev8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "mainsequence"
-version = "8.1.20.dev7"
+version = "8.1.20.dev8"
 description = "Main Sequence SDK "
 readme = "README.md"
 requires-python = ">=3.13"

{mainsequence-8.1.20.dev7 → mainsequence-8.1.20.dev8}/tests/test_cli.py

@@ -8197,6 +8197,40 @@ def test_time_index_table_run_query(cli_mod, runner, monkeypatch):
     assert '"value": 1' in result.output
 
 
+def test_time_index_table_run_query_error_is_not_double_prefixed(cli_mod, runner, monkeypatch):
+    """The api layer already names the operation; the CLI must not prefix it again."""
+    monkeypatch.setattr(cli_mod, "_require_login", lambda: {"username": "u"})
+
+    def _run_query(storage_uid, sql, *, timeout=None):
+        raise cli_mod.ApiError(
+            "Time-index table query failed: 415 POST "
+            "http://127.0.0.1:8000/api/v1/time-index-meta-tables/abc/run-query/: "
+            'Unsupported media type "text/plain" in request.'
+        )
+
+    monkeypatch.setattr(cli_mod, "run_time_index_table_query", _run_query)
+
+    result = runner.invoke(
+        cli_mod.app,
+        ["time-index-table", "run_query", "abc", "SELECT 1 AS value"],
+    )
+    assert result.exit_code == 1
+    assert result.output.count("Time-index table query failed:") == 1
+
+
+def test_meta_table_run_query_error_is_not_double_prefixed(cli_mod, runner, monkeypatch):
+    monkeypatch.setattr(cli_mod, "_require_login", lambda: {"username": "u"})
+
+    def _run_query(meta_table_uid, sql, *, timeout=None):
+        raise cli_mod.ApiError("MetaTable query failed: boom")
+
+    monkeypatch.setattr(cli_mod, "run_meta_table_query", _run_query)
+
+    result = runner.invoke(cli_mod.app, ["meta-table", "run_query", "abc", "SELECT 1"])
+    assert result.exit_code == 1
+    assert result.output.count("MetaTable query failed:") == 1
+
+
 def test_meta_table_run_query(cli_mod, runner, monkeypatch):
     captured = {}
     monkeypatch.setattr(cli_mod, "_require_login", lambda: {"username": "u"})

{mainsequence-8.1.20.dev7 → mainsequence-8.1.20.dev8}/tests/test_filter_normalization.py

@@ -803,7 +803,7 @@ def test_output_table_delete_after_date_accepts_index_coordinates(monkeypatch):
     }
 
 
-def test_output_table_run_query_posts_plain_text_sql(monkeypatch):
+def test_output_table_run_query_posts_json_sql(monkeypatch):
     from mainsequence.client import metatables as models_metatables
 
     captured = {}
@@ -858,10 +858,10 @@ def test_output_table_run_query_posts_plain_text_sql(monkeypatch):
     assert result["ok"] is True
     assert result["dynamic_table_id"] == 714
     assert captured == {
-        "headers": {"Content-Type": "text/plain"},
+        "headers": {"Content-Type": "application/json"},
         "r_type": "POST",
         "url": f"{models_metatables.TimeIndexMetaTable.get_object_url()}/714/run-query/",
-        "payload": {"data": "SELECT * FROM my_table LIMIT 100"},
+        "payload": {"json": "SELECT * FROM my_table LIMIT 100"},
         "timeout": 30,
     }
     assert session.headers == {"Content-Type": "application/json"}