fix #53

Lancetnik · Jun 6, 2023 · 9caf05d · 9caf05d
1 parent ffe6421
commit 9caf05d
Show file tree

Hide file tree

Showing 27 changed files with 58 additions and 63 deletions.
diff --git a/README.md b/README.md
@@ -336,10 +336,10 @@ from fastapi import Depends, FastAPI
 from pydantic import BaseModel
 from propan.fastapi import RabbitRouter
 
-app = FastAPI()
-
 router = RabbitRouter("amqp://guest:guest@localhost:5672")
 
+app = FastAPI(lifespan=router.lifespan_context)
+
 class Incoming(BaseModel):
     m: dict
 

diff --git a/docs/docs/en/CHANGELOG.md b/docs/docs/en/CHANGELOG.md
@@ -74,10 +74,10 @@ Great news! Now **Propan** can be used as a full part of **FastAPI**!
 from fastapi import FastAPI
 from propan.fastapi import RabbitRouter
 
-app = FastAPI()
-
 router = RabbitRouter("amqp://guest:guest@localhost:5672")
 
+app = FastAPI(lifespan=router.lifespan_context)
+
 @router.event("test")
 async def hello(m: dict) -> dict:
      return { "response": "Hello Propan!" }

diff --git a/docs/docs/ru/CHANGELOG.md b/docs/docs/ru/CHANGELOG.md
@@ -74,10 +74,10 @@ propan create async [broker] [APPNAME]
 from fastapi import FastAPI
 from propan.fastapi import RabbitRouter
 
-app = FastAPI()
-
 router = RabbitRouter("amqp://guest:guest@localhost:5672")
 
+app = FastAPI(lifespan=router.lifespan_context)
+
 @router.event("test")
 async def hello(m: dict) -> dict:
     return { "response": "Hello, Propan!" }

diff --git a/docs/docs_src/index/kafka/05_native_fastapi.py b/docs/docs_src/index/kafka/05_native_fastapi.py
@@ -2,10 +2,10 @@
 from pydantic import BaseModel
 from propan.fastapi import KafkaRouter
 
-app = FastAPI()
-
 router = KafkaRouter("localhost:9092")
 
+app = FastAPI(lifespan=router.lifespan_context)
+
 class Incoming(BaseModel):
     m: dict
 

diff --git a/docs/docs_src/index/nats/05_native_fastapi.py b/docs/docs_src/index/nats/05_native_fastapi.py
@@ -2,10 +2,10 @@
 from pydantic import BaseModel
 from propan.fastapi import NatsRouter
 
-app = FastAPI()
-
 router = NatsRouter("nats://localhost:4222")
 
+app = FastAPI(lifespan=router.lifespan_context)
+
 class Incoming(BaseModel):
     m: dict
 

diff --git a/docs/docs_src/index/rabbit/05_native_fastapi.py b/docs/docs_src/index/rabbit/05_native_fastapi.py
@@ -2,10 +2,10 @@
 from pydantic import BaseModel
 from propan.fastapi import RabbitRouter
 
-app = FastAPI()
-
 router = RabbitRouter("amqp://guest:guest@localhost:5672")
 
+app = FastAPI(lifespan=router.lifespan_context)
+
 class Incoming(BaseModel):
     m: dict
 

diff --git a/docs/docs_src/index/redis/05_native_fastapi.py b/docs/docs_src/index/redis/05_native_fastapi.py
@@ -2,10 +2,10 @@
 from pydantic import BaseModel
 from propan.fastapi import RedisRouter
 
-app = FastAPI()
-
 router = RedisRouter("redis://localhost:6379")
 
+app = FastAPI(lifespan=router.lifespan_context)
+
 class Incoming(BaseModel):
     m: dict
 

diff --git a/docs/docs_src/index/sqs/05_native_fastapi.py b/docs/docs_src/index/sqs/05_native_fastapi.py
@@ -2,10 +2,10 @@
 from pydantic import BaseModel
 from propan.fastapi import SQSRouter
 
-app = FastAPI()
-
 router = SQSRouter("http://localhost:9324")
 
+app = FastAPI(lifespan=router.lifespan_context)
+
 class Incoming(BaseModel):
     m: dict
 

diff --git a/docs/docs_src/integrations/kafka/fastapi_plugin.py b/docs/docs_src/integrations/kafka/fastapi_plugin.py
@@ -2,10 +2,10 @@
 from pydantic import BaseModel
 from propan.fastapi import KafkaRouter
 
-app = FastAPI()
-
 router = KafkaRouter("localhost:9092")
 
+app = FastAPI(lifespan=router.lifespan_context)
+
 class Incoming(BaseModel):
     m: dict
 

diff --git a/docs/docs_src/integrations/kafka/fastapi_plugin_depends.py b/docs/docs_src/integrations/kafka/fastapi_plugin_depends.py
@@ -3,10 +3,10 @@
 from propan.fastapi import KafkaRouter
 from typing_extensions import Annotated
 
-app = FastAPI()
-
 router = KafkaRouter("localhost:9092")
 
+app = FastAPI(lifespan=router.lifespan_context)
+
 def broker():
     return router.broker
 

diff --git a/docs/docs_src/integrations/kafka/fastapi_plugin_send.py b/docs/docs_src/integrations/kafka/fastapi_plugin_send.py
@@ -1,10 +1,10 @@
 from fastapi import FastAPI
 from propan.fastapi import KafkaRouter
 
-app = FastAPI()
-
 router = KafkaRouter("localhost:9092")
 
+app = FastAPI(lifespan=router.lifespan_context)
+
 @router.get("/")
 async def hello_http():
     await router.broker.publish("Hello, Kafka!", "test")

diff --git a/docs/docs_src/integrations/nats/fastapi_plugin.py b/docs/docs_src/integrations/nats/fastapi_plugin.py
@@ -2,10 +2,10 @@
 from pydantic import BaseModel
 from propan.fastapi import NatsRouter
 
-app = FastAPI()
-
 router = NatsRouter("nats://localhost:4222")
 
+app = FastAPI(lifespan=router.lifespan_context)
+
 class Incoming(BaseModel):
     m: dict
 

diff --git a/docs/docs_src/integrations/nats/fastapi_plugin_depends.py b/docs/docs_src/integrations/nats/fastapi_plugin_depends.py
@@ -3,10 +3,10 @@
 from propan.fastapi import NatsRouter
 from typing_extensions import Annotated
 
-app = FastAPI()
-
 router = NatsRouter("nats://localhost:4222")
 
+app = FastAPI(lifespan=router.lifespan_context)
+
 def broker():
     return router.broker
 

diff --git a/docs/docs_src/integrations/nats/fastapi_plugin_send.py b/docs/docs_src/integrations/nats/fastapi_plugin_send.py
@@ -1,10 +1,10 @@
 from fastapi import FastAPI
 from propan.fastapi import NatsRouter
 
-app = FastAPI()
-
 router = NatsRouter("nats://localhost:4222")
 
+app = FastAPI(lifespan=router.lifespan_context)
+
 @router.get("/")
 async def hello_http():
     await router.broker.publish("Hello, Nats!", "test")

diff --git a/docs/docs_src/integrations/rabbit/fastapi_plugin.py b/docs/docs_src/integrations/rabbit/fastapi_plugin.py
@@ -2,10 +2,10 @@
 from pydantic import BaseModel
 from propan.fastapi import RabbitRouter
 
-app = FastAPI()
-
 router = RabbitRouter("amqp://guest:guest@localhost:5672")
 
+app = FastAPI(lifespan=router.lifespan_context)
+
 class Incoming(BaseModel):
     m: dict
 

diff --git a/docs/docs_src/integrations/rabbit/fastapi_plugin_depends.py b/docs/docs_src/integrations/rabbit/fastapi_plugin_depends.py
@@ -3,10 +3,10 @@
 from propan.fastapi import RabbitRouter
 from typing_extensions import Annotated
 
-app = FastAPI()
-
 router = RabbitRouter("amqp://guest:guest@localhost:5672")
 
+app = FastAPI(lifespan=router.lifespan_context)
+
 def broker():
     return router.broker
 

diff --git a/docs/docs_src/integrations/rabbit/fastapi_plugin_send.py b/docs/docs_src/integrations/rabbit/fastapi_plugin_send.py
@@ -1,10 +1,10 @@
 from fastapi import FastAPI
 from propan.fastapi import RabbitRouter
 
-app = FastAPI()
-
 router = RabbitRouter("amqp://guest:guest@localhost:5672")
 
+app = FastAPI(lifespan=router.lifespan_context)
+
 @router.get("/")
 async def hello_http():
     await router.broker.publish("Hello, Rabbit!", "test")

diff --git a/docs/docs_src/integrations/redis/fastapi_plugin.py b/docs/docs_src/integrations/redis/fastapi_plugin.py
@@ -2,10 +2,10 @@
 from pydantic import BaseModel
 from propan.fastapi import RedisRouter
 
-app = FastAPI()
-
 router = RedisRouter("redis://localhost:6379")
 
+app = FastAPI(lifespan=router.lifespan_context)
+
 class Incoming(BaseModel):
     m: dict
 

diff --git a/docs/docs_src/integrations/redis/fastapi_plugin_depends.py b/docs/docs_src/integrations/redis/fastapi_plugin_depends.py
@@ -3,10 +3,10 @@
 from propan.fastapi import RedisRouter
 from typing_extensions import Annotated
 
-app = FastAPI()
-
 router = RedisRouter("redis://localhost:6379")
 
