pydantic-rpc 0.5.0__py3-none-any.whl → 0.6.1__py3-none-any.whl

pydantic_rpc/core.py

@@ -31,6 +31,7 @@ from sonora.wsgi import grpcWSGI
 from sonora.asgi import grpcASGI
 from connecpy.asgi import ConnecpyASGIApp as ConnecpyASGI
 from connecpy.errors import Errors
+from connecpy.wsgi import ConnecpyWSGIApp as ConnecpyWSGI
 
 # Protobuf Python modules for Timestamp, Duration (requires protobuf / grpcio)
 from google.protobuf import timestamp_pb2, duration_pb2
@@ -356,6 +357,69 @@ def connect_obj_with_stub_async(pb2_grpc_module, pb2_module, obj: object) -> typ
     return ConcreteServiceClass
 
 
+def connect_obj_with_stub_connecpy(connecpy_module, pb2_module, obj: object) -> type:
+    """
+    Connect a Python service object to a Connecpy stub.
+    """
+    service_class = obj.__class__
+    stub_class_name = service_class.__name__
+    stub_class = getattr(connecpy_module, stub_class_name)
+
+    class ConcreteServiceClass(stub_class):
+        pass
+
+    def implement_stub_method(method):
+        sig = inspect.signature(method)
+        arg_type = get_request_arg_type(sig)
+        converter = generate_message_converter(arg_type)
+        response_type = sig.return_annotation
+        size_of_parameters = len(sig.parameters)
+
+        match size_of_parameters:
+            case 1:
+
+                def stub_method1(self, request, context, method=method):
+                    try:
+                        arg = converter(request)
+                        resp_obj = method(arg)
+                        return convert_python_message_to_proto(
+                            resp_obj, response_type, pb2_module
+                        )
+                    except ValidationError as e:
+                        return context.abort(Errors.InvalidArgument, str(e))
+                    except Exception as e:
+                        return context.abort(Errors.Internal, str(e))
+
+                return stub_method1
+
+            case 2:
+
+                def stub_method2(self, request, context, method=method):
+                    try:
+                        arg = converter(request)
+                        resp_obj = method(arg, context)
+                        return convert_python_message_to_proto(
+                            resp_obj, response_type, pb2_module
+                        )
+                    except ValidationError as e:
+                        return context.abort(Errors.InvalidArgument, str(e))
+                    except Exception as e:
+                        return context.abort(Errors.Internal, str(e))
+
+                return stub_method2
+
+            case _:
+                raise Exception("Method must have exactly one or two parameters")
+
+    for method_name, method in get_rpc_methods(obj):
+        if method.__name__.startswith("_"):
+            continue
+        a_method = implement_stub_method(method)
+        setattr(ConcreteServiceClass, method_name, a_method)
+
+    return ConcreteServiceClass
+
+
 def connect_obj_with_stub_async_connecpy(
     connecpy_module, pb2_module, obj: object
 ) -> type:
@@ -1330,11 +1394,54 @@ class ConnecpyASGIApp:
         await self._app(scope, receive, send)
 
 
+class ConnecpyWSGIApp:
+    """
+    A WSGI-compatible application that can serve Connect-RPC via Connecpy's ConnecpyWSGIApp.
+    """
+
+    def __init__(self):
+        self._app = ConnecpyWSGI()
+        self._service_names = []
+        self._package_name = ""
+
+    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
+        )
+        self.mount_using_pb2_modules(connecpy_module, pb2_module, obj)
+
+    def mount_using_pb2_modules(self, connecpy_module, pb2_module, obj: object):
+        """Connect the compiled connecpy and pb2 modules with the async service implementation."""
+        concreteServiceClass = connect_obj_with_stub_connecpy(
+            connecpy_module, pb2_module, obj
+        )
+        service_name = obj.__class__.__name__
+        service_impl = concreteServiceClass()
+        connecpy_server = get_connecpy_server_class(connecpy_module, service_name)
+        self._app.add_service(connecpy_server(service=service_impl))
+        full_service_name = pb2_module.DESCRIPTOR.services_by_name[
+            service_name
+        ].full_name
+        self._service_names.append(full_service_name)
+
+    def mount_objs(self, *objs):
+        """Mount multiple service objects into this WSGI app."""
+        for obj in objs:
+            self.mount(obj, self._package_name)
+
+    def __call__(self, environ, start_response):
+        """WSGI entry point."""
+        return self._app(environ, start_response)
+
+
 def main():
     import argparse
 
     parser = argparse.ArgumentParser(description="Generate and compile proto files.")
