pydantic-rpc 0.4.0__tar.gz → 0.4.1__tar.gz

{pydantic_rpc-0.4.0 → pydantic_rpc-0.4.1}/PKG-INFO

@@ -1,10 +1,11 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: pydantic-rpc
-Version: 0.4.0
+Version: 0.4.1
 Summary: A Python library for building gRPC/ConnectRPC services with Pydantic models.
 Author: Yasushi Itoh
+License-File: LICENSE
 Requires-Python: >=3.11
-Requires-Dist: connecpy>=1.2.0
+Requires-Dist: connecpy>=1.2.1
 Requires-Dist: grpcio-health-checking>=1.56.2
 Requires-Dist: grpcio-reflection>=1.56.2
 Requires-Dist: grpcio-tools>=1.56.2
@@ -229,7 +230,7 @@ app.mount(Greeter())
 PydanticRPC also partially supports Connect-RPC via connecpy. Check out “greeting_connecpy.py” for an example:
 
 ```bash
-rye run python greeting_connecpy.py
+uv run greeting_connecpy.py
 ```
 
 This will launch a Connecpy-based ASGI application that uses the same Pydantic models to serve Connect-RPC requests.

{pydantic_rpc-0.4.0 → pydantic_rpc-0.4.1}/README.md

@@ -215,7 +215,7 @@ app.mount(Greeter())
 PydanticRPC also partially supports Connect-RPC via connecpy. Check out “greeting_connecpy.py” for an example:
 
 ```bash
-rye run python greeting_connecpy.py
+uv run greeting_connecpy.py
 ```
 
 This will launch a Connecpy-based ASGI application that uses the same Pydantic models to serve Connect-RPC requests.

{pydantic_rpc-0.4.0 → pydantic_rpc-0.4.1}/examples/README.md

