dapr-ext-fastapi-dev 1.15.0.dev43__tar.gz → 1.16.0.dev48__tar.gz

{dapr-ext-fastapi-dev-1.15.0.dev43 → dapr_ext_fastapi_dev-1.16.0.dev48}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: dapr-ext-fastapi-dev
-Version: 1.15.0.dev43
+Version: 1.16.0.dev48
 Summary: The developmental release for Dapr FastAPI extension.
 Home-page: https://dapr.io/
 Author: Dapr Authors
@@ -8,7 +8,6 @@ Author-email: daprweb@microsoft.com
 License: Apache
 Project-URL: Documentation, https://github.com/dapr/docs
 Project-URL: Source, https://github.com/dapr/python-sdk
-Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: Apache Software License
@@ -21,6 +20,11 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.9
 License-File: LICENSE
+Requires-Dist: dapr>=1.16.0.dev
+Requires-Dist: uvicorn>=0.11.6
+Requires-Dist: fastapi>=0.60.1
+Dynamic: description
+Dynamic: license-file
+Dynamic: summary
 
 This is the developmental release for Dapr FastAPI extension.
-

{dapr-ext-fastapi-dev-1.15.0.dev43 → dapr_ext_fastapi_dev-1.16.0.dev48}/dapr/ext/fastapi/__init__.py

@@ -16,5 +16,4 @@ limitations under the License.
 from .actor import DaprActor
 from .app import DaprApp
 
-
 __all__ = ['DaprActor', 'DaprApp']

{dapr-ext-fastapi-dev-1.15.0.dev43 → dapr_ext_fastapi_dev-1.16.0.dev48}/dapr/ext/fastapi/actor.py

@@ -13,12 +13,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-from typing import Any, Optional, Type, List
+from typing import Any, List, Optional, Type
 
 from dapr.actor import Actor, ActorRuntime
 from dapr.clients.exceptions import ERROR_CODE_UNKNOWN, DaprInternalError
 from dapr.serializers import DefaultJSONSerializer
-from fastapi import FastAPI, APIRouter, Request, Response, status  # type: ignore
+from fastapi import APIRouter, FastAPI, Request, Response, status  # type: ignore
 from fastapi.logger import logger
 from fastapi.responses import JSONResponse
 

{dapr-ext-fastapi-dev-1.15.0.dev43 → dapr_ext_fastapi_dev-1.16.0.dev48}/dapr/ext/fastapi/app.py

