maxc-cli 0.3.1__tar.gz → 0.3.2__tar.gz

{maxc_cli-0.3.1 → maxc_cli-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maxc-cli
-Version: 0.3.1
+Version: 0.3.2
 Summary: Agent-native MaxCompute CLI for external coding agents
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9

{maxc_cli-0.3.1 → maxc_cli-0.3.2}/setup.py

@@ -9,7 +9,7 @@ README = ROOT / "README.md"
 
 setup(
     name="maxc-cli",
-    version="0.3.1",
+    version="0.3.2",
     description="Agent-native MaxCompute CLI for external coding agents",
     long_description=README.read_text(encoding="utf-8"),
     long_description_content_type="text/markdown",

{maxc_cli-0.3.1 → maxc_cli-0.3.2}/src/maxc_cli/__init__.py

@@ -2,4 +2,4 @@
 
 __all__ = ["__version__"]
 
-__version__ = "0.3.1"
+__version__ = "0.3.2"

{maxc_cli-0.3.1 → maxc_cli-0.3.2}/src/maxc_cli/app.py

@@ -21,6 +21,7 @@ from .backend import OdpsBackend
 from .cache import LocalCache
 from .config import (
     AuthConfig,
+    ExternalAuthConfig,
     TableDefinition,
     default_global_config_path,
     load_config,
@@ -2740,7 +2741,6 @@ class MaxCApp:
         JSON to stdout.  See :class:`ExternalCredentialProvider` for the
         expected JSON format.
         """
-        from .auth_providers import ExternalAuthConfig
         target_path = target_config_path or default_global_config_path()
         existing_payload = load_config_mapping(target_path) if target_path.exists() else {}
         existing_auth = AuthConfig.from_mapping(existing_payload.get("auth", {}) or {})

{maxc_cli-0.3.1 → maxc_cli-0.3.2}/src/maxc_cli/backend/query.py

@@ -46,15 +46,20 @@ def _count_statements(sql: 'str') -> 'int':
     return sum(1 for part in cleaned.split(";") if part.strip())
 
 
-def _parse_sql_with_hints(sql: 'str', *, force: 'bool' = False) -> 'tuple[str, dict[str, str]]':
+def _parse_sql_with_hints(
+    sql: 'str', *, force: 'bool' = False,
+) -> 'tuple[str, dict[str, str], int | None]':
     """Extract SET statements from *sql* and enforce client-side read-only mode.
 
-    Returns ``(remaining_sql, merged_hints)`` where ``merged_hints``
-    contains only user-supplied SET values.  Write operations
-    (INSERT, CREATE, DROP, etc.) are blocked unless *force* is ``True``.
+    Returns ``(remaining_sql, merged_hints, priority)``. ``merged_hints``
+    contains user-supplied SET values minus ``odps.instance.priority``,
+    which is lifted out into ``priority`` so callers can pass it as the
+    ``priority=`` kwarg of ``run_sql`` / ``execute_sql``.
 
-    Empty SQL raises ``ValidationError``. Multi-statement SQL automatically
-    receives ``odps.sql.submit.mode=script`` unless the user already set it.
+    Write operations (INSERT, CREATE, DROP, etc.) are blocked unless
+    *force* is ``True``. Empty SQL raises ``ValidationError``.
+    Multi-statement SQL automatically receives
+    ``odps.sql.submit.mode=script`` unless the user already set it.
     """
     parsed = SettingParser.parse(sql)
     if parsed.errors:
@@ -87,7 +92,34 @@ def _parse_sql_with_hints(sql: 'str', *, force: 'bool' = False) -> 'tuple[str, d
     if _count_statements(remaining) >= 2:
         hints.setdefault("odps.sql.submit.mode", "script")
 
-    return remaining, hints
+    # odps.instance.priority is not a SQL hint — it's a top-level kwarg on
+    # run_sql/execute_sql. Lift it out so the caller can thread it through.
+    priority = _pop_priority(hints)
+
+    return remaining, hints, priority
+
+
+def _pop_priority(hints: 'dict[str, str]') -> 'int | None':
+    """Pop ``odps.instance.priority`` from *hints* and parse as int.
+
+    Match is case-insensitive on the key. Returns ``None`` if absent.
+    Raises ``ValidationError`` if the value isn't an integer.
+    """
+    matched_key: str | None = None
+    for k in hints:
+        if k.lower() == "odps.instance.priority":
+            matched_key = k
+            break
+    if matched_key is None:
+        return None
+    raw = hints.pop(matched_key)
+    try:
+        return int(raw)
+    except (TypeError, ValueError):
+        raise ValidationError(
+            f"Invalid odps.instance.priority value {raw!r}: must be an integer.",
+            suggestion="Use SET odps.instance.priority=N; where N is an integer.",
+        ) from None
 
 
 class QueryMixin:
@@ -125,7 +157,8 @@ class QueryMixin:
             ValidationError: If SET syntax is invalid.
             BackendConnectionError: If ODPS connection fails.
         """
-        actual_sql, hints = _parse_sql_with_hints(sql, force=force)
+        actual_sql, hints, priority = _parse_sql_with_hints(sql, force=force)
+        priority_kwargs = {"priority": priority} if priority is not None else {}
 
         started_at = now_utc_iso()
         started_monotonic = monotonic()
@@ -162,7 +195,7 @@ class QueryMixin:
 
         try:
             instance = self.client.run_sql(
-                actual_sql, project=project, hints=hints,
+                actual_sql, project=project, hints=hints, **priority_kwargs,
             )
         except Exception as exc:
             raise translate_odps_error(exc) from exc
@@ -204,7 +237,7 @@ class QueryMixin:
         Returns:
             Dict with estimated_input_size_bytes, sql_complexity, sql_udf_num, etc.
         """
-        actual_sql, hints = _parse_sql_with_hints(sql, force=force)
+        actual_sql, hints, _priority = _parse_sql_with_hints(sql, force=force)
         started_monotonic = monotonic()
         try:
             sql_cost = self.client.execute_sql_cost(
@@ -240,7 +273,8 @@ class QueryMixin:
         Returns:
             Dict with query outline, cost metadata, and ``execution_plan`` text.
         """
-        actual_sql, hints = _parse_sql_with_hints(sql, force=force)
+        actual_sql, hints, priority = _parse_sql_with_hints(sql, force=force)
+        priority_kwargs = {"priority": priority} if priority is not None else {}
         # script-mode auto-hint doesn't apply to EXPLAIN itself; remove if present.
         explain_hints = {k: v for k, v in hints.items() if k != "odps.sql.submit.mode"}
         started_monotonic = monotonic()
@@ -252,6 +286,7 @@ class QueryMixin:
                 f"EXPLAIN {actual_sql}",
                 project=project,
                 hints=explain_hints,
+                **priority_kwargs,
             )
             try:
                 results = instance.get_task_results()
@@ -319,7 +354,8 @@ class QueryMixin:
         """
         from ..models import JobInfo
 
-        actual_sql, hints = _parse_sql_with_hints(sql, force=force)
+        actual_sql, hints, priority = _parse_sql_with_hints(sql, force=force)
+        priority_kwargs = {"priority": priority} if priority is not None else {}
 
         try:
             instance = self.client.run_sql(
@@ -327,6 +363,7 @@ class QueryMixin:
                 project=project,
                 hints=hints,
                 unique_identifier_id=idempotency_key,
+                **priority_kwargs,
             )
         except Exception as exc:
             raise translate_odps_error(exc) from exc

{maxc_cli-0.3.1 → maxc_cli-0.3.2}/src/maxc_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maxc-cli
-Version: 0.3.1
+Version: 0.3.2
 Summary: Agent-native MaxCompute CLI for external coding agents
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9

{maxc_cli-0.3.1 → maxc_cli-0.3.2}/tests/test_external_auth.py

@@ -790,3 +790,57 @@ class TestAuthSeemsConfiguredExternal:
         self._clear_odps_env(monkeypatch)
         config = _minimal_config()
         assert _auth_seems_configured(self._stub_app(config)) is False
+
+
+# ============================================================
+# MaxCApp.auth_login_external — end-to-end regression
+# ============================================================
+
+class TestAuthLoginExternalAppMethod:
+    """Regression: a stale lazy import (``from .auth_providers import
+    ExternalAuthConfig``) in ``MaxCApp.auth_login_external`` raised
+    ``ImportError`` at runtime after a ruff F401 sweep removed the
+    transitive re-export from ``auth_providers``. The dataclass lives in
+    ``config``; the import must come from there. This test exercises the
+    method end-to-end so any future re-routing of ``ExternalAuthConfig``
+    that breaks the call site is caught immediately.
+    """
+
+    @staticmethod
+    def _clear_odps_env(monkeypatch):
+        import maxc_cli.backend as backend_module
+        for aliases in backend_module.ODPS_ENV_ALIASES.values():
+            for alias in aliases:
+                monkeypatch.delenv(alias, raising=False)
+
+    def test_writes_external_provider_config_without_validation(self, tmp_path, monkeypatch):
+        import yaml
+
+        from maxc_cli.app import MaxCApp
+        self._clear_odps_env(monkeypatch)
+        monkeypatch.chdir(tmp_path)
+        monkeypatch.setenv("HOME", str(tmp_path))
+
+        config_path = tmp_path / "config.yaml"
+        app = MaxCApp(cwd=tmp_path, load_backend=False)
+
+        envelope = app.auth_login_external(
+            process_command="/usr/bin/echo '{}'",
+            process_timeout=30,
+            project="proj_x",
+            endpoint="http://service.cn-test.maxcompute.aliyun.com/api",
+            region_name="cn-test",
+            no_validate=True,
+            target_config_path=config_path,
+        )
+
+        assert envelope.status == "success"
+        assert envelope.command == "auth.login-external"
+        assert envelope.data["auth_type"] == "external"
+        assert envelope.data["process_command"] == "/usr/bin/echo '{}'"
+
+        saved = yaml.safe_load(config_path.read_text(encoding="utf-8"))
+        assert saved["auth"]["provider"] == "external"
+        assert saved["auth"]["external"]["process_command"] == "/usr/bin/echo '{}'"
+        assert saved["auth"]["external"]["process_timeout"] == 30
+        assert saved["auth"]["project"] == "proj_x"

{maxc_cli-0.3.1 → maxc_cli-0.3.2}/tests/test_phase1_improvements.py

@@ -572,19 +572,19 @@ class TestParseSqlWithHints:
     def test_multi_statement_injects_script_mode(self):
         from maxc_cli.backend.query import _parse_sql_with_hints
 
-        _, hints = _parse_sql_with_hints("SELECT 1; SELECT 2")
+        _, hints, _ = _parse_sql_with_hints("SELECT 1; SELECT 2")
         assert hints.get("odps.sql.submit.mode") == "script"
 
     def test_single_statement_does_not_inject_script_mode(self):
         from maxc_cli.backend.query import _parse_sql_with_hints
 
-        _, hints = _parse_sql_with_hints("SELECT 1")
+        _, hints, _ = _parse_sql_with_hints("SELECT 1")
         assert "odps.sql.submit.mode" not in hints
 
     def test_user_provided_script_mode_is_preserved(self):
         from maxc_cli.backend.query import _parse_sql_with_hints
 
-        _, hints = _parse_sql_with_hints(
+        _, hints, _ = _parse_sql_with_hints(
             "SET odps.sql.submit.mode=non_script; SELECT 1; SELECT 2"
         )
         # User's value wins
@@ -593,13 +593,13 @@ class TestParseSqlWithHints:
     def test_trailing_semicolon_is_not_treated_as_multistatement(self):
         from maxc_cli.backend.query import _parse_sql_with_hints
 
-        _, hints = _parse_sql_with_hints("SELECT 1;")
+        _, hints, _ = _parse_sql_with_hints("SELECT 1;")
         assert "odps.sql.submit.mode" not in hints
 
     def test_comments_are_not_counted_as_statements(self):
         from maxc_cli.backend.query import _parse_sql_with_hints
 
-        _, hints = _parse_sql_with_hints(
+        _, hints, _ = _parse_sql_with_hints(
             "-- header;\nSELECT 1; -- trailing comment;"
         )
         assert "odps.sql.submit.mode" not in hints

{maxc_cli-0.3.1 → maxc_cli-0.3.2}/tests/test_setting_parser.py

@@ -91,19 +91,21 @@ def test_set_with_escaped_semicolon():
 
 
 def test_parse_sql_with_hints_default_no_extra_hints():
-    actual_sql, hints = _parse_sql_with_hints("SELECT 1")
+    actual_sql, hints, priority = _parse_sql_with_hints("SELECT 1")
     assert actual_sql == "SELECT 1"
     assert hints == {}
+    assert priority is None
 
 
 def test_parse_sql_with_hints_merges_user_set():
-    actual_sql, hints = _parse_sql_with_hints(
+    actual_sql, hints, priority = _parse_sql_with_hints(
         "SET odps.sql.type.system.odps2=true; SELECT 1"
     )
     assert actual_sql == "SELECT 1"
     assert hints == {
         "odps.sql.type.system.odps2": "true",
     }
+    assert priority is None
 
 
 def test_parse_sql_with_hints_blocks_write_without_force():
@@ -117,13 +119,14 @@ def test_parse_sql_with_hints_blocks_write_without_force():
 
 
 def test_parse_sql_with_hints_force_allows_write():
-    actual_sql, hints = _parse_sql_with_hints("CREATE TABLE t (id BIGINT)", force=True)
+    actual_sql, hints, priority = _parse_sql_with_hints("CREATE TABLE t (id BIGINT)", force=True)
     assert actual_sql == "CREATE TABLE t (id BIGINT)"
     assert hints == {}
+    assert priority is None
 
 
 def test_parse_sql_with_hints_force_preserves_user_sets():
-    actual_sql, hints = _parse_sql_with_hints(
+    actual_sql, hints, _priority = _parse_sql_with_hints(
         "SET odps.sql.type.system.odps2=true; CREATE TABLE t (id BIGINT)",
         force=True,
     )
@@ -136,6 +139,39 @@ def test_parse_sql_with_hints_invalid_set_raises():
         _parse_sql_with_hints("SET no_semicolon SELECT 1")
 
 
+def test_parse_sql_with_hints_extracts_priority():
+    actual_sql, hints, priority = _parse_sql_with_hints(
+        "SET odps.instance.priority=3; SELECT 1"
+    )
+    assert actual_sql == "SELECT 1"
+    assert priority == 3
+    # priority must be stripped from the hints dict — it's a run_sql kwarg, not a SQL hint.
+    assert "odps.instance.priority" not in hints
+
+
+def test_parse_sql_with_hints_priority_case_insensitive_key():
+    _, hints, priority = _parse_sql_with_hints(
+        "SET ODPS.Instance.Priority=5; SELECT 1"
+    )
+    assert priority == 5
+    assert hints == {}
+
+
+def test_parse_sql_with_hints_priority_invalid_raises():
+    with pytest.raises(ValidationError, match="odps.instance.priority"):
+        _parse_sql_with_hints("SET odps.instance.priority=high; SELECT 1")
+
+
+def test_parse_sql_with_hints_priority_coexists_with_other_hints():
+    _, hints, priority = _parse_sql_with_hints(
+        "SET odps.instance.priority=1; "
+        "SET odps.sql.type.system.odps2=true; "
+        "SELECT 1"
+    )
+    assert priority == 1
+    assert hints == {"odps.sql.type.system.odps2": "true"}
+
+
 # --- translate_odps_error readonly detection tests ---