dapr-ext-fastapi-dev 1.11.0rc1.dev1781__py3-none-any.whl → 1.14.0rc1.dev2__py3-none-any.whl

dapr/ext/fastapi/__init__.py

@@ -17,7 +17,4 @@ from .actor import DaprActor
 from .app import DaprApp
 
 
-__all__ = [
-    'DaprActor',
-    'DaprApp'
-]
+__all__ = ['DaprActor', 'DaprApp']

dapr/ext/fastapi/actor.py

@@ -15,7 +15,7 @@ limitations under the License.
 
 from typing import Any, Optional, Type, List
 
-from fastapi import FastAPI, APIRouter, Request, Response, status   # type: ignore
+from fastapi import FastAPI, APIRouter, Request, Response, status  # type: ignore
 from fastapi.logger import logger
 from fastapi.responses import JSONResponse
 
@@ -23,15 +23,16 @@ from dapr.actor import Actor, ActorRuntime
 from dapr.clients.exceptions import DaprInternalError, ERROR_CODE_UNKNOWN
 from dapr.serializers import DefaultJSONSerializer
 
-DEFAULT_CONTENT_TYPE = "application/json; utf-8"
+DEFAULT_CONTENT_TYPE = 'application/json; utf-8'
 DAPR_REENTRANCY_ID_HEADER = 'Dapr-Reentrancy-Id'
 
 
 def _wrap_response(
-        status_code: int,
-        msg: Any,
-        error_code: Optional[str] = None,
-        content_type: Optional[str] = DEFAULT_CONTENT_TYPE):
+    status_code: int,
+    msg: Any,
+    error_code: Optional[str] = None,
+    content_type: Optional[str] = DEFAULT_CONTENT_TYPE,
+):
     resp = None
     if isinstance(msg, str):
         response_obj = {
@@ -48,9 +49,7 @@ def _wrap_response(
 
 
 class DaprActor(object):
-
-    def __init__(self, app: FastAPI,
-                 router_tags: Optional[List[str]] = ['Actor']):
+    def __init__(self, app: FastAPI, router_tags: Optional[List[str]] = ['Actor']):
         # router_tags should be added to all magic Dapr Actor methods implemented here
         self._router_tags = router_tags
         self._router = APIRouter()
@@ -59,7 +58,7 @@ class DaprActor(object):
         app.include_router(self._router)
 
     def init_routes(self, router: APIRouter):
-        @router.get("/healthz", tags=self._router_tags)
+        @router.get('/healthz', tags=self._router_tags)
         async def healthz():
             return {'status': 'ok'}
 
@@ -73,96 +72,83 @@ class DaprActor(object):
             try:
                 await ActorRuntime.deactivate(actor_type_name, actor_id)
             except DaprInternalError as ex:
-                return _wrap_response(
-                    status.HTTP_500_INTERNAL_SERVER_ERROR,
-                    ex.as_dict())
+                return _wrap_response(status.HTTP_500_INTERNAL_SERVER_ERROR, ex.as_dict())
             except Exception as ex:
                 return _wrap_response(
-                    status.HTTP_500_INTERNAL_SERVER_ERROR,
-                    repr(ex),
-                    ERROR_CODE_UNKNOWN)
+                    status.HTTP_500_INTERNAL_SERVER_ERROR, repr(ex), ERROR_CODE_UNKNOWN
+                )
 
             msg = f'deactivated actor: {actor_type_name}.{actor_id}'
             logger.debug(msg)
             return _wrap_response(status.HTTP_200_OK, msg)
 
-        @router.put('/actors/{actor_type_name}/{actor_id}/method/{method_name}',
-                    tags=self._router_tags)
+        @router.put(
+            '/actors/{actor_type_name}/{actor_id}/method/{method_name}', tags=self._router_tags
+        )
         async def actor_method(
-                actor_type_name: str,
-                actor_id: str,
-                method_name: str,
-                request: Request):
+            actor_type_name: str, actor_id: str, method_name: str, request: Request
+        ):
             try:
                 # Read raw bytes from request stream
                 req_body = await request.body()
                 reentrancy_id = request.headers.get(DAPR_REENTRANCY_ID_HEADER)
                 result = await ActorRuntime.dispatch(
-                    actor_type_name, actor_id, method_name, req_body, reentrancy_id)
+                    actor_type_name, actor_id, method_name, req_body, reentrancy_id
+                )
             except DaprInternalError as ex:
