Adressing more feedback

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

Author: RyanLettieri

durabletask-azuremanaged/durabletask/azuremanaged/durabletask_scheduler_client.py renamed to durabletask-azuremanaged/durabletask/azuremanaged/client.py

@@ -3,26 +3,28 @@
 
 from typing import Optional
 from durabletask.client import TaskHubGrpcClient
-from durabletask.azuremanaged.access_token_manager import AccessTokenManager
+from durabletask.azuremanaged.internal.access_token_manager import AccessTokenManager
 from durabletask.azuremanaged.durabletask_grpc_interceptor import DTSDefaultClientInterceptorImpl
 
 # Client class used for Durable Task Scheduler (DTS)
 class DurableTaskSchedulerClient(TaskHubGrpcClient):
-    def __init__(self,
+    def __init__(self, *,
                  host_address: str,
-                 secure_channel: bool,
+                 taskhub: str,
+                 secure_channel: Optional[bool] = True,
                  metadata: Optional[list[tuple[str, str]]] = None,
                  use_managed_identity: Optional[bool] = False,
-                 client_id: Optional[str] = None,
-                 taskhub: str = None,
-                 **kwargs):
+                 client_id: Optional[str] = None):
 
+        if taskhub == None:
+            raise ValueError("Taskhub value cannot be empty. Please provide a value for your taskhub")
+        
         # Ensure metadata is a list
         metadata = metadata or []
         self._metadata = metadata.copy()  # Use a copy to avoid modifying original
 
         # Append DurableTask-specific metadata
-        self._metadata.append(("taskhub", taskhub or "default-taskhub"))
+        self._metadata.append(("taskhub", taskhub))
         self._metadata.append(("dts", "True"))
         self._metadata.append(("use_managed_identity", str(use_managed_identity)))
         self._metadata.append(("client_id", str(client_id or "None")))
@@ -37,9 +39,7 @@ def __init__(self,
             host_address=host_address,
             secure_channel=secure_channel,
             metadata=None,
-            interceptors=self._interceptors,
-            **kwargs
-        )
+            interceptors=self._interceptors)
 
     def __update_metadata_with_token(self):
         """

durabletask-azuremanaged/durabletask/azuremanaged/durabletask_grpc_interceptor.py

@@ -2,7 +2,7 @@
 # Licensed under the MIT License.
 
 from durabletask.internal.grpc_interceptor import _ClientCallDetails, DefaultClientInterceptorImpl
-from durabletask.azuremanaged.access_token_manager import AccessTokenManager
+from durabletask.azuremanaged.internal.access_token_manager import AccessTokenManager
 
 import grpc
 

durabletask-azuremanaged/durabletask/azuremanaged/durabletask_keep_alive_service.py

@@ -7,9 +7,9 @@
 
 # By default, when there's 10minutes left before the token expires, refresh the token
 class AccessTokenManager:
-    def __init__(self, refresh_buffer: int = 600, metadata: Optional[list[tuple[str, str]]] = None):
+    def __init__(self, refresh_interval_seconds: int = 600, metadata: Optional[list[tuple[str, str]]] = None):
         self.scope = "https://durabletask.io/.default"
-        self.refresh_buffer = refresh_buffer
+        self.refresh_interval_seconds = refresh_interval_seconds
         self._use_managed_identity = False
         self._metadata = metadata
         self._client_id = None
@@ -42,13 +42,13 @@ def get_access_token(self) -> str:
             self.refresh_token()
         return self.token
 
-    # Checks if the token is expired, or if it will expire in the next "refresh_buffer" seconds.
+    # Checks if the token is expired, or if it will expire in the next "refresh_interval_seconds" seconds.
     # For example, if the token is created to have a lifespan of 2 hours, and the refresh buffer is set to 30 minutes,
     # We will grab a new token when there're 30minutes left on the lifespan of the token
     def is_token_expired(self) -> bool:
         if self.expiry_time is None:
             return True
-        return datetime.now(timezone.utc) >= (self.expiry_time - timedelta(seconds=self.refresh_buffer))
+        return datetime.now(timezone.utc) >= (self.expiry_time - timedelta(seconds=self.refresh_interval_seconds))
 
     def refresh_token(self):
         new_token = self.credential.get_token(self.scope)

durabletask-azuremanaged/durabletask/azuremanaged/access_token_manager.py renamed to durabletask-azuremanaged/durabletask/azuremanaged/internal/access_token_manager.py

@@ -3,20 +3,22 @@
 
 from typing import Optional
 from durabletask.worker import TaskHubGrpcWorker
-from durabletask.azuremanaged.access_token_manager import AccessTokenManager
+from durabletask.azuremanaged.internal.access_token_manager import AccessTokenManager
 from durabletask.azuremanaged.durabletask_grpc_interceptor import DTSDefaultClientInterceptorImpl
 
 # Worker class used for Durable Task Scheduler (DTS)
 class DurableTaskSchedulerWorker(TaskHubGrpcWorker):
-    def __init__(self,
+    def __init__(self, *,
                  host_address: str,
+                 taskhub: str,
                  secure_channel: bool,
                  metadata: Optional[list[tuple[str, str]]] = None,
                  use_managed_identity: Optional[bool] = False,
-                 client_id: Optional[str] = None,
-                 taskhub: str = None,
-                 **kwargs):
+                 client_id: Optional[str] = None):
 
+        if taskhub == None:
+            raise ValueError("Taskhub value cannot be empty. Please provide a value for your taskhub")
+
         # Ensure metadata is a list
         metadata = metadata or []
         self._metadata = metadata.copy()  # Copy to prevent modifying input
@@ -37,9 +39,7 @@ def __init__(self,
             host_address=host_address,
             secure_channel=secure_channel,
             metadata=None, 
-            interceptors=interceptors,
-            **kwargs
-        )
+            interceptors=interceptors)
 
     def __update_metadata_with_token(self):
         """

