zop-cli 0.2.1__tar.gz → 0.2.2__tar.gz

{zop_cli-0.2.1 → zop_cli-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zop-cli
-Version: 0.2.1
+Version: 0.2.2
 Summary: High-throughput Zotero CLI focused on batch operations and automation
 Project-URL: Homepage, https://github.com/anomalyco/zop
 Project-URL: Issues, https://github.com/anomalyco/zop/issues

{zop_cli-0.2.1 → zop_cli-0.2.2}/src/zop/_version.py

@@ -2,4 +2,4 @@
 
 from __future__ import annotations
 
-__version__ = "0.2.1"
+__version__ = "0.2.2"

{zop_cli-0.2.1 → zop_cli-0.2.2}/src/zop/adapters/zotero_api.py

@@ -172,6 +172,11 @@ class ZoteroApi:
             parent_key: New parent key. Pass ``None`` or ``False`` to detach to
                 top-level. Default (sentinel) leaves parent unchanged.
             version: If-Unmodified-Since-Version for optimistic locking.
+
+        Returns:
+            The updated collection dict, or an empty dict on an empty response.
+            Zotero answers single-object PATCHes with ``204 No Content``, so
+            callers must not subscript the result to read fields.
         """
         payload: dict[str, Any] = {}
         if name is not None:
@@ -182,7 +187,8 @@ class ZoteroApi:
         if version is not None:
             headers["If-Unmodified-Since-Version"] = str(version)
         resp = await self._client.patch(self._coll_url(key), json=payload, headers=headers)
-        return cast("dict[str, Any]", self._check(resp))
+        result = self._check(resp)
+        return result if isinstance(result, dict) else {}
 
     async def delete_collection(self, key: str, *, version: int | None = None) -> None:
         """Delete a collection. CASCADE: deletes all subcollections."""

{zop_cli-0.2.1 → zop_cli-0.2.2}/src/zop/services/collections.py

@@ -305,12 +305,17 @@ class CollectionsService:
             if version is None:
                 current = await api.get_collection(key)
                 version = current["version"]
-            r = await api.update_collection(key, parent_key=parent_key, version=version)
+            # Zotero PATCH /collections/{key} returns 204 No Content (no body),
+            # so the patch response carries no fields to read. Re-read the
+            # collection to return its true updated state (new version, name,
+            # parent) — subscripting the patch response crashes (BUG-11).
+            await api.update_collection(key, parent_key=parent_key, version=version)
+            updated = await api.get_collection(key)
         return Collection(
-            key=r["key"],
-            name=r["data"]["name"],
-            parent_key=r["data"].get("parentCollection") or None,
-            version=r["version"],
+            key=updated["key"],
+            name=updated["data"]["name"],
+            parent_key=updated["data"].get("parentCollection") or None,
+            version=updated["version"],
         )
 
     async def move_items(

{zop_cli-0.2.1 → zop_cli-0.2.2}/tests/test_collections.py

@@ -222,23 +222,50 @@ async def test_reparent_fetches_version_when_not_provided(
     monkeypatch: pytest.MonkeyPatch,
 ) -> None:
     fake_api.get_collection.return_value = {
-        "key": "K",
+        "key": "KEY00001",
         "version": 5,
         "data": {"name": "n", "parentCollection": False},
     }
-    fake_api.update_collection.return_value = {
+    fake_api.update_collection.return_value = {}  # 204 No Content
+    monkeypatch.setattr(CollectionsService, "_require_api", lambda self: fake_api)
+    svc = CollectionsService(db_path=fake_db, creds=creds)
+
+    await svc.reparent("KEY00001", None)  # detach to top-level
+
+    # get_collection called twice: once to read the version, once to re-read
+    # the updated state (PATCH /collections/{key} returns no body — BUG-11).
+    assert fake_api.get_collection.await_count == 2
+    assert all(c.args == ("KEY00001",) for c in fake_api.get_collection.call_args_list)
+    assert fake_api.update_collection.await_count == 1
+    assert fake_api.update_collection.call_args.kwargs["version"] == 5
+
+
+async def test_reparent_returns_updated_state_after_empty_patch(
+    fake_db: Path,
+    creds: ApiCreds,
+    fake_api: AsyncMock,
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    """BUG-11: PATCH /collections/{key} returns 204 No Content → update_collection
+    yields {}. reparent must NOT subscript the patch response; it re-reads the
+    collection to build the result, so it returns a Collection instead of
+    raising ``TypeError: 'NoneType' object is not subscriptable``.
+    """
+    fake_api.update_collection.return_value = {}  # real 204 behavior
+    fake_api.get_collection.return_value = {
         "key": "KEY00001",
         "version": 6,
-        "data": {"name": "n", "parentCollection": False},
+        "data": {"name": "ExistingParent", "parentCollection": "PARENT01"},
     }
     monkeypatch.setattr(CollectionsService, "_require_api", lambda self: fake_api)
     svc = CollectionsService(db_path=fake_db, creds=creds)
 
-    await svc.reparent("K", None)  # detach to top-level
+    # "ExistingParent" resolves locally to PARENT01; reparent KEY00001 under it.
+    result = await svc.reparent("KEY00001", "ExistingParent")
 
-    fake_api.get_collection.assert_awaited_once_with("K")
-    assert fake_api.update_collection.await_count == 1
-    assert fake_api.update_collection.call_args.kwargs["version"] == 5
+    assert result.key == "KEY00001"
+    assert result.parent_key == "PARENT01"
+    assert result.version == 6
 
 
 # ---- create: --parent accepts KEY + API fallback (BUG-7) ----

{zop_cli-0.2.1 → zop_cli-0.2.2}/tests/test_zotero_api.py

@@ -178,6 +178,24 @@ async def test_get_collection_gets_single_collection(creds: ApiCreds) -> None:
     assert result["version"] == 9
 
 
+# ---- update_collection ----
+
+
+async def test_update_collection_empty_body_returns_empty_dict(creds: ApiCreds) -> None:
+    """BUG-11: Zotero PATCH /collections/{key} returns 204 No Content (empty
+    body). update_collection must yield {} (like update_item), not None — a
+    ``None`` return crashes any caller that subscripts the result (reparent).
+    """
+
+    def handler(request: httpx.Request) -> httpx.Response:
+        return httpx.Response(204)  # no content
+
+    async with ZoteroApi(creds, transport=httpx.MockTransport(handler)) as api:
+        result = await api.update_collection("K", parent_key="P", version=5)
+
+    assert result == {}
+
+
 # ---- _check status-code mapping ----