Skip to content

Commit 4462b0e

Browse files
committed
client_name -> TaskOwner
1 parent 87e855c commit 4462b0e

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

packages/celery-library/tests/unit/test_async_jobs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ async def _start_task_via_rpc(
160160
**kwargs: Any,
161161
) -> tuple[AsyncJobGet, AsyncJobFilter]:
162162
job_filter = AsyncJobFilter(
163-
user_id=user_id, product_name=product_name, client_name="pytest_client"
163+
user_id=user_id, product_name=product_name, task_owner="pytest_client"
164164
)
165165
async_job_get = await async_jobs.submit(
166166
rabbitmq_rpc_client=client,

packages/models-library/src/models_library/api_schemas_rpc_async_jobs/async_jobs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ class AsyncJobFilter(AsyncJobFilterBase):
6767

6868
product_name: ProductName
6969
user_id: UserID
70-
client_name: Annotated[ # this is the name of the app which *submits* the async job. It is mainly used for filtering purposes
70+
task_owner: Annotated[ # this is the name of the app which *submits* the async job. It is mainly used for filtering purposes
7171
str,
7272
StringConstraints(min_length=1, pattern=r"^[^\s]+$"),
7373
]

packages/service-library/tests/rabbitmq/test_rabbitmq_rpc_interfaces_async_jobs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def job_filter(faker: Faker) -> AsyncJobFilter:
4242
return AsyncJobFilter(
4343
user_id=faker.pyint(min_value=1),
4444
product_name=faker.word(),
45-
client_name=_ASYNC_JOB_CLIENT_NAME,
45+
task_owner=_ASYNC_JOB_CLIENT_NAME,
4646
)
4747

4848

services/api-server/src/simcore_service_api_server/services_rpc/storage.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
def get_job_filter(user_id: UserID, product_name: ProductName) -> AsyncJobFilter:
2121
return AsyncJobFilter(
22-
user_id=user_id, product_name=product_name, client_name=APP_NAME
22+
user_id=user_id, product_name=product_name, task_owner=APP_NAME
2323
)
2424

2525

services/storage/tests/unit/test_rpc_handlers_paths.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ async def _assert_compute_path_size(
7474
location_id=location_id,
7575
path=path,
7676
job_filter=AsyncJobFilter(
77-
user_id=user_id, product_name=product_name, client_name="PYTEST_CLIENT_NAME"
77+
user_id=user_id, product_name=product_name, task_owner="PYTEST_CLIENT_NAME"
7878
),
7979
)
8080
async for job_composed_result in wait_and_get_result(
@@ -83,7 +83,7 @@ async def _assert_compute_path_size(
8383
method_name=RPCMethodName(compute_path_size.__name__),
8484
job_id=async_job.job_id,
8585
job_filter=AsyncJobFilter(
86-
user_id=user_id, product_name=product_name, client_name="PYTEST_CLIENT_NAME"
86+
user_id=user_id, product_name=product_name, task_owner="PYTEST_CLIENT_NAME"
8787
),
8888
client_timeout=datetime.timedelta(seconds=120),
8989
):
@@ -111,7 +111,7 @@ async def _assert_delete_paths(
111111
location_id=location_id,
112112
paths=paths,
113113
job_filter=AsyncJobFilter(
114-
user_id=user_id, product_name=product_name, client_name="PYTEST_CLIENT_NAME"
114+
user_id=user_id, product_name=product_name, task_owner="PYTEST_CLIENT_NAME"
115115
),
116116
)
117117
async for job_composed_result in wait_and_get_result(
@@ -120,7 +120,7 @@ async def _assert_delete_paths(
120120
method_name=RPCMethodName(compute_path_size.__name__),
121121
job_id=async_job.job_id,
122122
job_filter=AsyncJobFilter(
123-
user_id=user_id, product_name=product_name, client_name="PYTEST_CLIENT_NAME"
123+
user_id=user_id, product_name=product_name, task_owner="PYTEST_CLIENT_NAME"
124124
),
125125
client_timeout=datetime.timedelta(seconds=120),
126126
):

services/storage/tests/unit/test_rpc_handlers_simcore_s3.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ async def _request_copy_folders(
9393
job_filter=AsyncJobFilter(
9494
user_id=user_id,
9595
product_name=product_name,
96-
client_name="PYTEST_CLIENT_NAME",
96+
task_owner="PYTEST_CLIENT_NAME",
9797
),
9898
)
9999

@@ -537,7 +537,7 @@ async def _request_start_export_data(
537537
job_filter=AsyncJobFilter(
538538
user_id=user_id,
539539
product_name=product_name,
540-
client_name="PYTEST_CLIENT_NAME",
540+
task_owner="PYTEST_CLIENT_NAME",
541541
),
542542
)
543543

services/web/server/src/simcore_service_webserver/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,5 +129,5 @@ def compose_support_error_msg(
129129

130130
def get_job_filter(*, user_id: UserID, product_name: ProductName) -> AsyncJobFilter:
131131
return AsyncJobFilter(
132-
user_id=user_id, product_name=product_name, client_name=APP_NAME
132+
user_id=user_id, product_name=product_name, task_owner=APP_NAME
133133
)

0 commit comments

Comments
 (0)