Skip to content

Commit fa2c514

Browse files
authored
Merge branch 'main' into andystaples/add-inprocess-test-backend
2 parents a00317c + 29bbc9a commit fa2c514

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,19 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
<<<<<<< andystaples/add-inprocess-test-backend
89
## 1.4.0
910

1011
ADDED
1112

1213
- Added `durabletask.testing` module with `InMemoryOrchestrationBackend` for testing orchestrations without a sidecar process
14+
=======
15+
## Unreleased
16+
17+
FIXED:
18+
19+
- Fix unbound variable in entity V1 processing
20+
>>>>>>> main
1321
1422
## v1.3.0
1523

durabletask/worker.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -740,21 +740,22 @@ def _execute_entity_batch(
740740
stub: Union[stubs.TaskHubSidecarServiceStub, ProtoTaskHubSidecarServiceStub],
741741
completionToken,
742742
):
743+
operation_infos: list[pb.OperationInfo] = []
743744
if isinstance(req, pb.EntityRequest):
744745
req, operation_infos = helpers.convert_to_entity_batch_request(req)
745746

746747
entity_state = StateShim(shared.from_json(req.entityState.value) if req.entityState.value else None)
747748

748749
instance_id = req.instanceId
750+
try:
751+
entity_instance_id = EntityInstanceId.parse(instance_id)
752+
except ValueError:
753+
raise RuntimeError(f"Invalid entity instance ID '{instance_id}' in entity operation request.")
749754

750755
results: list[pb.OperationResult] = []
751756
for operation in req.operations:
752757
start_time = datetime.now(timezone.utc)
753758
executor = _EntityExecutor(self._registry, self._logger)
754-
try:
755-
entity_instance_id = EntityInstanceId.parse(instance_id)
756-
except ValueError:
757-
raise RuntimeError(f"Invalid entity instance ID '{instance_id}' in entity operation request.")
758759

759760
operation_result = None
760761

0 commit comments

Comments
 (0)