pydantic-rpc 0.2.0__tar.gz → 0.2.2__tar.gz

{pydantic_rpc-0.2.0 → pydantic_rpc-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pydantic-rpc
-Version: 0.2.0
+Version: 0.2.2
 Summary: A Python library for building gRPC/ConnectRPC services with Pydantic models.
 Author: Yasushi Itoh
 Requires-Python: >=3.11
@@ -14,10 +14,10 @@ Description-Content-Type: text/markdown
 
 # 🚀 PydanticRPC
 
-**PydanticRPC** is a Python library that enables you to rapidly expose Pydantic models via gRPC/ConnectRPC services without writing any protobuf files. Instead, it automatically generates protobuf files on the fly from the method signatures of your Python objects and the type signatures of your Pydantic models.
+**PydanticRPC** is a Python library that enables you to rapidly expose [Pydantic](https://docs.pydantic.dev/) models via [gRPC](https://grpc.io/)/[ConnectRPC](https://connectrpc.com/docs/protocol/) services without writing any protobuf files. Instead, it automatically generates protobuf files on the fly from the method signatures of your Python objects and the type signatures of your Pydantic models.
 
 
-Below is an example of a simple gRPC service that exposes a PydanticAI agent:
+Below is an example of a simple gRPC service that exposes a [PydanticAI](https://ai.pydantic.dev/) agent:
 
 ```python
 import asyncio
@@ -54,6 +54,40 @@ if __name__ == "__main__":
     loop.run_until_complete(s.run(OlympicsLocationAgent()))
 ```
 
+And here is an example of a simple ConnectRPC service that exposes the same agent as an ASGI application:
+
+```python
+import asyncio
+
+from pydantic_ai import Agent
+from pydantic_rpc import ConnecpyASGIApp, Message
+
+
+class CityLocation(Message):
+    city: str
+    country: str
+
+
+class Olympics(Message):
+    year: int
+
+    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
+
+app = ConnecpyASGIApp()
+app.mount(OlympicsLocationAgent())
+
+```
+
 
 ## 💡 Key Features
 

{pydantic_rpc-0.2.0 → pydantic_rpc-0.2.2}/README.md

@@ -1,9 +1,9 @@
 # 🚀 PydanticRPC
 
-**PydanticRPC** is a Python library that enables you to rapidly expose Pydantic models via gRPC/ConnectRPC services without writing any protobuf files. Instead, it automatically generates protobuf files on the fly from the method signatures of your Python objects and the type signatures of your Pydantic models.
+**PydanticRPC** is a Python library that enables you to rapidly expose [Pydantic](https://docs.pydantic.dev/) models via [gRPC](https://grpc.io/)/[ConnectRPC](https://connectrpc.com/docs/protocol/) services without writing any protobuf files. Instead, it automatically generates protobuf files on the fly from the method signatures of your Python objects and the type signatures of your Pydantic models.
 
 
-Below is an example of a simple gRPC service that exposes a PydanticAI agent:
+Below is an example of a simple gRPC service that exposes a [PydanticAI](https://ai.pydantic.dev/) agent:
 
 ```python
 import asyncio
@@ -40,6 +40,40 @@ if __name__ == "__main__":
     loop.run_until_complete(s.run(OlympicsLocationAgent()))
 ```
 
+And here is an example of a simple ConnectRPC service that exposes the same agent as an ASGI application:
+
+```python
+import asyncio
+
+from pydantic_ai import Agent
+from pydantic_rpc import ConnecpyASGIApp, Message
+
+
+class CityLocation(Message):
+    city: str
+    country: str
+
+
+class Olympics(Message):
+    year: int
+
+    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
+
+app = ConnecpyASGIApp()
+app.mount(OlympicsLocationAgent())
+
+```
+
 
 ## 💡 Key Features
 

{pydantic_rpc-0.2.0 → pydantic_rpc-0.2.2}/examples/agent_aio_grpc.py

@@ -1,5 +1,6 @@
 import asyncio
 
+from pydantic import field_validator
 from pydantic_ai import Agent
 from pydantic_rpc import AsyncIOServer, Message
 
@@ -16,6 +17,16 @@ class Olympics(Message):
     def prompt(self):
         return f"Where were the Olympics held in {self.year}?"
 
+    @field_validator("year")
+    def validate_year(cls, value):
+        if value < 1896:
+            raise ValueError("The first modern Olympics was held in 1896.")
+
+        if value % 4 != 0:
+            raise ValueError("The Olympics are held every 4 years.")
+
+        return value
+
 
 class OlympicsLocationAgent:
     def __init__(self):

{pydantic_rpc-0.2.0 → pydantic_rpc-0.2.2}/examples/agent_connecpy.py

@@ -2,6 +2,7 @@ import asyncio
 
 from hypercorn.asyncio import serve
 from hypercorn.config import Config
+from pydantic import field_validator
 from pydantic_ai import Agent
 from pydantic_rpc import ConnecpyASGIApp, Message
 
@@ -17,6 +18,16 @@ class Olympics(Message):
     def prompt(self):
         return f"Where were the Olympics held in {self.year}?"
 
+    @field_validator("year")
+    def validate_year(cls, value):
+        if value < 1896:
+            raise ValueError("The first modern Olympics was held in 1896.")
+
+        if value % 4 != 0:
+            raise ValueError("The Olympics are held every 4 years.")
+
+        return value
+
 
 class OlympicsLocationAgent:
     def __init__(self):

{pydantic_rpc-0.2.0 → pydantic_rpc-0.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pydantic-rpc"
-version = "0.2.0"
+version = "0.2.2"
 description = "A Python library for building gRPC/ConnectRPC services with Pydantic models."
 authors = [
     { name = "Yasushi Itoh" }

{pydantic_rpc-0.2.0 → pydantic_rpc-0.2.2}/src/pydantic_rpc/core.py

@@ -24,10 +24,11 @@ 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
+from pydantic import BaseModel, ValidationError
 from sonora.wsgi import grpcWSGI
 from sonora.asgi import grpcASGI
 from connecpy.asgi import ConnecpyASGIApp as ConnecpyASGI
+from connecpy.errors import Errors
 
 # Protobuf Python modules for Timestamp, Duration (requires protobuf / grpcio)
 from google.protobuf import timestamp_pb2, duration_pb2
@@ -198,25 +199,35 @@ def connect_obj_with_stub(pb2_grpc_module, pb2_module, service_obj: object) -> t
             case 1:
 
                 def stub_method1(self, request, context, method=method):
-                    # Convert request to Python object
-                    arg = converter(request)
-                    # Invoke the actual method
-                    resp_obj = method(arg)
-                    # Convert the returned Python Message to a protobuf message
-                    return convert_python_message_to_proto(
-                        resp_obj, response_type, pb2_module
-                    )
+                    try:
+                        # Convert request to Python object
+                        arg = converter(request)
+                        # Invoke the actual method
+                        resp_obj = method(arg)
+                        # Convert the returned Python Message to a protobuf message
+                        return convert_python_message_to_proto(
+                            resp_obj, response_type, pb2_module
+                        )
+                    except ValidationError as e:
+                        return context.abort(grpc.StatusCode.INVALID_ARGUMENT, str(e))
+                    except Exception as e:
+                        return context.abort(grpc.StatusCode.INTERNAL, str(e))
 
                 return stub_method1
 
             case 2:
 
                 def stub_method2(self, request, context, method=method):
-                    arg = converter(request)
-                    resp_obj = method(arg, context)
-                    return convert_python_message_to_proto(
-                        resp_obj, response_type, pb2_module
-                    )
+                    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(grpc.StatusCode.INVALID_ARGUMENT, str(e))
+                    except Exception as e:
+                        return context.abort(grpc.StatusCode.INTERNAL, str(e))
 
                 return stub_method2
 
@@ -255,22 +266,32 @@ def connect_obj_with_stub_async(pb2_grpc_module, pb2_module, obj: object) -> typ
             case 1:
 
                 async def stub_method1(self, request, context, method=method):
-                    arg = converter(request)
-                    resp_obj = await method(arg)
-                    return convert_python_message_to_proto(
-                        resp_obj, response_type, pb2_module
-                    )
+                    try:
+                        arg = converter(request)
+                        resp_obj = await method(arg)
+                        return convert_python_message_to_proto(
+                            resp_obj, response_type, pb2_module
+                        )
+                    except ValidationError as e:
+                        await context.abort(grpc.StatusCode.INVALID_ARGUMENT, str(e))
+                    except Exception as e:
+                        await context.abort(grpc.StatusCode.INTERNAL, str(e))
 
                 return stub_method1
 
             case 2:
 
                 async def stub_method2(self, request, context, method=method):
-                    arg = converter(request)
-                    resp_obj = await method(arg, context)
-                    return convert_python_message_to_proto(
-                        resp_obj, response_type, pb2_module
-                    )
+                    try:
+                        arg = converter(request)
+                        resp_obj = await method(arg, context)
+                        return convert_python_message_to_proto(
+                            resp_obj, response_type, pb2_module
+                        )
+                    except ValidationError as e:
+                        await context.abort(grpc.StatusCode.INVALID_ARGUMENT, str(e))
+                    except Exception as e:
+                        await context.abort(grpc.StatusCode.INTERNAL, str(e))
 
                 return stub_method2
 
@@ -302,7 +323,6 @@ def connect_obj_with_stub_async_connecpy(
 
     def implement_stub_method(method):
         sig = inspect.signature(method)
-        print(type(method))
         arg_type = get_request_arg_type(sig)
         converter = generate_message_converter(arg_type)
         response_type = sig.return_annotation
@@ -312,22 +332,32 @@ def connect_obj_with_stub_async_connecpy(
             case 1:
 
                 async def stub_method1(self, request, context, method=method):
-                    arg = converter(request)
-                    resp_obj = await method(arg)
-                    return convert_python_message_to_proto(
-                        resp_obj, response_type, pb2_module
-                    )
+                    try:
+                        arg = converter(request)
+                        resp_obj = await method(arg)
+                        return convert_python_message_to_proto(
+                            resp_obj, response_type, pb2_module
+                        )
+                    except ValidationError as e:
+                        await context.abort(Errors.InvalidArgument, str(e))
+                    except Exception as e:
+                        await context.abort(Errors.Internal, str(e))
 
                 return stub_method1
 
             case 2:
 
                 async def stub_method2(self, request, context, method=method):
-                    arg = converter(request)
-                    resp_obj = await method(arg, context)
-                    return convert_python_message_to_proto(
-                        resp_obj, response_type, pb2_module
-                    )
+                    try:
+                        arg = converter(request)
+                        resp_obj = await method(arg, context)
+                        return convert_python_message_to_proto(
+                            resp_obj, response_type, pb2_module
+                        )
+                    except ValidationError as e:
+                        await context.abort(Errors.InvalidArgument, str(e))
+                    except Exception as e:
+                        await context.abort(Errors.Internal, str(e))
 
                 return stub_method2
 
@@ -865,7 +895,11 @@ def generate_and_compile_proto(obj: object, package_name: str = ""):
         pb2_grpc_module = importlib.import_module(
             f"{obj.__class__.__name__.lower()}_pb2_grpc"
         )
-        return pb2_grpc_module, pb2_module
+
+        if pb2_grpc_module is not None and pb2_module is not None:
+            return pb2_grpc_module, pb2_module
+
+        # If the modules are not found, generate and compile the proto files.
 
     klass = obj.__class__
     proto_file = generate_proto(obj, package_name)
@@ -892,7 +926,11 @@ def generate_and_compile_proto_using_connecpy(obj: object, package_name: str = "
         connecpy_module = importlib.import_module(
             f"{obj.__class__.__name__.lower()}_connecpy"
         )
-        return connecpy_module, pb2_module
+
+        if connecpy_module is not None and pb2_module is not None:
+            return connecpy_module, pb2_module
+
+        # If the modules are not found, generate and compile the proto files.
 
     klass = obj.__class__
     proto_file = generate_proto(obj, package_name)