morphcloud 0.1.110__tar.gz → 0.1.111__tar.gz

{morphcloud-0.1.110 → morphcloud-0.1.111}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: morphcloud
-Version: 0.1.110
+Version: 0.1.111
 Summary: A Python SDK and CLI tool for creating, managing, and interacting with Morph Cloud VMs.
 Author-email: Morph Labs <jobs@morph.so>
 License: Apache-2.0
@@ -218,7 +218,7 @@ morphcloud instance copy -r ./local_dir inst_123:/remote/dir
 
 ### Volumes
 
-Morph Volumes exposes an S3-compatible object store. Object operations use your normal `MORPH_API_KEY`. Bucket creation requires a volumes service API key via `MORPH_VOLUMES_SERVICE_API_KEY`.
+Morph Volumes exposes an S3-compatible object store. Bucket lifecycle and object operations use your normal `MORPH_API_KEY`.
 
 ```python
 import os
@@ -226,8 +226,7 @@ import os
 from morphcloud import MorphCloudClient
 
 client = MorphCloudClient(
-    api_key="morph_...",
-    volumes_service_api_key=os.environ["MORPH_VOLUMES_SERVICE_API_KEY"],
+    api_key=os.environ["MORPH_API_KEY"],
 )
 
 client.volumes.create_bucket("my-volume-bucket")
@@ -267,10 +266,9 @@ morphcloud volumes rm -r s3://my-volume-bucket/datasets/
 If you use profiles with non-default endpoints, the volumes gateway can be configured explicitly:
 
 ```bash
-morphcloud profile set stage \
-  --api-host stage.morph.so \
-  --service-base-url https://service.svc.stage.morph.so \
-  --volumes-base-url https://volumes.svc.stage.morph.so
+morphcloud profile set prod \
+  --api-host cloud.morph.so \
+  --volumes-base-url https://volumes.svc.cloud.morph.so
 ```
 
 ### Interactive Tools

{morphcloud-0.1.110 → morphcloud-0.1.111}/README.md

@@ -187,7 +187,7 @@ morphcloud instance copy -r ./local_dir inst_123:/remote/dir
 
 ### Volumes
 
-Morph Volumes exposes an S3-compatible object store. Object operations use your normal `MORPH_API_KEY`. Bucket creation requires a volumes service API key via `MORPH_VOLUMES_SERVICE_API_KEY`.
+Morph Volumes exposes an S3-compatible object store. Bucket lifecycle and object operations use your normal `MORPH_API_KEY`.
 
 ```python
 import os
@@ -195,8 +195,7 @@ import os
 from morphcloud import MorphCloudClient
 
 client = MorphCloudClient(
-    api_key="morph_...",
-    volumes_service_api_key=os.environ["MORPH_VOLUMES_SERVICE_API_KEY"],
+    api_key=os.environ["MORPH_API_KEY"],
 )
 
 client.volumes.create_bucket("my-volume-bucket")
@@ -236,10 +235,9 @@ morphcloud volumes rm -r s3://my-volume-bucket/datasets/
 If you use profiles with non-default endpoints, the volumes gateway can be configured explicitly:
 
 ```bash
-morphcloud profile set stage \
-  --api-host stage.morph.so \
-  --service-base-url https://service.svc.stage.morph.so \
-  --volumes-base-url https://volumes.svc.stage.morph.so
+morphcloud profile set prod \
+  --api-host cloud.morph.so \
+  --volumes-base-url https://volumes.svc.cloud.morph.so
 ```
 
 ### Interactive Tools

{morphcloud-0.1.110 → morphcloud-0.1.111}/morphcloud/volumes/client.py

@@ -4,7 +4,6 @@ import datetime as dt
 import hashlib
 import hmac
 import json
-import os
 import re
 import typing
 import xml.etree.ElementTree as ET
@@ -186,19 +185,11 @@ class VolumesClient:
     def __init__(self, client: MorphCloudClient):
         self._client = client
         self.base_url = str(client.volumes_base_url or "").rstrip("/")
-        self.service_base_url = str(client.service_base_url or "").rstrip("/")
-        self.volumes_service_api_key = str(
-            getattr(client, "volumes_service_api_key", None)
-            or os.environ.get("MORPH_VOLUMES_SERVICE_API_KEY")
-            or ""
-        ).strip()
-        self._active_organization_id: str | None = None
         transport = build_http_transport()
         self._http_client = httpx.Client(
             timeout=None,
             transport=transport,
         )
