-
Notifications
You must be signed in to change notification settings - Fork 20
Add support for new event types #86
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
andystaples
wants to merge
2
commits into
main
Choose a base branch
from
andystaples/add-support-for-new-event-types
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -828,6 +828,7 @@ def __init__(self, instance_id: str, registry: _Registry): | |||||
| self._pending_tasks: dict[int, task.CompletableTask] = {} | ||||||
| # Maps entity ID to task ID | ||||||
| self._entity_task_id_map: dict[str, tuple[EntityInstanceId, int]] = {} | ||||||
| self._entity_lock_task_id_map: dict[str, tuple[EntityInstanceId, int]] = {} | ||||||
| # Maps criticalSectionId to task ID | ||||||
| self._entity_lock_id_map: dict[str, int] = {} | ||||||
| self._sequence_number = 0 | ||||||
|
|
@@ -1590,33 +1591,70 @@ def process_event( | |||||
| else: | ||||||
| raise TypeError("Unexpected sub-orchestration task type") | ||||||
| elif event.HasField("eventRaised"): | ||||||
| # event names are case-insensitive | ||||||
| event_name = event.eventRaised.name.casefold() | ||||||
| if not ctx.is_replaying: | ||||||
| self._logger.info(f"{ctx.instance_id} Event raised: {event_name}") | ||||||
| task_list = ctx._pending_events.get(event_name, None) | ||||||
| decoded_result: Optional[Any] = None | ||||||
| if task_list: | ||||||
| event_task = task_list.pop(0) | ||||||
| if event.eventRaised.name in ctx._entity_task_id_map: | ||||||
| # This eventRaised represents the result of an entity operation after being translated to the old | ||||||
| # entity protocol by the Durable WebJobs extension | ||||||
| entity_id, task_id = ctx._entity_task_id_map.get(event.eventRaised.name, (None, None)) | ||||||
| if entity_id is None: | ||||||
| raise RuntimeError(f"Could not retrieve entity ID for entity-related eventRaised with ID '{event.eventId}'") | ||||||
| if task_id is None: | ||||||
| raise RuntimeError(f"Could not retrieve task ID for entity-related eventRaised with ID '{event.eventId}'") | ||||||
| entity_task = ctx._pending_tasks.pop(task_id, None) | ||||||
| if not entity_task: | ||||||
| raise RuntimeError(f"Could not retrieve entity task for entity-related eventRaised with ID '{event.eventId}'") | ||||||
| result = None | ||||||
| if not ph.is_empty(event.eventRaised.input): | ||||||
| decoded_result = shared.from_json(event.eventRaised.input.value) | ||||||
| event_task.complete(decoded_result) | ||||||
| if not task_list: | ||||||
| del ctx._pending_events[event_name] | ||||||
| # TODO: Investigate why the event result is wrapped in a dict with "result" key | ||||||
| result = shared.from_json(event.eventRaised.input.value)["result"] | ||||||
| ctx._entity_context.recover_lock_after_call(entity_id) | ||||||
| entity_task.complete(result) | ||||||
| ctx.resume() | ||||||
| else: | ||||||
| # buffer the event | ||||||
| event_list = ctx._received_events.get(event_name, None) | ||||||
| if not event_list: | ||||||
| event_list = [] | ||||||
| ctx._received_events[event_name] = event_list | ||||||
| elif event.eventRaised.name in ctx._entity_lock_task_id_map: | ||||||
| # This eventRaised represents the result of an entity operation after being translated to the old | ||||||
| # entity protocol by the Durable WebJobs extension | ||||||
| entity_id, task_id = ctx._entity_lock_task_id_map.get(event.eventRaised.name, (None, None)) | ||||||
| if entity_id is None: | ||||||
| raise RuntimeError(f"Could not retrieve entity ID for entity-related eventRaised with ID '{event.eventId}'") | ||||||
| if task_id is None: | ||||||
| raise RuntimeError(f"Could not retrieve task ID for entity-related eventRaised with ID '{event.eventId}'") | ||||||
| entity_task = ctx._pending_tasks.pop(task_id, None) | ||||||
| if not entity_task: | ||||||
| raise RuntimeError(f"Could not retrieve entity task for entity-related eventRaised with ID '{event.eventId}'") | ||||||
| result = None | ||||||
| if not ph.is_empty(event.eventRaised.input): | ||||||
| decoded_result = shared.from_json(event.eventRaised.input.value) | ||||||
| event_list.append(decoded_result) | ||||||
| # TODO: Investigate why the event result is wrapped in a dict with "result" key | ||||||
| result = shared.from_json(event.eventRaised.input.value)["result"] | ||||||
andystaples marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||||||
| result = shared.from_json(event.eventRaised.input.value)["result"] | |
| pass # result is not used in this block |
andystaples marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
andystaples marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
andystaples marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
andystaples marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
andystaples marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
andystaples marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
andystaples marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
andystaples marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
andystaples marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
andystaples marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
andystaples marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
andystaples marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.