aspyx-service 0.10.7__py3-none-any.whl → 0.11.0__py3-none-any.whl

aspyx_service/restchannel.py

@@ -9,6 +9,7 @@ from typing import get_type_hints, TypeVar, Annotated, Callable, get_origin, get
 from pydantic import BaseModel
 
 from aspyx.reflection import DynamicProxy, Decorators
+from aspyx.util import get_serializer
 
 from .channels import HTTPXChannel
 from .service import channel, ServiceCommunicationException
@@ -130,9 +131,26 @@ class RestChannel(HTTPXChannel):
     # local class
 
     class Call:
+        # slots
+
+        __slots__ = [
+            "type",
+            "url_template",
+            "path_param_names",
+            "body_param_name",
+            "query_param_names",
+            "return_type",
+            "signature",
+            "body_serializer"
+        ]
+
+        # constructor
+
         def __init__(self, type: Type, method : Callable):
             self.signature = inspect.signature(method)
 
+            type_hints = get_type_hints(method)
+
             param_names = list(self.signature.parameters.keys())
             param_names.remove("self")
 
@@ -171,6 +189,7 @@ class RestChannel(HTTPXChannel):
 
                     if BodyMarker in metadata:
                         self.body_param_name = param_name
+                        self.body_serializer = get_serializer(type_hints[param_name])
                         param_names.remove(param_name)
                     elif QueryParamMarker in metadata:
                         self.query_param_names.add(param_name)
@@ -197,6 +216,7 @@ class RestChannel(HTTPXChannel):
                                     or is_dataclass(typ)
                             ):
                                 self.body_param_name = name
+                                self.body_serializer = get_serializer(type_hints[name])
                                 param_names.remove(name)
                                 break
 
@@ -207,7 +227,7 @@ class RestChannel(HTTPXChannel):
 
             # return type
 
-            self.return_type = get_type_hints(method)['return']
+            self.return_type = type_hints['return']
 
     # constructor
 
@@ -241,7 +261,7 @@ class RestChannel(HTTPXChannel):
         query_params = {k: arguments[k] for k in call.query_param_names if k in arguments}
         body = {}
         if call.body_param_name is not None:
-            body = self.to_dict(arguments.get(call.body_param_name))
+            body = call.body_serializer(arguments.get(call.body_param_name))#self.to_dict(arguments.get(call.body_param_name))
 
         # call
 
@@ -273,7 +293,7 @@ class RestChannel(HTTPXChannel):
         query_params = {k: arguments[k] for k in call.query_param_names if k in arguments}
         body = {}
         if call.body_param_name is not None:
-            body = self.to_dict(arguments.get(call.body_param_name))
+            body = call.body_serializer(arguments.get(call.body_param_name))#self.to_dict(arguments.get(call.body_param_name))
 
         # call
 

aspyx_service/server.py

@@ -19,11 +19,12 @@ from fastapi import FastAPI, APIRouter, Request as HttpRequest, Response as Http
 from fastapi.responses import JSONResponse
 from starlette.middleware.base import BaseHTTPMiddleware
 
-from aspyx.di import Environment, injectable, on_init, inject_environment, on_destroy
+from aspyx.di import Environment, on_init, inject_environment, on_destroy
 from aspyx.reflection import TypeDescriptor, Decorators
 from aspyx.util import get_deserializer, get_serializer
 
-from .service import ComponentRegistry
+from .protobuf import ProtobufManager
+from .service import ComponentRegistry, ServiceDescriptor
 from .healthcheck import HealthCheckManager
 
 from .service import Server, ServiceManager
@@ -172,10 +173,11 @@ class FastAPIServer(Server):
 
     # constructor
 
-    def __init__(self, fast_api: FastAPI, service_manager: ServiceManager, component_registry: ComponentRegistry):
+    def __init__(self, fast_api: FastAPI, service_manager: ServiceManager, component_registry: ComponentRegistry, protobuf_manager: ProtobufManager):
         super().__init__()
 
         self.environment : Optional[Environment] = None
+        self.protobuf_manager = protobuf_manager
         self.service_manager = service_manager
         self.component_registry = component_registry
 
@@ -213,6 +215,7 @@ class FastAPIServer(Server):
         self.add_routes()
         self.fast_api.include_router(self.router)
 