@@ -1,144 +1,152 @@
-# 📚 Examples
-
-## 📝 Prerequisites
-
-Ensure you have [Rye](https://rye-up.com/) installed on your system. If not, you can install it using the following command:
-
-```bash
-curl -sSL https://rye-up.com/install.sh | bash
-```
-
-## 🔧 Setup
-
-1. **Clone the Repository:**
-
-    ```bash
-    git clone https://github.com/i2y/pydantic-rpc.git
-    cd pydantic-rpc/examples
-    ```
-
-2. **Install Dependencies with Rye:**
-
-    ```bash
-    rye sync
-    ```
-
-## 🖥️ gRPC Server Example
-
-### 🔧 Server (`greeting.py`)
-
-A simple gRPC server.
-
-**Usage:**
-
-```bash
-rye run python greeting.py
-```
-
-### 🔗 Client (`greeter_client.py`)
-
-A gRPC client to interact with the server.
-
-**Usage:**
-
-```bash
-rye run python greeter_client.py
-```
-
-## ⚡ Asyncio gRPC Server Example
-
-### 🔧 Asyncio Server (`asyncio_greeting.py`)
-
-An asyncio gRPC server using `AsyncIOServer`.
-
-**Usage:**
-
-```bash
-rye run python asyncio_greeting.py
-```
-
-## 🌐 ASGI Integration (gRPC-Web)
-
-### 🌐 ASGI Application (`greeting_asgi.py`)
-
-Integrate **PydanticRPC** (gRPC-Web) with an ASGI-compatible framework.
-
-**Usage:**
-
-```bash
-rye run hypercorn -bind :3000 greeting_asgi:app
-```
-
-### 🔗 Client (`greeter_sonora_client.py`)
-A gRPC-Web client to interact with the server.
-
-**Usage:**
-
-```bash
-rye run python greeter_sonora_client.py
-```
-
-
-## 🌐 WSGI Integration
-
-### 🌐 WSGI Application (`greeting_wsgi.py`)
-
-Integrate **PydanticRPC** (gRPC-Web) with a WSGI-compatible framework.
-
-**Usage:**
-
-```bash
-rye run python greeting_wsgi.py
-```
-
-### 🔗 Client (`greeter_sonora_client.py`)
-A gRPC-Web client to interact with the server.
-
-**Usage:**
-
-```bash
-rye run python greeter_sonora_client.py
-```
-
-
-## 🛡️ Custom Interceptor and Running Multiple Services Exxample
-
-### 🔧 Server (`foobar.py`)
-A simple gRPC server with custom interceptor and running multiple services.
-
-**Usage:**
-
-```bash
-rye run python foobar.py
-```
-
-### 🔗 Client (`foobar_client.py`)
-A gRPC client to interact with the server.
-
-**Usage:**
-
-```bash
-rye run python foobar_client.py
-```
-
-## 🤝 Connecpy (Connect-RPC) Example
-
-### 🔧 Server (`greeting_connecpy.py`)
-
-A Connect-RPC ASGI application using PydanticRPC + connecpy.
-
-**Usage:**
-
-```bash
-rye run hypercorn --bind :3000 greeting_connecpy:app
-```
-
-### 🔗 Client (`greeter_client_connecpy.py`)
-
-A Connect-RPC client to interact with the server.
-
-**Usage:**
-
-```bash
-rye run python greeter_client_connecpy.py
-```
+# 📚 Examples
+
+## 📝 Prerequisites
+
+Ensure you have [UV](https://docs.astral.sh/uv/) installed on your system. If not, you can install it using the following command:
+
+### Linux/macOS
+
+```bash
+curl -LsSf https://astral.sh/uv/install.sh | sh
+```
+
+### Windows
+
+```powershell
+powershell -ExecutionPolicy ByPass -c "irm https://astral.sh/uv/install.ps1 | iex"
+```
+
+## 🔧 Setup
+
+1. **Clone the Repository:**
+
+    ```bash
+    git clone https://github.com/i2y/pydantic-rpc.git
+    cd pydantic-rpc/examples
+    ```
+
+2. **Install Dependencies with Rye:**
+
+    ```bash
+    uv sync
+    ```
+
+## 🖥️ gRPC Server Example
+
+### 🔧 Server (`greeting.py`)
+
+A simple gRPC server.
+
+**Usage:**
+
+```bash
+uv run greeting.py
+```
+
+### 🔗 Client (`greeter_client.py`)
+
+A gRPC client to interact with the server.
+
+**Usage:**
+
+```bash
+uv run greeter_client.py
+```
+
+## ⚡ Asyncio gRPC Server Example
+
+### 🔧 Asyncio Server (`asyncio_greeting.py`)
+
+An asyncio gRPC server using `AsyncIOServer`.
+
+**Usage:**
+
+```bash
+uv run asyncio_greeting.py
+```
+
+## 🌐 ASGI Integration (gRPC-Web)
+
+### 🌐 ASGI Application (`greeting_asgi.py`)
+
+Integrate **PydanticRPC** (gRPC-Web) with an ASGI-compatible framework.
+
+**Usage:**
+
+```bash
+uv run hypercorn -bind :3000 greeting_asgi:app
+```
+
+### 🔗 Client (`greeter_sonora_client.py`)
+A gRPC-Web client to interact with the server.
+
+**Usage:**
+
+```bash
+uv run greeter_sonora_client.py
+```
+
+
+## 🌐 WSGI Integration
+
+### 🌐 WSGI Application (`greeting_wsgi.py`)
+
+Integrate **PydanticRPC** (gRPC-Web) with a WSGI-compatible framework.
+
+**Usage:**
+
+```bash
+uv run greeting_wsgi.py
+```
+
+### 🔗 Client (`greeter_sonora_client.py`)
+A gRPC-Web client to interact with the server.
+
+**Usage:**
+
+```bash
+uv run greeter_sonora_client.py
+```
+
+
+## 🛡️ Custom Interceptor and Running Multiple Services Exxample
+
+### 🔧 Server (`foobar.py`)
+A simple gRPC server with custom interceptor and running multiple services.
+
+**Usage:**
+
+```bash
+uv run foobar.py
+```
+
+### 🔗 Client (`foobar_client.py`)
+A gRPC client to interact with the server.
+
+**Usage:**
+
+```bash
+uv run foobar_client.py
+```
+
+## 🤝 Connecpy (Connect-RPC) Example
+
+### 🔧 Server (`greeting_connecpy.py`)
+
+A Connect-RPC ASGI application using PydanticRPC + connecpy.
+
+**Usage:**
+
+```bash
+uv run hypercorn --bind :3000 greeting_connecpy:app
+```
+
+### 🔗 Client (`greeter_client_connecpy.py`)
+
+A Connect-RPC client to interact with the server.
+
+**Usage:**
+
+```bash
+uv run greeter_client_connecpy.py
+```

{pydantic_rpc-0.4.0 → pydantic_rpc-0.4.1}/examples/agent_aio_grpc.py

@@ -35,6 +35,13 @@ class StreamingResult(Message):
 
 class OlympicsAgent:
     def __init__(self):
+        # # if pydantic_ai >= 0.0.21
+        # ollama_model = OpenAIModel(
+        #     model_name="llama3.2",
+        #     base_url="http://localhost:11434/v1",
+        #     api_key="",
+        # )
+        # self._agent = Agent(ollama_model)
         self._agent = Agent("ollama:llama3.2")
 
     async def ask(self, req: OlympicsQuery) -> CityLocation:

{pydantic_rpc-0.4.0 → pydantic_rpc-0.4.1}/examples/agent_connecpy.py

@@ -1,46 +1,53 @@
-import asyncio
-
-from typing import Annotated
-
-from hypercorn.asyncio import serve
-from hypercorn.config import Config
-from pydantic import Field
-from pydantic_ai import Agent
-from pydantic_rpc import ConnecpyASGIApp, Message
-
-
-class CityLocation(Message):
-    city: Annotated[str, Field(description="The city where the Olympics were held")]
-    country: Annotated[
-        str, Field(description="The country where the Olympics were held")
-    ]
-
-
-class Olympics(Message):
-    year: Annotated[
-        int, Field(description="The year of the Olympics", ge=1896, multiple_of=4)
-    ]
-
-    def prompt(self):
-        return f"Where were the Olympics held in {self.year}?"
-
-
-class OlympicsLocationAgent:
-    def __init__(self):
-        self._agent = Agent("ollama:llama3.2", result_type=CityLocation)
-
-    async def ask(self, req: Olympics) -> CityLocation:
-        result = await self._agent.run(req.prompt())
-        return result.data
-
-
-async def main():
-    app = ConnecpyASGIApp()
-    app.mount(OlympicsLocationAgent())
-    config = Config()
-    config.bind = ["0.0.0.0:3000"]
-    await serve(app, config)
-
-
-if __name__ == "__main__":
-    asyncio.run(main())
+import asyncio
+
+from typing import Annotated
+
+from hypercorn.asyncio import serve
+from hypercorn.config import Config
+from pydantic import Field
+from pydantic_ai import Agent
+from pydantic_rpc import ConnecpyASGIApp, Message
+
+
+class CityLocation(Message):
+    city: Annotated[str, Field(description="The city where the Olympics were held")]
+    country: Annotated[
+        str, Field(description="The country where the Olympics were held")
+    ]
+
+
+class Olympics(Message):
+    year: Annotated[
+        int, Field(description="The year of the Olympics", ge=1896, multiple_of=4)
+    ]
+
+    def prompt(self):
+        return f"Where were the Olympics held in {self.year}?"
+
+
+class OlympicsLocationAgent:
+    def __init__(self):
+        # # if pydantic_ai >= 0.0.21
+        # ollama_model = OpenAIModel(
+        #     model_name="llama3.2",
+        #     base_url="http://localhost:11434/v1",
+        #     api_key="",
+        # )
+        # self._agent = Agent(ollama_model, result_type=CityLocation)
+        self._agent = Agent("ollama:llama3.2", result_type=CityLocation)
+
+    async def ask(self, req: Olympics) -> CityLocation:
+        result = await self._agent.run(req.prompt())
+        return result.data
+
+
+async def main():
+    app = ConnecpyASGIApp()
+    app.mount(OlympicsLocationAgent())
+    config = Config()
+    config.bind = ["0.0.0.0:3000"]
+    await serve(app, config)
+
+
+if __name__ == "__main__":
+    asyncio.run(main())

{pydantic_rpc-0.4.0 → pydantic_rpc-0.4.1}/examples/barservice_pb2.py

@@ -1,12 +1,19 @@
 # -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
 # source: barservice.proto
+# Protobuf Python Version: 5.29.0
 """Generated protocol buffer code."""
 
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import runtime_version as _runtime_version
 from google.protobuf import symbol_database as _symbol_database
 from google.protobuf.internal import builder as _builder
+
+_runtime_version.ValidateProtobufRuntimeVersion(
+    _runtime_version.Domain.PUBLIC, 5, 29, 0, "", "barservice.proto"
+)
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -19,8 +26,8 @@ DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
 _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, "barservice_pb2", _globals)
-if _descriptor._USE_C_DESCRIPTORS == False:
-    DESCRIPTOR._options = None
+if not _descriptor._USE_C_DESCRIPTORS:
+    DESCRIPTOR._loaded_options = None
     _globals["_BARRESPONSE"]._serialized_start = 28
     _globals["_BARRESPONSE"]._serialized_end = 56
     _globals["_BARREQUEST"]._serialized_start = 58

{pydantic_rpc-0.4.0 → pydantic_rpc-0.4.1}/examples/barservice_pb2.pyi

@@ -6,13 +6,13 @@ from typing import ClassVar as _ClassVar, Iterable as _Iterable, Optional as _Op
 DESCRIPTOR: _descriptor.FileDescriptor
 
 class BarResponse(_message.Message):
-    __slots__ = ["names"]
+    __slots__ = ("names",)
     NAMES_FIELD_NUMBER: _ClassVar[int]
     names: _containers.RepeatedScalarFieldContainer[str]
     def __init__(self, names: _Optional[_Iterable[str]] = ...) -> None: ...
 
 class BarRequest(_message.Message):
-    __slots__ = ["names"]
+    __slots__ = ("names",)
     NAMES_FIELD_NUMBER: _ClassVar[int]
     names: _containers.RepeatedScalarFieldContainer[str]
     def __init__(self, names: _Optional[_Iterable[str]] = ...) -> None: ...

{pydantic_rpc-0.4.0 → pydantic_rpc-0.4.1}/examples/barservice_pb2_grpc.py

@@ -2,9 +2,32 @@
 """Client and server classes corresponding to protobuf-defined services."""
 
 import grpc
+import warnings
 
 import barservice_pb2 as barservice__pb2
 
+GRPC_GENERATED_VERSION = "1.70.0"
+GRPC_VERSION = grpc.__version__
+_version_not_supported = False
+
+try:
+    from grpc._utilities import first_version_is_lower
+
+    _version_not_supported = first_version_is_lower(
+        GRPC_VERSION, GRPC_GENERATED_VERSION
+    )
+except ImportError:
+    _version_not_supported = True
+
+if _version_not_supported:
+    raise RuntimeError(
+        f"The grpc package installed is at version {GRPC_VERSION},"
+        + f" but the generated code in barservice_pb2_grpc.py depends on"
+        + f" grpcio>={GRPC_GENERATED_VERSION}."
+        + f" Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}"
+        + f" or downgrade your generated code using grpcio-tools<={GRPC_VERSION}."
+    )
+
 
 class BarServiceStub(object):
     """Missing associated documentation comment in .proto file."""
@@ -19,6 +42,7 @@ class BarServiceStub(object):
             "/bar.v1.BarService/Bar",
             request_serializer=barservice__pb2.BarRequest.SerializeToString,
             response_deserializer=barservice__pb2.BarResponse.FromString,
+            _registered_method=True,
         )
 
 
