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

aspyx_service/__init__.py

@@ -12,6 +12,7 @@ from .healthcheck import health_checks, health_check, HealthCheckManager, Health
 from .restchannel import RestChannel, post, get, put, delete, QueryParam, Body, rest
 from .session import Session, SessionManager, SessionContext
 from .authorization import AuthorizationManager, AbstractAuthorizationFactory
+from .protobuf import ProtobufManager
 
 @module()
 class ServiceModule:
@@ -48,6 +49,10 @@ __all__ = [
     "MissingTokenException",
     "AuthorizationException",
 
+    # protobuf
+
+    "ProtobufManager",
+
     # authorization
 
     "AuthorizationManager",

aspyx_service/channels.py

@@ -16,7 +16,7 @@ from pydantic import BaseModel
 from aspyx.di.configuration import inject_value
 from aspyx.reflection import DynamicProxy, TypeDescriptor
 from aspyx.threading import ThreadLocal, ContextLocal
-from aspyx.util import get_deserializer, TypeDeserializer, TypeSerializer, get_serializer
+from aspyx.util import get_deserializer, TypeDeserializer, TypeSerializer, get_serializer, CopyOnWriteCache
 from .service import ServiceManager, ServiceCommunicationException, TokenExpiredException, InvalidTokenException, \
     AuthorizationException, MissingTokenException
 
@@ -61,6 +61,9 @@ class TokenContext:
             cls.refresh_token.reset(refresh_token)
 
 class HTTPXChannel(Channel):
+    """
+    A channel using the httpx clients.
+    """
     __slots__ = [
         "client",
         "async_client",
@@ -75,28 +78,6 @@ class HTTPXChannel(Channel):
     client_local = ThreadLocal[Client]()
     async_client_local = ThreadLocal[AsyncClient]()
 
-    # class methods
-
-    @classmethod
-    def to_dict(cls, obj: Any) -> Any:
-        if isinstance(obj, BaseModel):
-            return obj.model_dump()
-
-        elif is_dataclass(obj):
-            return {
-                f.name: cls.to_dict(getattr(obj, f.name))
-
-                for f in fields(obj)
-            }
-
-        elif isinstance(obj, (list, tuple)):
-            return [cls.to_dict(item) for item in obj]
-
-        elif isinstance(obj, dict):
-            return {key: cls.to_dict(value) for key, value in obj.items()}
-
-        return obj
-
     # constructor
 
     def __init__(self):
@@ -104,9 +85,8 @@ class HTTPXChannel(Channel):
 
         self.timeout = 1000.0
         self.service_names: dict[Type, str] = {}
-        self.serializers: dict[Callable, list[Callable]] = {}
-        self.deserializers: dict[Callable, Callable] = {}
-        self.optimize_serialization = True
+        self.serializers = CopyOnWriteCache[Callable, list[Callable]]()
+        self.deserializers = CopyOnWriteCache[Callable, Callable]()
 
     # inject
 
@@ -132,7 +112,7 @@ class HTTPXChannel(Channel):
 
             serializers = [get_serializer(type) for type in param_types]
 
-            self.serializers[method] = serializers
+            self.serializers.put(method, serializers)
 
         return serializers
 
@@ -143,7 +123,7 @@ class HTTPXChannel(Channel):
 
             deserializer = get_deserializer(return_type)
 
-            self.deserializers[method] = deserializer
+            self.deserializers.put(method, deserializer)
 
         return deserializer
 
@@ -291,16 +271,11 @@ class DispatchJSONChannel(HTTPXChannel):
     def invoke(self, invocation: DynamicProxy.Invocation):
         service_name = self.service_names[invocation.type]  # map type to registered service name
 
-        request : dict = {
-            "method": f"{self.component_descriptor.name}:{service_name}:{invocation.method.__name__}"
-            #"args": invocation.args
+        request = {
+            "method": f"{self.component_descriptor.name}:{service_name}:{invocation.method.__name__}",
+            "args": self.serialize_args(invocation)
         }
 
-        if self.optimize_serialization:
-            request["args"] = self.serialize_args(invocation)
-        else:
-            request["args"] = self.to_dict(invocation.args)
-
         try:
             http_result = self.request( "post", f"{self.get_url()}/invoke", json=request, timeout=self.timeout)
             result = http_result.json()
@@ -317,15 +292,11 @@ class DispatchJSONChannel(HTTPXChannel):
 
     async def invoke_async(self, invocation: DynamicProxy.Invocation):
         service_name = self.service_names[invocation.type]  # map type to registered service name
-        request : dict = {
-            "method": f"{self.component_descriptor.name}:{service_name}:{invocation.method.__name__}"
+        request = {
+            "method": f"{self.component_descriptor.name}:{service_name}:{invocation.method.__name__}",
+            "args": self.serialize_args(invocation)
         }
 
-        if self.optimize_serialization:
-            request["args"] = self.serialize_args(invocation)
-        else:
-            request["args"] = self.to_dict(invocation.args)
-
         try:
             data =  await self.request_async("post", f"{self.get_url()}/invoke", json=request, timeout=self.timeout)
             result = data.json()
@@ -361,15 +332,11 @@ class DispatchMSPackChannel(HTTPXChannel):
 
     def invoke(self, invocation: DynamicProxy.Invocation):
         service_name = self.service_names[invocation.type]  # map type to registered service name
-        request: dict = {
-            "method": f"{self.component_descriptor.name}:{service_name}:{invocation.method.__name__}"
+        request = {
+            "method": f"{self.component_descriptor.name}:{service_name}:{invocation.method.__name__}",
+            "args": self.serialize_args(invocation)
         }
 
-        if self.optimize_serialization:
-            request["args"] = self.serialize_args(invocation)
-        else:
-            request["args"] = self.to_dict(invocation.args)
-
         try:
             packed = msgpack.packb(request, use_bin_type=True)
 
@@ -397,10 +364,11 @@ class DispatchMSPackChannel(HTTPXChannel):
                 if "invalid_token" in www_auth:
                     if 'expired' in www_auth:
                         raise TokenExpiredException() from e
-                    elif 'missing' in www_auth:
+
+                    if 'missing' in www_auth:
                         raise MissingTokenException() from e
-                    else:
-                        raise InvalidTokenException() from e
+
+                    raise InvalidTokenException() from e
 
             raise RemoteServiceException(str(e)) from e
         except httpx.HTTPError as e:
@@ -417,15 +385,11 @@ class DispatchMSPackChannel(HTTPXChannel):
 
     async def invoke_async(self, invocation: DynamicProxy.Invocation):
         service_name = self.service_names[invocation.type]  # map type to registered service name
-        request: dict = {
-            "method": f"{self.component_descriptor.name}:{service_name}:{invocation.method.__name__}"
+        request = {
+            "method": f"{self.component_descriptor.name}:{service_name}:{invocation.method.__name__}",
+            "args": self.serialize_args(invocation)
         }
 
-        if self.optimize_serialization:
-            request["args"] = self.serialize_args(invocation)
-        else:
-            request["args"] = self.to_dict(invocation.args)
-
         try:
             packed = msgpack.packb(request, use_bin_type=True)
 

aspyx_service/healthcheck.py

@@ -15,7 +15,7 @@ from aspyx.reflection import Decorators, TypeDescriptor
 
 def health_checks():
     """
-    Instances of classes that are annotated with @injectable can be created by an Environment.
+    Instances of classes that are annotated with @health_checks contain healt mehtods.
     """
     def decorator(cls):
         Decorators.add(cls, health_checks)
@@ -31,7 +31,7 @@ def health_checks():
 
 def health_check(name="", cache = 0, fail_if_slower_than = 0):
     """
-    Methods annotated with `@on_init` will be called when the instance is created.
+    Methods annotated with `@health_check` specify health checks that will be executed.
     """
     def decorator(func):
         Decorators.add(func, health_check, name, cache, fail_if_slower_than)