-                return _wrap_response(
-                    status.HTTP_500_INTERNAL_SERVER_ERROR, ex.as_dict())
+                return _wrap_response(status.HTTP_500_INTERNAL_SERVER_ERROR, ex.as_dict())
             except Exception as ex:
                 return _wrap_response(
-                    status.HTTP_500_INTERNAL_SERVER_ERROR,
-                    repr(ex),
-                    ERROR_CODE_UNKNOWN)
+                    status.HTTP_500_INTERNAL_SERVER_ERROR, repr(ex), ERROR_CODE_UNKNOWN
+                )
 
             msg = f'called method. actor: {actor_type_name}.{actor_id}, method: {method_name}'
             logger.debug(msg)
             return _wrap_response(status.HTTP_200_OK, result)
 
-        @router.put('/actors/{actor_type_name}/{actor_id}/method/timer/{timer_name}',
-                    tags=self._router_tags)
+        @router.put(
+            '/actors/{actor_type_name}/{actor_id}/method/timer/{timer_name}', tags=self._router_tags
+        )
         async def actor_timer(
-                actor_type_name: str,
-                actor_id: str,
-                timer_name: str,
-                request: Request):
+            actor_type_name: str, actor_id: str, timer_name: str, request: Request
+        ):
             try:
                 # Read raw bytes from request stream
                 req_body = await request.body()
                 await ActorRuntime.fire_timer(actor_type_name, actor_id, timer_name, req_body)
             except DaprInternalError as ex:
-                return _wrap_response(
-                    status.HTTP_500_INTERNAL_SERVER_ERROR,
-                    ex.as_dict())
+                return _wrap_response(status.HTTP_500_INTERNAL_SERVER_ERROR, ex.as_dict())
             except Exception as ex:
                 return _wrap_response(
-                    status.HTTP_500_INTERNAL_SERVER_ERROR,
-                    repr(ex),
-                    ERROR_CODE_UNKNOWN)
+                    status.HTTP_500_INTERNAL_SERVER_ERROR, repr(ex), ERROR_CODE_UNKNOWN
+                )
 
             msg = f'called timer. actor: {actor_type_name}.{actor_id}, timer: {timer_name}'
             logger.debug(msg)
             return _wrap_response(status.HTTP_200_OK, msg)
 
-        @router.put('/actors/{actor_type_name}/{actor_id}/method/remind/{reminder_name}',
-                    tags=self._router_tags)
+        @router.put(
+            '/actors/{actor_type_name}/{actor_id}/method/remind/{reminder_name}',
+            tags=self._router_tags,
+        )
         async def actor_reminder(
-                actor_type_name: str,
-                actor_id: str,
-                reminder_name: str,
-                request: Request):
+            actor_type_name: str, actor_id: str, reminder_name: str, request: Request
+        ):
             try:
                 # Read raw bytes from request stream
                 req_body = await request.body()
-                await ActorRuntime.fire_reminder(
-                    actor_type_name, actor_id, reminder_name, req_body)
+                await ActorRuntime.fire_reminder(actor_type_name, actor_id, reminder_name, req_body)
             except DaprInternalError as ex:
