refactor: Rename DurableTaskSchedulerServerlessWorker to ServerlessWorker and update related imports

Author: YunchuWang

durabletask-azuremanaged/durabletask/azuremanaged/extensions/serverless/__init__.py

@@ -10,35 +10,15 @@
 Usage::
 
     from durabletask.azuremanaged.extensions.serverless import (
-        DurableTaskSchedulerServerlessWorker,
+        ServerlessWorker,
         ServerlessActivitiesClient,
     )
 """
 
-from durabletask.azuremanaged.extensions.serverless.client import (
-    DEFAULT_CPU,
-    DEFAULT_MAX_CONCURRENT_ACTIVITIES,
-    DEFAULT_MEMORY,
-    DEFAULT_WORKER_PROFILE_ID,
-    ServerlessActivitiesClient,
-    build_image_ref,
-    build_serverless_activity_declaration,
-    build_serverless_worker_heartbeat,
-    build_serverless_worker_start,
-    resolve_activity_names,
-)
-from durabletask.azuremanaged.extensions.serverless.worker import DurableTaskSchedulerServerlessWorker
+from durabletask.azuremanaged.extensions.serverless.client import ServerlessActivitiesClient
+from durabletask.azuremanaged.extensions.serverless.worker import ServerlessWorker
 
 __all__ = [
-    "DEFAULT_CPU",
-    "DEFAULT_MAX_CONCURRENT_ACTIVITIES",
-    "DEFAULT_MEMORY",
-    "DEFAULT_WORKER_PROFILE_ID",
-    "DurableTaskSchedulerServerlessWorker",
+    "ServerlessWorker",
     "ServerlessActivitiesClient",
-    "build_image_ref",
-    "build_serverless_activity_declaration",
-    "build_serverless_worker_heartbeat",
-    "build_serverless_worker_start",
-    "resolve_activity_names",
 ]

durabletask-azuremanaged/durabletask/azuremanaged/extensions/serverless/client.py

@@ -21,10 +21,11 @@
 DEFAULT_MAX_CONCURRENT_ACTIVITIES = 100
 
 
-def resolve_activity_names(activity_names: Iterable[str]) -> list[str]:
+def resolve_activity_names(activity_names: str | Iterable[str]) -> list[str]:
     resolved: list[str] = []
     seen: set[str] = set()
-    for name in activity_names:
+    names = [activity_names] if isinstance(activity_names, str) else activity_names
+    for name in names:
         normalized = name.strip()
         if normalized and normalized not in seen:
             resolved.append(normalized)
@@ -60,7 +61,7 @@ def build_image_ref(
 
 def build_serverless_activity_declaration(
         *,
-        activity_names: Iterable[str],
+        activity_names: str | Iterable[str],
         worker_profile_id: str = DEFAULT_WORKER_PROFILE_ID,
         container_image: Optional[str] = None,
         registry_server: Optional[str] = None,
@@ -192,7 +193,7 @@ def close(self) -> None:
     def declare_serverless_activities(
             self,
             *,
-            activity_names: Iterable[str],
+            activity_names: str | Iterable[str],
             worker_profile_id: str = DEFAULT_WORKER_PROFILE_ID,
             container_image: Optional[str] = None,
             registry_server: Optional[str] = None,

durabletask-azuremanaged/durabletask/azuremanaged/extensions/serverless/worker.py

@@ -25,7 +25,7 @@
 )
 
 
-class DurableTaskSchedulerServerlessWorker(DurableTaskSchedulerWorker):
+class ServerlessWorker(DurableTaskSchedulerWorker):
     """DTS worker mode for activity containers started by serverless activities.
 
     This worker registers a live worker session with DTS and restricts dispatch

examples/serverless/README.md

