Address PR feedback (1)

Signed-off-by: Sergio Herrera <627709+seherv@users.noreply.github.com>

Author: seherv

.github/workflows/build-tag.yaml

@@ -97,6 +97,7 @@ jobs:
         # overwriting an existing release; replacing a tagged version's
         # contents requires bumping VERSION and re-tagging.
         twine upload --skip-existing dist/*
+    # TODO: remove in 1.20.
     # The previously-separate distributions (dapr-ext-fastapi, dapr-ext-grpc,
     # dapr-ext-langgraph, dapr-ext-strands, dapr-ext-workflow, flask-dapr)
     # are intentionally NOT republished. Bundling the extension code into

.gitignore

@@ -45,7 +45,6 @@ pip-delete-this-directory.txt
 
 # Unit test / coverage reports
 htmlcov/
-.tox/
 .nox/
 .coverage
 .coverage.*

dapr/__init__.py

@@ -13,6 +13,8 @@
 limitations under the License.
 """
 
+# TODO: remove in 1.20 (pre-1.19 dapr-ext-* / flask-dapr migration only).
+#
 # On import, checks for two states a legacy dapr-ext-* install could leave
 # the environment in.
 #

dapr/ext/fastapi/__init__.py

@@ -17,6 +17,8 @@
     from .actor import DaprActor
     from .app import DaprApp
 except ImportError as exc:
+    if exc.name != 'fastapi':
+        raise
     raise ImportError(
         f'dapr.ext.fastapi is missing an optional dependency ({exc.name!r}). '
         f'Install the extension with: pip install "dapr[fastapi]"'

dapr/ext/fastapi/actor.py

@@ -15,13 +15,14 @@
 
 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 APIRouter, FastAPI, Request, Response, status  # type: ignore
 from fastapi.logger import logger
 from fastapi.responses import JSONResponse
 
+from dapr.actor import Actor, ActorRuntime
+from dapr.clients.exceptions import ERROR_CODE_UNKNOWN, DaprInternalError
+from dapr.serializers import DefaultJSONSerializer
+
 DEFAULT_CONTENT_TYPE = 'application/json; utf-8'
 DAPR_REENTRANCY_ID_HEADER = 'Dapr-Reentrancy-Id'
 

dapr/ext/flask/__init__.py

@@ -17,6 +17,8 @@
     from .actor import DaprActor
     from .app import DaprApp
 except ImportError as exc:
+    if exc.name != 'flask':
+        raise
     raise ImportError(
         f'dapr.ext.flask is missing an optional dependency ({exc.name!r}). '
         f'Install the extension with: pip install "dapr[flask]"'

dapr/ext/flask/actor.py

@@ -16,10 +16,11 @@
 import asyncio
 from typing import Any, Optional, Type
 
+from flask import jsonify, make_response, request
+
 from dapr.actor import Actor, ActorRuntime
 from dapr.clients.exceptions import ERROR_CODE_UNKNOWN, DaprInternalError
 from dapr.serializers import DefaultJSONSerializer
-from flask import jsonify, make_response, request
 
 DEFAULT_CONTENT_TYPE = 'application/json; utf-8'
 DAPR_REENTRANCY_ID_HEADER = 'Dapr-Reentrancy-Id'

dapr/ext/grpc/__init__.py

@@ -20,6 +20,8 @@
 try:
     from dapr.ext.grpc.app import App, Rule  # type:ignore
 except ImportError as exc:
+    if exc.name != 'cloudevents':
+        raise
     raise ImportError(
         f'dapr.ext.grpc is missing an optional dependency ({exc.name!r}). '
         f'Install the extension with: pip install "dapr[grpc]"'

dapr/ext/grpc/_health_servicer.py

@@ -1,6 +1,7 @@
 from typing import Callable, Optional
 
 import grpc
+
 from dapr.proto import appcallback_service_v1
 from dapr.proto.runtime.v1.appcallback_pb2 import HealthCheckResponse
 

dapr/ext/grpc/_servicer.py

@@ -16,12 +16,12 @@
 import warnings
 from typing import Callable, Dict, List, Optional, Tuple, Union
 
+import grpc
 from cloudevents.sdk.event import v1  # type: ignore
 from google.protobuf import empty_pb2
 from google.protobuf.message import Message as GrpcMessage
 from google.protobuf.struct_pb2 import Struct
 
-import grpc
 from dapr.clients._constants import DEFAULT_JSON_CONTENT_TYPE
 from dapr.clients.grpc._request import BindingRequest, InvokeMethodRequest, JobEvent
 from dapr.clients.grpc._response import InvokeMethodResponse, TopicEventResponse