-                return _wrap_response(
-                    status.HTTP_500_INTERNAL_SERVER_ERROR,
-                    ex.as_dict())
+                return _wrap_response(status.HTTP_500_INTERNAL_SERVER_ERROR, ex.as_dict())
             except Exception as ex:
                 return _wrap_response(
-                    status.HTTP_500_INTERNAL_SERVER_ERROR,
-                    repr(ex),
-                    ERROR_CODE_UNKNOWN)
+                    status.HTTP_500_INTERNAL_SERVER_ERROR, repr(ex), ERROR_CODE_UNKNOWN
+                )
 
             msg = f'called reminder. actor: {actor_type_name}.{actor_id}, reminder: {reminder_name}'
             logger.debug(msg)
             return _wrap_response(status.HTTP_200_OK, msg)
 
-    async def register_actor(self, actor: Type[Actor]) -> None:
-        await ActorRuntime.register_actor(actor)
+    async def register_actor(self, actor: Type[Actor], **kwargs) -> None:
+        await ActorRuntime.register_actor(actor, **kwargs)
         logger.debug(f'registered actor: {actor.__class__.__name__}')

dapr/ext/fastapi/app.py

@@ -24,24 +24,24 @@ class DaprApp:
         app_instance: The FastAPI instance to wrap.
     """
 
-    def __init__(self, app_instance: FastAPI,
-                 router_tags: Optional[List[str]] = ['PubSub']):
+    def __init__(self, app_instance: FastAPI, router_tags: Optional[List[str]] = ['PubSub']):
         # The router_tags should be added to all magic Dapr App PubSub methods implemented here
         self._router_tags = router_tags
         self._app = app_instance
         self._subscriptions: List[Dict[str, object]] = []
 
-        self._app.add_api_route("/dapr/subscribe",
-                                self._get_subscriptions,
-                                methods=["GET"],
-                                tags=self._router_tags)
-
-    def subscribe(self,
-                  pubsub: str,
-                  topic: str,
-                  metadata: Optional[Dict[str, str]] = {},
-                  route: Optional[str] = None,
-                  dead_letter_topic: Optional[str] = None):
+        self._app.add_api_route(
+            '/dapr/subscribe', self._get_subscriptions, methods=['GET'], tags=self._router_tags
+        )
+
+    def subscribe(
+        self,
+        pubsub: str,
+        topic: str,
+        metadata: Optional[Dict[str, str]] = {},
+        route: Optional[str] = None,
+        dead_letter_topic: Optional[str] = None,
+    ):
         """
         Subscribes to a topic on a pub/sub component.
 
