Merge pull request #11 from pierrecomputer/make-async-lt-3.10-compatible

make `async with` < 3.10 compatible

Author: jacobbednarz

packages/code-storage-python/pierre_storage/commit.py

@@ -389,28 +389,26 @@ async def send(self) -> CommitResult:
             "Code-Storage-Agent": get_user_agent(),
         }
 
-        async with (
-            httpx.AsyncClient() as client,
-            client.stream(
+        async with httpx.AsyncClient() as client:
+            async with client.stream(
                 "POST",
                 self.url,
                 headers=headers,
                 content=self._build_request_body(metadata),
                 timeout=180.0,
-            ) as response,
-        ):
-            if not response.is_success:
-                error_info = await _parse_commit_error(response, "createCommit")
-                raise RefUpdateError(
-                    error_info["message"],
-                    status=error_info["status"],
-                    reason=error_info["status"],
-                    ref_update=error_info.get("ref_update"),
-                )
-
-            result_data = await response.aread()
-            result = json.loads(result_data)
-            return _build_commit_result(result)
+            ) as response:
+                if not response.is_success:
+                    error_info = await _parse_commit_error(response, "createCommit")
+                    raise RefUpdateError(
+                        error_info["message"],
+                        status=error_info["status"],
+                        reason=error_info["status"],
+                        ref_update=error_info.get("ref_update"),
+                    )
+
+                result_data = await response.aread()
+                result = json.loads(result_data)
+                return _build_commit_result(result)
 
     def _build_metadata(self) -> Dict[str, Any]:
         """Build metadata payload for commit."""
@@ -491,28 +489,26 @@ async def request_stream() -> AsyncIterator[bytes]:
 
     url = f"{base_url.rstrip('/')}/api/v{api_version}/repos/diff-commit"
 
-    async with (
-        httpx.AsyncClient() as client,
-        client.stream(
+    async with httpx.AsyncClient() as client:
+        async with client.stream(
             "POST",
             url,
             headers=headers,
             content=request_stream(),
             timeout=180.0,
-        ) as response,
-    ):
-        if not response.is_success:
-            error_info = await _parse_commit_error(response, "createCommitFromDiff")
-            raise RefUpdateError(
-                error_info["message"],
-                status=error_info["status"],
-                reason=error_info["status"],
-                ref_update=error_info.get("ref_update"),
-            )
+        ) as response:
+            if not response.is_success:
+                error_info = await _parse_commit_error(response, "createCommitFromDiff")
+                raise RefUpdateError(
+                    error_info["message"],
+                    status=error_info["status"],
+                    reason=error_info["status"],
+                    ref_update=error_info.get("ref_update"),
+                )
 
-        result_data = await response.aread()
-        result = json.loads(result_data)
-        return _build_commit_result(result)
+            result_data = await response.aread()
+            result = json.loads(result_data)
+            return _build_commit_result(result)
 
 
 def resolve_commit_ttl_seconds(options: Optional[CreateCommitOptions]) -> int:

packages/code-storage-python/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pierre-storage"
-version = "1.3.2"
+version = "1.3.3"
 description = "Pierre Git Storage SDK for Python"
 readme = "README.md"
 license = "MIT"
@@ -68,7 +68,7 @@ target-version = "py39"
 
 [tool.ruff.lint]
 select = ["E", "F", "I", "N", "W", "B", "C4", "SIM"]
-ignore = ["E501"]
+ignore = ["E501", "SIM117"]
 
 [tool.uv]
 dev-dependencies = [

packages/code-storage-python/tests/test_commit.py

@@ -676,3 +676,71 @@ def capture_stream(*args, **kwargs):
             assert captured_headers is not None
             assert "Code-Storage-Agent" in captured_headers
             assert captured_headers["Code-Storage-Agent"] == get_user_agent()
+
+    @pytest.mark.asyncio
+    async def test_send_importable_on_python39(self, git_storage_options: dict) -> None:
+        """Regression test: parenthesized async-with syntax is Python 3.10+ only.
+
+        Before the fix, commit.py used:
+
+            async with (
+                httpx.AsyncClient() as client,
+                client.stream(...) as response,
+            ):
+
+        That form raises SyntaxError on Python 3.9 at import time, making the
+        entire module unusable despite pyproject.toml declaring requires-python>=3.9.
+        The fix is nested async-with statements, which are valid back to Python 3.1.
+
+        This test confirms send() completes successfully, which would be unreachable
+        on Python 3.9 because the module would never import.
+        """
+        import sys
+
+        import pierre_storage.commit  # must be importable without SyntaxError
+
+        assert pierre_storage.commit is not None, (
+            "pierre_storage.commit failed to import — likely a SyntaxError "
+            f"from parenthesized async-with on Python {sys.version_info}"
+        )
+
+        storage = GitStorage(git_storage_options)
+
+        stream_response = MagicMock()
+        stream_response.is_success = True
+        stream_response.aread = AsyncMock(
+            return_value=(
+                b'{"commit":{"commit_sha":"aaa","tree_sha":"bbb",'
+                b'"target_branch":"main","pack_bytes":10,"blob_count":1},'
+                b'"result":{"success":true,"status":"ok","branch":"main",'
+                b'"old_sha":"000","new_sha":"aaa"}}'
+            )
+        )
+
+        with patch("httpx.AsyncClient") as mock_client:
+            mock_response = MagicMock()
+            mock_response.status_code = 200
+            mock_response.is_success = True
+            mock_response.json.return_value = {"repo_id": "test-repo"}
+            mock_client.return_value.__aenter__.return_value.post = AsyncMock(
+                return_value=mock_response
+            )
+            stream_ctx = MagicMock()
+            stream_ctx.__aenter__ = AsyncMock(return_value=stream_response)
+            stream_ctx.__aexit__ = AsyncMock(return_value=None)
+            mock_client.return_value.__aenter__.return_value.stream = MagicMock(
+                return_value=stream_ctx
+            )
+
+            repo = await storage.create_repo(id="test-repo")
+            result = await (
+                repo.create_commit(
+                    target_branch="main",
+                    commit_message="test",
+                    author={"name": "A", "email": "a@example.com"},
+                )
+                .add_file_from_string("f.txt", "hello")
+                .send()
+            )
+
+        assert result["commit_sha"] == "aaa"