Skip to content

Commit 5585566

Browse files
authored
🎨♻️ cosmetic / refactor: remove default value (#8660)
1 parent 3d5e1bd commit 5585566

File tree

7 files changed

+19
-10
lines changed

7 files changed

+19
-10
lines changed

services/director-v2/src/simcore_service_director_v2/api/routes/dynamic_services.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,9 @@ async def stop_dynamic_service(
186186
assert request # nosec
187187

188188
try:
189-
await scheduler.mark_service_for_removal(node_uuid, can_save)
189+
await scheduler.mark_service_for_removal(
190+
node_uuid=node_uuid, can_save=can_save, skip_observation_recreation=False
191+
)
190192
except DynamicSidecarNotFoundError:
191193
# legacy service? if it's not then a 404 will anyway be received
192194
# forward to director-v0

services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/scheduler/_abc.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ async def mark_service_for_removal(
107107
node_uuid: NodeID,
108108
can_save: bool | None,
109109
*,
110-
skip_observation_recreation: bool = False,
110+
skip_observation_recreation: bool,
111111
) -> None:
112112
"""The service will be removed as soon as possible"""
113113

services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/scheduler/_core/_scheduler.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ async def mark_service_for_removal(
323323
node_uuid: NodeID,
324324
can_save: bool | None,
325325
*,
326-
skip_observation_recreation: bool = False,
326+
skip_observation_recreation: bool,
327327
) -> None:
328328
"""Marks service for removal, causing RemoveMarkedService to trigger"""
329329
async with self._lock:
@@ -393,6 +393,7 @@ async def mark_all_services_in_wallet_for_removal(
393393
await self.mark_service_for_removal(
394394
scheduler_data.node_uuid,
395395
can_save=scheduler_data.dynamic_sidecar.service_removal_state.can_save,
396+
skip_observation_recreation=False,
396397
)
397398

398399
async def is_service_awaiting_manual_intervention(self, node_uuid: NodeID) -> bool:

services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/scheduler/_task.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,12 @@ async def mark_service_for_removal(
102102
node_uuid: NodeID,
103103
can_save: bool | None,
104104
*,
105-
skip_observation_recreation: bool = False,
105+
skip_observation_recreation: bool,
106106
) -> None:
107107
return await self.scheduler.mark_service_for_removal(
108-
node_uuid, can_save, skip_observation_recreation=skip_observation_recreation
108+
node_uuid=node_uuid,
109+
can_save=can_save,
110+
skip_observation_recreation=skip_observation_recreation,
109111
)
110112

111113
async def mark_all_services_in_wallet_for_removal(

services/director-v2/tests/unit/test_modules_dynamic_sidecar_observer.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,9 @@ async def test_regression_break_endless_loop_cancellation_edge_case(
145145
# NOTE: this will create the observation task as well!
146146
# Simulates user action like going back to the dashboard.
147147
await dynamic_sidecar_scheduler.mark_service_for_removal(
148-
scheduler_data_from_http_request.node_uuid, can_save=can_save
148+
scheduler_data_from_http_request.node_uuid,
149+
can_save=can_save,
150+
skip_observation_recreation=False,
149151
)
150152

151153
assert (

services/director-v2/tests/unit/test_modules_dynamic_sidecar_scheduler.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ async def _assert_get_dynamic_services_mocked(
113113
yield stack_status
114114

115115
await scheduler.mark_service_for_removal(
116-
scheduler_data.node_uuid, can_save=True
116+
scheduler_data.node_uuid, can_save=True, skip_observation_recreation=False
117117
)
118118
assert (
119119
scheduler_data.service_name
@@ -259,7 +259,9 @@ async def test_scheduler_add_remove(
259259
if with_observation_cycle:
260260
await manually_trigger_scheduler()
261261

262-
await scheduler.mark_service_for_removal(scheduler_data.node_uuid, can_save=True)
262+
await scheduler.mark_service_for_removal(
263+
scheduler_data.node_uuid, can_save=True, skip_observation_recreation=False
264+
)
263265
if with_observation_cycle:
264266
await manually_trigger_scheduler()
265267

@@ -354,7 +356,7 @@ async def test_remove_missing_no_error(
354356
) -> None:
355357
with pytest.raises(DynamicSidecarNotFoundError) as execinfo:
356358
await scheduler.mark_service_for_removal(
357-
scheduler_data.node_uuid, can_save=True
359+
scheduler_data.node_uuid, can_save=True, skip_observation_recreation=False
358360
)
359361
assert "not found" in str(execinfo.value)
360362

services/director-v2/tests/unit/with_dbs/test_api_route_dynamic_services.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ def get_stack_status(node_uuid: NodeID) -> RunningDynamicServiceDetails:
269269
)
270270

271271
# MOCKING remove_service
272-
def remove_service(node_uuid: NodeID, *ars: Any, **kwargs: Any) -> None:
272+
def remove_service(self, node_uuid: NodeID, *ars: Any, **kwargs: Any) -> None:
273273
if exp_status_code == status.HTTP_307_TEMPORARY_REDIRECT:
274274
raise DynamicSidecarNotFoundError(node_uuid=node_uuid)
275275

0 commit comments

Comments
 (0)