@@ -44,6 +68,7 @@ def add_BarServiceServicer_to_server(servicer, server):
         "bar.v1.BarService", rpc_method_handlers
     )
     server.add_generic_rpc_handlers((generic_handler,))
+    server.add_registered_method_handlers("bar.v1.BarService", rpc_method_handlers)
 
 
 # This class is part of an EXPERIMENTAL API.
@@ -77,4 +102,5 @@ class BarService(object):
             wait_for_ready,
             timeout,
             metadata,
+            _registered_method=True,
         )

{pydantic_rpc-0.4.0 → pydantic_rpc-0.4.1}/examples/fooservice_pb2.py

@@ -1,12 +1,19 @@
 # -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
 # source: fooservice.proto
+# Protobuf Python Version: 5.29.0
 """Generated protocol buffer code."""
 
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import runtime_version as _runtime_version
 from google.protobuf import symbol_database as _symbol_database
 from google.protobuf.internal import builder as _builder
+
+_runtime_version.ValidateProtobufRuntimeVersion(
+    _runtime_version.Domain.PUBLIC, 5, 29, 0, "", "fooservice.proto"
+)
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -19,12 +26,12 @@ DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
 _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, "fooservice_pb2", _globals)
-if _descriptor._USE_C_DESCRIPTORS == False:
-    DESCRIPTOR._options = None
-    _FOORESPONSE_DENTRY._options = None
-    _FOORESPONSE_DENTRY._serialized_options = b"8\001"
-    _FOOREQUEST_DENTRY._options = None
-    _FOOREQUEST_DENTRY._serialized_options = b"8\001"
+if not _descriptor._USE_C_DESCRIPTORS:
+    DESCRIPTOR._loaded_options = None
+    _globals["_FOORESPONSE_DENTRY"]._loaded_options = None
+    _globals["_FOORESPONSE_DENTRY"]._serialized_options = b"8\001"
+    _globals["_FOOREQUEST_DENTRY"]._loaded_options = None
+    _globals["_FOOREQUEST_DENTRY"]._serialized_options = b"8\001"
     _globals["_FOORESPONSE"]._serialized_start = 28
     _globals["_FOORESPONSE"]._serialized_end = 149
     _globals["_FOORESPONSE_DENTRY"]._serialized_start = 109

