aspyx-service 0.10.2__py3-none-any.whl → 0.10.3__py3-none-any.whl

aspyx_service/channels.py

@@ -13,6 +13,7 @@ from pydantic import BaseModel
 
 from aspyx.di.configuration import inject_value
 from aspyx.reflection import DynamicProxy, TypeDescriptor
+from aspyx.threading import ThreadLocal
 from .service import ServiceManager, ServiceCommunicationException
 
 from .service import ComponentDescriptor, ChannelInstances, ServiceException, channel, Channel, RemoteServiceException
@@ -28,6 +29,11 @@ class HTTPXChannel(Channel):
         "timeout"
     ]
 
+    # class properties
+
+    client_local = ThreadLocal[Client]()
+    async_client_local = ThreadLocal[AsyncClient]()
+
     # class methods
 
     @classmethod
@@ -61,8 +67,6 @@ class HTTPXChannel(Channel):
         super().__init__()
 
         self.timeout = 1000.0
-        self.client: Optional[Client] = None
-        self.async_client: Optional[AsyncClient] = None
         self.service_names: dict[Type, str] = {}
         self.deserializers: dict[Callable, Callable] = {}
 
@@ -95,24 +99,25 @@ class HTTPXChannel(Channel):
         for service in component_descriptor.services:
             self.service_names[service.type] = service.name
 
-        # make client
-
-        self.client = self.make_client()
-        self.async_client = self.make_async_client()
-
     # public
 
     def get_client(self) -> Client:
-        if self.client is None:
-            self.client = self.make_client()
+        client = self.client_local.get()
+
+        if client is None:
+            client = self.make_client()
+            self.client_local.set(client)
 
-        return self.client
+        return client
 
     def get_async_client(self) -> AsyncClient:
-        if self.async_client is None:
-            self.async_client = self.make_async_client()
+        async_client = self.async_client_local.get()
+
+        if async_client is None:
+            async_client = self.make_async_client()
+            self.async_client_local.set(async_client)
 
-        return self.async_client
+        return async_client
 
     def make_client(self) -> Client:
         return Client()  # base_url=url

aspyx_service/restchannel.py

@@ -249,16 +249,15 @@ class RestChannel(HTTPXChannel):
         try:
             result = None
             if call.type == "get":
-                result = await self.get_client().get(self.get_url() + url, params=query_params, timeout=self.timeout).json()
+                result = await self.get_async_client().get(self.get_url() + url, params=query_params, timeout=self.timeout)
             elif call.type == "put":
-                result = await self.get_client().put(self.get_url() + url, params=query_params, timeout=self.timeout).json()
+                result = await self.get_async_client().put(self.get_url() + url, params=query_params, timeout=self.timeout)
             elif call.type == "delete":
-                result = await self.get_client().delete(self.get_url() + url, params=query_params, timeout=self.timeout).json()
+                result = await self.get_async_client().delete(self.get_url() + url, params=query_params, timeout=self.timeout)
             elif call.type == "post":
-                result = await self.get_client().post(self.get_url() + url, params=query_params, json=body,
-                                                timeout=self.timeout).json()
+                result = await self.get_async_client().post(self.get_url() + url, params=query_params, json=body, timeout=self.timeout)
 
-            return self.get_deserializer(invocation.type, invocation.method)(result)
+            return self.get_deserializer(invocation.type, invocation.method)(result.json())
         except ServiceCommunicationException:
             raise
 
@@ -285,15 +284,15 @@ class RestChannel(HTTPXChannel):
         try:
             result = None
             if call.type == "get":
-                result = self.get_client().get(self.get_url() + url, params=query_params, timeout=self.timeout).json()
+                result = self.get_client().get(self.get_url() + url, params=query_params, timeout=self.timeout)
             elif call.type == "put":
-                result = self.get_client().put(self.get_url() + url, params=query_params, timeout=self.timeout).json()
+                result = self.get_client().put(self.get_url() + url, params=query_params, timeout=self.timeout)
             elif call.type == "delete":
-                result = self.get_client().delete(self.get_url() + url, params=query_params, timeout=self.timeout).json()
+                result = self.get_client().delete(self.get_url() + url, params=query_params, timeout=self.timeout)
             elif call.type == "post":
