add grpc keepalive/retry + Lint - Optimize imports

dapr/actor/__init__.py

@@ -20,7 +20,6 @@
 from dapr.actor.runtime.remindable import Remindable
 from dapr.actor.runtime.runtime import ActorRuntime
 
-
 __all__ = [
     'ActorInterface',
     'ActorProxy',

dapr/actor/client/proxy.py

@@ -21,8 +21,8 @@
 from dapr.actor.runtime._type_utils import get_dispatchable_attrs_from_interface
 from dapr.clients import DaprActorClientBase, DaprActorHttpClient
 from dapr.clients.retry import RetryPolicy
-from dapr.serializers import Serializer, DefaultJSONSerializer
 from dapr.conf import settings
+from dapr.serializers import DefaultJSONSerializer, Serializer
 
 # Actor factory Callable type hint.
 ACTOR_FACTORY_CALLBACK = Callable[[ActorInterface, str, str], 'ActorProxy']
@@ -35,8 +35,7 @@ def create(
         actor_type: str,
         actor_id: ActorId,
         actor_interface: Optional[Type[ActorInterface]] = None,
-    ) -> 'ActorProxy':
-        ...
+    ) -> 'ActorProxy': ...
 
 
 class ActorProxyFactory(ActorFactoryBase):

dapr/actor/runtime/_reminder_data.py

@@ -14,7 +14,6 @@
 """
 
 import base64
-
 from datetime import timedelta
 from typing import Any, Dict, Optional
 

dapr/actor/runtime/_state_provider.py

@@ -14,12 +14,11 @@
 """
 
 import io
+from typing import Any, List, Tuple, Type
 
-from typing import Any, List, Type, Tuple
-from dapr.actor.runtime.state_change import StateChangeKind, ActorStateChange
+from dapr.actor.runtime.state_change import ActorStateChange, StateChangeKind
 from dapr.clients.base import DaprActorClientBase
