Skip to content

Commit 6eb9b2e

Browse files
author
Andrei Neagu
committed
rename endpoint
1 parent eb681b1 commit 6eb9b2e

File tree

7 files changed

+11
-12
lines changed

7 files changed

+11
-12
lines changed

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/dynamic_scheduler/services.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ async def stop_dynamic_service(
8080

8181

8282
@log_decorator(_logger, level=logging.DEBUG)
83-
async def retrieve_data_on_ports(
83+
async def retrieve_inputs(
8484
rabbitmq_rpc_client: RabbitMQRPCClient,
8585
*,
8686
node_id: NodeID,
@@ -89,7 +89,7 @@ async def retrieve_data_on_ports(
8989
) -> RetrieveDataOutEnveloped:
9090
result = await rabbitmq_rpc_client.request(
9191
DYNAMIC_SCHEDULER_RPC_NAMESPACE,
92-
_RPC_METHOD_NAME_ADAPTER.validate_python("retrieve_data_on_ports"),
92+
_RPC_METHOD_NAME_ADAPTER.validate_python("retrieve_inputs"),
9393
node_id=node_id,
9494
port_keys=port_keys,
9595
timeout_s=timeout_s,

services/dynamic-scheduler/src/simcore_service_dynamic_scheduler/api/rpc/_services.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ async def stop_dynamic_service(
5252

5353

5454
@router.expose()
55-
async def retrieve_data_on_ports(
55+
async def retrieve_inputs(
5656
app: FastAPI, *, node_id: NodeID, port_keys: list[ServicePortKey]
5757
) -> RetrieveDataOutEnveloped:
58-
return await scheduler_interface.retrieve_data_on_ports(
58+
return await scheduler_interface.retrieve_inputs(
5959
app, node_id=node_id, port_keys=port_keys
6060
)

services/dynamic-scheduler/src/simcore_service_dynamic_scheduler/services/director_v2/_public_client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ async def stop_dynamic_service(
102102

103103
raise
104104

105-
async def retrieve_data_on_ports(
105+
async def retrieve_inputs(
106106
self,
107107
*,
108108
node_id: NodeID,

services/dynamic-scheduler/src/simcore_service_dynamic_scheduler/services/scheduler_interface.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,15 @@ async def stop_dynamic_service(
6464
await set_request_as_stopped(app, dynamic_service_stop)
6565

6666

67-
async def retrieve_data_on_ports(
67+
async def retrieve_inputs(
6868
app: FastAPI, *, node_id: NodeID, port_keys: list[ServicePortKey]
6969
) -> RetrieveDataOutEnveloped:
7070
settings: ApplicationSettings = app.state.settings
7171
if settings.DYNAMIC_SCHEDULER_USE_INTERNAL_SCHEDULER:
7272
raise NotImplementedError
7373

7474
director_v2_client = DirectorV2Client.get_from_app_state(app)
75-
return await director_v2_client.retrieve_data_on_ports(
75+
return await director_v2_client.retrieve_inputs(
7676
node_id=node_id,
7777
port_keys=port_keys,
7878
timeout=settings.DYNAMIC_SCHEDULER_SERVICE_UPLOAD_DOWNLOAD_TIMEOUT,

services/web/server/src/simcore_service_webserver/dynamic_scheduler/api.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,12 +139,11 @@ async def stop_dynamic_services_in_project(
139139
await logged_gather(*services_to_stop)
140140

141141

142-
# NOTE: ANE https://github.com/ITISFoundation/osparc-simcore/issues/3191
143-
async def retrieve(
142+
async def retrieve_inputs(
144143
app: web.Application, node_id: NodeID, port_keys: list[ServicePortKey]
145144
) -> RetrieveDataOutEnveloped:
146145
settings: DynamicSchedulerSettings = get_plugin_settings(app)
147-
return await services.retrieve_data_on_ports(
146+
return await services.retrieve_inputs(
148147
get_rabbitmq_rpc_client(app),
149148
node_id=node_id,
150149
port_keys=port_keys,

services/web/server/src/simcore_service_webserver/projects/_nodes_handlers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ async def retrieve_node(request: web.Request) -> web.Response:
280280
retrieve = await parse_request_body_as(NodeRetrieve, request)
281281

282282
return web.json_response(
283-
await dynamic_scheduler_api.retrieve(
283+
await dynamic_scheduler_api.retrieve_inputs(
284284
request.app, path_params.node_id, retrieve.port_keys
285285
),
286286
dumps=json_dumps,

services/web/server/src/simcore_service_webserver/projects/projects_api.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1129,7 +1129,7 @@ async def _safe_retrieve(
11291129
app: web.Application, node_id: NodeID, port_keys: list[str]
11301130
) -> None:
11311131
try:
1132-
await dynamic_scheduler_api.retrieve(app, node_id, port_keys)
1132+
await dynamic_scheduler_api.retrieve_inputs(app, node_id, port_keys)
11331133
except RPCServerError as exc:
11341134
log.warning(
11351135
"Unable to call :retrieve endpoint on service %s, keys: [%s]: error: [%s]",

0 commit comments

Comments
 (0)