Make Compression protocol public and default to gzip-only

.github/workflows/ci.yaml

@@ -87,10 +87,6 @@ jobs:
         run: uv run pytest ${{ matrix.coverage == 'cov' && '--cov=connectrpc --cov-report=xml' || '' }}
         working-directory: conformance
 
-      - name: run tests with minimal dependencies
-        run: uv run --exact pytest ${{ matrix.coverage == 'cov' && '--cov=connectrpc --cov-report=xml' || '' }}
-        working-directory: noextras
-
       - name: run Go tests
         run: go test ./...
         working-directory: protoc-gen-connect-python

conformance/test/client.py

@@ -18,11 +18,13 @@
 from gen.connectrpc.conformance.v1.config_pb2 import Code as ConformanceCode
 from gen.connectrpc.conformance.v1.config_pb2 import (
     Codec,
-    Compression,
     HTTPVersion,
     Protocol,
     StreamType,
 )
+from gen.connectrpc.conformance.v1.config_pb2 import (
+    Compression as ConformanceCompression,
+)
 from gen.connectrpc.conformance.v1.service_connect import (
     ConformanceServiceClient,
     ConformanceServiceClientSync,
@@ -42,6 +44,9 @@
 
 from connectrpc.client import ResponseMetadata
 from connectrpc.code import Code
+from connectrpc.compression.brotli import BrotliCompression
+from connectrpc.compression.gzip import GzipCompression
+from connectrpc.compression.zstd import ZstdCompression
 from connectrpc.errors import ConnectError
 from connectrpc.request import Headers
 
@@ -50,6 +55,8 @@
 
     from google.protobuf.any_pb2 import Any
 
+    from connectrpc.compression import Compression
+
 
 def _convert_code(error: Code) -> ConformanceCode:
     match error:
@@ -87,20 +94,16 @@ def _convert_code(error: Code) -> ConformanceCode:
             return ConformanceCode.CODE_UNAUTHENTICATED
 
 
-def _convert_compression(compression: Compression) -> str:
+def _convert_compression(compression: ConformanceCompression) -> Compression | None:
     match compression:
-        case Compression.COMPRESSION_IDENTITY:
-            return "identity"
-        case Compression.COMPRESSION_GZIP:
-            return "gzip"
-        case Compression.COMPRESSION_BR:
-            return "br"
-        case Compression.COMPRESSION_ZSTD:
-            return "zstd"
-        case Compression.COMPRESSION_DEFLATE:
-            return "deflate"
-        case Compression.COMPRESSION_SNAPPY:
-            return "snappy"
+        case ConformanceCompression.COMPRESSION_IDENTITY:
+            return None
+        case ConformanceCompression.COMPRESSION_GZIP:
+            return GzipCompression()
+        case ConformanceCompression.COMPRESSION_BR:
+            return BrotliCompression()
+        case ConformanceCompression.COMPRESSION_ZSTD:
+            return ZstdCompression()
         case _:
             msg = f"Unsupported compression: {compression}"
             raise ValueError(msg)
@@ -152,6 +155,11 @@ async def client_sync(
         ConformanceServiceClientSync(
             f"{scheme}://{test_request.host}:{test_request.port}",
             http_client=http_client,
+            accept_compression=[
+                GzipCompression(),
+                BrotliCompression(),
+                ZstdCompression(),
+            ],
             send_compression=_convert_compression(test_request.compression),
             proto_json=test_request.codec == Codec.CODEC_JSON,
             grpc=test_request.protocol == Protocol.PROTOCOL_GRPC,
@@ -186,6 +194,11 @@ async def client_async(
         ConformanceServiceClient(
             f"{scheme}://{test_request.host}:{test_request.port}",
             http_client=http_client,
+            accept_compression=[
+                GzipCompression(),
+                BrotliCompression(),
+                ZstdCompression(),
+            ],
             send_compression=_convert_compression(test_request.compression),
             proto_json=test_request.codec == Codec.CODEC_JSON,
             grpc=test_request.protocol == Protocol.PROTOCOL_GRPC,

conformance/test/gen/connectrpc/conformance/v1/service_connect.py

@@ -26,6 +26,7 @@
         Mapping,
     )
 
+    from connectrpc.compression import Compression
     from connectrpc.interceptor import Interceptor, InterceptorSync
     from connectrpc.request import Headers, RequestContext
 
@@ -89,7 +90,7 @@ def __init__(
         *,
         interceptors: Iterable[Interceptor] = (),
         read_max_bytes: int | None = None,
-        compressions: Iterable[str] | None = None,
+        compressions: Iterable[Compression] | None = None,
     ) -> None:
         super().__init__(
             service=service,
@@ -356,7 +357,7 @@ def __init__(
         service: ConformanceServiceSync,
         interceptors: Iterable[InterceptorSync] = (),
         read_max_bytes: int | None = None,
-        compressions: Iterable[str] | None = None,
+        compressions: Iterable[Compression] | None = None,
     ) -> None:
         super().__init__(
             endpoints={

conformance/test/server.py

@@ -43,6 +43,9 @@
 from google.protobuf.any_pb2 import Any
 
 from connectrpc.code import Code
+from connectrpc.compression.brotli import BrotliCompression
+from connectrpc.compression.gzip import GzipCompression
+from connectrpc.compression.zstd import ZstdCompression
 from connectrpc.errors import ConnectError
 
 if TYPE_CHECKING:
@@ -396,10 +399,14 @@ def bidi_stream(
     read_max_bytes = int(read_max_bytes)
 
 asgi_app = ConformanceServiceASGIApplication(
-    TestService(), read_max_bytes=read_max_bytes
+    TestService(),
+    read_max_bytes=read_max_bytes,
+    compressions=(GzipCompression(), ZstdCompression(), BrotliCompression()),
 )
 wsgi_app = ConformanceServiceWSGIApplication(
-    TestServiceSync(), read_max_bytes=read_max_bytes
+    TestServiceSync(),
+    read_max_bytes=read_max_bytes,
+    compressions=(GzipCompression(), ZstdCompression(), BrotliCompression()),
 )
 
 

connect-python.code-workspace

@@ -2,20 +2,16 @@
   "folders": [
     {
       "name": "/",
-      "path": "."
+      "path": ".",
     },
     {
       "name": "conformance",
-      "path": "./conformance"
+      "path": "./conformance",
     },
     {
       "name": "example",
-      "path": "./example"
+      "path": "./example",
     },
-    {
-      "name": "noextras",
-      "path": "./noextras"
-    }
   ],
   "extensions": {
     "recommendations": [
@@ -26,8 +22,8 @@
       "golang.go",
       "ms-python.python",
       "ms-python.vscode-pylance",
-      "nefrob.vscode-just-syntax"
-    ]
+      "nefrob.vscode-just-syntax",
+    ],
   },
   "settings": {
     "editor.formatOnSave": true,
@@ -39,25 +35,25 @@
     "python.testing.unittestEnabled": false,
     "[github-actions-workflow]": {
       "editor.formatOnSave": true,
-      "editor.defaultFormatter": "esbenp.prettier-vscode"
+      "editor.defaultFormatter": "esbenp.prettier-vscode",
     },
     "debugpy.debugJustMyCode": false,
     "[python]": {
       "editor.formatOnSave": true,
       "editor.codeActionsOnSave": {
         "source.fixAll": "explicit",
-        "source.organizeImports": "explicit"
+        "source.organizeImports": "explicit",
       },
-      "editor.defaultFormatter": "charliermarsh.ruff"
+      "editor.defaultFormatter": "charliermarsh.ruff",
     },
     "[json][jsonc]": {
       "editor.formatOnSave": true,
-      "editor.defaultFormatter": "esbenp.prettier-vscode"
+      "editor.defaultFormatter": "esbenp.prettier-vscode",
     },
     "yaml.format.enable": false,
     "[yaml]": {
       "editor.formatOnSave": true,
-      "editor.defaultFormatter": "esbenp.prettier-vscode"
-    }
-  }
+      "editor.defaultFormatter": "esbenp.prettier-vscode",
+    },
+  },
 }

example/example/eliza_connect.py

@@ -26,6 +26,7 @@
         Mapping,
     )
 
+    from connectrpc.compression import Compression
     from connectrpc.interceptor import Interceptor, InterceptorSync
     from connectrpc.request import Headers, RequestContext
 
@@ -56,7 +57,7 @@ def __init__(
         *,
         interceptors: Iterable[Interceptor] = (),
         read_max_bytes: int | None = None,
-        compressions: Iterable[str] | None = None,
+        compressions: Iterable[Compression] | None = None,
     ) -> None:
         super().__init__(
             service=service,
@@ -192,7 +193,7 @@ def __init__(
         service: ElizaServiceSync,
         interceptors: Iterable[InterceptorSync] = (),
         read_max_bytes: int | None = None,
-        compressions: Iterable[str] | None = None,
+        compressions: Iterable[Compression] | None = None,
     ) -> None:
         super().__init__(
             endpoints={

justfile

@@ -19,13 +19,8 @@ lint:
 typecheck:
     uv run pyright
 
-# Run unit tests with no extras
-[working-directory('noextras')]
-test-noextras *args:
-    uv run --exact pytest -W error {{ args }}
-
 # Run unit tests
-test *args: (test-noextras args)
+test *args:
     uv run pytest -W error {{ args }}
 
 # Run lint, typecheck and test