pydantic-rpc 0.11.0__py3-none-any.whl → 0.13.0__py3-none-any.whl

pydantic_rpc/core.py

@@ -1,6 +1,9 @@
+import annotated_types
 import asyncio
 import datetime
 import enum
+import grpc
+import grpc_tools
 import importlib.util
 import inspect
 import os
@@ -8,11 +11,19 @@ import signal
 import sys
 import time
 import types
-from typing import Union
 from collections.abc import AsyncIterator, Awaitable, Callable, Iterable
 from concurrent import futures
+from connectrpc.code import Code as Errors
+# Protobuf Python modules for Timestamp, Duration (requires protobuf / grpcio)
+from google.protobuf import duration_pb2, timestamp_pb2, empty_pb2
+from grpc import ServicerContext
+from grpc_health.v1 import health_pb2, health_pb2_grpc
+from grpc_health.v1.health import HealthServicer
+from grpc_reflection.v1alpha import reflection
+from grpc_tools import protoc
 from pathlib import Path
 from posixpath import basename
+from pydantic import BaseModel, ValidationError
 from typing import (
     Any,
     Optional,
@@ -22,20 +33,10 @@ from typing import (
     cast,
     TypeGuard,
 )
+from typing import Union
+from typing import Union, Sequence, Tuple
+from concurrent.futures import Executor
 
-import annotated_types
-import grpc
-from grpc import ServicerContext
-import grpc_tools
-from connecpy.code import Code as Errors
-
-# Protobuf Python modules for Timestamp, Duration (requires protobuf / grpcio)
-from google.protobuf import duration_pb2, timestamp_pb2, empty_pb2
-from grpc_health.v1 import health_pb2, health_pb2_grpc
-from grpc_health.v1.health import HealthServicer
-from grpc_reflection.v1alpha import reflection
-from grpc_tools import protoc
-from pydantic import BaseModel, ValidationError
 from .decorators import get_method_options, has_http_option
 from .tls import GrpcTLSConfig
 
@@ -726,15 +727,15 @@ def connect_obj_with_stub_async(
     return ConcreteServiceClass
 
 
-def connect_obj_with_stub_connecpy(
-    connecpy_module: Any, pb2_module: Any, obj: object
+def connect_obj_with_stub_connect_python(
+    connect_python_module: Any, pb2_module: Any, obj: object
 ) -> type:
     """
-    Connect a Python service object to a Connecpy stub.
+    Connect a Python service object to a Connect Python stub.
     """
     service_class = obj.__class__
     stub_class_name = service_class.__name__
-    stub_class = getattr(connecpy_module, stub_class_name)
+    stub_class = getattr(connect_python_module, stub_class_name)
 
     class ConcreteServiceClass(stub_class):
         pass
@@ -845,15 +846,15 @@ def connect_obj_with_stub_connecpy(
     return ConcreteServiceClass
 
 
-def connect_obj_with_stub_async_connecpy(
-    connecpy_module: Any, pb2_module: Any, obj: object
+def connect_obj_with_stub_async_connect_python(
+    connect_python_module: Any, pb2_module: Any, obj: object
 ) -> type:
     """
-    Connect a Python service object to a Connecpy stub for async methods with streaming support.
+    Connect a Python service object to a Connect Python stub for async methods with streaming support.
     """
     service_class = obj.__class__
     stub_class_name = service_class.__name__
-    stub_class = getattr(connecpy_module, stub_class_name)
+    stub_class = getattr(connect_python_module, stub_class_name)
 
     class ConcreteServiceClass(stub_class):
         pass
@@ -2030,10 +2031,10 @@ def generate_grpc_code(proto_path: Path) -> types.ModuleType | None:
     return module
 
 
-def generate_connecpy_code(proto_path: Path) -> types.ModuleType | None:
+def generate_connect_python_code(proto_path: Path) -> types.ModuleType | None:
     """
-    Run protoc with the Connecpy plugin to generate Python Connecpy code from proto_path.
-    Writes foo_connecpy.py next to proto_path, then imports and returns that module.
+    Run protoc with the Connect Python plugin to generate Python Connect code from proto_path.
+    Writes foo_connect_python.py next to proto_path, then imports and returns that module.
     """
     # 1) Ensure the .proto exists
     if not proto_path.is_file():
@@ -2051,7 +2052,7 @@ def generate_connecpy_code(proto_path: Path) -> types.ModuleType | None:
         "protoc",  # Dummy program name (required for protoc.main)
         "-I.",
         f"-I{well_known_path}",
-        f"--connecpy_out={out_str}",
+        f"--connect-python_out={out_str}",
         proto_path.name,
     ]
 
@@ -2065,7 +2066,7 @@ def generate_connecpy_code(proto_path: Path) -> types.ModuleType | None:
 
     # 4) Locate the generated file
     base_name = proto_path.stem  # "foo"
-    generated_filename = f"{base_name}_connecpy.py"  # "foo_connecpy.py"
+    generated_filename = f"{base_name}_connect.py"  # "foo_connect.py"
     generated_filepath = out_dir / generated_filename
 
     # 5) Add out_dir to sys.path so we can import by filename
@@ -2074,7 +2075,7 @@ def generate_connecpy_code(proto_path: Path) -> types.ModuleType | None:
 
     # 6) Load and return the module
     spec = importlib.util.spec_from_file_location(
-        base_name + "_connecpy", str(generated_filepath)
+        base_name + "_connect", str(generated_filepath)
     )
     if spec is None or spec.loader is None:
         return None
@@ -2259,7 +2260,7 @@ def get_proto_path(proto_filename: str) -> Path:
     return base / proto_filename
 
 
-def generate_and_compile_proto_using_connecpy(
+def generate_and_compile_proto_using_connect_python(
     obj: object,
     package_name: str = "",
     existing_proto_path: Path | None = None,
@@ -2268,7 +2269,7 @@ def generate_and_compile_proto_using_connecpy(
         import importlib
 
         pb2_module = None
-        connecpy_module = None
+        connect_python_module = None
 
         try:
             pb2_module = importlib.import_module(
@@ -2278,14 +2279,14 @@ def generate_and_compile_proto_using_connecpy(
             pass
 
         try:
-            connecpy_module = importlib.import_module(
-                f"{obj.__class__.__name__.lower()}_connecpy"
+            connect_python_module = importlib.import_module(
+                f"{obj.__class__.__name__.lower()}_connect"
             )
         except ImportError:
             pass
 
-        if connecpy_module is not None and pb2_module is not None:
-            return connecpy_module, pb2_module
+        if connect_python_module is not None and pb2_module is not None:
+            return connect_python_module, pb2_module
 
         # If the modules are not found, generate and compile the proto files.
 
@@ -2306,10 +2307,10 @@ def generate_and_compile_proto_using_connecpy(
     if gen_pb is None:
         raise Exception("Generating pb code")
 
-    gen_connecpy = generate_connecpy_code(proto_file_path)
-    if gen_connecpy is None:
-        raise Exception("Generating Connecpy code")
-    return gen_connecpy, gen_pb
+    gen_connect_python = generate_connect_python_code(proto_file_path)
+    if gen_connect_python is None:
+        raise Exception("Generating Connect Python code")
+    return gen_connect_python, gen_pb
 
 
 def is_combined_proto_enabled() -> bool:
@@ -2711,10 +2712,22 @@ class AsyncIOServer:
         service: Optional[object] = None,
         port: int = 50051,
         package_name: str = "",
-        *interceptors: grpc.ServerInterceptor,
         tls: Optional["GrpcTLSConfig"] = None,
+        interceptors: Optional[Sequence[grpc.ServerInterceptor]] = None,
+        migration_thread_pool: Optional[Executor] = None,
+        handlers: Optional[Sequence[grpc.GenericRpcHandler]] = None,
+        options: Optional[Sequence[Tuple[str, Any]]] = None,
+        maximum_concurrent_rpcs: Optional[int] = None,
+        compression: Optional[grpc.Compression] = None,
     ) -> None:
-        self._server: grpc.aio.Server = grpc.aio.server(interceptors=interceptors)
+        self._server: grpc.aio.Server = grpc.aio.server(
+            migration_thread_pool=migration_thread_pool,
+            handlers=handlers,
+            interceptors=interceptors,
+            options=options,
+            maximum_concurrent_rpcs=maximum_concurrent_rpcs,
+            compression=compression,
+        )
         self._service_names: list[str] = []
         self._package_name: str = package_name
         self._port: int = port
@@ -2804,20 +2817,24 @@ class AsyncIOServer:
         await self._server.stop(10)
         print("gRPC server shutdown.")
 
+    async def stop(self, grace: float = 10.0):
+        """Stop the gRPC server gracefully."""
+        await self._server.stop(grace)
 
-def get_connecpy_asgi_app_class(connecpy_module: Any, service_name: str):
-    """Get the ASGI application class from connecpy module (Connecpy v2.x)."""
-    return getattr(connecpy_module, f"{service_name}ASGIApplication")
 
+def get_connect_python_asgi_app_class(connect_python_module: Any, service_name: str):
+    """Get the ASGI application class from connect-python module."""
+    return getattr(connect_python_module, f"{service_name}ASGIApplication")
 
-def get_connecpy_wsgi_app_class(connecpy_module: Any, service_name: str):
-    """Get the WSGI application class from connecpy module (Connecpy v2.x)."""
-    return getattr(connecpy_module, f"{service_name}WSGIApplication")
+
+def get_connect_python_wsgi_app_class(connect_python_module: Any, service_name: str):
+    """Get the WSGI application class from connect-python module."""
+    return getattr(connect_python_module, f"{service_name}WSGIApplication")
 
 
 class ASGIApp:
     """
-    An ASGI-compatible application that can serve Connect-RPC via Connecpy.
+    An ASGI-compatible application that can serve Connect-RPC via connect-python.
     """
 
     def __init__(self, service: Optional[object] = None, package_name: str = ""):
@@ -2828,23 +2845,25 @@ class ASGIApp:
 
     def mount(self, obj: object, package_name: str = ""):
         """Generate and compile proto files, then mount the async service implementation."""
-        connecpy_module, pb2_module = generate_and_compile_proto_using_connecpy(
-            obj, package_name
+        connect_python_module, pb2_module = (
+            generate_and_compile_proto_using_connect_python(obj, package_name)
         )
-        self.mount_using_pb2_modules(connecpy_module, pb2_module, obj)
+        self.mount_using_pb2_modules(connect_python_module, pb2_module, obj)
 
     def mount_using_pb2_modules(
-        self, connecpy_module: Any, pb2_module: Any, obj: object
+        self, connect_python_module: Any, pb2_module: Any, obj: object
     ):
-        """Connect the compiled connecpy and pb2 modules with the async service implementation."""
-        concreteServiceClass = connect_obj_with_stub_async_connecpy(
-            connecpy_module, pb2_module, obj
+        """Connect the compiled connect-python and pb2 modules with the async service implementation."""
+        concreteServiceClass = connect_obj_with_stub_async_connect_python(
+            connect_python_module, pb2_module, obj
         )
         service_name = obj.__class__.__name__
         service_impl = concreteServiceClass()
 
         # Get the service-specific ASGI application class
-        app_class = get_connecpy_asgi_app_class(connecpy_module, service_name)
+        app_class = get_connect_python_asgi_app_class(
+            connect_python_module, service_name
+        )
         app = app_class(service=service_impl)
 
         # Store the app and its path for routing
@@ -2899,7 +2918,7 @@ class ASGIApp:
 
 class WSGIApp:
     """
-    A WSGI-compatible application that can serve Connect-RPC via Connecpy.
+    A WSGI-compatible application that can serve Connect-RPC via connect-python.
     """
 
     def __init__(self, service: Optional[object] = None, package_name: str = ""):
@@ -2910,23 +2929,25 @@ class WSGIApp:
 
     def mount(self, obj: object, package_name: str = ""):
         """Generate and compile proto files, then mount the sync service implementation."""
-        connecpy_module, pb2_module = generate_and_compile_proto_using_connecpy(
-            obj, package_name
+        connect_python_module, pb2_module = (
+            generate_and_compile_proto_using_connect_python(obj, package_name)
         )
-        self.mount_using_pb2_modules(connecpy_module, pb2_module, obj)
+        self.mount_using_pb2_modules(connect_python_module, pb2_module, obj)
 
     def mount_using_pb2_modules(
-        self, connecpy_module: Any, pb2_module: Any, obj: object
+        self, connect_python_module: Any, pb2_module: Any, obj: object
     ):
-        """Connect the compiled connecpy and pb2 modules with the sync service implementation."""
-        concreteServiceClass = connect_obj_with_stub_connecpy(
-            connecpy_module, pb2_module, obj
+        """Connect the compiled connect-python and pb2 modules with the sync service implementation."""
+        concreteServiceClass = connect_obj_with_stub_connect_python(
+            connect_python_module, pb2_module, obj
         )
         service_name = obj.__class__.__name__
         service_impl = concreteServiceClass()
 
         # Get the service-specific WSGI application class
-        app_class = get_connecpy_wsgi_app_class(connecpy_module, service_name)
+        app_class = get_connect_python_wsgi_app_class(
+            connect_python_module, service_name
+        )
         app = app_class(service=service_impl)
 
         # Store the app and its path for routing

pydantic_rpc/decorators.py

@@ -3,7 +3,7 @@
 from typing import Any, Callable, Dict, List, Optional, TypeVar, Type
 from functools import wraps
 import grpc
-from connecpy.code import Code as ConnectErrors
+from connectrpc.code import Code as ConnectErrors
 
 from .options import OptionMetadata, OPTION_METADATA_ATTR
 

{pydantic_rpc-0.11.0.dist-info → pydantic_rpc-0.13.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pydantic-rpc
-Version: 0.11.0
+Version: 0.13.0
 Summary: A Python library for building gRPC/ConnectRPC services with Pydantic models.
 Author: Yasushi Itoh
 Requires-Dist: annotated-types==0.7.0
@@ -9,7 +9,8 @@ Requires-Dist: grpcio>=1.56.2
 Requires-Dist: grpcio-tools>=1.56.2
 Requires-Dist: grpcio-reflection>=1.56.2
 Requires-Dist: grpcio-health-checking>=1.56.2
-Requires-Dist: connecpy>=2.2.0
+Requires-Dist: connect-python>=0.5.0
+Requires-Dist: protoc-gen-connect-python>=0.1.0
 Requires-Dist: mcp>=1.9.4
 Requires-Dist: starlette>=0.27.0
 Requires-Python: >=3.11
@@ -1247,6 +1248,64 @@ class MyMessage(Message):
 
 This approach works because protobuf allows message types within `oneof` fields, and the collections are contained within those messages.
 
+## 🔧 Development
+
+This project uses [`just`](https://github.com/casey/just) as a command runner for development tasks.
+
+### Installing just
+
+**macOS:**
+```bash
+brew install just
+```
+
+**Linux:**
+```bash
+curl --proto '=https' --tlsv1.2 -sSf https://just.systems/install.sh | bash -s -- --to ~/bin
+```
+
+**Windows:**
+Download from [GitHub releases](https://github.com/casey/just/releases)
+
+### Quick Start
+
+```bash
+# Install dependencies
+just install
+
+# Run tests
+just test  # or just t
+
+# Format and lint code
+just format  # or just f
+just lint    # or just l
+
+# Run all checks (lint + tests)
+just check   # or just c
+
+# See all available commands
+just --list
+```
+
+### Running Examples
+
+```bash
+# Start servers
+just greeting-server  # gRPC server on port 50051
+just greeting-asgi    # Connect RPC ASGI on port 8000
+just greeting-wsgi    # Connect RPC WSGI on port 3000
+
+# Test with buf curl (in another terminal)
+just greet            # gRPC request
+just connect-greet    # Connect RPC request
+just wsgi-greet       # WSGI request
+
+# Custom names
+just greet-name Alice
+just connect-greet-name Bob
+```
+
+For more development commands and options, see the [Justfile](Justfile) or run `just --list`.
 
 ## TODO
 - [x] Streaming Support

{pydantic_rpc-0.11.0.dist-info → pydantic_rpc-0.13.0.dist-info}/RECORD

@@ -1,12 +1,12 @@
 pydantic_rpc/__init__.py,sha256=c5e0b5d4ed6de3e3c7c1ada5389e704ce149ea56ca0930392db6abdf222b4e86,871
-pydantic_rpc/core.py,sha256=9f1a8e669df10d99fea575b83efcb7209c186e461de0ae7050e0592ee675d45c,114131
-pydantic_rpc/decorators.py,sha256=d147eb7c0814043b79ef2f8551947341f32852296467b35b12bc4e63469ef294,6217
+pydantic_rpc/core.py,sha256=29d7ec3e92acc9f7630cbec67057cb4de6a1d1d29aceb2de87e629780e40f067,115222
+pydantic_rpc/decorators.py,sha256=94d87825e034b6303df46dd74e6c8c7ed5c88133aa504d61249a83dbf82f1de3,6219
 pydantic_rpc/mcp/__init__.py,sha256=f05ad62cc38db5c5972e16870c484523c58c5ac650d8454706f1ce4539cc7a52,123
 pydantic_rpc/mcp/converter.py,sha256=b60dcaf82e6bff6be4b2ab8b1e9f2d16e09cb98d8f00182a4f6f73d1a78848a4,4158
 pydantic_rpc/mcp/exporter.py,sha256=20833662f9a973ed9e1a705b9b59aaa2533de6c514ebd87ef66664a430a0d04f,10239
 pydantic_rpc/options.py,sha256=6094036184a500b92715fd91d31ecc501460a56de47dcf6024c6335ae8e5d6e3,4561
 pydantic_rpc/py.typed,sha256=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855,0
 pydantic_rpc/tls.py,sha256=0eb290cc09c8ebedc71e7a97c01736d9675a314f70ebd80a2ce73e3f1689d359,3567
-pydantic_rpc-0.11.0.dist-info/WHEEL,sha256=ab6157bc637547491fb4567cd7ddf26b04d63382916ca16c29a5c8e94c9c9ef7,79
-pydantic_rpc-0.11.0.dist-info/METADATA,sha256=fae01debdcc0725d6cc2f89180d9dd88cfcb5e05581faee71b75f95b4119b195,34906
-pydantic_rpc-0.11.0.dist-info/RECORD,,
+pydantic_rpc-0.13.0.dist-info/WHEEL,sha256=ab6157bc637547491fb4567cd7ddf26b04d63382916ca16c29a5c8e94c9c9ef7,79
+pydantic_rpc-0.13.0.dist-info/METADATA,sha256=55031ff9b0cb51054bc7e8c2f22c1ffda8ce9a3288cbf2c453e86944d3a68e7b,36156
+pydantic_rpc-0.13.0.dist-info/RECORD,,