-        self._json_client = httpx.Client(timeout=30, transport=transport)
 
     def _compose_url(
         self,
@@ -319,69 +310,6 @@ class VolumesClient:
             )
         return response
 
-    def _require_volumes_service_api_key(self) -> str:
-        if not self.volumes_service_api_key:
-            raise ValueError(
-                "Bucket creation requires MORPH_VOLUMES_SERVICE_API_KEY or "
-                "MorphCloudClient(..., volumes_service_api_key=...)."
-            )
-        return self.volumes_service_api_key
-
-    def _get_active_organization_id(self) -> str:
-        if self._active_organization_id:
-            return self._active_organization_id
-
-        response = self._json_client.request(
-            method="GET",
-            url=f"{self._client.base_url.rstrip('/')}/orgs/active",
-            headers={"Authorization": f"Bearer {self._client.api_key}"},
-        )
-        if response.is_error:
-            raise ApiError(
-                f"Volumes organization lookup failed for url '{response.url}'",
-                response.status_code,
-                _parse_error_body(response.text),
-            )
-
-        payload = response.json()
-        if not isinstance(payload, dict):
-            raise ValueError("Unexpected active organization response.")
-
-        organization_id = (
-            payload.get("organization_id")
-            or payload.get("id")
-            or (payload.get("organization") or {}).get("id")
-        )
-        if not organization_id:
-            raise ValueError("Could not determine the active organization for volumes.")
-
-        self._active_organization_id = str(organization_id)
-        return self._active_organization_id
-
-    def _service_request(
-        self,
-        method: str,
-        path: str,
-        *,
-        json_body: typing.Mapping[str, typing.Any] | None = None,
-    ) -> httpx.Response:
-        response = self._json_client.request(
-            method=method.upper(),
-            url=f"{self.service_base_url}{path}",
-            headers={
-                "Authorization": (f"Bearer {self._require_volumes_service_api_key()}"),
-                "X-Morph-Organization-ID": self._get_active_organization_id(),
-            },
-            json=dict(json_body or {}),
-        )
-        if response.is_error:
-            raise ApiError(
-                f"Volumes control-plane request failed for url '{response.url}'",
-                response.status_code,
-                _parse_error_body(response.text),
-            )
-        return response
-
     def list_buckets(self) -> list[VolumeBucket]:
         response = self._request(
             "GET",
@@ -401,18 +329,13 @@ class VolumesClient:
 
     def create_bucket(self, bucket: str) -> VolumeBucket:
         normalized_bucket = _normalize_bucket(bucket)
-        response = self._service_request(
-            "POST",
-            "/service/volume",
-            json_body={"name": normalized_bucket},
+        self._request(
+            "PUT",
+            self._compose_url(bucket=normalized_bucket),
         )
-        payload = response.json()
-        volume_payload = payload.get("volume") if isinstance(payload, dict) else None
-        if not isinstance(volume_payload, dict):
-            raise ValueError("Unexpected create volume response from service API.")
         return VolumeBucket(
-            name=str(volume_payload.get("name") or normalized_bucket),
-            created_at=typing.cast(str | None, volume_payload.get("created_at")),
+            name=normalized_bucket,
+            created_at=None,
         )
 
     def delete_bucket(self, bucket: str) -> None:

{morphcloud-0.1.110 → morphcloud-0.1.111}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "morphcloud"
-version = "0.1.110"
+version = "0.1.111"
 description = "A Python SDK and CLI tool for creating, managing, and interacting with Morph Cloud VMs."
 authors = [
     {name = "Morph Labs", email = "jobs@morph.so"}

{morphcloud-0.1.110 → morphcloud-0.1.111}/tests/unit/test_cli_volumes.py

@@ -50,6 +50,30 @@ def test_volumes_ls_lists_buckets(monkeypatch):
     assert "beta" in result.output
 
 
+def test_volumes_mb_creates_bucket(monkeypatch):
+    import morphcloud.cli as cli_mod
+    import morphcloud.volumes.cli as volumes_cli
+
+    _install_noop_spinner(monkeypatch)
+
+    calls = []
+    stub_volumes = types.SimpleNamespace(
+        create_bucket=lambda bucket: calls.append(bucket),
+    )
+    monkeypatch.setattr(
+        volumes_cli,
+        "get_client",
+        lambda: types.SimpleNamespace(volumes=stub_volumes),
+    )
+
+    runner = CliRunner()
+    result = runner.invoke(cli_mod.cli, ["volumes", "mb", "demo"])
+
+    assert result.exit_code == 0, result.output
+    assert calls == ["demo"]
+    assert "s3://demo" in result.output
+
+
 def test_volumes_cp_uploads_to_bucket_prefix(monkeypatch, tmp_path):
     import morphcloud.cli as cli_mod
     import morphcloud.volumes.cli as volumes_cli

{morphcloud-0.1.110 → morphcloud-0.1.111}/tests/unit/test_volumes_client.py

@@ -57,19 +57,15 @@ class StubHTTPClient:
 def _build_client(
     *,
     s3_responses=(),
-    json_responses=(),
-    volumes_service_api_key="morph_service_key",
 ):
     morph_client = types.SimpleNamespace(
         api_key="morph_test_key",
         base_url="https://cloud.morph.so/api",
         service_base_url="https://service.svc.stage.morph.so",
         volumes_base_url="https://volumes.svc.stage.morph.so",
-        volumes_service_api_key=volumes_service_api_key,
     )
     client = VolumesClient(morph_client)
     client._http_client = StubHTTPClient(s3_responses)
-    client._json_client = StubHTTPClient(json_responses)
     return client
 
 
@@ -95,55 +91,49 @@ def test_list_buckets_parses_xml():
     assert buckets[0].created_at == "2026-04-01T00:00:00Z"
 
 
-def test_create_bucket_uses_service_api_and_active_org():
+def test_create_bucket_uses_signed_gateway_request():
     client = _build_client(
-        json_responses=[
-            StubResponse(
-                json_data={
-                    "organization_id": "organization_demo",
-                    "organization": {"id": "organization_demo"},
-                },
-                url="https://cloud.morph.so/api/orgs/active",
-            ),
+        s3_responses=[
             StubResponse(
-                json_data={
-                    "volume": {
-                        "name": "demo",
-                        "created_at": "2026-04-06T00:00:00Z",
-                    }
-                },
-                url="https://service.svc.stage.morph.so/service/volume",
-            ),
+                status_code=200,
+                headers={"Location": "https://volumes.svc.stage.morph.so/demo"},
+                url="https://volumes.svc.stage.morph.so/demo",
+            )
         ]
     )
 
     bucket = client.create_bucket("demo")
 
     assert bucket.name == "demo"
-    assert bucket.created_at == "2026-04-06T00:00:00Z"
-    assert client._json_client.calls[0]["method"] == "GET"
-    assert client._json_client.calls[0]["url"].endswith("/orgs/active")
-    assert client._json_client.calls[0]["headers"]["Authorization"] == (
-        "Bearer morph_test_key"
-    )
-    assert client._json_client.calls[1]["method"] == "POST"
-    assert client._json_client.calls[1]["url"].endswith("/service/volume")
-    assert client._json_client.calls[1]["headers"]["Authorization"] == (
-        "Bearer morph_service_key"
+    assert bucket.created_at is None
+    assert len(client._http_client.calls) == 1
+    assert client._http_client.calls[0]["method"] == "PUT"
+    assert client._http_client.calls[0]["url"] == "https://volumes.svc.stage.morph.so/demo"
+    assert client._http_client.calls[0]["content"] is None
+    assert client._http_client.calls[0]["headers"]["Authorization"].startswith(
+        "AWS4-HMAC-SHA256 "
     )
-    assert client._json_client.calls[1]["headers"]["X-Morph-Organization-ID"] == (
-        "organization_demo"
-    )
-    assert client._json_client.calls[1]["json"] == {"name": "demo"}
 
 
-def test_create_bucket_requires_service_api_key():
-    client = _build_client(volumes_service_api_key="")
+def test_create_bucket_raises_api_error_on_conflict():
+    client = _build_client(
+        s3_responses=[
+            StubResponse(
+                status_code=409,
+                text=(
+                    "<Error><Code>BucketAlreadyExists</Code>"
+                    "<Message>bucket already exists</Message></Error>"
+                ),
+                url="https://volumes.svc.stage.morph.so/demo",
+            )
+        ]
+    )
 
-    with pytest.raises(ValueError) as excinfo:
+    with pytest.raises(ApiError) as excinfo:
         client.create_bucket("demo")
 
-    assert "MORPH_VOLUMES_SERVICE_API_KEY" in str(excinfo.value)
+    assert excinfo.value.status_code == 409
+    assert "BucketAlreadyExists" in excinfo.value.response_body
 
 
 def test_list_directory_derives_prefixes_from_flat_listing():