@@ -31,7 +31,7 @@ $env:DTS_SERVERLESS_MAX_ACTIVITIES = "1"
 ```
 
 The remote worker code cannot pass DTS runtime settings to the SDK. In a
-sandbox, `DurableTaskSchedulerServerlessWorker()` reads `DTS_ENDPOINT`,
+sandbox, `ServerlessWorker()` reads `DTS_ENDPOINT`,
 `DTS_TASK_HUB`, `DTS_WORKER_PROFILE_ID`, `DTS_SERVERLESS_MAX_ACTIVITIES`,
 `DTS_SUBSTRATE`, and `DTS_SANDBOX_ID` from environment variables injected by
 DTS. The worker reports its registered activity names when it connects, and

examples/serverless/main_app.py

@@ -40,7 +40,7 @@ def hello_orchestrator(ctx: task.OrchestrationContext, name: str):
     taskhub=taskhub_name,
     token_credential=credential)
 serverless_client.declare_serverless_activities(
-    activity_names=[REMOTE_ACTIVITY_NAME],
+    activity_names=REMOTE_ACTIVITY_NAME,
     worker_profile_id=worker_profile_id,
     container_image=serverless_image,
     cpu=serverless_cpu,

examples/serverless/remote_worker.py

@@ -4,7 +4,7 @@
 import time
 
 from durabletask import task
-from durabletask.azuremanaged.extensions.serverless import DurableTaskSchedulerServerlessWorker
+from durabletask.azuremanaged.extensions.serverless import ServerlessWorker
 
 
 def remote_hello(ctx: task.ActivityContext, name: str) -> str:
@@ -13,7 +13,7 @@ def remote_hello(ctx: task.ActivityContext, name: str) -> str:
     return f"Hello {name} from Python serverless worker {sandbox_id}!"
 
 
-with DurableTaskSchedulerServerlessWorker() as worker:
+with ServerlessWorker() as worker:
     worker.add_activity(remote_hello)
     worker.start()
     print("Python serverless remote worker is running. Press Ctrl+C to stop.")

tests/durabletask-azuremanaged/test_serverless_extension.py

@@ -3,8 +3,9 @@
 
 import inspect
 
-from durabletask.azuremanaged.extensions.serverless import (
-    DurableTaskSchedulerServerlessWorker,
+import durabletask.azuremanaged.extensions.serverless as serverless
+from durabletask.azuremanaged.extensions.serverless import ServerlessWorker
+from durabletask.azuremanaged.extensions.serverless.client import (
     build_image_ref,
     build_serverless_activity_declaration,
     build_serverless_worker_heartbeat,
@@ -21,6 +22,14 @@ def test_resolve_activity_names_trims_and_deduplicates() -> None:
     ]
 
 
+def test_public_serverless_package_exports_customer_entrypoints_only() -> None:
+    assert serverless.__all__ == [
+        "ServerlessWorker",
+        "ServerlessActivitiesClient",
+    ]
+    assert serverless.ServerlessWorker is ServerlessWorker
+
+
 def test_build_image_ref_matches_dotnet_options() -> None:
     assert build_image_ref(container_image=" repo/image:tag ") == "repo/image:tag"
     assert build_image_ref(
@@ -59,6 +68,15 @@ def test_build_serverless_activity_declaration() -> None:
     assert list(declaration.cmd) == ["/app/remote_worker.py"]
 
 
+def test_build_serverless_activity_declaration_accepts_single_name() -> None:
+    declaration = build_serverless_activity_declaration(
+        worker_profile_id="preview",
+        activity_names="RemoteHello",
+        container_image="example.azurecr.io/serverless-worker:v1")
+
+    assert list(declaration.activity_names) == ["RemoteHello"]
+
+
 def test_build_serverless_activity_declaration_preserves_public_pull() -> None:
     declaration = build_serverless_activity_declaration(
         worker_profile_id="preview",
@@ -90,14 +108,14 @@ def test_build_serverless_worker_start_and_heartbeat() -> None:
 
 
 def test_serverless_worker_constructor_does_not_expose_runtime_contract() -> None:
-    assert list(inspect.signature(DurableTaskSchedulerServerlessWorker).parameters) == []
+    assert list(inspect.signature(ServerlessWorker).parameters) == []
 
 
 def test_serverless_worker_does_not_own_wakeup_server(monkeypatch) -> None:
     monkeypatch.setenv("DTS_ENDPOINT", "http://localhost:8080")
     monkeypatch.setenv("DTS_TASK_HUB", "env-hub")
 
-    worker = DurableTaskSchedulerServerlessWorker()
+    worker = ServerlessWorker()
 
     assert not hasattr(worker, "_serverless_wakeup_port")
     assert not hasattr(worker, "_serverless_wakeup_server")
@@ -111,7 +129,7 @@ def test_serverless_worker_reads_sandbox_environment_and_registered_activities(m
     monkeypatch.setenv("DTS_SUBSTRATE", "AcaSessionPool")
     monkeypatch.setenv("DTS_SANDBOX_ID", "env-sandbox")
 
-    worker = DurableTaskSchedulerServerlessWorker()
+    worker = ServerlessWorker()
     worker._registry.add_named_activity("EnvActivity", lambda _ctx, value: value)
     worker._registry.add_named_activity("OtherActivity", lambda _ctx, value: value)
     worker._configure_serverless_activity_filters()
@@ -138,7 +156,7 @@ def test_serverless_worker_requires_registered_activities(monkeypatch) -> None:
     monkeypatch.setenv("DTS_ENDPOINT", "http://localhost:8080")
     monkeypatch.setenv("DTS_TASK_HUB", "env-hub")
 
-    worker = DurableTaskSchedulerServerlessWorker()
+    worker = ServerlessWorker()
 
     try:
         worker._configure_serverless_activity_filters()