aspyx-service 0.10.7__tar.gz → 0.11.0__tar.gz

{aspyx_service-0.10.7 → aspyx_service-0.11.0}/PKG-INFO

@@ -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.10.7 → aspyx_service-0.11.0}/performance-test/main.py

@@ -11,11 +11,11 @@ from server import  ServerModule
 from aspyx.util import Logger
 
 
-Logger.configure(default_level=logging.DEBUG, levels={
+Logger.configure(default_level=logging.INFO, levels={
     "httpx": logging.ERROR,
-    "aspyx.di": logging.ERROR,
-    "aspyx.di.aop": logging.ERROR,
-    "aspyx.service": logging.ERROR
+    "aspyx.di": logging.INFO,
+    "aspyx.di.aop": logging.INFO,
+    "aspyx.service": logging.INFO
 })
 
 PORT = int(os.getenv("FAST_API_PORT", "8000"))

{aspyx_service-0.10.7 → aspyx_service-0.11.0}/performance-test/performance-test.py

@@ -6,7 +6,7 @@ import threading
 import time
 import logging
 
-from typing import Callable, TypeVar, Type, Awaitable, Any, Dict, cast
+from typing import Callable, TypeVar, Type, Awaitable, Any, cast
 
 from consul import Consul
 
@@ -95,6 +95,8 @@ data = Data(i=1, f=1.0, b=True, s="s",
             )
 
 def run_loops(name: str, loops: int, type: Type[T], instance: T,  callable: Callable[[T], None]):
+    callable(instance) # initialization
+
     start = time.perf_counter()
     for _ in range(loops):
         callable(instance)
@@ -105,6 +107,8 @@ def run_loops(name: str, loops: int, type: Type[T], instance: T,  callable: Call
     print(f"run {name}, loops={loops}: avg={avg_ms:.3f} ms")
 
 async def run_async_loops(name: str, loops: int, type: Type[T], instance: T,  callable: Callable[[T], Awaitable[Any]]):
+    await callable(instance)  # initialization
+
     start = time.perf_counter()
     for _ in range(loops):
         await callable(instance)
@@ -192,12 +196,17 @@ async def main():
     run_loops("rest", loops, TestRestService, manager.get_service(TestRestService, preferred_channel="rest"), lambda service: service.get("world"))
     run_loops("json", loops, TestService, manager.get_service(TestService, preferred_channel="dispatch-json"), lambda service: service.hello("world"))
     run_loops("msgpack", loops, TestService, manager.get_service(TestService, preferred_channel="dispatch-msgpack"), lambda service: service.hello("world"))
+    run_loops("protobuf", loops, TestService, manager.get_service(TestService, preferred_channel="dispatch-protobuf"),
+              lambda service: service.hello("world"))
 
     # pydantic
 
     run_loops("rest & pydantic", loops, TestRestService, manager.get_service(TestRestService, preferred_channel="rest"), lambda service: service.post_pydantic("hello", pydantic))
     run_loops("json & pydantic", loops, TestService, manager.get_service(TestService, preferred_channel="dispatch-json"), lambda service: service.pydantic(pydantic))
     run_loops("msgpack & pydantic", loops, TestService, manager.get_service(TestService, preferred_channel="dispatch-msgpack"), lambda service: service.pydantic(pydantic))
+    run_loops("protobuf & pydantic", loops, TestService,
+              manager.get_service(TestService, preferred_channel="dispatch-protobuf"),
+              lambda service: service.pydantic(pydantic))
 
     # data class
 
@@ -209,6 +218,9 @@ async def main():
     run_loops("msgpack & data", loops, TestService,
               manager.get_service(TestService, preferred_channel="dispatch-msgpack"),
               lambda service: service.data(data))
+    run_loops("protobuf & data", loops, TestService,
+              manager.get_service(TestService, preferred_channel="dispatch-protobuf"),
+              lambda service: service.data(data))
 
     # async
 
@@ -218,6 +230,9 @@ async def main():
               lambda service: service.hello("world"))
     await run_async_loops("async msgpack", loops, TestAsyncService, manager.get_service(TestAsyncService, preferred_channel="dispatch-msgpack"),
               lambda service: service.hello("world"))
+    await run_async_loops("async protobuf", loops, TestAsyncService,
+                          manager.get_service(TestAsyncService, preferred_channel="dispatch-protobuf"),
+                          lambda service: service.hello("world"))
 
     # pydantic
 
@@ -229,6 +244,9 @@ async def main():
     await run_async_loops("async msgpack & pydantic", loops, TestAsyncService,
               manager.get_service(TestAsyncService, preferred_channel="dispatch-msgpack"),
               lambda service: service.pydantic(pydantic))
+    await run_async_loops("async protobuf & pydantic", loops, TestAsyncService,
+                          manager.get_service(TestAsyncService, preferred_channel="dispatch-protobuf"),
+                          lambda service: service.pydantic(pydantic))
 
     # data class
 
@@ -242,6 +260,9 @@ async def main():
     await run_async_loops("async msgpack & data", loops, TestAsyncService,
               manager.get_service(TestAsyncService, preferred_channel="dispatch-msgpack"),
               lambda service: service.data(data))
+    await run_async_loops("async protobuf & data", loops, TestAsyncService,
+                          manager.get_service(TestAsyncService, preferred_channel="dispatch-protobuf"),
+                          lambda service: service.data(data))
 
     # a real thread test
 
@@ -262,6 +283,9 @@ async def main():
     run_threaded_sync_loops("threaded sync json, 16 thread", loops, 16, TestService,
                              manager.get_service(TestService, preferred_channel="dispatch-json"),
                              lambda service: service.hello("world"))
+    run_threaded_sync_loops("threaded sync protobuf, 16 thread", loops, 16, TestService,
+                            manager.get_service(TestService, preferred_channel="dispatch-protobuf"),
+                            lambda service: service.hello("world"))
 
     # async
 
@@ -280,6 +304,9 @@ async def main():
     run_threaded_async_loops("threaded async json, 16 thread", loops, 16, TestAsyncService,
                              manager.get_service(TestAsyncService, preferred_channel="dispatch-json"),
                              lambda service: service.hello("world"))
+    run_threaded_async_loops("threaded async protobuf, 16 thread", loops, 16, TestAsyncService,
+                             manager.get_service(TestAsyncService, preferred_channel="dispatch-protobuf"),
+                             lambda service: service.hello("world"))
 
 if __name__ == "__main__":
     asyncio.run(main())

{aspyx_service-0.10.7 → aspyx_service-0.11.0}/performance-test/server.py

@@ -7,7 +7,8 @@ from typing import Optional
 from consul import Consul
 from fastapi import FastAPI
 
-from aspyx_service import HealthCheckManager, ServiceModule, ConsulComponentRegistry, SessionManager, FastAPIServer
+from aspyx_service import HealthCheckManager, ServiceModule, ConsulComponentRegistry, SessionManager, FastAPIServer, \
+    ProtobufManager
 
 from client import ClientModule, TestService, TestAsyncService, Data, Pydantic, TestRestService, TestAsyncRestService, TestComponent
 
@@ -17,9 +18,6 @@ from aspyx.di import on_running, module, create
 from aspyx.di.aop import Invocation, advice, error
 from aspyx.exception import handle, ExceptionManager
 
-
-
-
 # implementation classes
 
 @implementation()
@@ -133,7 +131,8 @@ class TestComponentImpl(AbstractComponent, TestComponent):
         return [
             ChannelAddress("rest", f"http://{Server.get_local_ip()}:{port}"),
             ChannelAddress("dispatch-json", f"http://{Server.get_local_ip()}:{port}"),
-            ChannelAddress("dispatch-msgpack", f"http://{Server.get_local_ip()}:{port}")
+            ChannelAddress("dispatch-msgpack", f"http://{Server.get_local_ip()}:{port}"),
+            ChannelAddress("dispatch-protobuf", f"http://{Server.get_local_ip()}:{port}")
         ]
 
     def startup(self) -> None:
@@ -156,8 +155,8 @@ class ServerModule:
     #    return YamlConfigurationSource(f"{Path(__file__).parent}/config.yaml")
 
     @create()
-    def create_server(self, service_manager: ServiceManager, component_registry: ComponentRegistry) -> FastAPIServer:
-        return FastAPIServer(self.fastapi, service_manager, component_registry)
+    def create_server(self, service_manager: ServiceManager, component_registry: ComponentRegistry, protobuf_manager: ProtobufManager) -> FastAPIServer:
+        return FastAPIServer(self.fastapi, service_manager, component_registry, protobuf_manager)
 
     @create()
     def create_session_storage(self) -> SessionManager.Storage:

{aspyx_service-0.10.7 → aspyx_service-0.11.0}/pyproject.toml

@@ -2,19 +2,20 @@
 
 [project]
 name = "aspyx_service"
-version = "0.10.7"
+version = "0.11.0"
 description = "Aspyx Service framework"
 authors = [{ name = "Andreas Ernst", email = "andreas.ernst7@gmail.com" }]
 readme = "README.md"
 license = { file = "LICENSE" }
 requires-python = ">=3.9"
 dependencies = [
-    "aspyx>=1.6.0",
+    "aspyx>=1.7.0",
     "python-consul2~=0.1.5",
     "fastapi~=0.115.13",
     "httpx~=0.28.1",
     "msgpack~=1.1.1",
-    "uvicorn[standard]"
+    "uvicorn[standard]",
+    "protobuf~=5.29.4"
 ]
 
 [build-system]

{aspyx_service-0.10.7 → aspyx_service-0.11.0}/src/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-0.10.7 → aspyx_service-0.11.0}/src/aspyx_service/channels.py

@@ -196,6 +196,32 @@ class HTTPXChannel(Channel):
 
             headers["Authorization"] = f"Bearer {token}"
 
+        ### TEST
+
+        print_size = False
+        if print_size:
+            request = self.get_client().build_request(http_method, url, params=params, json=json, headers=headers, timeout=timeout, content=content)
+            # Measure body
+            body_size = len(request.content or b"")
+
+            # Measure headers (as raw bytes)
+            headers_size = sum(
+                len(k.encode()) + len(v.encode()) + 4  # ": " + "\r\n"
+                for k, v in request.headers.items()
+            ) + 2  # final \r\n
+
+            # Optional: estimate request line
+            request_line = f"{request.method} {request.url.raw_path.decode()} HTTP/1.1\r\n".encode()
+            request_line_size = len(request_line)
+
+            # Total estimated size
+            total_size = request_line_size + headers_size + body_size
+
+            print(f"Request line: {request_line_size} bytes")
+            print(f"Headers: {headers_size} bytes")
+            print(f"Body: {body_size} bytes")
+            print(f"Total request size: {total_size} bytes")
+
         try:
             response = self.get_client().request(http_method, url, params=params, json=json, headers=headers, timeout=timeout, content=content)
             response.raise_for_status()
@@ -397,10 +423,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:

{aspyx_service-0.10.7 → aspyx_service-0.11.0}/src/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)