+        # TODO: trace routes
         #for route in self.fast_api.routes:
         #    print(f"{route.name}: {route.path} [{route.methods}]")
 
@@ -344,16 +347,51 @@ class FastAPIServer(Server):
 
         return args
 
+    def get_descriptor_and_method(self, method_name: str) -> typing.Tuple[ServiceDescriptor, Callable]:
+        parts = method_name.split(":")
+
+        # component = parts[0]
+        service_name = parts[1]
+        method_name = parts[2]
+
+        service_descriptor : ServiceDescriptor = typing.cast(ServiceDescriptor, ServiceManager.descriptors_by_name[service_name])
+        service = self.service_manager.get_service(service_descriptor.type, preferred_channel="local")
+
+        return service_descriptor, getattr(service, method_name)
+
     async def invoke(self, http_request: HttpRequest):
         content_type = http_request.headers.get("content-type", "")
+        response_name = ""
+
+        service_descriptor : ServiceDescriptor
+        method : Callable
+        args : list[Any]
 
         content = "json"
         if "application/msgpack" in content_type:
             content = "msgpack"
-            raw_data = await http_request.body()
-            data = msgpack.unpackb(raw_data, raw=False)
+            data = msgpack.unpackb(await http_request.body(), raw=False)
+            service_descriptor, method = self.get_descriptor_and_method(data["method"])
+            args = self.deserialize_args(data["args"], service_descriptor.type, method)
+
         elif "application/json" in content_type:
             data = await http_request.json()
