maxc-cli 0.2.1__tar.gz → 0.2.3__tar.gz

{maxc_cli-0.2.1 → maxc_cli-0.2.3}/PKG-INFO

@@ -1,16 +1,15 @@
 Metadata-Version: 2.4
 Name: maxc-cli
-Version: 0.2.1
+Version: 0.2.3
 Summary: Agent-native MaxCompute CLI for external coding agents
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 Requires-Dist: PyYAML>=5.4
 Requires-Dist: pyodps

{maxc_cli-0.2.1 → maxc_cli-0.2.3}/setup.py

@@ -9,11 +9,11 @@ README = ROOT / "README.md"
 
 setup(
     name="maxc-cli",
-    version="0.2.1",
+    version="0.2.3",
     description="Agent-native MaxCompute CLI for external coding agents",
     long_description=README.read_text(encoding="utf-8"),
     long_description_content_type="text/markdown",
-    python_requires=">=3.8",
+    python_requires=">=3.9",
     package_dir={"": "src"},
     packages=find_packages(where="src"),
     include_package_data=True,
@@ -26,7 +26,6 @@ setup(
     },
     classifiers=[
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",

{maxc_cli-0.2.1 → maxc_cli-0.2.3}/src/maxc_cli/__init__.py

@@ -2,4 +2,4 @@
 
 __all__ = ["__version__"]
 
-__version__ = "0.2.1"
+__version__ = "0.2.3"

{maxc_cli-0.2.1 → maxc_cli-0.2.3}/src/maxc_cli/auth_providers.py

@@ -3,6 +3,7 @@ from dataclasses import dataclass, field
 from datetime import datetime, timedelta, timezone
 import hashlib
 import json
+import logging
 from pathlib import Path
 import shlex
 import shutil
@@ -14,6 +15,8 @@ from .config import AuthConfig, ExternalAuthConfig, MaxCConfig, NcsAuthConfig
 from .exceptions import FeatureUnavailableError, ValidationError
 from .helpers import missing_odps_settings, odps_identity_source, resolve_odps_settings
 
+logger = logging.getLogger(__name__)
+
 
 @dataclass
 class ResolvedAuthConnection:
@@ -486,7 +489,7 @@ class ExternalCredentialProvider:
             expires_at_str = payload.get("expires_at")
             if not expires_at_str:
                 return None  # no expiry → don't trust kv cache
-            expires_at = datetime.fromisoformat(expires_at_str)
+            expires_at = datetime.fromisoformat(expires_at_str.replace("Z", "+00:00"))
             if expires_at.tzinfo is None:
                 expires_at = expires_at.replace(tzinfo=timezone.utc)
             cutoff = expires_at - timedelta(seconds=self._EXPIRY_BUFFER_SECONDS)
@@ -517,6 +520,13 @@ class ExternalCredentialProvider:
             pass  # kv_store write failure is non-fatal
 
     def get_credential(self) -> 'SimpleTempCredential':
+        try:
+            return self._get_credential_inner()
+        except Exception as exc:
+            logger.warning("ExternalCredentialProvider.get_credential() failed: %s", exc)
+            raise
+
+    def _get_credential_inner(self) -> 'SimpleTempCredential':
         # 1. In-process cache (fast path)
         with self._lock:
             if not self._is_expired():
@@ -537,7 +547,7 @@ class ExternalCredentialProvider:
         raw_expiry = payload.get("expires_at")
         if raw_expiry:
             try:
-                expires_at = datetime.fromisoformat(raw_expiry)
+                expires_at = datetime.fromisoformat(raw_expiry.replace("Z", "+00:00"))
                 if expires_at.tzinfo is None:
                     expires_at = expires_at.replace(tzinfo=timezone.utc)
             except (ValueError, TypeError):
@@ -590,6 +600,10 @@ class ExternalCredentialProvider:
     def get_security_token(self) -> 'str | None':
         return self.get_credential().security_token
 
+    # Alias: pyodps CredentialProviderAccount falls back to get_credentials()
+    # when get_credential() raises, so both must exist.
+    get_credentials = get_credential
+
 
 def build_external_account(settings: 'dict[str, str | None]', *, cache: 'Any | None' = None):
     """Build a pyodps Account backed by an ExternalCredentialProvider."""

{maxc_cli-0.2.1 → maxc_cli-0.2.3}/src/maxc_cli/cli.py

@@ -1,4 +1,6 @@
 
+from __future__ import annotations
+
 import argparse
 import difflib
 import sys

{maxc_cli-0.2.1 → maxc_cli-0.2.3}/src/maxc_cli/helpers.py

@@ -1,5 +1,7 @@
 """Helper functions for MaxCompute backend operations."""
 
+from __future__ import annotations
+
 from collections import Counter
 from datetime import date, datetime, time, timezone
 from decimal import Decimal

{maxc_cli-0.2.1 → maxc_cli-0.2.3}/src/maxc_cli/masking.py

@@ -1,9 +1,10 @@
+from __future__ import annotations
 
 import re
-from typing import Any
+from typing import Any, List, Optional
 
 
-SENSITIVE_PATTERNS: list[tuple[re.Pattern[str], str]] = [
+SENSITIVE_PATTERNS: List[tuple[re.Pattern[str], str]] = [
     (re.compile(r"(?i)(password|passwd|secret|pwd|api_key)"), "password"),
     (re.compile(r"(?i)(phone|mobile|tel|cellphone)"), "phone"),
     (re.compile(r"(?i)(email|e_mail|mail_addr)"), "email"),
@@ -11,7 +12,7 @@ SENSITIVE_PATTERNS: list[tuple[re.Pattern[str], str]] = [
 ]
 
 
-def _classify_column(column_name: str, extra_patterns: list[str] | None = None) -> str | None:
+def _classify_column(column_name: str, extra_patterns: Optional[List[str]] = None) -> Optional[str]:
     """Return the masking type for a column name, or None if not sensitive."""
     for pattern, mask_type in SENSITIVE_PATTERNS:
         if pattern.search(column_name):
@@ -63,10 +64,10 @@ _MASKERS: dict[str, Any] = {
 
 
 def mask_rows(
-    rows: list[dict[str, Any]],
-    schema: list[dict[str, Any]],
-    extra_sensitive_columns: list[str] | None = None,
-) -> tuple[list[dict[str, Any]], list[str]]:
+    rows: List[dict[str, Any]],
+    schema: List[dict[str, Any]],
+    extra_sensitive_columns: Optional[List[str]] = None,
+) -> tuple[List[dict[str, Any]], List[str]]:
     """Mask sensitive columns in query result rows.
 
     Returns (masked_rows, masked_column_names).

{maxc_cli-0.2.1 → maxc_cli-0.2.3}/src/maxc_cli/setting_parser.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from enum import Enum
 from typing import Dict, List, NamedTuple
 

{maxc_cli-0.2.1 → maxc_cli-0.2.3}/src/maxc_cli.egg-info/PKG-INFO

@@ -1,16 +1,15 @@
 Metadata-Version: 2.4
 Name: maxc-cli
-Version: 0.2.1
+Version: 0.2.3
 Summary: Agent-native MaxCompute CLI for external coding agents
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 Requires-Dist: PyYAML>=5.4
 Requires-Dist: pyodps

{maxc_cli-0.2.1 → maxc_cli-0.2.3}/tests/test_catalog.py

@@ -4,6 +4,7 @@ catalog_search_tables — with kv_store caching behaviour."""
 import json
 from datetime import datetime, timedelta, timezone
 from pathlib import Path
+from typing import Optional
 from unittest.mock import MagicMock, PropertyMock, patch
 
 import pytest
@@ -24,7 +25,7 @@ def _make_cache(tmp_path: Path) -> LocalCache:
     return LocalCache(cache_dir)
 
 
-def _make_backend(*, cache: LocalCache | None = None, project: str = "test_proj") -> CatalogMixin:
+def _make_backend(*, cache: Optional[LocalCache] = None, project: str = "test_proj") -> CatalogMixin:
     """Create a minimal CatalogMixin instance with mocked ODPS client."""
     mixin = CatalogMixin()
 

{maxc_cli-0.2.1 → maxc_cli-0.2.3}/tests/test_external_auth.py

@@ -2,6 +2,7 @@
 infer_auth_provider external branch."""
 
 import json
+import logging
 import os
 import stat
 import subprocess
@@ -9,6 +10,7 @@ import tempfile
 from datetime import datetime, timedelta, timezone
 from io import StringIO
 from pathlib import Path
+from typing import Optional
 from unittest.mock import MagicMock, patch
 
 import pytest
@@ -40,10 +42,10 @@ def _make_cache(tmp_path: Path) -> LocalCache:
 
 def _minimal_config(
     *,
-    provider: str | None = None,
-    ext_command: str | None = None,
-    project: str | None = None,
-    endpoint: str | None = None,
+    provider: Optional[str] = None,
+    ext_command: Optional[str] = None,
+    project: Optional[str] = None,
+    endpoint: Optional[str] = None,
 ) -> MaxCConfig:
     """Create a MaxCConfig with minimal required fields for auth testing."""
     from maxc_cli.config import AgentConfig
@@ -77,8 +79,8 @@ def _cred_json(
     *,
     access_key_id: str = "LTAI_TEST",
     access_key_secret: str = "secret_test",
-    security_token: str | None = None,
-    expiration: str | None = None,
+    security_token: Optional[str] = None,
+    expiration: Optional[str] = None,
 ) -> str:
     """Build credential JSON string for echo commands."""
     payload: dict = {
@@ -437,8 +439,8 @@ class TestBuildExternalAccount:
 
 class TestInferAuthProviderExternal:
 
-    def _make_config(self, *, provider: str | None = None,
-                     ext_command: str | None = None) -> MaxCConfig:
+    def _make_config(self, *, provider: Optional[str] = None,
+                     ext_command: Optional[str] = None) -> MaxCConfig:
         return _minimal_config(provider=provider, ext_command=ext_command)
 
     def test_explicit_external_provider(self):
@@ -662,3 +664,57 @@ class TestNcsToExternalMigration:
         conn = resolve_auth_connection(config)
         assert conn.auth_type == "external"
         assert conn.provider == "external"
+
+
+# ============================================================
+# get_credentials alias + exception logging
+# ============================================================
+
+class TestGetCredentialsAliasAndExceptionLogging:
+    """Verify that get_credentials() works (pyodps fallback) and that
+    original exceptions are logged instead of being silently swallowed."""
+
+    def test_get_credentials_is_alias_of_get_credential(self):
+        """get_credentials() returns the same result as get_credential()."""
+        cmd = _echo_cmd(_cred_json())
+        p = ExternalCredentialProvider(command=cmd, timeout=10)
+        c1 = p.get_credential()
+        c2 = p.get_credentials()
+        assert c1.access_key_id == c2.access_key_id
+        assert c1.access_key_secret == c2.access_key_secret
+
+    def test_get_credentials_propagates_original_error(self):
+        """When the command fails, get_credentials() raises the original
+        ValidationError — not AttributeError."""
+        cmd = "exit 42"
+        p = ExternalCredentialProvider(command=cmd, timeout=10)
+        with pytest.raises(ValidationError, match="exited with code 42"):
+            p.get_credentials()
+
+    def test_get_credential_logs_original_error(self, caplog):
+        """When get_credential() fails, the original error is logged
+        at WARNING level so it is not silently swallowed by pyodps'
+        bare ``except`` in CredentialProviderAccount._refresh_credential."""
+        cmd = "exit 42"
+        p = ExternalCredentialProvider(command=cmd, timeout=10)
+        with caplog.at_level(logging.WARNING, logger="maxc_cli.auth_providers"):
+            with pytest.raises(ValidationError, match="exited with code 42"):
+                p.get_credential()
+        assert any("get_credential() failed" in rec.message for rec in caplog.records)
+
+    def test_credential_provider_account_fallback_uses_get_credentials(self):
+        """Integration test: CredentialProviderAccount._refresh_credential
+        falls back from get_credential → get_credentials when the first
+        call raises.  With our alias, both calls raise the same
+        ValidationError (not AttributeError)."""
+        try:
+            from odps.accounts import CredentialProviderAccount
+        except ImportError:
+            pytest.skip("pyodps not installed")
+
+        cmd = "exit 42"
+        provider = ExternalCredentialProvider(command=cmd, timeout=10)
+        account = CredentialProviderAccount(provider)
+
+        with pytest.raises(ValidationError, match="exited with code 42"):
+            account._refresh_credential()