qena-shared-lib 0.1.8__py3-none-any.whl → 0.1.9__py3-none-any.whl

qena_shared_lib/exception_handlers.py

@@ -121,8 +121,8 @@ def handle_http_service_error(
     if exception.logstash_logging:
         logstash_logger_method(
             message=exception.message,
-            tags=exception.tags or tags,
-            extra=exception.extra or extra,
+            tags=tags,
+            extra=extra,
             exception=exception if exception.extract_exc_info else None,
         )
     else:

qena_shared_lib/http.py

@@ -10,7 +10,6 @@ from fastapi.types import IncEx
 
 __all__ = [
     "api_controller",
-    "ApiController",
     "ControllerBase",
     "delete",
     "get",
@@ -63,20 +62,19 @@ class RouteHandlerMeta:
     openapi_extra: dict[str, Any] | None = None
 
 
-class ApiController:
-    def __init__(
-        self,
-        prefix: str | None = None,
-        *,
-        tags: list[str | Enum] | None = None,
-        dependencies: Sequence[Depends] | None = None,
-        default_response_class: type[Response] = JSONResponse,
-        responses: dict[int | str, dict[str, Any]] | None = None,
-        redirect_slashes: bool = True,
-        deprecated: bool | None = None,
-        include_in_schema: bool = True,
-    ):
-        self._api_router = APIRouter(
+def api_controller(
+    prefix: str | None = None,
+    *,
+    tags: list[str | Enum] | None = None,
+    dependencies: Sequence[Depends] | None = None,
+    default_response_class: type[Response] = JSONResponse,
+    responses: dict[int | str, dict[str, Any]] | None = None,
+    redirect_slashes: bool = True,
+    deprecated: bool | None = None,
+    include_in_schema: bool = True,
+) -> Callable[["ControllerBase"], "ControllerBase"]:
+    def annotate_class(api_controller_class: ControllerBase):
+        router = APIRouter(
             prefix=prefix or "",
             tags=tags,
             dependencies=dependencies,
@@ -87,33 +85,11 @@ class ApiController:
             include_in_schema=include_in_schema,
         )
 
-    def __call__(self, controller: type[AC]) -> type[AC]:
-        setattr(controller, API_CONTROLLER_ATTRIBUTE, self._api_router)
-
-        return controller
+        setattr(api_controller_class, API_CONTROLLER_ATTRIBUTE, router)
 
+        return api_controller_class
 
-def api_controller(
-    prefix: str | None = None,
-    *,
-    tags: list[str | Enum] | None = None,
-    dependencies: Sequence[Depends] | None = None,
-    default_response_class: type[Response] = JSONResponse,
-    responses: dict[int | str, dict[str, Any]] | None = None,
-    redirect_slashes: bool = True,
-    deprecated: bool | None = None,
-    include_in_schema: bool = True,
-) -> ApiController:
-    return ApiController(
-        prefix=prefix,
-        tags=tags,
-        dependencies=dependencies,
-        default_response_class=default_response_class,
-        responses=responses,
-        redirect_slashes=redirect_slashes,
-        deprecated=deprecated,
-        include_in_schema=include_in_schema,
-    )
+    return annotate_class
 
 
 def get(

qena_shared_lib/rabbitmq/_exception_handlers.py

@@ -87,8 +87,8 @@ def handle_rabbit_mq_service_exception(
     if exception.logstash_logging:
         logstash_logger_method(
             message=exception.message,
-            tags=exception.tags or tags,
-            extra=exception.extra or extra,
+            tags=tags,
+            extra=extra,
             exception=exception if exception.extract_exc_info else None,
         )
     else:

{qena_shared_lib-0.1.8.dist-info → qena_shared_lib-0.1.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qena-shared-lib
-Version: 0.1.8
+Version: 0.1.9
 Summary: A shared tools for other services
 Requires-Python: >=3.10
 Requires-Dist: cronsim==2.6
@@ -40,6 +40,9 @@ A shared tools for other services. It includes.
 To create fastapi app.
 
 ``` py
+from qena_shared_lib.application import Builder, Environment
+
+
 def main() -> FastAPI:
     builder = (
         Builder()
@@ -63,6 +66,11 @@ $ uvicorn --factory main:main
 ### Lifespan
 
 ``` py
+from contextlib import asynccontextmanager
+
+from fastapi import FastAPI
+
+
 @asynccontextmanager
 def lifespan(app: FastAPI):
     ...
@@ -83,6 +91,16 @@ def main() -> FastAPI:
 ### Dependencies
 
 ``` py
+class EmailService:
+    def __init__(self):
+        ...
+
+
+class Database:
+    def __init__(self):
+        ...
+
+
 def main() -> FastAPI:
     ...
 
@@ -95,7 +113,10 @@ def main() -> FastAPI:
 ### Controllers
 
 ``` py
-@ApiController("/users")
+from qena_shared_lib.http import ControllerBase, api_controller, post
+
+
+@api_controller("/users")
 class UserController(ControllerBase):
 
     def __init__(self, email_service: EmailService):
@@ -112,11 +133,18 @@ def main() -> FastAPI:
     builder.with_controllers([
         UserController
     ])
+
+    ...
 ```
 
 ### Routers
 
 ``` py
+from fastapi import APIRouter
+
+from qena_shared_lib.dependencies.http import DependsOn
+
+
 router = APIRouter(prefix="/auth")
 
 
@@ -153,6 +181,9 @@ def main() -> FastAPI:
 ## Logstash
 
 ``` py
+from qena_shared_lib.logstash import BaseLogstashSender, HTTPSender, # TCPSender
+
+
 @asynccontextmanager
 async def lifespan(app: FastAPI):
     logstash = get_service(BaseLogstashSender)
@@ -203,6 +234,9 @@ def log_message(
 To create rabbitmq connection manager.
 
 ``` py
+from qena_shared_lib.rabbitmq import ListenerBase, consume, consumer
+
+
 @asynccontextmanager
 async def lifespan(app: FastAPI):
     rabbitmq = get_service(RabbitMqManager)
@@ -214,7 +248,7 @@ async def lifespan(app: FastAPI):
     rabbitmq.disconnect()
 
 
-@Consumer("UserQueue")
+@consumer("UserQueue")
 class UserConsumer(ListenerBase):
 
     def __init__(self, db: Database):
@@ -249,7 +283,7 @@ def main() -> FastAPI:
 async def store_user(
     rabbitmq: Annotated[
         RabbitMqManager,
-        DependsOne(RabbitMqManager)
+        DependsOn(RabbitMqManager)
     ],
     user: User,
 )
@@ -266,7 +300,7 @@ async def store_user(
 async def get_user(
     rabbitmq: Annotated[
         RabbitMqManager,
-        DependsOne(RabbitMqManager)
+        DependsOn(RabbitMqManager)
     ],
     user_id: str,
 )
@@ -281,7 +315,10 @@ async def get_user(
 ### Flow control
 
 ``` py
-@Consumer("UserQueue")
+from qena_shared_lib.rabbitmq import ... , ListenerContext
+
+
+@consumer("UserQueue")
 class UserConsumer(ListenerBase):
 
     @consume()
@@ -299,7 +336,10 @@ class UserConsumer(ListenerBase):
 Optionally it is possible to reply to rpc calls, through.
 
 ``` py
-@RpcWorker("UserQueue")
+from qena_shared_lib.rabbitmq import ... , rpc_worker
+
+
+@rpc_worker("UserQueue")
 class UserWorker(ListenerBase):
 
     @execute()
@@ -311,10 +351,92 @@ class UserWorker(ListenerBase):
         ...
 ```
 
+### Retry consumer
+
+Consumer can retry to consumer a message in an event of failure.
+
+``` py
+from qena_shared_lib.rabbitmq import (
+    BackoffRetryDelay,
+    FixedRetryDelay,
+    RabbitMqManager,
+    RetryDelayJitter,
+    RetryPolicy,
+)
+
+
+@consumer(
+    queue="UserQueue",
+    # can be defined for consumer of specific queue
+    retry_policy=RetryPolicy(
+        exceptions=(AMQPError,),
+        max_retry=5,
+        retry_delay_strategy=FixedRetryDelay(
+            retry_delay=2
+        ),
+        retry_delay_jitter=RetryDelayJitter(min=0.5, max=5.0),
+    )
+)
+class UserConsumer(ListenerBase):
+
+    @consume(
+        # for specific target
+        retry_policy=RetryPolicy(
+            exceptions=(AMQPError,),
+            max_retry=5,
+            retry_delay_strategy=FixedRetryDelay(
+                retry_delay=2
+            ),
+            retry_delay_jitter=RetryDelayJitter(min=0.5, max=5.0),
+        )
+    )
+    async def store_user(self, ctx: ListenerContext, user: User):
+        ...
+
+        await ctx.flow_control.request(10)
+
+        ...
+
+
+def main() -> FastAPI:
+    ...
+
+    rabbitmq = RabbitMqManager(
+        logstash=logstash,
+        container=builder.container,
+        # or globally for all consumers
+        listener_global_retry_policy=RetryPolicy(
+            exceptions=(AMQPError,),
+            max_retry=10,
+            retry_delay_strategy=BackoffRetryDelay(
+                multiplier=1.5, min=2, max=10
+            ),
+            retry_delay_jitter=RetryDelayJitter(min=0.5, max=5.0),
+            match_by_cause=True,
+        ),
+    )
+
+    rabbitmq.include_listener(UserConsumer)
+    builder.add_singleton(
+        service=RabbitMqManager,
+        instance=rabbitmq,
+    )
+```
+
+
 
 ## Scheduler
 
 ``` py
+from qena_shared_lib.scheduler import (
+    ScheduleManager,
+    # Scheduler,
+    SchedulerBase,
+    schedule,
+    scheduler,
+)
+
+
 @asynccontextmanager
 async def lifespan(app: FastAPI):
     schedule_manager = get_service(ScheduleManager)
@@ -326,7 +448,7 @@ async def lifespan(app: FastAPI):
     schedule_manager.stop()
 
 
-@Scheduler()
+@scheduler()
 class TaskScheduler(SchedulerBase):
 
     def __init__(self, db: Database)
@@ -367,6 +489,9 @@ def main() -> FastAPI:
 ## Background
 
 ``` py
+from qena_shared_lib.background import Background
+
+
 @asynccontextmanager
 async def lifespan(app: FastAPI):
     background = get_service(Background)
@@ -410,7 +535,10 @@ async def process_data(
 ### Password hasher
 
 ``` py
-@ApiController("/users")
+from qena_shared_lib.security import PasswordHasher
+
+
+@api_controller("/users")
 class UserController(ControllerBase):
 
     def __init__(self, password_hasher: PasswordHasher):
@@ -439,6 +567,9 @@ def main() -> FastAPI:
 ### JWT
 
 ``` py
+from qena_shared_lib.security import JwtAdapter
+
+
 @ApiController("/users")
 class UserController(ControllerBase):
 
@@ -478,7 +609,10 @@ def main() -> FastAPI:
 ### ACL
 
 ``` py
-@ApiController("/users")
+from qena_shared_lib.security import Authorization
+
+
+@api_controller("/users")
 class UserController(ControllerBase):
 
     @post()
@@ -486,7 +620,7 @@ class UserController(ControllerBase):
         self,
         user: Annotated[
             UserInfo,
-            EndpointACL(
+            Authorization(
                 user_type="ADMIN",
                 persmission=[
                     "READ"
@@ -501,7 +635,7 @@ class UserController(ControllerBase):
 async def get_users(
     user: Annotated[
         UserInfo,
-        EndpointACL("ADMIN")
+        Authorization("ADMIN")
     ]
 )
     ...

{qena_shared_lib-0.1.8.dist-info → qena_shared_lib-0.1.9.dist-info}/RECORD

@@ -1,9 +1,9 @@
 qena_shared_lib/__init__.py,sha256=WokKEFaMNow6h2ZY_fyB-tiYnic-Ed6K6kyzKgg3Rlw,371
 qena_shared_lib/application.py,sha256=LyMgCrp1wqUfHsQktybWW-fZG-XugxZ6_Bafhp3gRls,5472
 qena_shared_lib/background.py,sha256=upWeJ747-4S4xsBOR-P2_oNar1YiaxCpnLhEDvnArmQ,3097
-qena_shared_lib/exception_handlers.py,sha256=DqE6nyYzn-TeJw3KDeDrfJiSmEogZ0WEY2-VId6rogM,6225
+qena_shared_lib/exception_handlers.py,sha256=qAXb8yE06yJRO2Qe9tfTu9D2DJhqgvX5wsc1_OPOjX4,6188
 qena_shared_lib/exceptions.py,sha256=GEGcSNaNMhFCdgCl6crNrrw-tmzPD-2Jz6MnpMvqXIU,9419
-qena_shared_lib/http.py,sha256=EQ19rf9-qu6MhD3FCrPYayjcEEyDQL0JVYpstVGOO2c,24572
+qena_shared_lib/http.py,sha256=ZWbCV0C4SOKasfGhMLDcqZpZgIUUA_rEPAooeBkKieo,23846
 qena_shared_lib/logging.py,sha256=JL6bAmkK1BJA84rZNpvDEmrec3dogQRpSug4fj1Omkw,1618
 qena_shared_lib/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qena_shared_lib/scheduler.py,sha256=wVLgHM0cCBZhqSmOAgEa5McEJSSTHfoMAEIrFGI0tT0,11946
@@ -19,11 +19,11 @@ qena_shared_lib/logstash/_tcp_sender.py,sha256=ncvc3wYxOJPkB7c_0W8vboaxMRJ_1UYGd
 qena_shared_lib/rabbitmq/__init__.py,sha256=HKGd-CfbqNkTMDzF9dd-ZQlj5fQfnO5S9qzMcILy8xk,1151
 qena_shared_lib/rabbitmq/_base.py,sha256=S7jo4NbtAO8rzr7mBwhxRJrSmzrypOalrJChfrQ6-6I,23098
 qena_shared_lib/rabbitmq/_channel.py,sha256=R0xzZvLkeE4YWsyLhx8bPDramsTFDZIcCgfsDyFmSB4,5429
-qena_shared_lib/rabbitmq/_exception_handlers.py,sha256=k9G7tQ5v9-9HnWH47RTX4W8rsjY8bqWBljLWtAKhTyk,4566
+qena_shared_lib/rabbitmq/_exception_handlers.py,sha256=gLkPFxQUW9faL8RApPT-Bqmn-fQ134q1ZvKInfRKjuo,4529
 qena_shared_lib/rabbitmq/_listener.py,sha256=1w5JAgwYy0xIU4kEZwL_KHyudfUWeqMWSXX5UdZ-p7M,46210
 qena_shared_lib/rabbitmq/_pool.py,sha256=MGubA-nYxxjgsZRF1yK4UBkzUy65t-suh0W1jZDk5q8,1952
 qena_shared_lib/rabbitmq/_publisher.py,sha256=Dr2u1IELCboCbozjTRsRtyQh7TRaJvujPsp74TF7utA,2434
 qena_shared_lib/rabbitmq/_rpc_client.py,sha256=eNzKpU_BvfDTR3udiSNtjJ4MaJqHrIOxMItKHA8aJbo,8909
-qena_shared_lib-0.1.8.dist-info/METADATA,sha256=UhHaHwUtUsGtTeKuk6Zv7KSV94oKCyfRv5HMhb4xxDs,8488
-qena_shared_lib-0.1.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qena_shared_lib-0.1.8.dist-info/RECORD,,
+qena_shared_lib-0.1.9.dist-info/METADATA,sha256=DJuWOWR6IvgDxREbIXdIK3TQJUNfcAtFPOmQdooaZO4,11232
+qena_shared_lib-0.1.9.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qena_shared_lib-0.1.9.dist-info/RECORD,,