durabletask-azuremanaged/durabletask/azuremanaged/durabletask_scheduler_worker.py renamed to durabletask-azuremanaged/durabletask/azuremanaged/worker.py

@@ -10,7 +10,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "durabletask.azuremanaged"
 version = "0.1b1"
-description = "An Azure Managed Backend for Durable Task Python SDK"
+description = "Extensions for the Durable Task Python SDK for integrating with the Durable Task Scheduler in Azure"
 keywords = [
     "durable",
     "task",

durabletask-azuremanaged/pyproject.toml

@@ -2,8 +2,8 @@
 that calls an activity function in a sequence and prints the outputs."""
 import os
 from durabletask import client, task
-from durabletask.azuremanaged.durabletask_scheduler_worker import DurableTaskSchedulerWorker
-from durabletask.azuremanaged.durabletask_scheduler_client import DurableTaskSchedulerClient
+from durabletask.azuremanaged.worker import DurableTaskSchedulerWorker
+from durabletask.azuremanaged.client import DurableTaskSchedulerClient
 
 def hello(ctx: task.ActivityContext, name: str) -> str:
     """Activity function that returns a greeting"""

examples/dts/dts_activity_sequence.py

@@ -6,9 +6,8 @@
 import os
 from durabletask import client, task
 from durabletask import client, task
-import DurableTaskSchedulerWorker
-import DurableTaskSchedulerClient
-
+from durabletask.azuremanaged.worker import DurableTaskSchedulerWorker
+from durabletask.azuremanaged.client import DurableTaskSchedulerClient
 
 def get_work_items(ctx: task.ActivityContext, _) -> list[str]:
     """Activity function that returns a list of work items"""

examples/dts/dts_fanout_fanin.py

@@ -3,5 +3,4 @@ grpcio>=1.60.0 # 1.60.0 is the version introducing protobuf 1.25.X support, newe
 protobuf
 pytest
 pytest-cov
-azure-identity
-durabletask-azuremanaged
+azure-identity