@@ -13,6 +13,7 @@ limitations under the License.
 """
 
 from typing import Dict, List, Optional
+
 from fastapi import FastAPI  # type: ignore
 
 

{dapr-ext-fastapi-dev-1.15.0.dev43 → dapr_ext_fastapi_dev-1.16.0.dev48}/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.15.0.dev'
+__version__ = '1.16.0.dev'

{dapr-ext-fastapi-dev-1.15.0.dev43 → dapr_ext_fastapi_dev-1.16.0.dev48}/dapr_ext_fastapi_dev.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: dapr-ext-fastapi-dev
-Version: 1.15.0.dev43
+Version: 1.16.0.dev48
 Summary: The developmental release for Dapr FastAPI extension.
 Home-page: https://dapr.io/
 Author: Dapr Authors
@@ -8,7 +8,6 @@ Author-email: daprweb@microsoft.com
 License: Apache
 Project-URL: Documentation, https://github.com/dapr/docs
 Project-URL: Source, https://github.com/dapr/python-sdk
-Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: Apache Software License
@@ -21,6 +20,11 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.9
 License-File: LICENSE
+Requires-Dist: dapr>=1.16.0.dev
+Requires-Dist: uvicorn>=0.11.6
+Requires-Dist: fastapi>=0.60.1
+Dynamic: description
+Dynamic: license-file
+Dynamic: summary
 
 This is the developmental release for Dapr FastAPI extension.
-

{dapr-ext-fastapi-dev-1.15.0.dev43 → dapr_ext_fastapi_dev-1.16.0.dev48}/dapr_ext_fastapi_dev.egg-info/SOURCES.txt

@@ -10,4 +10,6 @@ dapr_ext_fastapi_dev.egg-info/PKG-INFO
 dapr_ext_fastapi_dev.egg-info/SOURCES.txt
 dapr_ext_fastapi_dev.egg-info/dependency_links.txt
 dapr_ext_fastapi_dev.egg-info/requires.txt
-dapr_ext_fastapi_dev.egg-info/top_level.txt
+dapr_ext_fastapi_dev.egg-info/top_level.txt
+tests/test_app.py
+tests/test_dapractor.py

{dapr-ext-fastapi-dev-1.15.0.dev43 → dapr_ext_fastapi_dev-1.16.0.dev48}/dapr_ext_fastapi_dev.egg-info/requires.txt

@@ -1,3 +1,3 @@
-dapr-dev>=1.15.0.dev
+dapr>=1.16.0.dev
 uvicorn>=0.11.6
 fastapi>=0.60.1

{dapr-ext-fastapi-dev-1.15.0.dev43 → dapr_ext_fastapi_dev-1.16.0.dev48}/setup.cfg

@@ -24,7 +24,7 @@ python_requires = >=3.9
 packages = find_namespace:
 include_package_data = True
 install_requires = 
-	dapr-dev >= 1.15.0.dev
+	dapr >= 1.16.0.dev
 	uvicorn >= 0.11.6
 	fastapi >= 0.60.1
 

dapr_ext_fastapi_dev-1.16.0.dev48/tests/test_app.py

@@ -0,0 +1,156 @@
+import unittest
+
+from dapr.ext.fastapi import DaprApp
+from fastapi import FastAPI
+from fastapi.testclient import TestClient
+from pydantic import BaseModel
+
+
+class Message(BaseModel):
+    body: str
+
+
+class DaprAppTest(unittest.TestCase):
+    def setUp(self):
+        self.app = FastAPI()
+        self.dapr_app = DaprApp(self.app)
+        self.client = TestClient(self.app)
+
+    def test_subscribe_subscription_registered(self):
+        @self.dapr_app.subscribe(pubsub='pubsub', topic='test')
+        def event_handler(event_data: Message):
+            return 'default route'
+
+        self.assertEqual(len(self.dapr_app._subscriptions), 1)
+
+        self.assertIn('/dapr/subscribe', [route.path for route in self.app.router.routes])
+        self.assertIn('/events/pubsub/test', [route.path for route in self.app.router.routes])
+
+        response = self.client.get('/dapr/subscribe')
+        self.assertEqual(
+            [
+                {
+                    'pubsubname': 'pubsub',
+                    'topic': 'test',
+                    'route': '/events/pubsub/test',
+                    'metadata': {},
+                }
+            ],
+            response.json(),
+        )
+
+        response = self.client.post('/events/pubsub/test', json={'body': 'new message'})
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.text, '"default route"')
+
+    def test_subscribe_with_route_subscription_registered_with_custom_route(self):
+        @self.dapr_app.subscribe(pubsub='pubsub', topic='test', route='/do-something')
+        def event_handler(event_data: Message):
+            return 'custom route'
+
+        self.assertEqual(len(self.dapr_app._subscriptions), 1)
+
+        self.assertIn('/dapr/subscribe', [route.path for route in self.app.router.routes])
+        self.assertIn('/do-something', [route.path for route in self.app.router.routes])
+
+        response = self.client.get('/dapr/subscribe')
+        self.assertEqual(
+            [{'pubsubname': 'pubsub', 'topic': 'test', 'route': '/do-something', 'metadata': {}}],
+            response.json(),
+        )
+
+        response = self.client.post('/do-something', json={'body': 'new message'})
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.text, '"custom route"')
+
+    def test_subscribe_metadata(self):
+        handler_metadata = {'rawPayload': 'true'}
+
+        @self.dapr_app.subscribe(pubsub='pubsub', topic='test', metadata=handler_metadata)
+        def event_handler(event_data: Message):
+            return 'custom metadata'
+
+        self.assertEqual((self.dapr_app._subscriptions[0]['metadata']['rawPayload']), 'true')
+
+        response = self.client.get('/dapr/subscribe')
+        self.assertEqual(
+            [
+                {
+                    'pubsubname': 'pubsub',
+                    'topic': 'test',
+                    'route': '/events/pubsub/test',
+                    'metadata': {'rawPayload': 'true'},
+                }
+            ],
+            response.json(),
+        )
+
+        response = self.client.post('/events/pubsub/test', json={'body': 'new message'})
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.text, '"custom metadata"')
+
+    def test_router_tag(self):
+        app1 = FastAPI()
+        app2 = FastAPI()
+        app3 = FastAPI()
+        DaprApp(app_instance=app1, router_tags=['MyTag', 'PubSub']).subscribe(
+            pubsub='mypubsub', topic='test'
+        )
+        DaprApp(app_instance=app2).subscribe(pubsub='mypubsub', topic='test')
+        DaprApp(app_instance=app3, router_tags=None).subscribe(pubsub='mypubsub', topic='test')
+
+        PATHS_WITH_EXPECTED_TAGS = ['/dapr/subscribe', '/events/mypubsub/test']
+
+        foundTags = False
+        for route in app1.router.routes:
+            if hasattr(route, 'tags'):
+                self.assertIn(route.path, PATHS_WITH_EXPECTED_TAGS)
+                self.assertEqual(['MyTag', 'PubSub'], route.tags)
+                foundTags = True
+        if not foundTags:
+            self.fail('No tags found')
+
+        foundTags = False
+        for route in app2.router.routes:
+            if hasattr(route, 'tags'):
+                self.assertIn(route.path, PATHS_WITH_EXPECTED_TAGS)
+                self.assertEqual(['PubSub'], route.tags)
+                foundTags = True
+        if not foundTags:
+            self.fail('No tags found')
+
+        for route in app3.router.routes:
+            if hasattr(route, 'tags'):
+                if len(route.tags) > 0:
+                    self.fail('Found tags on route that should not have any')
+
+    def test_subscribe_dead_letter(self):
+        dead_letter_topic = 'dead-test'
+
+        @self.dapr_app.subscribe(pubsub='pubsub', topic='test', dead_letter_topic=dead_letter_topic)
+        def event_handler(event_data: Message):
+            return 'dead letter test'
+
+        self.assertEqual((self.dapr_app._subscriptions[0]['deadLetterTopic']), dead_letter_topic)
+
+        response = self.client.get('/dapr/subscribe')
+        self.assertEqual(
+            [
+                {
+                    'pubsubname': 'pubsub',
+                    'topic': 'test',
+                    'route': '/events/pubsub/test',
+                    'metadata': {},
+                    'deadLetterTopic': dead_letter_topic,
+                }
+            ],
+            response.json(),
+        )
+
+        response = self.client.post('/events/pubsub/test', json={'body': 'new message'})
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.text, '"dead letter test"')
+
+
+if __name__ == '__main__':
+    unittest.main()

dapr_ext_fastapi_dev-1.16.0.dev48/tests/test_dapractor.py

@@ -0,0 +1,88 @@
+# -*- coding: utf-8 -*-
+
+"""
+Copyright 2023 The Dapr Authors
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
+
+import json
+import unittest
+
+from dapr.ext.fastapi.actor import DaprActor, _wrap_response
+from fastapi import FastAPI
+
+
+class DaprActorTest(unittest.TestCase):
+    def test_wrap_response_str(self):
+        r = _wrap_response(200, 'fake_message')
+        self.assertEqual({'message': 'fake_message'}, json.loads(r.body))
+        self.assertEqual(200, r.status_code)
+
+    def test_wrap_response_str_err(self):
+        r = _wrap_response(400, 'fake_message', 'ERR_FAKE')
+        self.assertEqual({'message': 'fake_message', 'errorCode': 'ERR_FAKE'}, json.loads(r.body))
+        self.assertEqual(400, r.status_code)
+
+    def test_wrap_response_bytes_text(self):
+        r = _wrap_response(200, b'fake_bytes_message', content_type='text/plain')
+        self.assertEqual(b'fake_bytes_message', r.body)
+        self.assertEqual(200, r.status_code)
+        self.assertEqual('text/plain', r.media_type)
+
+    def test_wrap_response_obj(self):
+        fake_data = {'message': 'ok'}
+        r = _wrap_response(200, fake_data)
+        self.assertEqual(fake_data, json.loads(r.body))
+        self.assertEqual(200, r.status_code)
+
+    def test_router_tag(self):
+        app1 = FastAPI()
+        app2 = FastAPI()
+        app3 = FastAPI()
+        DaprActor(app=app1, router_tags=['MyTag', 'Actor'])
+        DaprActor(app=app2)
+        DaprActor(app=app3, router_tags=None)
+
+        PATHS_WITH_EXPECTED_TAGS = [
+            '/healthz',
+            '/dapr/config',
+            '/actors/{actor_type_name}/{actor_id}',
+            '/actors/{actor_type_name}/{actor_id}/method/{method_name}',
+            '/actors/{actor_type_name}/{actor_id}/method/timer/{timer_name}',
+            '/actors/{actor_type_name}/{actor_id}/method/remind/{reminder_name}',
+        ]
+
+        foundTags = False
+        for route in app1.router.routes:
+            if hasattr(route, 'tags'):
+                self.assertIn(route.path, PATHS_WITH_EXPECTED_TAGS)
+                self.assertEqual(['MyTag', 'Actor'], route.tags)
+                foundTags = True
+        if not foundTags:
+            self.fail('No tags found')
+
+        foundTags = False
+        for route in app2.router.routes:
+            if hasattr(route, 'tags'):
+                self.assertIn(route.path, PATHS_WITH_EXPECTED_TAGS)
+                self.assertEqual(['Actor'], route.tags)
+                foundTags = True
+        if not foundTags:
+            self.fail('No tags found')
+
+        for route in app3.router.routes:
+            if hasattr(route, 'tags'):
+                if len(route.tags) > 0:
+                    self.fail('Found tags on route that should not have any')
+
+
+if __name__ == '__main__':
+    unittest.main()