@vespermcp/mcp-server 1.2.8 → 1.2.10

package/build/python/config.py

@@ -155,12 +155,7 @@ def _get_from_env(name: str) -> Optional[str]:
 
 
 def get_key(name: str) -> Optional[str]:
-    # 1) env vars (highest priority)
-    env_val = _get_from_env(name)
-    if env_val:
-        return env_val
-
-    # 2) keyring (secure)
+    # 1) keyring (secure)
     if HAS_KEYRING:
         try:
             val = keyring.get_password(SERVICE_NAME, name)
@@ -169,14 +164,21 @@ def get_key(name: str) -> Optional[str]:
         except Exception:
             pass
 
-    # 3) encrypted fallback config.toml
+    # 2) encrypted fallback config.toml
     fallback = _read_fallback_toml()
     enc = fallback.get(name)
-    if not enc:
-        return None
-    secret = _get_or_create_local_secret()
-    method = fallback.get("__method__", "fernet" if HAS_FERNET else "xor")
-    return _decrypt_value(enc, method, secret)
+    if enc:
+        secret = _get_or_create_local_secret()
+        method = fallback.get("__method__", "fernet" if HAS_FERNET else "xor")
+        dec = _decrypt_value(enc, method, secret)
+        if dec:
+            return dec
+
+    # 3) env vars (fallback only)
+    env_val = _get_from_env(name)
+    if env_val:
+        return env_val
+    return None
 
 
 def set_key(name: str, value: str) -> Dict[str, str]:

package/build/python/kaggle_engine.py

@@ -20,14 +20,13 @@ def _ensure_auth() -> Dict[str, Any]:
         }
 
     # Priority:
-    # 1) Existing env vars
-    # 2) secure local store (keyring or ~/.vesper/config.toml)
+    # 1) secure local store (keyring or ~/.vesper/config.toml)
+    # 2) existing env vars
     # 3) ~/.kaggle/kaggle.json handled by KaggleApi.authenticate()
-    if not os.getenv("KAGGLE_USERNAME") or not os.getenv("KAGGLE_KEY"):
-        keys = get_all()
-        if keys.get("kaggle_username") and keys.get("kaggle_key"):
-            os.environ["KAGGLE_USERNAME"] = keys["kaggle_username"]
-            os.environ["KAGGLE_KEY"] = keys["kaggle_key"]
+    keys = get_all()
+    if keys.get("kaggle_username") and keys.get("kaggle_key"):
+        os.environ["KAGGLE_USERNAME"] = keys["kaggle_username"]
+        os.environ["KAGGLE_KEY"] = keys["kaggle_key"]
 
     api = KaggleApi()
     try:

package/build/python/vesper/core/asset_downloader.py

@@ -60,6 +60,42 @@ class AssetDownloader:
         if asyncio.iscoroutine(maybe):
             await maybe
 
+    @staticmethod
+    def _hydrate_kaggle_credentials() -> None:
+        try:
+            from config import get_all  # type: ignore
+            keys = get_all() or {}
+        except Exception:
+            keys = {}
+
+        username = keys.get("kaggle_username") or os.getenv("KAGGLE_USERNAME")
+        key = keys.get("kaggle_key") or os.getenv("KAGGLE_KEY")
+
+        if username:
+            os.environ["KAGGLE_USERNAME"] = str(username)
+        if key:
+            os.environ["KAGGLE_KEY"] = str(key)
+
+        username = os.getenv("KAGGLE_USERNAME")
+        key = os.getenv("KAGGLE_KEY")
+        if not username or not key:
+            return
+
+        kaggle_dir = Path.home() / ".kaggle"
+        kaggle_file = kaggle_dir / "kaggle.json"
+        try:
+            kaggle_dir.mkdir(parents=True, exist_ok=True)
+            kaggle_file.write_text(
+                json.dumps({"username": username, "key": key}, ensure_ascii=False),
+                encoding="utf-8",
+            )
+            try:
+                os.chmod(kaggle_file, 0o600)
+            except Exception:
+                pass
+        except Exception:
+            pass
+
     @staticmethod
     def find_image_column(dataset: Any) -> Optional[str]:
         features = getattr(dataset, "features", None)
@@ -240,8 +276,17 @@ class AssetDownloader:
 
         await self._emit("start", {"source": "kaggle", "dataset": kaggle_ref})
 
+        self._hydrate_kaggle_credentials()
+
         api = KaggleApi()
-        api.authenticate()
+        try:
+            api.authenticate()
+        except Exception as e:
+            raise RuntimeError(
+                "Kaggle authentication failed. Run 'configure_kaggle' or 'configure_keys' with "
+                "kaggle_username and kaggle_key, then retry. "
+                f"Details: {e}"
+            )
 
         tmp_dir = Path(tempfile.mkdtemp(prefix="vesper_kaggle_assets_"))
         downloaded = 0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vespermcp/mcp-server",