+            service_descriptor, method = self.get_descriptor_and_method(data["method"])
+            args = self.deserialize_args(data["args"], service_descriptor.type, method)
+
+        elif "application/x-protobuf" in content_type:
+            content = "protobuf"
+            service_descriptor, method = self.get_descriptor_and_method(http_request.headers.get("x-rpc-method") )
+            self.protobuf_manager.check(service_descriptor.type)
+            data = await http_request.body()
+
+            request_name = ProtobufManager.get_message_name(service_descriptor.type, f"{method.__name__}Request")
+
+            request = self.protobuf_manager.get_message_type(request_name)()
+            request.ParseFromString(data)
+
+            args = self.protobuf_manager.create_deserializer(request.DESCRIPTOR, method).deserialize(request)
+
         else:
             return HttpResponse(
                 content="Unsupported Content-Type",
@@ -364,43 +402,55 @@ class FastAPIServer(Server):
         request = data
 
         if content == "json":
-            return await self.dispatch(http_request, request)
-        else:
-            return HttpResponse(
-                content=msgpack.packb(await self.dispatch(http_request, request), use_bin_type=True),
-                media_type="application/msgpack"
-            )
+            try:
+                result = await self.dispatch(service_descriptor, method, args)
 
-    async def dispatch(self, http_request: HttpRequest, request: dict) :
-        ServiceManager.logger.debug("dispatch request %s", request["method"])
+                return Response(result=result, exception=None).model_dump()
+            except Exception as e:
+                return Response(result=None, exception=str(e)).model_dump()
 
-        # <comp>:<service>:<method>
+        elif content == "protobuf":
+            response_name = ProtobufManager.get_message_name(service_descriptor.type, f"{method.__name__}Response")
+            response_type = self.protobuf_manager.get_message_type(response_name)
 
-        parts = request["method"].split(":")
+            result_serializer = self.protobuf_manager.create_result_serializer(response_type, method)
 
-        #component = parts[0]
-        service_name = parts[1]
-        method_name = parts[2]
+            try:
+                result = await self.dispatch(service_descriptor, method, args)
 
-        service_descriptor = ServiceManager.descriptors_by_name[service_name]
-        service = self.service_manager.get_service(service_descriptor.type, preferred_channel="local")
+                result_message = result_serializer.serialize_result(result, None)
 
-        method = getattr(service, method_name)
+                return HttpResponse(
+                    content=result_message.SerializeToString(),
+                    media_type="application/x-protobuf"
+                )
 
-        args = self.deserialize_args(request["args"], service_descriptor.type, method)
-        try:
-            if inspect.iscoroutinefunction(method):
-                result = await method(*args)
-            else:
-                result = method(*args)
+            except Exception as e:
+                result_message = result_serializer.serialize_result(None, str(e))
 
-            return Response(result=result, exception=None).model_dump()
+                return HttpResponse(
+                    content=result_message.SerializeToString(),
+                    media_type="application/x-protobuf"
+                )
 
-        except HTTPException as e:
-            raise
+        else:
+            try:
+                response = Response(result=await self.dispatch(service_descriptor, method, args), exception=None).model_dump()
+            except Exception as e:
+                response = Response(result=None, exception=str(e)).model_dump()
 
-        except Exception as e:
-            return Response(result=None, exception=str(e)).model_dump()
+            return HttpResponse(
+                content=msgpack.packb(response, use_bin_type=True),
+                media_type="application/msgpack"
+            )
+
+    async def dispatch(self, service_descriptor: ServiceDescriptor, method: Callable, args: list[Any]) :
+        ServiceManager.logger.debug("dispatch request %s.%s", service_descriptor, method.__name__)
+
+        if inspect.iscoroutinefunction(method):
+            return await method(*args)
+        else:
+            return method(*args)
 
     # override
 

aspyx_service/service.py

@@ -18,6 +18,7 @@ from aspyx.di import injectable, Environment, Providers, ClassInstanceProvider,
 from aspyx.di.aop.aop import ClassAspectTarget
 from aspyx.reflection import Decorators, DynamicProxy, DecoratorDescriptor, TypeDescriptor
 from aspyx.util import StringBuilder
+
 from .healthcheck import HealthCheckManager, HealthStatus
 
 T = TypeVar("T")
@@ -557,7 +558,7 @@ class ComponentRegistry:
 
 
 @injectable()
-class ChannelManager:
+class ChannelFactory:
     """
     Internal factory for channels.
     """
@@ -567,7 +568,7 @@ class ChannelManager:
     def register_channel(cls, channel: str, type: Type):
         ServiceManager.logger.info("register channel %s", channel)
 
-        ChannelManager.factories[channel] = type
+        ChannelFactory.factories[channel] = type
 
     # constructor
 
@@ -603,7 +604,7 @@ def channel(name: str):
 
         Providers.register(ClassInstanceProvider(cls, False, "request"))
 
-        ChannelManager.register_channel(name, cls)
+        ChannelFactory.register_channel(name, cls)
 
         return cls
 
@@ -649,18 +650,22 @@ class ServiceManager:
     def register_component(cls, component_type: Type, services: list[Type]):
         component_descriptor = ComponentDescriptor(component_type, services)
 
+        setattr(component_type, "__descriptor__", component_descriptor)
+
         cls.logger.info("register component %s", component_descriptor.name)
 
         ServiceManager.descriptors[component_type] = component_descriptor
         ServiceManager.descriptors_by_name[component_descriptor.name] = component_descriptor
 
         for component_service in component_descriptor.services:
+            setattr(component_service.type, "__descriptor__", component_service)
+
             ServiceManager.descriptors[component_service.type] = component_service
             ServiceManager.descriptors_by_name[component_service.name] = component_service
 
     # constructor
 
-    def __init__(self, component_registry: ComponentRegistry, channel_manager: ChannelManager):
+    def __init__(self, component_registry: ComponentRegistry, channel_manager: ChannelFactory):
         self.component_registry = component_registry
         self.channel_manager = channel_manager
         self.environment : Optional[Environment] = None

{aspyx_service-0.10.7.dist-info → aspyx_service-0.11.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aspyx_service
-Version: 0.10.7
+Version: 0.11.0
 Summary: Aspyx Service framework
 Author-email: Andreas Ernst <andreas.ernst7@gmail.com>
 License: MIT License
@@ -26,10 +26,11 @@ License: MIT License
         SOFTWARE.
 License-File: LICENSE
 Requires-Python: >=3.9
-Requires-Dist: aspyx>=1.6.0
+Requires-Dist: aspyx>=1.7.0
 Requires-Dist: fastapi~=0.115.13
 Requires-Dist: httpx~=0.28.1
 Requires-Dist: msgpack~=1.1.1
+Requires-Dist: protobuf~=5.29.4
 Requires-Dist: python-consul2~=0.1.5
 Requires-Dist: uvicorn[standard]
 Description-Content-Type: text/markdown

aspyx_service-0.11.0.dist-info/RECORD

@@ -0,0 +1,14 @@
+aspyx_service/__init__.py,sha256=Mzt6pBhME_qDij2timEZT0emTTXRues_xXu3muhk3Jc,2642
+aspyx_service/authorization.py,sha256=0B1xb0WrRaj2rcGTHVUhh6i8aA0sy7BmpYA18xI9LQA,3833
+aspyx_service/channels.py,sha256=6R9WeC8JO-TI2FPtWBm7ad-jivn-gmkHoB7z6xosw6A,17423
+aspyx_service/healthcheck.py,sha256=XiQx1T0DP0kcCyK_sYBuE-JHs5N285HotLVycFCgzBU,5612
+aspyx_service/protobuf.py,sha256=OTOPRxpzPZEK0lX2BIH3R-FNnxiBtsWvypuyzMla5bU,39010
+aspyx_service/registries.py,sha256=bnTjKb40fbZXA52E2lDSEzCWI5_NBKZzQjc8ffufB5g,8039
+aspyx_service/restchannel.py,sha256=aCpNCvv1eIRa9IJW8Os4bQQErZKrEeyID65QhnD9QJw,9134
+aspyx_service/server.py,sha256=dl3UWawQRPNy7h9WzHQge3dF8nG_3oYWBVgjfN-iqQg,15891
+aspyx_service/service.py,sha256=0sFBpjRxEtMjRhwI1f51qsUCcTzbqoMx7gA3gZNge7A,27159
+aspyx_service/session.py,sha256=HjGpnmwdislc8Ur6pQbSMi2K-lvTsb9_XyO80zupiF8,3713
+aspyx_service-0.11.0.dist-info/METADATA,sha256=ff-Pa-1neQhtVGBX4ByuVLQ8ujH54AjND7unm1H8F2U,17978
+aspyx_service-0.11.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+aspyx_service-0.11.0.dist-info/licenses/LICENSE,sha256=n4jfx_MNj7cBtPhhI7MCoB_K35cj1icP9yJ4Rh4vlvY,1070
+aspyx_service-0.11.0.dist-info/RECORD,,

aspyx_service-0.10.7.dist-info/RECORD

@@ -1,13 +0,0 @@
-aspyx_service/__init__.py,sha256=OWJoScdDVK1NTs9cIgImShgEdJb8TZHLBQjS11rA0Yo,2564
-aspyx_service/authorization.py,sha256=0B1xb0WrRaj2rcGTHVUhh6i8aA0sy7BmpYA18xI9LQA,3833
-aspyx_service/channels.py,sha256=u1afqUfcmVgLxXDXC2BYHH-dMozLcmVROuPRpypSwr8,16397
-aspyx_service/healthcheck.py,sha256=vjfY7s5kd5mRJynVpvAJ4BvVF7QY1xrvj94Y-m041LQ,5615
-aspyx_service/registries.py,sha256=bnTjKb40fbZXA52E2lDSEzCWI5_NBKZzQjc8ffufB5g,8039
-aspyx_service/restchannel.py,sha256=0Xb8grEE8Dyx3g3ENl78DDMKa2WGjIKIPgOrpw5p9ak,8470
-aspyx_service/server.py,sha256=75B1l__GknjwKX2jGIoR4YUTaaFBEVQ_qfHW2a3cy4U,13354
-aspyx_service/service.py,sha256=drETAZasbYJZisnmbhAqW0-mHghJ3IWyPaU-7etxvBI,27003
-aspyx_service/session.py,sha256=HjGpnmwdislc8Ur6pQbSMi2K-lvTsb9_XyO80zupiF8,3713
-aspyx_service-0.10.7.dist-info/METADATA,sha256=mZ2ZsGGqncY4y4pGpeaOy-cDIQu7OHwRWjW09T1jzwM,17946
-aspyx_service-0.10.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-aspyx_service-0.10.7.dist-info/licenses/LICENSE,sha256=n4jfx_MNj7cBtPhhI7MCoB_K35cj1icP9yJ4Rh4vlvY,1070
-aspyx_service-0.10.7.dist-info/RECORD,,