Skip to content

Commit 826e60c

Browse files
fix: result
1 parent 8aa2fe7 commit 826e60c

File tree

4 files changed

+10
-7
lines changed
  • packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/storage
  • services

4 files changed

+10
-7
lines changed

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/storage/simcore_s3.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ async def start_search(
6161
rabbitmq_rpc_client: RabbitMQRPCClient,
6262
*,
6363
owner_metadata: OwnerMetadata,
64+
user_id: UserID,
6465
limit: int,
6566
name_pattern: str,
6667
modified_at: (
@@ -73,6 +74,7 @@ async def start_search(
7374
rpc_namespace=STORAGE_RPC_NAMESPACE,
7475
method_name=TypeAdapter(RPCMethodName).validate_python("start_search"),
7576
owner_metadata=owner_metadata,
77+
user_id=user_id,
7678
limit=limit,
7779
name_pattern=name_pattern,
7880
modified_at=modified_at,

services/storage/src/simcore_service_storage/api/rpc/_simcore_s3.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ async def copy_folders_from_project(
4949
async def start_export_data(
5050
task_manager: TaskManager,
5151
owner_metadata: OwnerMetadata,
52+
user_id: UserID,
5253
paths_to_export: list[PathToExport],
5354
export_as: Literal["path", "download_link"],
54-
user_id: UserID,
5555
) -> AsyncJobGet:
5656
if export_as == "path":
5757
task_name = export_data.__name__
@@ -75,7 +75,8 @@ async def start_export_data(
7575
@router.expose()
7676
async def start_search(
7777
task_manager: TaskManager,
78-
job_filter: AsyncJobFilter,
78+
owner_metadata: OwnerMetadata,
79+
user_id: UserID,
7980
limit: int,
8081
name_pattern: str,
8182
modified_at: (
@@ -84,14 +85,13 @@ async def start_search(
8485
project_id: str | None = None,
8586
) -> AsyncJobGet:
8687
task_name = search.__name__
87-
task_filter = TaskFilter.model_validate(job_filter.model_dump())
8888
task_uuid = await task_manager.submit_task(
89-
task_metadata=TaskMetadata(
89+
execution_metadata=ExecutionMetadata(
9090
name=task_name,
9191
streamed_result=True,
9292
),
93-
task_filter=task_filter,
94-
user_id=job_filter.user_id,
93+
owner_metadata=owner_metadata,
94+
user_id=user_id,
9595
project_id=project_id,
9696
limit=limit,
9797
name_pattern=name_pattern,

services/web/server/src/simcore_service_webserver/storage/_rest.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -564,6 +564,7 @@ class _PathParams(BaseModel):
564564
product_name=_req_ctx.product_name,
565565
).model_dump()
566566
),
567+
user_id=_req_ctx.user_id,
567568
limit=search_body.limit,
568569
name_pattern=search_body.filters.name_pattern,
569570
modified_at=(

services/web/server/src/simcore_service_webserver/tasks/_rest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ async def get_async_job_result(request: web.Request) -> web.Response:
186186
)
187187

188188
return create_data_response(
189-
TaskResult(result=task_result, error=None),
189+
TaskResult(result=task_result.result, error=None),
190190
status=status.HTTP_200_OK,
191191
)
192192

0 commit comments

Comments
 (0)