-  "version": "1.2.8",
+  "version": "1.2.10",
   "description": "AI-powered dataset discovery, quality analysis, and preparation MCP server with multimodal support (text, image, audio, video)",
   "type": "module",
   "main": "build/index.js",

package/src/python/config.py

@@ -155,12 +155,7 @@ def _get_from_env(name: str) -> Optional[str]:
 
 
 def get_key(name: str) -> Optional[str]:
-    # 1) env vars (highest priority)
-    env_val = _get_from_env(name)
-    if env_val:
-        return env_val
-
-    # 2) keyring (secure)
+    # 1) keyring (secure)
     if HAS_KEYRING:
         try:
             val = keyring.get_password(SERVICE_NAME, name)
@@ -169,14 +164,21 @@ def get_key(name: str) -> Optional[str]:
         except Exception:
             pass
 
-    # 3) encrypted fallback config.toml
+    # 2) encrypted fallback config.toml
     fallback = _read_fallback_toml()
     enc = fallback.get(name)
-    if not enc:
-        return None
-    secret = _get_or_create_local_secret()
-    method = fallback.get("__method__", "fernet" if HAS_FERNET else "xor")
-    return _decrypt_value(enc, method, secret)
+    if enc:
+        secret = _get_or_create_local_secret()
+        method = fallback.get("__method__", "fernet" if HAS_FERNET else "xor")
+        dec = _decrypt_value(enc, method, secret)
+        if dec:
+            return dec
+
+    # 3) env vars (fallback only)
+    env_val = _get_from_env(name)
+    if env_val:
+        return env_val
+    return None
 
 
 def set_key(name: str, value: str) -> Dict[str, str]:

package/src/python/kaggle_engine.py

@@ -20,14 +20,13 @@ def _ensure_auth() -> Dict[str, Any]:
         }
 
     # Priority:
-    # 1) Existing env vars
-    # 2) secure local store (keyring or ~/.vesper/config.toml)
+    # 1) secure local store (keyring or ~/.vesper/config.toml)
+    # 2) existing env vars
     # 3) ~/.kaggle/kaggle.json handled by KaggleApi.authenticate()
-    if not os.getenv("KAGGLE_USERNAME") or not os.getenv("KAGGLE_KEY"):
-        keys = get_all()
-        if keys.get("kaggle_username") and keys.get("kaggle_key"):
-            os.environ["KAGGLE_USERNAME"] = keys["kaggle_username"]
-            os.environ["KAGGLE_KEY"] = keys["kaggle_key"]
+    keys = get_all()
+    if keys.get("kaggle_username") and keys.get("kaggle_key"):
+        os.environ["KAGGLE_USERNAME"] = keys["kaggle_username"]
+        os.environ["KAGGLE_KEY"] = keys["kaggle_key"]
 
     api = KaggleApi()
     try:

package/src/python/vesper/core/asset_downloader.py

@@ -60,6 +60,42 @@ class AssetDownloader:
         if asyncio.iscoroutine(maybe):
             await maybe
 
+    @staticmethod
+    def _hydrate_kaggle_credentials() -> None:
+        try:
+            from config import get_all  # type: ignore
+            keys = get_all() or {}
+        except Exception:
+            keys = {}
+
+        username = keys.get("kaggle_username") or os.getenv("KAGGLE_USERNAME")
+        key = keys.get("kaggle_key") or os.getenv("KAGGLE_KEY")
+
+        if username:
+            os.environ["KAGGLE_USERNAME"] = str(username)
+        if key:
+            os.environ["KAGGLE_KEY"] = str(key)
+
+        username = os.getenv("KAGGLE_USERNAME")
+        key = os.getenv("KAGGLE_KEY")
+        if not username or not key:
+            return
+
+        kaggle_dir = Path.home() / ".kaggle"
+        kaggle_file = kaggle_dir / "kaggle.json"
+        try:
+            kaggle_dir.mkdir(parents=True, exist_ok=True)
+            kaggle_file.write_text(
+                json.dumps({"username": username, "key": key}, ensure_ascii=False),
+                encoding="utf-8",
+            )
+            try:
+                os.chmod(kaggle_file, 0o600)
+            except Exception:
+                pass
+        except Exception:
+            pass
+
     @staticmethod
     def find_image_column(dataset: Any) -> Optional[str]:
         features = getattr(dataset, "features", None)
@@ -240,8 +276,17 @@ class AssetDownloader:
 
         await self._emit("start", {"source": "kaggle", "dataset": kaggle_ref})
 
+        self._hydrate_kaggle_credentials()
+
         api = KaggleApi()
-        api.authenticate()
+        try:
+            api.authenticate()
+        except Exception as e:
+            raise RuntimeError(
+                "Kaggle authentication failed. Run 'configure_kaggle' or 'configure_keys' with "
+                "kaggle_username and kaggle_key, then retry. "
+                f"Details: {e}"
+            )
 
         tmp_dir = Path(tempfile.mkdtemp(prefix="vesper_kaggle_assets_"))
         downloaded = 0