runcloud-sdk 0.7.0__tar.gz → 0.7.2__tar.gz

{runcloud_sdk-0.7.0/runcloud_sdk.egg-info → runcloud_sdk-0.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: runcloud-sdk
-Version: 0.7.0
+Version: 0.7.2
 Summary: Python SDK for run.cloud, including sandbox-provider compatibility adapters
 Author: Newly
 License-Expression: Apache-2.0
@@ -21,7 +21,7 @@ Python SDK for [run.cloud](https://run.cloud).
 
 ```bash
 pip install runcloud-sdk
-export RUN_CLOUD_API_KEY="rc_live_..."
+runcloud login
 ```
 
 ```python
@@ -36,6 +36,10 @@ finally:
     box.destroy()
 ```
 
+`Client()` automatically uses the credential saved by `runcloud login`. For
+automation, set `RUN_CLOUD_API_KEY` and optionally `RUN_CLOUD_API_URL`, or pass
+`api_key` and `api_url` directly.
+
 ## Compatibility adapters
 
 The same distribution includes migration adapters:

{runcloud_sdk-0.7.0 → runcloud_sdk-0.7.2}/README.md

@@ -4,7 +4,7 @@ Python SDK for [run.cloud](https://run.cloud).
 
 ```bash
 pip install runcloud-sdk
-export RUN_CLOUD_API_KEY="rc_live_..."
+runcloud login
 ```
 
 ```python
@@ -19,6 +19,10 @@ finally:
     box.destroy()
 ```
 
+`Client()` automatically uses the credential saved by `runcloud login`. For
+automation, set `RUN_CLOUD_API_KEY` and optionally `RUN_CLOUD_API_URL`, or pass
+`api_key` and `api_url` directly.
+
 ## Compatibility adapters
 
 The same distribution includes migration adapters:

{runcloud_sdk-0.7.0 → runcloud_sdk-0.7.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "runcloud-sdk"
-version = "0.7.0"
+version = "0.7.2"
 description = "Python SDK for run.cloud, including sandbox-provider compatibility adapters"
 readme = "README.md"
 requires-python = ">=3.9"

{runcloud_sdk-0.7.0 → runcloud_sdk-0.7.2}/runcloud/client.py

@@ -5,13 +5,17 @@ from __future__ import annotations
 import base64
 import json
 import os
+import time
 import urllib.error
 import urllib.parse
 import urllib.request
 from dataclasses import dataclass
+from pathlib import Path
 from typing import Any, Callable, Optional, Union
 
 Transport = Callable[[str, str, Any], Any]
+DEFAULT_API_URL = "https://api.run.cloud"
+USER_AGENT = "runcloud-python/0.7.2"
 
 
 class RunCloudError(Exception):
@@ -38,6 +42,47 @@ class ExecResult:
     stderr: str
 
 
+@dataclass(frozen=True)
+class _SavedCredentials:
+    api_key: str
+    api_url: str
+
+
+def _nonempty_string(value: Any) -> Optional[str]:
+    if not isinstance(value, str):
+        return None
+    normalized = value.strip()
+    return normalized or None
+
+
+def _load_saved_credentials() -> Optional[_SavedCredentials]:
+    configured_home = _nonempty_string(os.environ.get("RUN_CLOUD_HOME"))
+    credentials_home = (
+        Path(configured_home).expanduser()
+        if configured_home
+        else Path.home() / ".run-cloud"
+    )
+    try:
+        payload = json.loads((credentials_home / "credentials").read_text())
+    except (OSError, TypeError, ValueError):
+        return None
+
+    if not isinstance(payload, dict):
+        return None
+    api_key = _nonempty_string(payload.get("token"))
+    api_url = _nonempty_string(payload.get("apiUrl"))
+    expires_at = payload.get("expiresAt")
+    if (
+        not api_key
+        or not api_url
+        or isinstance(expires_at, bool)
+        or not isinstance(expires_at, (int, float))
+        or expires_at < time.time()
+    ):
+        return None
+    return _SavedCredentials(api_key=api_key, api_url=api_url)
+
+
 class Client:
     def __init__(
         self,
@@ -46,17 +91,32 @@ class Client:
         timeout: float = 60.0,
         transport: Optional[Transport] = None,
     ):
+        explicit_api_key = _nonempty_string(api_key)
+        environment_api_key = _nonempty_string(
+            os.environ.get("RUN_CLOUD_API_KEY")
+        ) or _nonempty_string(os.environ.get("RUN_CLOUD_API_TOKEN"))
+        saved_credentials = (
+            None
+            if explicit_api_key or environment_api_key
+            else _load_saved_credentials()
+        )
         self.api_key = (
-            api_key
-            or os.environ.get("RUN_CLOUD_API_KEY")
-            or os.environ.get("RUN_CLOUD_API_TOKEN")
+            explicit_api_key
+            or environment_api_key
+            or (saved_credentials.api_key if saved_credentials else None)
         )
         if not self.api_key:
             raise ValueError(
-                "Run Cloud API key required. Set RUN_CLOUD_API_KEY or pass Client(api_key=...)."
+                "Run Cloud API key required. Run `runcloud login`, set "
+                "RUN_CLOUD_API_KEY, or pass Client(api_key=...)."
             )
+        explicit_api_url = _nonempty_string(api_url)
+        environment_api_url = _nonempty_string(os.environ.get("RUN_CLOUD_API_URL"))
         self.api_url = (
-            api_url or os.environ.get("RUN_CLOUD_API_URL") or "https://api.run.cloud"
+            explicit_api_url
+            or environment_api_url
+            or (saved_credentials.api_url if saved_credentials else None)
+            or DEFAULT_API_URL
         ).rstrip("/")
         self.timeout = timeout
         self._transport = transport
@@ -72,6 +132,7 @@ class Client:
             headers={
                 "Authorization": "Bearer " + self.api_key,
                 "Content-Type": "application/json",
+                "User-Agent": USER_AGENT,
             },
         )
         try:

{runcloud_sdk-0.7.0 → runcloud_sdk-0.7.2/runcloud_sdk.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: runcloud-sdk
-Version: 0.7.0
+Version: 0.7.2
 Summary: Python SDK for run.cloud, including sandbox-provider compatibility adapters
 Author: Newly
 License-Expression: Apache-2.0
@@ -21,7 +21,7 @@ Python SDK for [run.cloud](https://run.cloud).
 
 ```bash
 pip install runcloud-sdk
-export RUN_CLOUD_API_KEY="rc_live_..."
+runcloud login
 ```
 
 ```python
@@ -36,6 +36,10 @@ finally:
     box.destroy()
 ```
 
+`Client()` automatically uses the credential saved by `runcloud login`. For
+automation, set `RUN_CLOUD_API_KEY` and optionally `RUN_CLOUD_API_URL`, or pass
+`api_key` and `api_url` directly.
+
 ## Compatibility adapters
 
 The same distribution includes migration adapters:

runcloud_sdk-0.7.2/tests/test_sdk.py

@@ -0,0 +1,198 @@
+import asyncio
+import base64
+import json
+import os
+import tempfile
+import time
+import unittest
+from pathlib import Path
+from unittest.mock import patch
+
+from runcloud import Client, UnsupportedCompatibilityFeatureError
+from runcloud.compat import modal
+from runcloud.compat.blaxel import SandboxInstance, SyncSandboxInstance
+from runcloud.compat.daytona import Daytona
+from runcloud.compat.e2b import Sandbox as E2BSandbox
+from runcloud.compat.sprites import SpritesClient
+from runcloud.compat.vercel import Sandbox as VercelSandbox
+
+SANDBOX = {"id": "sb_python", "name": "compat", "state": "running"}
+
+
+class Recorder:
+    def __init__(self):
+        self.calls = []
+
+    def __call__(self, method, path, body):
+        self.calls.append((method, path, body))
+        if path.endswith("/exec"):
+            return {"exit_code": 0, "stdout": "ok\n", "stderr": ""}
+        if path.endswith("/fs"):
+            return {"content": base64.b64encode(b"artifact").decode()}
+        if path == "/run-cloud/sandboxes" and method == "GET":
+            return {"items": [SANDBOX]}
+        return SANDBOX
+
+
+class Response:
+    def __enter__(self):
+        return self
+
+    def __exit__(self, *_):
+        return None
+
+    def read(self):
+        return b"{}"
+
+
+class SDKTests(unittest.TestCase):
+    def setUp(self):
+        self.recorder = Recorder()
+        self.client = Client(api_key="rc_live_test", transport=self.recorder)
+
+    def test_native_routes(self):
+        box = self.client.create(cpu=1.5, memory=2048)
+        self.assertEqual(box.exec("echo ok").stdout, "ok\n")
+        self.assertEqual(box.read_file("/tmp/a"), b"artifact")
+        box.pause()
+        box.resume()
+        box.destroy()
+        self.assertIn(
+            (
+                "POST",
+                "/run-cloud/sandboxes",
+                {
+                    "image": "runcloud/agent-base",
+                    "cpu": 1.5,
+                    "memory": 2048,
+                },
+            ),
+            self.recorder.calls,
+        )
+
+    def test_compatibility_adapters_share_the_public_client(self):
+        app = modal.App.lookup("compat", client=self.client)
+        self.assertEqual(modal.Sandbox.create(app=app).exec("echo ok").wait(), 0)
+        self.assertEqual(
+            E2BSandbox.create(client=self.client).commands.run("echo ok").exit_code, 0
+        )
+        self.assertEqual(
+            Daytona(client=self.client).create().process.exec("echo ok").exit_code, 0
+        )
+        self.assertEqual(
+            VercelSandbox.create(client=self.client).run_command("echo").exit_code, 0
+        )
+        self.assertTrue(SyncSandboxInstance.create(client=self.client))
+        async_blaxel = asyncio.run(SandboxInstance.create(client=self.client))
+        asyncio.run(async_blaxel.delete())
+        self.assertTrue(SpritesClient(client=self.client).create_sprite("compat"))
+
+    def test_unsupported_features_fail_loudly(self):
+        with self.assertRaises(UnsupportedCompatibilityFeatureError):
+            modal.Image.debian_slim().pip_install("requests")
+
+    def test_requests_identify_the_python_sdk(self):
+        with patch(
+            "runcloud.client.urllib.request.urlopen",
+            return_value=Response(),
+        ) as urlopen:
+            Client(api_key="rc_live_test").request("GET", "/run-cloud/account")
+
+        request = urlopen.call_args.args[0]
+        self.assertEqual(request.get_header("User-agent"), "runcloud-python/0.7.2")
+
+
+class CredentialTests(unittest.TestCase):
+    def setUp(self):
+        self.temporary_directory = tempfile.TemporaryDirectory()
+        self.run_cloud_home = Path(self.temporary_directory.name)
+        self.environment = patch.dict(
+            os.environ,
+            {"RUN_CLOUD_HOME": str(self.run_cloud_home)},
+            clear=False,
+        )
+        self.environment.start()
+        for name in ("RUN_CLOUD_API_KEY", "RUN_CLOUD_API_TOKEN", "RUN_CLOUD_API_URL"):
+            os.environ.pop(name, None)
+
+    def tearDown(self):
+        self.environment.stop()
+        self.temporary_directory.cleanup()
+
+    def save_credentials(
+        self,
+        *,
+        token="saved-key",
+        api_url="https://saved.example/api/",
+        expires_at=None,
+    ):
+        payload = {
+            "token": token,
+            "apiUrl": api_url,
+            "appUrl": "https://run.cloud",
+            "expiresAt": expires_at or time.time() + 3600,
+        }
+        (self.run_cloud_home / "credentials").write_text(json.dumps(payload))
+
+    def test_uses_saved_cli_credentials(self):
+        self.save_credentials()
+
+        client = Client()
+
+        self.assertEqual(client.api_key, "saved-key")
+        self.assertEqual(client.api_url, "https://saved.example/api")
+
+    def test_modal_app_lookup_uses_saved_cli_credentials(self):
+        self.save_credentials()
+
+        app = modal.App.lookup("my-app", create_if_missing=True)
+
+        self.assertEqual(app.client.api_key, "saved-key")
+        self.assertEqual(app.client.api_url, "https://saved.example/api")
+
+    def test_explicit_credentials_override_environment_and_saved_login(self):
+        self.save_credentials()
+        os.environ["RUN_CLOUD_API_KEY"] = "environment-key"
+        os.environ["RUN_CLOUD_API_URL"] = "https://environment.example"
+
+        client = Client(
+            api_key="explicit-key",
+            api_url="https://explicit.example/",
+        )
+
+        self.assertEqual(client.api_key, "explicit-key")
+        self.assertEqual(client.api_url, "https://explicit.example")
+
+    def test_environment_credentials_override_saved_login(self):
+        self.save_credentials()
+        os.environ["RUN_CLOUD_API_KEY"] = "environment-key"
+
+        client = Client()
+
+        self.assertEqual(client.api_key, "environment-key")
+        self.assertEqual(client.api_url, "https://api.run.cloud")
+
+    def test_api_url_override_applies_to_saved_login(self):
+        self.save_credentials()
+        os.environ["RUN_CLOUD_API_URL"] = "https://override.example/"
+
+        client = Client()
+
+        self.assertEqual(client.api_key, "saved-key")
+        self.assertEqual(client.api_url, "https://override.example")
+
+    def test_ignores_expired_saved_credentials(self):
+        self.save_credentials(expires_at=time.time() - 1)
+
+        with self.assertRaisesRegex(ValueError, "runcloud login"):
+            Client()
+
+    def test_ignores_malformed_saved_credentials(self):
+        (self.run_cloud_home / "credentials").write_text("{not json")
+
+        with self.assertRaisesRegex(ValueError, "RUN_CLOUD_API_KEY"):
+            Client()
+
+
+if __name__ == "__main__":
+    unittest.main()

runcloud_sdk-0.7.0/tests/test_sdk.py

@@ -1,79 +0,0 @@
-import asyncio
-import base64
-import unittest
-
-from runcloud import Client, UnsupportedCompatibilityFeatureError
-from runcloud.compat import modal
-from runcloud.compat.blaxel import SandboxInstance, SyncSandboxInstance
-from runcloud.compat.daytona import Daytona
-from runcloud.compat.e2b import Sandbox as E2BSandbox
-from runcloud.compat.sprites import SpritesClient
-from runcloud.compat.vercel import Sandbox as VercelSandbox
-
-SANDBOX = {"id": "sb_python", "name": "compat", "state": "running"}
-
-
-class Recorder:
-    def __init__(self):
-        self.calls = []
-
-    def __call__(self, method, path, body):
-        self.calls.append((method, path, body))
-        if path.endswith("/exec"):
-            return {"exit_code": 0, "stdout": "ok\n", "stderr": ""}
-        if path.endswith("/fs"):
-            return {"content": base64.b64encode(b"artifact").decode()}
-        if path == "/run-cloud/sandboxes" and method == "GET":
-            return {"items": [SANDBOX]}
-        return SANDBOX
-
-
-class SDKTests(unittest.TestCase):
-    def setUp(self):
-        self.recorder = Recorder()
-        self.client = Client(api_key="rc_live_test", transport=self.recorder)
-
-    def test_native_routes(self):
-        box = self.client.create(cpu=1.5, memory=2048)
-        self.assertEqual(box.exec("echo ok").stdout, "ok\n")
-        self.assertEqual(box.read_file("/tmp/a"), b"artifact")
-        box.pause()
-        box.resume()
-        box.destroy()
-        self.assertIn(
-            (
-                "POST",
-                "/run-cloud/sandboxes",
-                {
-                    "image": "runcloud/agent-base",
-                    "cpu": 1.5,
-                    "memory": 2048,
-                },
-            ),
-            self.recorder.calls,
-        )
-
-    def test_compatibility_adapters_share_the_public_client(self):
-        app = modal.App.lookup("compat", client=self.client)
-        self.assertEqual(modal.Sandbox.create(app=app).exec("echo ok").wait(), 0)
-        self.assertEqual(
-            E2BSandbox.create(client=self.client).commands.run("echo ok").exit_code, 0
-        )
-        self.assertEqual(
-            Daytona(client=self.client).create().process.exec("echo ok").exit_code, 0
-        )
-        self.assertEqual(
-            VercelSandbox.create(client=self.client).run_command("echo").exit_code, 0
-        )
-        self.assertTrue(SyncSandboxInstance.create(client=self.client))
-        async_blaxel = asyncio.run(SandboxInstance.create(client=self.client))
-        asyncio.run(async_blaxel.delete())
-        self.assertTrue(SpritesClient(client=self.client).create_sprite("compat"))
-
-    def test_unsupported_features_fail_loudly(self):
-        with self.assertRaises(UnsupportedCompatibilityFeatureError):
-            modal.Image.debian_slim().pip_install("requests")
-
-
-if __name__ == "__main__":
-    unittest.main()