Fixing interceptor issue

Signed-off-by: Ryan Lettieri <[email protected]>

Author: RyanLettieri

durabletask/client.py

@@ -104,6 +104,8 @@ def __init__(self, *,
         # Determine the interceptors to use
         if interceptors is not None:
             self._interceptors = interceptors
+            if metadata:
+                self._interceptors.append(DefaultClientInterceptorImpl(metadata))
         elif metadata:
             self._interceptors = [DefaultClientInterceptorImpl(metadata)]
         else:

durabletask/internal/shared.py

@@ -6,6 +6,7 @@
 import logging
 from types import SimpleNamespace
 from typing import Any, Optional
+from durabletask.internal.grpc_interceptor import DefaultClientInterceptorImpl
 
 import grpc
 
@@ -25,7 +26,7 @@ def get_grpc_channel(
         host_address: Optional[str],
         metadata: Optional[list[tuple[str, str]]] = None,
         secure_channel: bool = False,
-        interceptors: Optional[list] = None) -> grpc.Channel:
+        interceptors: Optional[list[DefaultClientInterceptorImpl]] = None) -> grpc.Channel:
 
     if host_address is None:
         host_address = get_default_host_address()

durabletask/worker.py

@@ -103,6 +103,8 @@ def __init__(self, *,
         # Determine the interceptors to use
         if interceptors is not None:
             self._interceptors = interceptors
+            if metadata:
+                self._interceptors.append(DefaultClientInterceptorImpl(metadata))
         elif self._metadata:
             self._interceptors = [DefaultClientInterceptorImpl(self._metadata)]
         else:

externalpackages/durabletaskscheduler/durabletask_scheduler_client.py

@@ -11,7 +11,7 @@ class DurableTaskSchedulerClient(TaskHubGrpcClient):
     def __init__(self,
                  host_address: str,
                  secure_channel: bool,
-                 metadata: Optional[list[tuple[str, str]]] = [],
+                 metadata: Optional[list[tuple[str, str]]] = None,
                  use_managed_identity: Optional[bool] = False,
                  client_id: Optional[str] = None,
                  taskhub: str = None,
@@ -29,13 +29,15 @@ def __init__(self,
 
         self._access_token_manager = AccessTokenManager(metadata=self._metadata)
         self.__update_metadata_with_token()
-        interceptors = [DTSDefaultClientInterceptorImpl(self._metadata)]
+        self._interceptors = [DTSDefaultClientInterceptorImpl(self._metadata)]
 
+        # We pass in None for the metadata so we don't construct an additional interceptor in the parent class
+        # Since the parent class doesn't use anything metadata for anything else, we can set it as None
         super().__init__(
             host_address=host_address,
             secure_channel=secure_channel,
-            metadata=self._metadata,
-            interceptors=interceptors,  # Now explicitly passing interceptors
+            metadata=None,
+            interceptors=self._interceptors,
             **kwargs
         )
 

externalpackages/durabletaskscheduler/durabletask_scheduler_worker.py

@@ -31,10 +31,12 @@ def __init__(self,
         self.__update_metadata_with_token()
         interceptors = [DTSDefaultClientInterceptorImpl(self._metadata)]
 
+        # We pass in None for the metadata so we don't construct an additional interceptor in the parent class
+        # Since the parent class doesn't use anything metadata for anything else, we can set it as None
         super().__init__(
             host_address=host_address,
             secure_channel=secure_channel,
-            metadata=self._metadata,
+            metadata=None, 
             interceptors=interceptors,
             **kwargs
         )