@@ -73,21 +73,27 @@ class DaprApp:
         Returns:
             The decorator for the function.
         """
+
         def decorator(func):
-            event_handler_route = f"/events/{pubsub}/{topic}" if route is None else route
-
-            self._app.add_api_route(event_handler_route,
-                                    func,
-                                    methods=["POST"],
-                                    tags=self._router_tags)
-
-            self._subscriptions.append({
-                "pubsubname": pubsub,
-                "topic": topic,
-                "route": event_handler_route,
-                "metadata": metadata,
-                **({"deadLetterTopic": dead_letter_topic} if dead_letter_topic is not None else {})
-            })
+            event_handler_route = f'/events/{pubsub}/{topic}' if route is None else route
+
+            self._app.add_api_route(
+                event_handler_route, func, methods=['POST'], tags=self._router_tags
+            )
+
+            self._subscriptions.append(
+                {
+                    'pubsubname': pubsub,
+                    'topic': topic,
+                    'route': event_handler_route,
+                    'metadata': metadata,
+                    **(
+                        {'deadLetterTopic': dead_letter_topic}
+                        if dead_letter_topic is not None
+                        else {}
+                    ),
+                }
+            )
 
         return decorator
 

dapr/ext/fastapi/version.py

@@ -13,4 +13,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-__version__ = "1.11.0rc1.dev"
+__version__ = '1.14.0rc1.dev'

{dapr_ext_fastapi_dev-1.11.0rc1.dev1781.dist-info → dapr_ext_fastapi_dev-1.14.0rc1.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dapr-ext-fastapi-dev
-Version: 1.11.0rc1.dev1781
+Version: 1.14.0rc1.dev2
 Summary: The developmental release for Dapr FastAPI extension.
 Home-page: https://dapr.io/
 Author: Dapr Authors
@@ -21,7 +21,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.8
 License-File: LICENSE
-Requires-Dist: dapr-dev >=1.11.0rc1.dev
+Requires-Dist: dapr-dev >=1.13.0rc1.dev
 Requires-Dist: uvicorn >=0.11.6
 Requires-Dist: fastapi >=0.60.1
 

dapr_ext_fastapi_dev-1.14.0rc1.dev2.dist-info/RECORD

@@ -0,0 +1,9 @@
+dapr/ext/fastapi/__init__.py,sha256=fs-DJZe2wY4zn7jC9KfpSLP0RJKrAekfbfyxW-dsZO8,679
+dapr/ext/fastapi/actor.py,sha256=Tu7-k3ulJfbsp5UrGAIA8LOp0DbGtwfLxgUnxRlZnlc,6558
+dapr/ext/fastapi/app.py,sha256=npOC9jEaycXCADiF6w-ENtLJrluPOuG6WRmKr1ldIm8,3747
+dapr/ext/fastapi/version.py,sha256=-RfJ_K9ZWVu8wf99edkDO56-_mci9MgDvADnB7FTX7o,618
+dapr_ext_fastapi_dev-1.14.0rc1.dev2.dist-info/LICENSE,sha256=D-QjNdE9_ypCaJn2kkQy-AYHZZ_x5aozSpR7Q1CpbRs,11377
+dapr_ext_fastapi_dev-1.14.0rc1.dev2.dist-info/METADATA,sha256=mWW33ilIbw8gje27n31CKQ2c8y1lqyh4Fn_MYrAJAAE,1087
+dapr_ext_fastapi_dev-1.14.0rc1.dev2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+dapr_ext_fastapi_dev-1.14.0rc1.dev2.dist-info/top_level.txt,sha256=iLDu9C_1nUTIsa3H4jMbuHuF-zs0opkitR7p7PCPYz0,5
+dapr_ext_fastapi_dev-1.14.0rc1.dev2.dist-info/RECORD,,

{dapr_ext_fastapi_dev-1.11.0rc1.dev1781.dist-info → dapr_ext_fastapi_dev-1.14.0rc1.dev2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: bdist_wheel (0.43.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

dapr_ext_fastapi_dev-1.11.0rc1.dev1781.dist-info/RECORD

@@ -1,9 +0,0 @@
-dapr/ext/fastapi/__init__.py,sha256=yTwj4FKfaSEsCQWNfqQd90QPP-lj_oguy7XDgyVWRkc,689
-dapr/ext/fastapi/actor.py,sha256=7mNs2EWbyk8C6q2C2Bd4JJ8WCKtJWYo0th_tRBo5Ypc,6921
-dapr/ext/fastapi/app.py,sha256=kAYZfv-ojAg3KhaFl3j3m_wCB3tPNL-6EGd8aAuzBIY,3795
-dapr/ext/fastapi/version.py,sha256=eYG8e0Uz0mlvNQDkrI6h7K21WOnyUFy2vbl5ChTd82U,618
-dapr_ext_fastapi_dev-1.11.0rc1.dev1781.dist-info/LICENSE,sha256=D-QjNdE9_ypCaJn2kkQy-AYHZZ_x5aozSpR7Q1CpbRs,11377
-dapr_ext_fastapi_dev-1.11.0rc1.dev1781.dist-info/METADATA,sha256=b4FjSvdRr987nlbVW2tEob143GuoTUyIwbyQqposfVM,1090
-dapr_ext_fastapi_dev-1.11.0rc1.dev1781.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-dapr_ext_fastapi_dev-1.11.0rc1.dev1781.dist-info/top_level.txt,sha256=iLDu9C_1nUTIsa3H4jMbuHuF-zs0opkitR7p7PCPYz0,5
-dapr_ext_fastapi_dev-1.11.0rc1.dev1781.dist-info/RECORD,,