Merge branch 'main' into andystaples-add-purge-timeout

Author: andystaples

.github/workflows/codeql.yml

@@ -67,7 +67,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@5595ccaf912efad79be6eef63a5619ff05969be3 # v4.37.6
+      uses: github/codeql-action/init@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7
       with:
         languages: ${{ matrix.language }}
         build-mode: ${{ matrix.build-mode }}
@@ -96,6 +96,6 @@ jobs:
         exit 1
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@5595ccaf912efad79be6eef63a5619ff05969be3 # v4.37.6
+      uses: github/codeql-action/analyze@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7
       with:
         category: "/language:${{matrix.language}}"

CHANGELOG.md

@@ -12,6 +12,8 @@ ADDED
 - Added an optional timeout to filtered orchestration purges. Callers can now
 limit a purge operation's duration and inspect `PurgeInstancesResult.is_complete`
 for completed, partial, or backend-unknown completion status.
+- Added `OrchestrationQuery.instance_id_prefix` to retrieve orchestration
+instances whose IDs begin with a specified prefix.
 - Added optional `reason` parameters to `TaskHubGrpcClient` and
 `AsyncTaskHubGrpcClient` suspend and resume operations. The reason is now sent
 to the backend with the lifecycle request.

azure-functions-durable/CHANGELOG.md

@@ -11,6 +11,8 @@ ADDED
 
 - Added an optional timeout to filtered orchestration purges through
 `DurableFunctionsClient` and `SyncDurableFunctionsClient`.
+- Added inherited `OrchestrationQuery.instance_id_prefix` support to retrieve
+orchestration instances whose IDs begin with a specified prefix.
 > [!NOTE]
 > Release this change only in coordination with a new `durabletask` release
 > that contains the suspend/resume reason APIs. Publish `durabletask` first,

durabletask-azuremanaged/CHANGELOG.md

@@ -11,6 +11,8 @@ ADDED
 
 - Added an optional timeout to filtered orchestration purges through
 `DurableTaskSchedulerClient` and `AsyncDurableTaskSchedulerClient`.
+- Added inherited `OrchestrationQuery.instance_id_prefix` support to retrieve
+orchestration instances whose IDs begin with a specified prefix.
 - Added optional `reason` parameters to suspend and resume operations inherited
 from `TaskHubGrpcClient` and `AsyncTaskHubGrpcClient`.
 

durabletask/client.py

@@ -196,6 +196,7 @@ class OrchestrationQuery:
     # results instead.
     max_instance_count: int | None = (1 << 31) - 1
     fetch_inputs_and_outputs: bool = False
+    instance_id_prefix: str | None = None
 
 
 @dataclass

durabletask/internal/client_helpers.py

@@ -103,6 +103,7 @@ def build_query_instances_req(
             runtimeStatus=[status.value for status in orchestration_query.runtime_status] if orchestration_query.runtime_status else None,
             createdTimeFrom=helpers.new_timestamp(orchestration_query.created_time_from) if orchestration_query.created_time_from else None,
             createdTimeTo=helpers.new_timestamp(orchestration_query.created_time_to) if orchestration_query.created_time_to else None,
+            instanceIdPrefix=helpers.get_string_value(orchestration_query.instance_id_prefix),
             maxInstanceCount=orchestration_query.max_instance_count,
             fetchInputsAndOutputs=orchestration_query.fetch_inputs_and_outputs,
             continuationToken=continuation_token

tests/durabletask/test_batch_actions.py

@@ -12,6 +12,7 @@
 import pytest
 from durabletask import client, entities, task
 from durabletask.client import TaskHubGrpcClient
+from durabletask.internal.client_helpers import build_query_instances_req
 from durabletask.testing import create_test_backend
 from durabletask.worker import TaskHubGrpcWorker
 
@@ -163,6 +164,47 @@ def test_get_orchestration_state_by_time_range(backend):
     assert len([o for o in orchestrations_outside_range if o.instance_id == id]) == 0
 
 
+def test_get_orchestration_state_by_instance_id_prefix(backend):
+    worker = TaskHubGrpcWorker(host_address=HOST)
+
+    worker.add_orchestrator(empty_orchestrator)
+    worker.start()
+
+    try:
+        with TaskHubGrpcClient(host_address=HOST) as c:
+            matching_id = "prefix-match"
+            non_matching_id = "other-instance"
+            c.schedule_new_orchestration(empty_orchestrator, instance_id=matching_id)
+            c.schedule_new_orchestration(empty_orchestrator, instance_id=non_matching_id)
+            c.wait_for_orchestration_completion(matching_id, timeout=30)
+            c.wait_for_orchestration_completion(non_matching_id, timeout=30)
+
+            query = client.OrchestrationQuery(instance_id_prefix="prefix-")
+            orchestrations = c.get_all_orchestration_states(query)
+    finally:
+        worker.stop()
+
+    assert [orchestration.instance_id for orchestration in orchestrations] == [matching_id]
+
+
+def test_orchestration_query_serializes_instance_id_prefix():
+    request = build_query_instances_req(
+        client.OrchestrationQuery(instance_id_prefix="prefix-"),
+        continuation_token=None,
+    )
+
+    assert request.query.HasField("instanceIdPrefix")
+    assert request.query.instanceIdPrefix.value == "prefix-"
+
+
+def test_orchestration_query_preserves_positional_argument_order():
+    query = client.OrchestrationQuery(None, None, None, None, True)
+
+    assert query.max_instance_count is None
+    assert query.fetch_inputs_and_outputs is True
+    assert query.instance_id_prefix is None
+
+
 def test_get_orchestration_state_pagination_succeeds(backend):
     # Create a custom handler to capture log messages
     log_records = []