Skip to content

Commit ccfe07f

Browse files
revert endpoint type
1 parent 0681310 commit ccfe07f

File tree

2 files changed

+61
-50
lines changed
  • services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/api_client

2 files changed

+61
-50
lines changed

services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/api_client/_public.py

Lines changed: 31 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ def _dynamic_services_scheduler_settings(self) -> DynamicServicesSchedulerSettin
8181
return settings
8282

8383
async def is_healthy(
84-
self, dynamic_sidecar_endpoint: str, *, with_retry: bool = True
84+
self, dynamic_sidecar_endpoint: AnyHttpUrl, *, with_retry: bool = True
8585
) -> bool:
8686
"""returns True if service is UP and running else False"""
8787
try:
@@ -97,7 +97,9 @@ async def is_healthy(
9797
except BaseHttpClientError:
9898
return False
9999

100-
async def containers_inspect(self, dynamic_sidecar_endpoint: str) -> dict[str, Any]:
100+
async def containers_inspect(
101+
self, dynamic_sidecar_endpoint: AnyHttpUrl
102+
) -> dict[str, Any]:
101103
"""
102104
returns dict containing docker inspect result form
103105
all dynamic-sidecar started containers
@@ -110,7 +112,7 @@ async def containers_inspect(self, dynamic_sidecar_endpoint: str) -> dict[str, A
110112

111113
@log_decorator(logger=_logger)
112114
async def containers_docker_status(
113-
self, dynamic_sidecar_endpoint: str
115+
self, dynamic_sidecar_endpoint: AnyHttpUrl
114116
) -> dict[str, dict[str, str]]:
115117
try:
116118
response = await self._thin_client.get_containers(
@@ -124,7 +126,7 @@ async def containers_docker_status(
124126
@log_decorator(logger=_logger)
125127
async def toggle_service_ports_io(
126128
self,
127-
dynamic_sidecar_endpoint: str,
129+
dynamic_sidecar_endpoint: AnyHttpUrl,
128130
*,
129131
enable_outputs: bool,
130132
enable_inputs: bool,
@@ -137,15 +139,15 @@ async def toggle_service_ports_io(
137139

138140
@log_decorator(logger=_logger)
139141
async def service_outputs_create_dirs(
140-
self, dynamic_sidecar_endpoint: str, outputs_labels: dict[str, Any]
142+
self, dynamic_sidecar_endpoint: AnyHttpUrl, outputs_labels: dict[str, Any]
141143
) -> None:
142144
await self._thin_client.post_containers_ports_outputs_dirs(
143145
dynamic_sidecar_endpoint, outputs_labels=outputs_labels
144146
)
145147

146148
@log_decorator(logger=_logger)
147149
async def get_entrypoint_container_name(
148-
self, dynamic_sidecar_endpoint: str, dynamic_sidecar_network_name: str
150+
self, dynamic_sidecar_endpoint: AnyHttpUrl, dynamic_sidecar_network_name: str
149151
) -> str:
150152
"""
151153
While this API raises EntrypointContainerNotFoundError
@@ -169,7 +171,7 @@ async def get_entrypoint_container_name(
169171

170172
async def _attach_container_to_network(
171173
self,
172-
dynamic_sidecar_endpoint: str,
174+
dynamic_sidecar_endpoint: AnyHttpUrl,
173175
container_id: str,
174176
network_id: str,
175177
network_aliases: list[str],
@@ -183,7 +185,7 @@ async def _attach_container_to_network(
183185
)
184186

185187
async def _detach_container_from_network(
186-
self, dynamic_sidecar_endpoint: str, container_id: str, network_id: str
188+
self, dynamic_sidecar_endpoint: AnyHttpUrl, container_id: str, network_id: str
187189
) -> None:
188190
"""detaches a container from a network if not already detached"""
189191
await self._thin_client.post_containers_networks_detach(
@@ -192,7 +194,7 @@ async def _detach_container_from_network(
192194

193195
async def attach_service_containers_to_project_network(
194196
self,
195-
dynamic_sidecar_endpoint: str,
197+
dynamic_sidecar_endpoint: AnyHttpUrl,
196198
dynamic_sidecar_network_name: str,
197199
project_network: str,
198200
project_id: ProjectID,
@@ -248,7 +250,7 @@ async def attach_service_containers_to_project_network(
248250

249251
async def detach_service_containers_from_project_network(
250252
self,
251-
dynamic_sidecar_endpoint: str,
253+
dynamic_sidecar_endpoint: AnyHttpUrl,
252254
project_network: str,
253255
project_id: ProjectID,
254256
) -> None:
@@ -280,14 +282,14 @@ async def detach_service_containers_from_project_network(
280282

281283
async def submit_docker_compose_spec(
282284
self,
283-
dynamic_sidecar_endpoint: str,
285+
dynamic_sidecar_endpoint: AnyHttpUrl,
284286
compose_spec: str,
285287
) -> None:
286288
await self._thin_client.post_containers_compose_spec(
287289
dynamic_sidecar_endpoint, compose_spec=compose_spec
288290
)
289291

290-
def _get_client(self, dynamic_sidecar_endpoint: str) -> Client:
292+
def _get_client(self, dynamic_sidecar_endpoint: AnyHttpUrl) -> Client:
291293
return Client(
292294
app=self._app,
293295
async_client=self._async_client,
@@ -297,7 +299,7 @@ def _get_client(self, dynamic_sidecar_endpoint: str) -> Client:
297299
async def _await_for_result(
298300
self,
299301
task_id: TaskId,
300-
dynamic_sidecar_endpoint: str,
302+
dynamic_sidecar_endpoint: AnyHttpUrl,
301303
task_timeout: PositiveFloat,
302304
progress_callback: ProgressCallback | None = None,
303305
) -> Any | None:
@@ -313,7 +315,7 @@ async def _await_for_result(
313315

314316
async def create_containers(
315317
self,
316-
dynamic_sidecar_endpoint: str,
318+
dynamic_sidecar_endpoint: AnyHttpUrl,
317319
metrics_params: CreateServiceMetricsAdditionalParams,
318320
progress_callback: ProgressCallback | None = None,
319321
) -> None:
@@ -332,7 +334,7 @@ async def create_containers(
332334

333335
async def stop_service(
334336
self,
335-
dynamic_sidecar_endpoint: str,
337+
dynamic_sidecar_endpoint: AnyHttpUrl,
336338
progress_callback: ProgressCallback | None = None,
337339
) -> None:
338340
response = await self._thin_client.post_containers_tasks_down(
@@ -347,7 +349,7 @@ async def stop_service(
347349
progress_callback,
348350
)
349351

350-
async def restore_service_state(self, dynamic_sidecar_endpoint: str) -> int:
352+
async def restore_service_state(self, dynamic_sidecar_endpoint: AnyHttpUrl) -> int:
351353
response = await self._thin_client.post_containers_tasks_state_restore(
352354
dynamic_sidecar_endpoint
353355
)
@@ -362,7 +364,9 @@ async def restore_service_state(self, dynamic_sidecar_endpoint: str) -> int:
362364
assert isinstance(result, int) # nosec
363365
return result
364366

365-
async def pull_user_services_images(self, dynamic_sidecar_endpoint: str) -> None:
367+
async def pull_user_services_images(
368+
self, dynamic_sidecar_endpoint: AnyHttpUrl
369+
) -> None:
366370
response = await self._thin_client.post_containers_images_pull(
367371
dynamic_sidecar_endpoint
368372
)
@@ -377,7 +381,7 @@ async def pull_user_services_images(self, dynamic_sidecar_endpoint: str) -> None
377381

378382
async def save_service_state(
379383
self,
380-
dynamic_sidecar_endpoint: str,
384+
dynamic_sidecar_endpoint: AnyHttpUrl,
381385
progress_callback: ProgressCallback | None = None,
382386
) -> int:
383387
response = await self._thin_client.post_containers_tasks_state_save(
@@ -396,7 +400,7 @@ async def save_service_state(
396400

397401
async def pull_service_input_ports(
398402
self,
399-
dynamic_sidecar_endpoint: str,
403+
dynamic_sidecar_endpoint: AnyHttpUrl,
400404
port_keys: list[ServicePortKey] | None = None,
401405
) -> int:
402406
response = await self._thin_client.post_containers_tasks_ports_inputs_pull(
@@ -414,7 +418,7 @@ async def pull_service_input_ports(
414418

415419
async def pull_service_output_ports(
416420
self,
417-
dynamic_sidecar_endpoint: str,
421+
dynamic_sidecar_endpoint: AnyHttpUrl,
418422
port_keys: list[str] | None = None,
419423
) -> int:
420424
response = await self._thin_client.post_containers_tasks_ports_outputs_pull(
@@ -433,7 +437,7 @@ async def pull_service_output_ports(
433437

434438
async def push_service_output_ports(
435439
self,
436-
dynamic_sidecar_endpoint: str,
440+
dynamic_sidecar_endpoint: AnyHttpUrl,
437441
progress_callback: ProgressCallback | None = None,
438442
) -> None:
439443
response = await self._thin_client.post_containers_tasks_ports_outputs_push(
@@ -448,7 +452,7 @@ async def push_service_output_ports(
448452
progress_callback,
449453
)
450454

451-
async def restart_containers(self, dynamic_sidecar_endpoint: str) -> None:
455+
async def restart_containers(self, dynamic_sidecar_endpoint: AnyHttpUrl) -> None:
452456
response = await self._thin_client.post_containers_tasks_restart(
453457
dynamic_sidecar_endpoint
454458
)
@@ -463,7 +467,7 @@ async def restart_containers(self, dynamic_sidecar_endpoint: str) -> None:
463467

464468
async def update_volume_state(
465469
self,
466-
dynamic_sidecar_endpoint: str,
470+
dynamic_sidecar_endpoint: AnyHttpUrl,
467471
volume_category: VolumeCategory,
468472
volume_status: VolumeStatus,
469473
) -> None:
@@ -485,7 +489,7 @@ async def configure_proxy(
485489
await self._thin_client.proxy_config_load(proxy_endpoint, proxy_configuration)
486490

487491
async def get_service_activity(
488-
self, dynamic_sidecar_endpoint: str
492+
self, dynamic_sidecar_endpoint: AnyHttpUrl
489493
) -> ActivityInfoOrNone:
490494
response = await self._thin_client.get_containers_activity(
491495
dynamic_sidecar_endpoint
@@ -495,7 +499,9 @@ async def get_service_activity(
495499
ActivityInfo.model_validate(decoded_response) if decoded_response else None
496500
)
497501

498-
async def free_reserved_disk_space(self, dynamic_sidecar_endpoint: str) -> None:
502+
async def free_reserved_disk_space(
503+
self, dynamic_sidecar_endpoint: AnyHttpUrl
504+
) -> None:
499505
await self._thin_client.post_disk_reserved_free(dynamic_sidecar_endpoint)
500506

501507

0 commit comments

Comments
 (0)