{pydantic_rpc-0.4.0 → pydantic_rpc-0.4.1}/examples/fooservice_pb2.pyi

@@ -6,9 +6,9 @@ from typing import ClassVar as _ClassVar, Mapping as _Mapping, Optional as _Opti
 DESCRIPTOR: _descriptor.FileDescriptor
 
 class FooResponse(_message.Message):
-    __slots__ = ["name", "age", "d"]
+    __slots__ = ("name", "age", "d")
     class DEntry(_message.Message):
-        __slots__ = ["key", "value"]
+        __slots__ = ("key", "value")
         KEY_FIELD_NUMBER: _ClassVar[int]
         VALUE_FIELD_NUMBER: _ClassVar[int]
         key: str
@@ -31,9 +31,9 @@ class FooResponse(_message.Message):
     ) -> None: ...
 
 class FooRequest(_message.Message):
-    __slots__ = ["name", "age", "d"]
+    __slots__ = ("name", "age", "d")
     class DEntry(_message.Message):
-        __slots__ = ["key", "value"]
+        __slots__ = ("key", "value")
         KEY_FIELD_NUMBER: _ClassVar[int]
         VALUE_FIELD_NUMBER: _ClassVar[int]
         key: str

{pydantic_rpc-0.4.0 → pydantic_rpc-0.4.1}/examples/fooservice_pb2_grpc.py