-    parser.add_argument("py_file", type=str, help="The Python file containing the service class.")
+    parser.add_argument(
+        "py_file", type=str, help="The Python file containing the service class."
+    )
     parser.add_argument("class_name", type=str, help="The name of the service class.")
     args = parser.parse_args()
 

{pydantic_rpc-0.5.0.dist-info → pydantic_rpc-0.6.1.dist-info}/METADATA

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: pydantic-rpc
-Version: 0.5.0
+Version: 0.6.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.1
+Requires-Dist: connecpy>=1.4.1
 Requires-Dist: grpcio-health-checking>=1.56.2
 Requires-Dist: grpcio-reflection>=1.56.2
 Requires-Dist: grpcio-tools>=1.56.2
@@ -23,7 +23,9 @@ Below is an example of a simple gRPC service that exposes a [PydanticAI](https:/
 ```python
 import asyncio
 
+from openai import AsyncOpenAI
 from pydantic_ai import Agent
+from pydantic_ai.models.openai import OpenAIModel
 from pydantic_rpc import AsyncIOServer, Message
 
 
@@ -42,7 +44,15 @@ class Olympics(Message):
 
 class OlympicsLocationAgent:
     def __init__(self):
-        self._agent = Agent("ollama:llama3.2", result_type=CityLocation)
+        client = AsyncOpenAI(
+            base_url="http://localhost:11434/v1",
+            api_key="ollama_api_key",
+        )
+        ollama_model = OpenAIModel(
+            model_name="llama3.2",
+            openai_client=client,
+        )
+        self._agent = Agent(ollama_model)
 
     async def ask(self, req: Olympics) -> CityLocation:
         result = await self._agent.run(req.prompt())
@@ -60,7 +70,9 @@ And here is an example of a simple Connect RPC service that exposes the same age
 ```python
 import asyncio
 
+from openai import AsyncOpenAI
 from pydantic_ai import Agent
+from pydantic_ai.models.openai import OpenAIModel
 from pydantic_rpc import ConnecpyASGIApp, Message
 
 
@@ -78,7 +90,15 @@ class Olympics(Message):
 
 class OlympicsLocationAgent:
     def __init__(self):
-        self._agent = Agent("ollama:llama3.2", result_type=CityLocation)
+        client = AsyncOpenAI(
+            base_url="http://localhost:11434/v1",
+            api_key="ollama_api_key",
+        )
+        ollama_model = OpenAIModel(
+            model_name="llama3.2",
+            openai_client=client,
+        )
+        self._agent = Agent(ollama_model, result_type=CityLocation)
 
     async def ask(self, req: Olympics) -> CityLocation:
         result = await self._agent.run(req.prompt())
@@ -104,6 +124,7 @@ app.mount(OlympicsLocationAgent())
   - 🌐 **WSGI/ASGI Support:** Create gRPC-Web services that can run as WSGI or ASGI applications powered by `Sonora`.
 - **For Connect-RPC:**
   - 🌐 **Connecpy Support:** Partially supports Connect-RPC via `Connecpy`.
+- 🛠️ **Pre-generated Protobuf Files and Code:** Pre-generate proto files and corresponding code via the CLI. By setting the environment variable (PYDANTIC_RPC_SKIP_GENERATION), you can skip runtime generation.
 
 ## 📦 Installation
 
@@ -257,7 +278,9 @@ When this variable is set to "true", PydanticRPC will load existing pre-generate
 ## 💎 Advanced Features
 
 ### 🌊 Response Streaming
-PydanticRPC supports streaming for responses in asynchronous gRPC and gRPC-Web services only.
+PydanticRPC supports streaming responses only for asynchronous gRPC and gRPC-Web services.
+If a service class method’s return type is `typing.AsyncIterator[T]`, the method is considered a streaming method.
+
 
 Please see the sample code below:
 
@@ -265,8 +288,10 @@ Please see the sample code below:
 import asyncio
 from typing import Annotated, AsyncIterator
 
+from openai import AsyncOpenAI
 from pydantic import Field
 from pydantic_ai import Agent
+from pydantic_ai.models.openai import OpenAIModel
 from pydantic_rpc import AsyncIOServer, Message
 
 
@@ -299,7 +324,15 @@ class StreamingResult(Message):
 
 class OlympicsAgent:
     def __init__(self):
-        self._agent = Agent("ollama:llama3.2")
+        client = AsyncOpenAI(
+            base_url='http://localhost:11434/v1',
+            api_key='ollama_api_key',
+        )
+        ollama_model = OpenAIModel(
+            model_name='llama3.2',
+            openai_client=client,
+        )
+        self._agent = Agent(ollama_model)
 
     async def ask(self, req: OlympicsQuery) -> CityLocation:
         result = await self._agent.run(req.prompt(), result_type=CityLocation)
@@ -319,6 +352,302 @@ if __name__ == "__main__":
     loop.run_until_complete(s.run(OlympicsAgent()))
 ```
 
+In the example above, the `ask_stream` method returns an `AsyncIterator[StreamingResult]` object, which is considered a streaming method. The `StreamingResult` class is a Pydantic model that defines the response type of the streaming method. You can use any Pydantic model as the response type.
+
+Now, you can call the `ask_stream` method of the server described above using your preferred gRPC client tool. The example below uses `buf curl`.
+
+
+```console
+% buf curl --data '{"start": 1980, "end": 2024}' -v http://localhost:50051/olympicsagent.v1.OlympicsAgent/AskStream --protocol grpc --http2-prior-knowledge 
+
+buf: * Using server reflection to resolve "olympicsagent.v1.OlympicsAgent"
+buf: * Dialing (tcp) localhost:50051...
+buf: * Connected to [::1]:50051
+buf: > (#1) POST /grpc.reflection.v1.ServerReflection/ServerReflectionInfo
+buf: > (#1) Accept-Encoding: identity
+buf: > (#1) Content-Type: application/grpc+proto
+buf: > (#1) Grpc-Accept-Encoding: gzip
+buf: > (#1) Grpc-Timeout: 119997m
+buf: > (#1) Te: trailers
+buf: > (#1) User-Agent: grpc-go-connect/1.12.0 (go1.21.4) buf/1.28.1
+buf: > (#1)
+buf: } (#1) [5 bytes data]
+buf: } (#1) [32 bytes data]
+buf: < (#1) HTTP/2.0 200 OK
+buf: < (#1) Content-Type: application/grpc
+buf: < (#1) Grpc-Message: Method not found!
+buf: < (#1) Grpc-Status: 12
+buf: < (#1)
+buf: * (#1) Call complete
+buf: > (#2) POST /grpc.reflection.v1alpha.ServerReflection/ServerReflectionInfo
+buf: > (#2) Accept-Encoding: identity
+buf: > (#2) Content-Type: application/grpc+proto
+buf: > (#2) Grpc-Accept-Encoding: gzip
+buf: > (#2) Grpc-Timeout: 119967m
+buf: > (#2) Te: trailers
+buf: > (#2) User-Agent: grpc-go-connect/1.12.0 (go1.21.4) buf/1.28.1
+buf: > (#2)
+buf: } (#2) [5 bytes data]
+buf: } (#2) [32 bytes data]
+buf: < (#2) HTTP/2.0 200 OK
+buf: < (#2) Content-Type: application/grpc
+buf: < (#2) Grpc-Accept-Encoding: identity, deflate, gzip
+buf: < (#2)
+buf: { (#2) [5 bytes data]
+buf: { (#2) [434 bytes data]
+buf: * Server reflection has resolved file "olympicsagent.proto"
+buf: * Invoking RPC olympicsagent.v1.OlympicsAgent.AskStream
+buf: > (#3) POST /olympicsagent.v1.OlympicsAgent/AskStream
+buf: > (#3) Accept-Encoding: identity
+buf: > (#3) Content-Type: application/grpc+proto
+buf: > (#3) Grpc-Accept-Encoding: gzip
+buf: > (#3) Grpc-Timeout: 119947m
+buf: > (#3) Te: trailers
+buf: > (#3) User-Agent: grpc-go-connect/1.12.0 (go1.21.4) buf/1.28.1
+buf: > (#3)
+buf: } (#3) [5 bytes data]
+buf: } (#3) [6 bytes data]
+buf: * (#3) Finished upload
+buf: < (#3) HTTP/2.0 200 OK
+buf: < (#3) Content-Type: application/grpc
+buf: < (#3) Grpc-Accept-Encoding: identity, deflate, gzip
+buf: < (#3)
+buf: { (#3) [5 bytes data]
+buf: { (#3) [25 bytes data]
+{
+ "answer": "Here's a list of Summer"
+}
+buf: { (#3) [5 bytes data]
+buf: { (#3) [31 bytes data]
+{
+  "answer": " and Winter Olympics from 198"
+}
+buf: { (#3) [5 bytes data]
+buf: { (#3) [29 bytes data]
+{
+  "answer": "0 to 2024:\n\nSummer Olympics"
+}
+buf: { (#3) [5 bytes data]
+buf: { (#3) [20 bytes data]
+{
+  "answer": ":\n1. 1980 - Moscow"
+}
+buf: { (#3) [5 bytes data]
+buf: { (#3) [20 bytes data]
+{
+  "answer": ", Soviet Union\n2. "
+}
+buf: { (#3) [5 bytes data]
+buf: { (#3) [32 bytes data]
+{
+  "answer": "1984 - Los Angeles, California"
+}
+buf: { (#3) [5 bytes data]
+buf: { (#3) [15 bytes data]
+{
+  "answer": ", USA\n3. 1988"
+}
+buf: { (#3) [5 bytes data]
+buf: { (#3) [26 bytes data]
+{
+  "answer": " - Seoul, South Korea\n4."
+}
+buf: { (#3) [5 bytes data]
+buf: { (#3) [27 bytes data]
+{
+  "answer": " 1992 - Barcelona, Spain\n"
+}
+buf: { (#3) [5 bytes data]
+buf: { (#3) [20 bytes data]
+{
+  "answer": "5. 1996 - Atlanta,"
+}
+buf: { (#3) [5 bytes data]
+buf: { (#3) [22 bytes data]
+{
+  "answer": " Georgia, USA\n6. 200"
+}
+buf: { (#3) [5 bytes data]
+buf: { (#3) [26 bytes data]
+{
+  "answer": "0 - Sydney, Australia\n7."
+}
+buf: { (#3) [5 bytes data]
+buf: { (#3) [25 bytes data]
+{
+  "answer": " 2004 - Athens, Greece\n"
+}
+buf: { (#3) [5 bytes data]
+buf: { (#3) [20 bytes data]
+{
+  "answer": "8. 2008 - Beijing,"
+}
+buf: { (#3) [5 bytes data]
+buf: { (#3) [18 bytes data]
+{
+  "answer": " China\n9. 2012 -"
+}
+buf: { (#3) [5 bytes data]
+buf: { (#3) [29 bytes data]
+{
+  "answer": " London, United Kingdom\n10."
+}
+buf: { (#3) [5 bytes data]
+buf: { (#3) [24 bytes data]
+{
+  "answer": " 2016 - Rio de Janeiro"
+}
+buf: { (#3) [5 bytes data]
+buf: { (#3) [18 bytes data]
+{
+  "answer": ", Brazil\n11. 202"
+}
+buf: { (#3) [5 bytes data]
+buf: { (#3) [24 bytes data]
+{
+  "answer": "0 - Tokyo, Japan (held"
+}
+buf: { (#3) [5 bytes data]
+buf: { (#3) [21 bytes data]
+{
+  "answer": " in 2021 due to the"
+}
+buf: { (#3) [5 bytes data]
+buf: { (#3) [26 bytes data]
+{
+  "answer": " COVID-19 pandemic)\n12. "
+}
+buf: { (#3) [5 bytes data]
+buf: { (#3) [28 bytes data]
+{
+  "answer": "2024 - Paris, France\n\nNote"
+}
+buf: { (#3) [5 bytes data]
+buf: { (#3) [41 bytes data]
+{
+  "answer": ": The Olympics were held without a host"
+}
+buf: { (#3) [5 bytes data]
+buf: { (#3) [26 bytes data]
+{
+  "answer": " city for one year (2022"
+}
+buf: { (#3) [5 bytes data]
+buf: { (#3) [42 bytes data]
+{
+  "answer": ", due to the Russian invasion of Ukraine"
+}
+buf: { (#3) [5 bytes data]
+buf: { (#3) [29 bytes data]
+{
+  "answer": ").\n\nWinter Olympics:\n1. 198"
+}
+buf: { (#3) [5 bytes data]
+buf: { (#3) [27 bytes data]
+{
+  "answer": "0 - Lake Placid, New York"
+}
+buf: { (#3) [5 bytes data]
+buf: { (#3) [15 bytes data]
+{
+  "answer": ", USA\n2. 1984"
+}
+buf: { (#3) [5 bytes data]
+buf: { (#3) [27 bytes data]
+{
+  "answer": " - Sarajevo, Yugoslavia ("
+}
+buf: { (#3) [5 bytes data]
+buf: { (#3) [30 bytes data]
+{
+  "answer": "now Bosnia and Herzegovina)\n"
+}
+buf: { (#3) [5 bytes data]
+buf: { (#3) [20 bytes data]
+{
+  "answer": "3. 1988 - Calgary,"
+}
+buf: { (#3) [5 bytes data]
+buf: { (#3) [25 bytes data]
+{
+  "answer": " Alberta, Canada\n4. 199"
+}
+buf: { (#3) [5 bytes data]
+buf: { (#3) [26 bytes data]
+{
+  "answer": "2 - Albertville, France\n"
+}
+buf: { (#3) [5 bytes data]
+buf: { (#3) [13 bytes data]
+{
+  "answer": "5. 1994 - L"
+}
+buf: { (#3) [5 bytes data]
+buf: { (#3) [24 bytes data]
+{
+  "answer": "illehammer, Norway\n6. "
+}
+buf: { (#3) [5 bytes data]
+buf: { (#3) [23 bytes data]
+{
+  "answer": "1998 - Nagano, Japan\n"
+}
+buf: { (#3) [5 bytes data]
+buf: { (#3) [16 bytes data]
+{
+  "answer": "7. 2002 - Salt"
+}
+buf: { (#3) [5 bytes data]
+buf: { (#3) [24 bytes data]
+{
+  "answer": " Lake City, Utah, USA\n"
+}
+buf: { (#3) [5 bytes data]
+buf: { (#3) [18 bytes data]
+{
+  "answer": "8. 2006 - Torino"
+}
+buf: { (#3) [5 bytes data]
+buf: { (#3) [17 bytes data]
+{
+  "answer": ", Italy\n9. 2010"
+}
+buf: { (#3) [5 bytes data]
+buf: { (#3) [40 bytes data]
+{
+  "answer": " - Vancouver, British Columbia, Canada"
+}
+buf: { (#3) [5 bytes data]
+buf: { (#3) [13 bytes data]
+{
+  "answer": "\n10. 2014 -"
+}
+buf: { (#3) [5 bytes data]
+buf: { (#3) [20 bytes data]
+{
+  "answer": " Sochi, Russia\n11."
+}
+buf: { (#3) [5 bytes data]
+buf: { (#3) [16 bytes data]
+{
+  "answer": " 2018 - Pyeong"
+}
+buf: { (#3) [5 bytes data]
+buf: { (#3) [24 bytes data]
+{
+  "answer": "chang, South Korea\n12."
+}
+buf: < (#3)
+buf: < (#3) Grpc-Message:
+buf: < (#3) Grpc-Status: 0
+buf: * (#3) Call complete
+buf: < (#2)
+buf: < (#2) Grpc-Message:
+buf: < (#2) Grpc-Status: 0
+buf: * (#2) Call complete
+%
+```
+
 ### 🔗 Multiple Services with Custom Interceptors
 
 PydanticRPC supports defining and running multiple services in a single server:
@@ -404,9 +733,9 @@ if __name__ == "__main__":
 
 TODO
 
-### 🗄️ Protobuf file and code (Python files) generation
+### 🗄️ Protobuf file and code (Python files) generation using CLI
 
-Youcan genereate protobuf files and code for a given module and a specified class using `pydantic-rpc` CLI command:
+You can genereate protobuf files and code for a given module and a specified class using `pydantic-rpc` CLI command:
 
 ```bash
 pydantic-rpc a_module.py aClassName

pydantic_rpc-0.6.1.dist-info/RECORD

@@ -0,0 +1,8 @@
+pydantic_rpc/__init__.py,sha256=oomSVGmh_zddQQaphQt1L2xSVh9dD1LVyaAq1cN1FW4,231
+pydantic_rpc/core.py,sha256=SB9GDZRxsMWQFxphinYQUAqrOx10eUn40fPTc7t1xYs,52107
+pydantic_rpc/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pydantic_rpc-0.6.1.dist-info/METADATA,sha256=Vi8bU0-HjPnhI0ETt9ReRhmMfJxBqPuf9gnAYQjTx4c,20481
+pydantic_rpc-0.6.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+pydantic_rpc-0.6.1.dist-info/entry_points.txt,sha256=LeZJ6UN-fhjKrEGkcmsAAKuA-fIe7MpvzKMPSZfi0NE,56
+pydantic_rpc-0.6.1.dist-info/licenses/LICENSE,sha256=Y6jkAm2VqPqoGIGQ-mEQCecNfteQ2LwdpYhC5XiH_cA,1069
+pydantic_rpc-0.6.1.dist-info/RECORD,,

pydantic_rpc-0.5.0.dist-info/RECORD

@@ -1,8 +0,0 @@
-pydantic_rpc/__init__.py,sha256=oomSVGmh_zddQQaphQt1L2xSVh9dD1LVyaAq1cN1FW4,231
-pydantic_rpc/core.py,sha256=7RPQEhqzzUIqm6IYLSsKYPIHV1_VV7UvCehPAAkUuJ4,48085
-pydantic_rpc/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pydantic_rpc-0.5.0.dist-info/METADATA,sha256=xBMHL0pmboi5BAkREyu-LtlhXJ_drfj3jOwUbOaHlKE,12060
-pydantic_rpc-0.5.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-pydantic_rpc-0.5.0.dist-info/entry_points.txt,sha256=LeZJ6UN-fhjKrEGkcmsAAKuA-fIe7MpvzKMPSZfi0NE,56
-pydantic_rpc-0.5.0.dist-info/licenses/LICENSE,sha256=Y6jkAm2VqPqoGIGQ-mEQCecNfteQ2LwdpYhC5XiH_cA,1069
-pydantic_rpc-0.5.0.dist-info/RECORD,,