-                result = self.get_client().post(self.get_url() + url, params=query_params, json=body, timeout=self.timeout).json()
+                result = self.get_client().post(self.get_url() + url, params=query_params, json=body, timeout=self.timeout)
 
-            return self.get_deserializer(invocation.type, invocation.method)(result)
+            return self.get_deserializer(invocation.type, invocation.method)(result.json())
         except ServiceCommunicationException:
             raise
 

aspyx_service/serialization.py

@@ -42,6 +42,9 @@ class TypeDeserializer:
         if is_dataclass(typ):
             field_deserializers = {f.name: TypeDeserializer(f.type) for f in fields(typ)}
             def deser_dataclass(value):
+                if is_dataclass(value):
+                    return value
+
                 return typ(**{
                     k: field_deserializers[k](v) for k, v in value.items()
                 })

aspyx_service/service.py

@@ -769,11 +769,12 @@ class ServiceManager:
 
         # check proxy
 
-        key = TypeAndChannel(type=component_descriptor.type, channel=preferred_channel)
+        channel_key = TypeAndChannel(type=component_descriptor.type, channel=preferred_channel)
+        proxy_key   = TypeAndChannel(type=service_type, channel=preferred_channel)
 
-        proxy = self.proxy_cache.get(key, None)
+        proxy = self.proxy_cache.get(proxy_key, None)
         if proxy is None:
-            channel_instance = self.channel_cache.get(key, None)
+            channel_instance = self.channel_cache.get(channel_key, None)
 
             if channel_instance is None:
                 address = self.find_service_address(component_descriptor, preferred_channel)
@@ -786,9 +787,9 @@ class ServiceManager:
                 # channel may have changed
 
                 if address.channel != preferred_channel:
-                    key = TypeAndChannel(type=component_descriptor.type, channel=address.channel)
+                    channel_key = TypeAndChannel(type=component_descriptor.type, channel=address.channel)
 
-                channel_instance = self.channel_cache.get(key, None)
+                channel_instance = self.channel_cache.get(channel_key, None)
                 if channel_instance is None:
                     # create channel
 
@@ -796,7 +797,7 @@ class ServiceManager:
 
                     # cache
 
-                    self.channel_cache[key] =  channel_instance
+                    self.channel_cache[channel_key] =  channel_instance
 
                     # and watch for changes in the addresses
 
@@ -805,7 +806,7 @@ class ServiceManager:
             # create proxy
 
             proxy = DynamicProxy.create(service_type, channel_instance)
-            self.proxy_cache[key] = proxy
+            self.proxy_cache[proxy_key] = proxy
 
         return proxy
 