-from dapr.serializers import Serializer, DefaultJSONSerializer
-
+from dapr.serializers import DefaultJSONSerializer, Serializer
 
 # Mapping StateChangeKind to Dapr State Operation
 _MAP_CHANGE_KIND_TO_OPERATION = {

dapr/actor/runtime/_type_information.py

@@ -13,10 +13,10 @@
 limitations under the License.
 """
 
-from dapr.actor.runtime.remindable import Remindable
-from dapr.actor.runtime._type_utils import is_dapr_actor, get_actor_interfaces
+from typing import TYPE_CHECKING, List, Type
 
-from typing import List, Type, TYPE_CHECKING
+from dapr.actor.runtime._type_utils import get_actor_interfaces, is_dapr_actor
+from dapr.actor.runtime.remindable import Remindable
 
 if TYPE_CHECKING:
     from dapr.actor.actor_interface import ActorInterface  # noqa: F401

dapr/actor/runtime/actor.py

@@ -14,16 +14,15 @@
 """
 
 import uuid
-
 from datetime import timedelta
 from typing import Any, Optional
 
 from dapr.actor.id import ActorId
 from dapr.actor.runtime._method_context import ActorMethodContext
-from dapr.actor.runtime.context import ActorRuntimeContext
-from dapr.actor.runtime.state_manager import ActorStateManager
 from dapr.actor.runtime._reminder_data import ActorReminderData
 from dapr.actor.runtime._timer_data import TIMER_CALLBACK, ActorTimerData
+from dapr.actor.runtime.context import ActorRuntimeContext
+from dapr.actor.runtime.state_manager import ActorStateManager
 
 
 class Actor:

dapr/actor/runtime/context.py

@@ -13,16 +13,16 @@
 limitations under the License.
 """
 
+from typing import TYPE_CHECKING, Callable, Optional
+
 from dapr.actor.id import ActorId
 from dapr.actor.runtime._state_provider import StateProvider
 from dapr.clients.base import DaprActorClientBase
 from dapr.serializers import Serializer
 
-from typing import Callable, Optional, TYPE_CHECKING
-
 if TYPE_CHECKING:
-    from dapr.actor.runtime.actor import Actor
     from dapr.actor.runtime._type_information import ActorTypeInformation
+    from dapr.actor.runtime.actor import Actor
 
 
 class ActorRuntimeContext:

dapr/actor/runtime/manager.py

@@ -15,17 +15,16 @@
 
 import asyncio
 import uuid
-
 from typing import Any, Callable, Coroutine, Dict, Optional
 
 from dapr.actor.id import ActorId
-from dapr.clients.exceptions import DaprInternalError
+from dapr.actor.runtime._method_context import ActorMethodContext
+from dapr.actor.runtime._reminder_data import ActorReminderData
 from dapr.actor.runtime.actor import Actor
 from dapr.actor.runtime.context import ActorRuntimeContext
-from dapr.actor.runtime._method_context import ActorMethodContext
 from dapr.actor.runtime.method_dispatcher import ActorMethodDispatcher
-from dapr.actor.runtime._reminder_data import ActorReminderData
 from dapr.actor.runtime.reentrancy_context import reentrancy_ctx
+from dapr.clients.exceptions import DaprInternalError
 
 TIMER_METHOD_NAME = 'fire_timer'
 REMINDER_METHOD_NAME = 'receive_reminder'

dapr/actor/runtime/method_dispatcher.py

@@ -14,9 +14,10 @@
 """
 
 from typing import Any, Dict, List
-from dapr.actor.runtime.actor import Actor
+
 from dapr.actor.runtime._type_information import ActorTypeInformation
 from dapr.actor.runtime._type_utils import get_dispatchable_attrs
+from dapr.actor.runtime.actor import Actor
 
 
 class ActorMethodDispatcher:

dapr/actor/runtime/reentrancy_context.py

@@ -13,7 +13,7 @@
 limitations under the License.
 """
 
-from typing import Optional
 from contextvars import ContextVar
+from typing import Optional
 
 reentrancy_ctx: ContextVar[Optional[str]] = ContextVar('reentrancy_ctx', default=None)

dapr/actor/runtime/runtime.py

@@ -14,20 +14,18 @@
 """
 
 import asyncio
-
-from typing import Dict, List, Optional, Type, Callable
+from typing import Callable, Dict, List, Optional, Type
 
 from dapr.actor.id import ActorId
+from dapr.actor.runtime._type_information import ActorTypeInformation
 from dapr.actor.runtime.actor import Actor
 from dapr.actor.runtime.config import ActorRuntimeConfig
 from dapr.actor.runtime.context import ActorRuntimeContext
-from dapr.actor.runtime._type_information import ActorTypeInformation
 from dapr.actor.runtime.manager import ActorManager
+from dapr.actor.runtime.reentrancy_context import reentrancy_ctx
 from dapr.clients.http.dapr_actor_http_client import DaprActorHttpClient
-from dapr.serializers import Serializer, DefaultJSONSerializer
 from dapr.conf import settings
-
-from dapr.actor.runtime.reentrancy_context import reentrancy_ctx
+from dapr.serializers import DefaultJSONSerializer, Serializer
 
 
 class ActorRuntime:

dapr/actor/runtime/state_change.py

@@ -14,7 +14,7 @@
 """
 
 from enum import Enum
-from typing import TypeVar, Generic, Optional
+from typing import Generic, Optional, TypeVar
 
 T = TypeVar('T')
 

dapr/aio/clients/__init__.py

@@ -15,14 +15,15 @@
 
 from typing import Callable, Dict, List, Optional, Union
 
+from google.protobuf.message import Message as GrpcMessage
+
+from dapr.aio.clients.grpc.client import DaprGrpcClientAsync, InvokeMethodResponse, MetadataTuple
 from dapr.clients.base import DaprActorClientBase
-from dapr.clients.exceptions import DaprInternalError, ERROR_CODE_UNKNOWN
-from dapr.aio.clients.grpc.client import DaprGrpcClientAsync, MetadataTuple, InvokeMethodResponse
-from dapr.clients.grpc._jobs import Job, FailurePolicy, DropFailurePolicy, ConstantFailurePolicy
+from dapr.clients.exceptions import ERROR_CODE_UNKNOWN, DaprInternalError
+from dapr.clients.grpc._jobs import ConstantFailurePolicy, DropFailurePolicy, FailurePolicy, Job
 from dapr.clients.http.dapr_actor_http_client import DaprActorHttpClient
 from dapr.clients.http.dapr_invocation_http_client import DaprInvocationHttpClient
 from dapr.conf import settings
-from google.protobuf.message import Message as GrpcMessage
 
 __all__ = [
     'DaprClient',
@@ -37,10 +38,10 @@
 ]
 
 from grpc.aio import (  # type: ignore
-    UnaryUnaryClientInterceptor,
-    UnaryStreamClientInterceptor,
-    StreamUnaryClientInterceptor,
     StreamStreamClientInterceptor,
+    StreamUnaryClientInterceptor,
+    UnaryStreamClientInterceptor,
+    UnaryUnaryClientInterceptor,
 )
 
 

dapr/aio/clients/grpc/_request.py

@@ -16,7 +16,7 @@
 import io
 from typing import Union
 
-from dapr.clients.grpc._crypto import EncryptOptions, DecryptOptions
+from dapr.clients.grpc._crypto import DecryptOptions, EncryptOptions
 from dapr.clients.grpc._helpers import to_bytes
 from dapr.clients.grpc._request import DaprRequest
 from dapr.proto import api_v1, common_v1

dapr/aio/clients/grpc/_response.py

@@ -15,8 +15,8 @@
 
 from typing import AsyncGenerator, Generic
 
-from dapr.proto import api_v1
 from dapr.clients.grpc._response import DaprResponse, TCryptoResponse
+from dapr.proto import api_v1
 
 
 class CryptoResponse(DaprResponse, Generic[TCryptoResponse]):
@@ -83,9 +83,7 @@ async def read(self, size: int = -1) -> bytes:
         return data[:size]
 
 
-class EncryptResponse(CryptoResponse[api_v1.EncryptResponse]):
-    ...
+class EncryptResponse(CryptoResponse[api_v1.EncryptResponse]): ...
 
 
-class DecryptResponse(CryptoResponse[api_v1.DecryptResponse]):
-    ...
+class DecryptResponse(CryptoResponse[api_v1.DecryptResponse]): ...

dapr/aio/clients/grpc/client.py

@@ -14,96 +14,90 @@
 """
 
 import asyncio
-import time
-import socket
 import json
+import socket
+import time
 import uuid
-
 from datetime import datetime
+from typing import Any, Awaitable, Callable, Dict, List, Optional, Sequence, Text, Union
 from urllib.parse import urlencode
-
 from warnings import warn
 
-from typing import Callable, Dict, Optional, Text, Union, Sequence, List, Any, Awaitable
-from typing_extensions import Self
-
-from google.protobuf.message import Message as GrpcMessage
-from google.protobuf.empty_pb2 import Empty as GrpcEmpty
-from google.protobuf.any_pb2 import Any as GrpcAny
-
 import grpc.aio  # type: ignore
+from google.protobuf.any_pb2 import Any as GrpcAny
+from google.protobuf.empty_pb2 import Empty as GrpcEmpty
+from google.protobuf.message import Message as GrpcMessage
 from grpc.aio import (  # type: ignore
-    UnaryUnaryClientInterceptor,
-    UnaryStreamClientInterceptor,
-    StreamUnaryClientInterceptor,
-    StreamStreamClientInterceptor,
     AioRpcError,
+    StreamStreamClientInterceptor,
+    StreamUnaryClientInterceptor,
+    UnaryStreamClientInterceptor,
+    UnaryUnaryClientInterceptor,
 )
+from typing_extensions import Self
 
-from dapr.aio.clients.grpc.subscription import Subscription
-from dapr.clients.exceptions import DaprInternalError, DaprGrpcError
-from dapr.clients.grpc._crypto import EncryptOptions, DecryptOptions
-from dapr.clients.grpc._state import StateOptions, StateItem
-from dapr.clients.grpc._helpers import getWorkflowRuntimeStatus
-from dapr.clients.health import DaprHealth
-from dapr.clients.retry import RetryPolicy
-from dapr.common.pubsub.subscription import StreamInactiveError
-from dapr.conf.helpers import GrpcEndpoint
-from dapr.conf import settings
-from dapr.proto import api_v1, api_service_v1, common_v1
-from dapr.proto.runtime.v1.dapr_pb2 import UnsubscribeConfigurationResponse
-from dapr.version import __version__
-
+from dapr.aio.clients.grpc._request import (
+    DecryptRequestIterator,
+    EncryptRequestIterator,
+)
+from dapr.aio.clients.grpc._response import (
+    DecryptResponse,
+    EncryptResponse,
+)
 from dapr.aio.clients.grpc.interceptors import (
     DaprClientInterceptorAsync,
     DaprClientTimeoutInterceptorAsync,
 )
+from dapr.aio.clients.grpc.subscription import Subscription
+from dapr.clients.exceptions import DaprGrpcError, DaprInternalError
+from dapr.clients.grpc import conversation
+from dapr.clients.grpc._crypto import DecryptOptions, EncryptOptions
 from dapr.clients.grpc._helpers import (
     MetadataTuple,
-    to_bytes,
-    validateNotNone,
-    validateNotBlankString,
     convert_dict_to_grpc_dict_of_any,
     convert_value_to_struct,
+    getWorkflowRuntimeStatus,
+    to_bytes,
+    validateNotBlankString,
+    validateNotNone,
 )
-from dapr.aio.clients.grpc._request import (
-    EncryptRequestIterator,
-    DecryptRequestIterator,
-)
-from dapr.aio.clients.grpc._response import (
-    EncryptResponse,
-    DecryptResponse,
-)
+from dapr.clients.grpc._jobs import Job
 from dapr.clients.grpc._request import (
-    InvokeMethodRequest,
     BindingRequest,
+    InvokeMethodRequest,
     TransactionalStateOperation,
 )
-from dapr.clients.grpc import conversation
-
-from dapr.clients.grpc._jobs import Job
 from dapr.clients.grpc._response import (
     BindingResponse,
+    BulkStateItem,
+    BulkStatesResponse,
+    ConfigurationResponse,
+    ConfigurationWatcher,
     DaprResponse,
-    GetSecretResponse,
     GetBulkSecretResponse,
     GetMetadataResponse,
+    GetSecretResponse,
+    GetWorkflowResponse,
     InvokeMethodResponse,
-    UnlockResponseStatus,
-    StateResponse,
-    BulkStatesResponse,
-    BulkStateItem,
-    ConfigurationResponse,
     QueryResponse,
     QueryResponseItem,
     RegisteredComponents,
-    ConfigurationWatcher,
-    TryLockResponse,
-    UnlockResponse,
-    GetWorkflowResponse,
     StartWorkflowResponse,
+    StateResponse,
     TopicEventResponse,
+    TryLockResponse,
+    UnlockResponse,
+    UnlockResponseStatus,
 )
+from dapr.clients.grpc._state import StateItem, StateOptions
+from dapr.clients.health import DaprHealth
+from dapr.clients.retry import RetryPolicy
+from dapr.common.pubsub.subscription import StreamInactiveError
+from dapr.conf import settings
+from dapr.conf.helpers import GrpcEndpoint
+from dapr.proto import api_service_v1, api_v1, common_v1
+from dapr.proto.runtime.v1.dapr_pb2 import UnsubscribeConfigurationResponse
+from dapr.version import __version__
 
 
 class DaprGrpcClientAsync:
@@ -170,7 +164,7 @@ def __init__(
 
         if not address:
             address = settings.DAPR_GRPC_ENDPOINT or (
-                f'{settings.DAPR_RUNTIME_HOST}:' f'{settings.DAPR_GRPC_PORT}'
+                f'{settings.DAPR_RUNTIME_HOST}:{settings.DAPR_GRPC_PORT}'
             )
 
         try: