-
Notifications
You must be signed in to change notification settings - Fork 133
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
Add Actor Mocks #750
Merged
+1,000
−4
Merged
Add Actor Mocks #750
Changes from 27 commits
Commits
Show all changes
35 commits
Select commit
Hold shift + click to select a range
92d11b0
Moved files to new branch to avoid weird git bug
lor1113 aee0fe0
requested documentation changes
lor1113 385456a
Merge branch 'dapr:main' into mock-actors-3
lor1113 faadd82
forgot to move file back to starting point
lor1113 45978e2
Merge branch 'mock-actors-3' of github.com:lor1113/python-sdk into mo…
lor1113 9d5e626
result of ruff format
lor1113 e17a85b
fixed minor formatting issues, fixed type issues
lor1113 278ba8d
Merge branch 'main' into mock-actors-3
elena-kolevska c23cc33
minor test fix
e67659d
fixes try_add_state
elena-kolevska cc6ee78
Revert "fixes try_add_state"
elena-kolevska 6cebadd
Update dapr/actor/runtime/mock_state_manager.py
lor1113 bebdcb1
Update dapr/actor/runtime/mock_actor.py
lor1113 1f1569f
Update daprdocs/content/en/python-sdk-docs/python-actor.md
lor1113 c3e6aca
Update daprdocs/content/en/python-sdk-docs/python-actor.md
lor1113 ef74591
Update daprdocs/content/en/python-sdk-docs/python-actor.md
lor1113 b0650a6
Update daprdocs/content/en/python-sdk-docs/python-actor.md
lor1113 1733b42
Update daprdocs/content/en/python-sdk-docs/python-actor.md
lor1113 df85211
Update daprdocs/content/en/python-sdk-docs/python-actor.md
lor1113 a7b86c7
Update daprdocs/content/en/python-sdk-docs/python-actor.md
lor1113 1a82754
minor error in docs
2480d7e
fixed and added more unit tests. Added example
33a5d1d
unittest fix
4fa7fb8
Update examples/demo_actor/README.md
lor1113 85b8d6c
concentrated some tests
e788174
removed unnecessary type hint
e391eda
Update daprdocs/content/en/python-sdk-docs/python-actor.md
lor1113 97bc300
Update examples/demo_actor/README.md
lor1113 9314788
documentation changes
7c4e5fc
Merge branch 'mock-actors-3' of github.com:lor1113/python-sdk into mo…
e180073
Merge branch 'main' into mock-actors-3
elena-kolevska 55d9106
now requires #type: ignore
d72be8e
small docs change
elena-kolevska 6b3b3ef
examples test fix
elena-kolevska d095086
Merge branch 'mock-actors-3' of github.com:lor1113/python-sdk into mo…
elena-kolevska 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 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 |
---|---|---|
@@ -0,0 +1,123 @@ | ||
""" | ||
Copyright 2023 The Dapr Authors | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
""" | ||
|
||
from __future__ import annotations | ||
|
||
from datetime import timedelta | ||
from typing import Any, Optional, TypeVar | ||
|
||
from dapr.actor.id import ActorId | ||
from dapr.actor.runtime._reminder_data import ActorReminderData | ||
from dapr.actor.runtime._timer_data import TIMER_CALLBACK, ActorTimerData | ||
from dapr.actor.runtime.actor import Actor | ||
from dapr.actor.runtime.mock_state_manager import MockStateManager | ||
from dapr.actor.runtime.state_manager import ActorStateManager | ||
|
||
|
||
class MockActor(Actor): | ||
"""A mock actor class to be used to override certain Actor methods for unit testing. | ||
To be used only via the create_mock_actor function, which takes in a class and returns a | ||
mock actor object for that class. | ||
|
||
Examples: | ||
class SomeActorInterface(ActorInterface): | ||
@actor_method(name="method") | ||
async def set_state(self, data: dict) -> None: | ||
|
||
class SomeActor(Actor, SomeActorInterface): | ||
async def set_state(self, data: dict) -> None: | ||
await self._state_manager.set_state('state', data) | ||
await self._state_manager.save_state() | ||
|
||
mock_actor = create_mock_actor(SomeActor, "actor_1") | ||
assert mock_actor._state_manager._mock_state == {} | ||
await mock_actor.set_state({"test":10}) | ||
assert mock_actor._state_manager._mock_state == {"test":10} | ||
""" | ||
|
||
def __init__(self, actor_id: str, initstate: Optional[dict]): | ||
self.id = ActorId(actor_id) | ||
self._runtime_ctx = None # type: ignore | ||
self._state_manager = MockStateManager(self, initstate) | ||
|
||
async def register_timer( | ||
self, | ||
name: Optional[str], | ||
callback: TIMER_CALLBACK, | ||
state: Any, | ||
due_time: timedelta, | ||
period: timedelta, | ||
ttl: Optional[timedelta] = None, | ||
) -> None: | ||
"""Adds actor timer to self._state_manager._mock_timers. | ||
Args: | ||
name (str): the name of the timer to register. | ||
callback (Callable): An awaitable callable which will be called when the timer fires. | ||
state (Any): An object which will pass to the callback method, or None. | ||
due_time (datetime.timedelta): the amount of time to delay before the awaitable | ||
callback is first invoked. | ||
period (datetime.timedelta): the time interval between invocations | ||
of the awaitable callback. | ||
ttl (Optional[datetime.timedelta]): the time interval before the timer stops firing | ||
""" | ||
name = name or self.__get_new_timer_name() | ||
timer = ActorTimerData(name, callback, state, due_time, period, ttl) | ||
self._state_manager._mock_timers[name] = timer | ||
|
||
async def unregister_timer(self, name: str) -> None: | ||
"""Unregisters actor timer from self._state_manager._mock_timers. | ||
|
||
Args: | ||
name (str): the name of the timer to unregister. | ||
""" | ||
self._state_manager._mock_timers.pop(name, None) | ||
|
||
async def register_reminder( | ||
self, | ||
name: str, | ||
state: bytes, | ||
due_time: timedelta, | ||
period: timedelta, | ||
ttl: Optional[timedelta] = None, | ||
) -> None: | ||
"""Adds actor reminder to self._state_manager._mock_reminders. | ||
|
||
Args: | ||
name (str): the name of the reminder to register. the name must be unique per actor. | ||
state (bytes): the user state passed to the reminder invocation. | ||
due_time (datetime.timedelta): the amount of time to delay before invoking the reminder | ||
for the first time. | ||
period (datetime.timedelta): the time interval between reminder invocations after | ||
the first invocation. | ||
ttl (datetime.timedelta): the time interval before the reminder stops firing | ||
""" | ||
reminder = ActorReminderData(name, state, due_time, period, ttl) | ||
self._state_manager._mock_reminders[name] = reminder | ||
|
||
async def unregister_reminder(self, name: str) -> None: | ||
"""Unregisters actor reminder from self._state_manager._mock_reminders.. | ||
|
||
Args: | ||
name (str): the name of the reminder to unregister. | ||
""" | ||
self._state_manager._mock_reminders.pop(name, None) | ||
|
||
|
||
T = TypeVar('T', bound=Actor) | ||
|
||
|
||
def create_mock_actor(cls1: type[T], actor_id: str, initstate: Optional[dict] = None) -> T: | ||
class MockSuperClass(MockActor, cls1): # type: ignore | ||
pass | ||
|
||
return MockSuperClass(actor_id, initstate) # type: ignore |
This file contains 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 |
---|---|---|
@@ -0,0 +1,238 @@ | ||
""" | ||
Copyright 2023 The Dapr Authors | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
""" | ||
|
||
import asyncio | ||
from contextvars import ContextVar | ||
from typing import TYPE_CHECKING, Any, Callable, Dict, List, Optional, Tuple, TypeVar | ||
|
||
from dapr.actor.runtime._reminder_data import ActorReminderData | ||
from dapr.actor.runtime._timer_data import ActorTimerData | ||
from dapr.actor.runtime.state_change import ActorStateChange, StateChangeKind | ||
from dapr.actor.runtime.state_manager import ActorStateManager, StateMetadata | ||
|
||
if TYPE_CHECKING: | ||
from dapr.actor.runtime.mock_actor import MockActor | ||
|
||
T = TypeVar('T') | ||
CONTEXT: ContextVar[Optional[Dict[str, Any]]] = ContextVar('state_tracker_context') | ||
|
||
|
||
class MockStateManager(ActorStateManager): | ||
def __init__(self, actor: 'MockActor', initstate: Optional[dict]): | ||
self._actor = actor | ||
self._default_state_change_tracker: Dict[str, StateMetadata] = {} | ||
self._mock_state: Dict[str, Any] = {} | ||
self._mock_timers: Dict[str, ActorTimerData] = {} | ||
self._mock_reminders: Dict[str, ActorReminderData] = {} | ||
if initstate: | ||
self._mock_state = initstate | ||
|
||
async def add_state(self, state_name: str, value: T) -> None: | ||
if not await self.try_add_state(state_name, value): | ||
raise ValueError(f'The actor state name {state_name} already exist.') | ||
|
||
async def try_add_state(self, state_name: str, value: T) -> bool: | ||
if state_name in self._default_state_change_tracker: | ||
state_metadata = self._default_state_change_tracker[state_name] | ||
if state_metadata.change_kind == StateChangeKind.remove: | ||
self._default_state_change_tracker[state_name] = StateMetadata( | ||
value, StateChangeKind.update | ||
) | ||
return True | ||
return False | ||
existed = state_name in self._mock_state | ||
if existed: | ||
return False | ||
self._default_state_change_tracker[state_name] = StateMetadata(value, StateChangeKind.add) | ||
self._mock_state[state_name] = value | ||
return True | ||
|
||
async def get_state(self, state_name: str) -> Optional[T]: | ||
has_value, val = await self.try_get_state(state_name) | ||
if has_value: | ||
return val | ||
else: | ||
raise KeyError(f'Actor State with name {state_name} was not found.') | ||
|
||
async def try_get_state(self, state_name: str) -> Tuple[bool, Optional[T]]: | ||
if state_name in self._default_state_change_tracker: | ||
state_metadata = self._default_state_change_tracker[state_name] | ||
if state_metadata.change_kind == StateChangeKind.remove: | ||
return False, None | ||
return True, state_metadata.value | ||
has_value = state_name in self._mock_state | ||
val = self._mock_state.get(state_name) | ||
if has_value: | ||
self._default_state_change_tracker[state_name] = StateMetadata( | ||
val, StateChangeKind.none | ||
) | ||
return has_value, val | ||
|
||
async def set_state(self, state_name: str, value: T) -> None: | ||
await self.set_state_ttl(state_name, value, None) | ||
|
||
async def set_state_ttl(self, state_name: str, value: T, ttl_in_seconds: Optional[int]) -> None: | ||
if ttl_in_seconds is not None and ttl_in_seconds < 0: | ||
return | ||
|
||
if state_name in self._default_state_change_tracker: | ||
state_metadata = self._default_state_change_tracker[state_name] | ||
state_metadata.value = value | ||
state_metadata.ttl_in_seconds = ttl_in_seconds | ||
|
||
if ( | ||
state_metadata.change_kind == StateChangeKind.none | ||
or state_metadata.change_kind == StateChangeKind.remove | ||
): | ||
state_metadata.change_kind = StateChangeKind.update | ||
self._default_state_change_tracker[state_name] = state_metadata | ||
self._mock_state[state_name] = value | ||
return | ||
|
||
existed = state_name in self._mock_state | ||
if existed: | ||
self._default_state_change_tracker[state_name] = StateMetadata( | ||
value, StateChangeKind.update, ttl_in_seconds | ||
) | ||
else: | ||
self._default_state_change_tracker[state_name] = StateMetadata( | ||
value, StateChangeKind.add, ttl_in_seconds | ||
) | ||
self._mock_state[state_name] = value | ||
|
||
async def remove_state(self, state_name: str) -> None: | ||
if not await self.try_remove_state(state_name): | ||
raise KeyError(f'Actor State with name {state_name} was not found.') | ||
|
||
async def try_remove_state(self, state_name: str) -> bool: | ||
if state_name in self._default_state_change_tracker: | ||
state_metadata = self._default_state_change_tracker[state_name] | ||
if state_metadata.change_kind == StateChangeKind.remove: | ||
return False | ||
elif state_metadata.change_kind == StateChangeKind.add: | ||
self._default_state_change_tracker.pop(state_name, None) | ||
self._mock_state.pop(state_name, None) | ||
return True | ||
self._mock_state.pop(state_name, None) | ||
state_metadata.change_kind = StateChangeKind.remove | ||
return True | ||
|
||
existed = state_name in self._mock_state | ||
if existed: | ||
self._default_state_change_tracker[state_name] = StateMetadata( | ||
None, StateChangeKind.remove | ||
) | ||
self._mock_state.pop(state_name, None) | ||
return True | ||
return False | ||
|
||
async def contains_state(self, state_name: str) -> bool: | ||
if state_name in self._default_state_change_tracker: | ||
state_metadata = self._default_state_change_tracker[state_name] | ||
return state_metadata.change_kind != StateChangeKind.remove | ||
return state_name in self._mock_state | ||
|
||
async def get_or_add_state(self, state_name: str, value: T) -> Optional[T]: | ||
has_value, val = await self.try_get_state(state_name) | ||
if has_value: | ||
return val | ||
change_kind = ( | ||
StateChangeKind.update | ||
if self.is_state_marked_for_remove(state_name) | ||
else StateChangeKind.add | ||
) | ||
self._mock_state[state_name] = value | ||
self._default_state_change_tracker[state_name] = StateMetadata(value, change_kind) | ||
return value | ||
|
||
async def add_or_update_state( | ||
self, state_name: str, value: T, update_value_factory: Callable[[str, T], T] | ||
) -> T: | ||
if not callable(update_value_factory): | ||
raise AttributeError('update_value_factory is not callable') | ||
|
||
if state_name in self._default_state_change_tracker: | ||
state_metadata = self._default_state_change_tracker[state_name] | ||
if state_metadata.change_kind == StateChangeKind.remove: | ||
self._default_state_change_tracker[state_name] = StateMetadata( | ||
value, StateChangeKind.update | ||
) | ||
self._mock_state[state_name] = value | ||
return value | ||
new_value = update_value_factory(state_name, state_metadata.value) | ||
state_metadata.value = new_value | ||
if state_metadata.change_kind == StateChangeKind.none: | ||
state_metadata.change_kind = StateChangeKind.update | ||
self._default_state_change_tracker[state_name] = state_metadata | ||
self._mock_state[state_name] = new_value | ||
return new_value | ||
|
||
has_value = state_name in self._mock_state | ||
val: Any = self._mock_state.get(state_name) | ||
if has_value: | ||
new_value = update_value_factory(state_name, val) | ||
self._default_state_change_tracker[state_name] = StateMetadata( | ||
new_value, StateChangeKind.update | ||
) | ||
self._mock_state[state_name] = new_value | ||
return new_value | ||
self._default_state_change_tracker[state_name] = StateMetadata(value, StateChangeKind.add) | ||
self._mock_state[state_name] = value | ||
return value | ||
|
||
async def get_state_names(self) -> List[str]: | ||
# TODO: Get all state names from Dapr once implemented. | ||
def append_names_sync(): | ||
state_names = [] | ||
for key, value in self._default_state_change_tracker.items(): | ||
if value.change_kind == StateChangeKind.add: | ||
state_names.append(key) | ||
elif value.change_kind == StateChangeKind.remove: | ||
state_names.append(key) | ||
return state_names | ||
|
||
default_loop = asyncio.get_running_loop() | ||
return await default_loop.run_in_executor(None, append_names_sync) | ||
|
||
async def clear_cache(self) -> None: | ||
self._default_state_change_tracker.clear() | ||
|
||
async def save_state(self) -> None: | ||
if len(self._default_state_change_tracker) == 0: | ||
return | ||
|
||
state_changes = [] | ||
states_to_remove = [] | ||
for state_name, state_metadata in self._default_state_change_tracker.items(): | ||
if state_metadata.change_kind == StateChangeKind.none: | ||
continue | ||
state_changes.append( | ||
ActorStateChange( | ||
state_name, | ||
state_metadata.value, | ||
state_metadata.change_kind, | ||
state_metadata.ttl_in_seconds, | ||
) | ||
) | ||
if state_metadata.change_kind == StateChangeKind.remove: | ||
states_to_remove.append(state_name) | ||
# Mark the states as unmodified so that tracking for next invocation is done correctly. | ||
state_metadata.change_kind = StateChangeKind.none | ||
for state_name in states_to_remove: | ||
self._default_state_change_tracker.pop(state_name, None) | ||
|
||
def is_state_marked_for_remove(self, state_name: str) -> bool: | ||
return ( | ||
state_name in self._default_state_change_tracker | ||
and self._default_state_change_tracker[state_name].change_kind == StateChangeKind.remove | ||
) |
This file contains 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we need this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you don't add this, then because of the type hinting problems mentioned earlier, the _mock_state, _mock_reminders and _mock_timer variables won't be correctly type hinted by the IDE, and will show up as white unknown variables.
With those type hint stubs
Without
Yes the code would still run just fine, but it's not very nice, no?
Type hinting the MockStateManager is of no use, because (as you can see in the image) it thinks the _state_manager variable it is dealing with is an ActorStateManager instead of MockStateManager.
In my view adding these stubs to ActorStateManager is harmless (at least, I cannot think of a scenario where they might cause problems or be undesirable) so I think they're worth having.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm leaning more towards removing the
_mock
arguments from the main code, and rely on good documentation (which @lor1113 already did) for awareness of the properties' existence. What do you think @berndverst ?