@@ -2,9 +2,32 @@
 """Client and server classes corresponding to protobuf-defined services."""
 
 import grpc
+import warnings
 
 import fooservice_pb2 as fooservice__pb2
 
+GRPC_GENERATED_VERSION = "1.70.0"
+GRPC_VERSION = grpc.__version__
+_version_not_supported = False
+
+try:
+    from grpc._utilities import first_version_is_lower
+
+    _version_not_supported = first_version_is_lower(
+        GRPC_VERSION, GRPC_GENERATED_VERSION
+    )
+except ImportError:
+    _version_not_supported = True
+
+if _version_not_supported:
+    raise RuntimeError(
+        f"The grpc package installed is at version {GRPC_VERSION},"
+        + f" but the generated code in fooservice_pb2_grpc.py depends on"
+        + f" grpcio>={GRPC_GENERATED_VERSION}."
+        + f" Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}"
+        + f" or downgrade your generated code using grpcio-tools<={GRPC_VERSION}."
+    )
+
 
 class FooServiceStub(object):
     """Missing associated documentation comment in .proto file."""
@@ -19,6 +42,7 @@ class FooServiceStub(object):
             "/foo.v1.FooService/Foo",
             request_serializer=fooservice__pb2.FooRequest.SerializeToString,
             response_deserializer=fooservice__pb2.FooResponse.FromString,
+            _registered_method=True,
         )
 
 
@@ -44,6 +68,7 @@ def add_FooServiceServicer_to_server(servicer, server):
         "foo.v1.FooService", rpc_method_handlers
     )
     server.add_generic_rpc_handlers((generic_handler,))
+    server.add_registered_method_handlers("foo.v1.FooService", rpc_method_handlers)
 
 
 # This class is part of an EXPERIMENTAL API.
@@ -77,4 +102,5 @@ class FooService(object):
             wait_for_ready,
             timeout,
             metadata,
+            _registered_method=True,
         )