Skip to content

Commit 979cc2c

Browse files
committed
make pylint happy
1 parent 2ce52b6 commit 979cc2c

File tree

7 files changed

+14
-12
lines changed

7 files changed

+14
-12
lines changed

services/api-server/src/simcore_service_api_server/api/routes/function_jobs_routes.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ async def function_job_status(
258258
raise UnsupportedFunctionFunctionJobClassCombinationError(
259259
function_class=function.function_class,
260260
function_job_class=function_job.function_class,
261-
)
261+
) from exc
262262

263263

264264
async def get_function_from_functionjobid(

services/api-server/src/simcore_service_api_server/api/routes/functions_routes.py

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

2828
from ..._service_function_jobs import FunctionJobService
2929
from ..._service_functions import FunctionService
30-
from ...celery.worker_tasks.functions_tasks import map as map_task
30+
from ...celery.worker_tasks.functions_tasks import function_map as map_task
3131
from ...celery.worker_tasks.functions_tasks import run_function as run_function_task
3232
from ...exceptions.function_errors import FunctionJobCacheNotFoundError
3333
from ...models.domain.functions import PreRegisteredFunctionJobData

services/api-server/src/simcore_service_api_server/celery/worker_tasks/functions_tasks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ async def run_function(
119119
)
120120

121121

122-
async def map(
122+
async def function_map(
123123
task: Task,
124124
task_id: TaskID,
125125
*,

services/api-server/src/simcore_service_api_server/celery/worker_tasks/tasks.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
from ...models.api_resources import JobLinks
1919
from ...models.domain.functions import PreRegisteredFunctionJobData
2020
from ...models.schemas.jobs import JobInputs, JobPricingSpecification
21-
from .functions_tasks import map, run_function
21+
from .functions_tasks import function_map, run_function
2222

2323
_logger = logging.getLogger(__name__)
2424

@@ -43,4 +43,4 @@ def setup_worker_tasks(app: Celery) -> None:
4343

4444
with log_context(_logger, logging.INFO, msg="worker task registration"):
4545
register_task(app, run_function)
46-
register_task(app, map)
46+
register_task(app, function_map)

services/api-server/tests/unit/api_functions/celery/test_functions.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ async def test_map_function_parent_info(
440440
with_api_server_celery_worker: TestWorkController,
441441
client: AsyncClient,
442442
mock_handler_in_functions_rpc_interface: Callable[
443-
[str, Any, Exception | None, Callable | None], None
443+
[str, Any, Exception | None, Callable | None], MockType
444444
],
445445
mock_registered_project_function: RegisteredProjectFunction,
446446
mock_registered_project_function_job: RegisteredFunctionJob,
@@ -550,7 +550,7 @@ def _default_side_effect(
550550
assert response.status_code == expected_status_code
551551

552552
if expected_status_code == status.HTTP_200_OK:
553-
job_collection = FunctionJobCollection.model_validate(response.json())
553+
FunctionJobCollection.model_validate(response.json())
554554
task_id = patch_mock.call_args.kwargs[
555555
"registered_function_job_patch"
556556
].job_creation_task_id

services/api-server/tests/unit/api_functions/conftest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ def mock_registered_function_job_collection(
260260
@pytest.fixture()
261261
def mock_handler_in_functions_rpc_interface(
262262
mock_wb_api_server_rpc: MockerFixture,
263-
) -> Callable[[str, Any, Exception | None, Callable | None], None]:
263+
) -> Callable[[str, Any, Exception | None, Callable | None], MockType]:
264264
def _mock(
265265
handler_name: str = "",
266266
return_value: Any = None,

services/api-server/tests/unit/api_functions/test_api_routers_function_jobs.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# pylint: disable=unused-argument
2+
# pylint: disable=too-many-arguments
3+
# pylint: disable=too-many-positional-arguments
24

35
import random
46
import uuid
@@ -9,7 +11,6 @@
911

1012
import httpx
1113
import pytest
12-
import simcore_service_api_server.api.routes.function_jobs_routes as function_jobs_routes
1314
from celery_library.task_manager import CeleryTaskManager
1415
from faker import Faker
1516
from fastapi import FastAPI, status
@@ -32,6 +33,7 @@
3233
from pytest_mock import MockerFixture, MockType
3334
from servicelib.celery.models import TaskFilter, TaskState, TaskStatus, TaskUUID
3435
from simcore_service_api_server._meta import API_VTAG
36+
from simcore_service_api_server.api.routes import function_jobs_routes
3537
from simcore_service_api_server.api.routes.function_jobs_routes import (
3638
_JOB_CREATION_TASK_STATUS_PREFIX,
3739
)
@@ -201,10 +203,10 @@ def mocked_list_function_jobs(offset: int, limit: int):
201203
(
202204
ProjectID(_faker.uuid4()),
203205
TaskID(_faker.uuid4()),
204-
random.choice([state for state in TaskState]),
206+
random.choice(list(TaskState)),
205207
),
206-
(None, None, random.choice([state for state in TaskState])),
207-
(None, TaskID(_faker.uuid4()), random.choice([state for state in TaskState])),
208+
(None, None, random.choice(list(TaskState))),
209+
(None, TaskID(_faker.uuid4()), random.choice(list(TaskState))),
208210
],
209211
)
210212
async def test_get_function_job_status(

0 commit comments

Comments
 (0)