{aspyx_service-0.10.2.dist-info → aspyx_service-0.10.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aspyx_service
-Version: 0.10.2
+Version: 0.10.3
 Summary: Aspyx Service framework
 Author-email: Andreas Ernst <andreas.ernst7@gmail.com>
 License: MIT License
@@ -70,19 +70,23 @@ that lets you deploy, discover and call services with different remoting protoco
 
 The basic design consists of four different concepts:
 
-!!! info "Service"
+**Service**
+
   defines a group of methods that can be called either locally or remotely. 
   These methods represent the functional interface exposed to clients — similar to an interface in traditional programming
 
-!!! info "Component"
+**Component**
+
   a component bundles one or more services and declares the channels (protocols) used to expose them.
   Think of a component as a deployment unit or module.
 
-!!! info "Component Registry "
+**Component Registry**
+
   acts as the central directory for managing available components.
   It allows the framework to register, discover, and resolve components and their services.
 
-!!! info "Channel"
+**Channel**
+
   is a pluggable transport layer that defines how service method invocations are transmitted and handled.
 
 Let's look at the "interface" layer first.
@@ -111,7 +115,7 @@ class Module:
     
     @create()
     def create_registry(self) -> ConsulComponentRegistry:
-        return ConsulComponentRegistry(Server.port, "http://localhost:8500") # a consul based registry!
+        return ConsulComponentRegistry(Server.port, Consul(host="localhost", port=8500)) # a consul based registry!
 
 environment = Environment(Module)
 service_manager = environment.get(ServiceManager)
@@ -361,7 +365,7 @@ A so called `URLSelector` is used internally to provide URLs for every single ca
 - `FirstURLSelector` always returns the first URL of the list of possible URLs
 - `RoundRobinURLSelector` switches sequentially between all URLs.
 
-To customize the behavior, an around advice can be implemented easily:
+To customize the behavior, an `around` advice can be implemented easily:
 
 **Example**:
  

aspyx_service-0.10.3.dist-info/RECORD

@@ -0,0 +1,12 @@
+aspyx_service/__init__.py,sha256=6t24VPrSCG83EAvYlqCKdEcEbyCY3vrSb5GoAx01Ymg,1662
+aspyx_service/channels.py,sha256=p5JIyo7eWyBiR2xQrfsEvq2L89FzeFT1tqKYhvXQbXs,9035
+aspyx_service/healthcheck.py,sha256=8ZPSkAx6ypoYaxDMkJT_MtL2pEN2LcUAishAWPCy-3I,5624
+aspyx_service/registries.py,sha256=JSsD32F8VffZMHyEDuapEWtvmem5SK9kR6bgsFRLFZQ,8002
+aspyx_service/restchannel.py,sha256=Q_7RURjZZW7N2LBLY9BL7qKyS_A62X7yFoGUoE-_0YY,9103
+aspyx_service/serialization.py,sha256=GEgfg1cNSOJ_oe0gEm0ajzugLyUmPiEsp9Qz6Fu4vkA,4207
+aspyx_service/server.py,sha256=PHKx3O90jnxm8dA4z331_51znhU-HlRB2Fa1AikmFXA,7052
+aspyx_service/service.py,sha256=Odl6_nvOOJ2lFjqCLJD8KLPt-sCG55VtQQiKTyNEOPs,26062
+aspyx_service-0.10.3.dist-info/METADATA,sha256=MrWNfy3T2m4G5MyKlV4Spr2yi6N_hE1VLRT3vNJ6Hm0,16955
+aspyx_service-0.10.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+aspyx_service-0.10.3.dist-info/licenses/LICENSE,sha256=n4jfx_MNj7cBtPhhI7MCoB_K35cj1icP9yJ4Rh4vlvY,1070
+aspyx_service-0.10.3.dist-info/RECORD,,

aspyx_service-0.10.2.dist-info/RECORD

@@ -1,12 +0,0 @@
-aspyx_service/__init__.py,sha256=6t24VPrSCG83EAvYlqCKdEcEbyCY3vrSb5GoAx01Ymg,1662
-aspyx_service/channels.py,sha256=9EjnY6DV_toqeQNswYZgmAtirXM_TTLGErs6hb1U9yw,8934
-aspyx_service/healthcheck.py,sha256=8ZPSkAx6ypoYaxDMkJT_MtL2pEN2LcUAishAWPCy-3I,5624
-aspyx_service/registries.py,sha256=JSsD32F8VffZMHyEDuapEWtvmem5SK9kR6bgsFRLFZQ,8002
-aspyx_service/restchannel.py,sha256=OVGyKNtORJEFnWsFB5MPkNldVFfJTGuUa4X658_x9Kg,9169
-aspyx_service/serialization.py,sha256=lEr106yiZ0UzVxGTGdiorZSSSNI7vP4C7RyrBJku-U0,4133
-aspyx_service/server.py,sha256=PHKx3O90jnxm8dA4z331_51znhU-HlRB2Fa1AikmFXA,7052
-aspyx_service/service.py,sha256=-hhxRpEtMn-JP57bHNF521zbGMHUy5YaXkbXyiu7dW4,25927
-aspyx_service-0.10.2.dist-info/METADATA,sha256=KEdh30D63sXs26FVOtCph_LF521bBJa7A6Qpc8d-9iQ,16966
-aspyx_service-0.10.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-aspyx_service-0.10.2.dist-info/licenses/LICENSE,sha256=n4jfx_MNj7cBtPhhI7MCoB_K35cj1icP9yJ4Rh4vlvY,1070
-aspyx_service-0.10.2.dist-info/RECORD,,