+app = FastAPI(lifespan=router.lifespan_context)
+
 def broker():
     return router.broker
 

diff --git a/docs/docs_src/integrations/redis/fastapi_plugin_send.py b/docs/docs_src/integrations/redis/fastapi_plugin_send.py
@@ -1,10 +1,10 @@
 from fastapi import FastAPI
 from propan.fastapi import RedisRouter
 
-app = FastAPI()
-
 router = RedisRouter("redis://localhost:6379")
 
+app = FastAPI(lifespan=router.lifespan_context)
+
 @router.get("/")
 async def hello_http():
     await router.broker.publish("Hello, Redis!", "test")

diff --git a/docs/docs_src/integrations/sqs/fastapi_plugin.py b/docs/docs_src/integrations/sqs/fastapi_plugin.py
@@ -2,10 +2,10 @@
 from pydantic import BaseModel
 from propan.fastapi import SQSRouter
 
-app = FastAPI()
-
 router = SQSRouter("http://localhost:9324")
 
+app = FastAPI(lifespan=router.lifespan_context)
+
 class Incoming(BaseModel):
     m: dict
 

diff --git a/docs/docs_src/integrations/sqs/fastapi_plugin_depends.py b/docs/docs_src/integrations/sqs/fastapi_plugin_depends.py
@@ -3,10 +3,10 @@
 from propan.fastapi import SQSRouter
 from typing_extensions import Annotated
 
-app = FastAPI()
-
 router = SQSRouter("http://localhost:9324")
 
+app = FastAPI(lifespan=router.lifespan_context)
+
 def broker():
     return router.broker
 

diff --git a/docs/docs_src/integrations/sqs/fastapi_plugin_send.py b/docs/docs_src/integrations/sqs/fastapi_plugin_send.py
@@ -1,10 +1,10 @@
 from fastapi import FastAPI
 from propan.fastapi import SQSRouter
 
-app = FastAPI()
-
 router = SQSRouter("http://localhost:9324")
 
+app = FastAPI(lifespan=router.lifespan_context)
+
 @router.get("/")
 async def hello_http():
     await router.broker.publish("Hello, SQS!", "test")

diff --git a/propan/__about__.py b/propan/__about__.py
@@ -2,7 +2,7 @@
 
 from unittest.mock import Mock
 
-__version__ = "0.1.2.12"
+__version__ = "0.1.2.13"
 
 
 INSTALL_MESSAGE = (

diff --git a/propan/brokers/_model/broker_usecase.py b/propan/brokers/_model/broker_usecase.py
@@ -218,21 +218,19 @@ def _wrap_decode_message(
         params: Sequence[ModelField] = (),
         _raw: bool = False,
     ) -> Callable[[PropanMessage], Awaitable[T]]:
-        decode: Callable[
-            [PropanMessage], Awaitable[Union[PropanMessage, DecodedMessage]]
-        ]
-        if _raw is True:
-            decode = _fake_decode
-        else:
-            decode = self._decode_message
-
         is_unwrap = len(params) > 1
 
         @wraps(func)
         async def wrapper(message: PropanMessage) -> T:
-            msg = await decode(message)
-            if is_unwrap is True and isinstance(msg, Mapping):
+            msg = await self._decode_message(message)
+            message.decoded_body = msg
+
+            if _raw is True:
+                return await func(message)
+
+            elif is_unwrap is True and isinstance(msg, Mapping):
                 return await func(**msg)
+
             else:
                 return await func(msg)
 
@@ -287,7 +285,3 @@ def _log(
             self.logger.log(
                 level=(log_level or self.log_level), msg=message, extra=extra
             )
-
-
-async def _fake_decode(message: PropanMessage) -> PropanMessage:
-    return message
diff --git a/propan/brokers/_model/schemas.py b/propan/brokers/_model/schemas.py
@@ -71,3 +71,4 @@ class PropanMessage:
     reply_to: str = ""
     headers: AnyDict = Field(default_factory=dict)
     message_id: str = Field(default_factory=lambda: str(uuid4()))
+    decoded_body: Optional[DecodedMessage] = None
diff --git a/propan/fastapi/core/route.py b/propan/fastapi/core/route.py
@@ -1,7 +1,7 @@
 import asyncio
 import inspect
 from itertools import dropwhile
-from typing import Any, Callable, Coroutine, Optional, Union
+from typing import Any, Callable, Coroutine, Optional
 
 from fastapi.dependencies.models import Dependant
 from fastapi.dependencies.utils import get_dependant, solve_dependencies
@@ -73,7 +73,7 @@ def get_session(
         )
 
         async def app(message: NativeMessage) -> Any:
-            body: Union[AnyDict, bytes] = message.body
+            body = message.decoded_body
             if first_arg is not None:
                 if not isinstance(body, dict):  # pragma: no branch
                     body = {first_arg: body}