Skip to content

Commit 8786b9a

Browse files
fix mypy
1 parent a1caf73 commit 8786b9a

File tree

9 files changed

+26
-23
lines changed

9 files changed

+26
-23
lines changed

services/web/server/src/simcore_service_webserver/meta_modeling/_results.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,5 +110,5 @@ def extract_project_results(workbench: dict[str, Any]) -> ExtractedResults:
110110
values = node["outputs"]
111111
results[noid], labels[noid] = values, label
112112

113-
res = ExtractedResults(progress=progress, labels=labels, values=results) # type: ignore[arg-type]
113+
res = ExtractedResults(progress=progress, labels=labels, values=results)
114114
return res

services/web/server/src/simcore_service_webserver/notifications/_rabbitmq_exclusive_queue_consumers.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
)
1414
from models_library.socketio import SocketMessageDict
1515
from models_library.users import GroupID
16-
from pydantic import parse_raw_as
16+
from pydantic import TypeAdapter, parse_raw_as
1717
from servicelib.logging_utils import log_catch, log_context
1818
from servicelib.rabbitmq import RabbitMQClient
1919
from servicelib.utils import logged_gather
@@ -67,8 +67,10 @@ async def _convert_to_node_update_event(
6767
async def _progress_message_parser(app: web.Application, data: bytes) -> bool:
6868
rabbit_message: (
6969
ProgressRabbitMessageNode | ProgressRabbitMessageProject
70-
) = parse_raw_as(
71-
ProgressRabbitMessageNode | ProgressRabbitMessageProject, data # type: ignore[arg-type] # from pydantic v2 --> https://github.com/pydantic/pydantic/discussions/4950
70+
) = TypeAdapter(
71+
ProgressRabbitMessageNode | ProgressRabbitMessageProject
72+
).validate_json(
73+
data
7274
)
7375
message: SocketMessageDict | None = None
7476
if isinstance(rabbit_message, ProgressRabbitMessageProject):

services/web/server/src/simcore_service_webserver/payments/_onetime_api.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import logging
22
from decimal import Decimal
3-
from typing import Any, cast
3+
from typing import Any
44
from uuid import uuid4
55

66
import arrow
@@ -235,11 +235,8 @@ async def _fake_get_payment_invoice_url(
235235
assert user_id # nosec
236236
assert wallet_id # nosec
237237

238-
return cast(
239-
HttpUrl,
240-
TypeAdapter(HttpUrl).validate_python(
241-
f"https://fake-invoice.com/?id={payment_id}"
242-
),
238+
return TypeAdapter(HttpUrl).validate_python(
239+
f"https://fake-invoice.com/?id={payment_id}",
243240
)
244241

245242

services/web/server/src/simcore_service_webserver/products/_db.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ async def get_product(self, product_name: str) -> Product | None:
100100
return Product(
101101
**dict(row.items()),
102102
is_payment_enabled=payments.enabled,
103-
credits_per_usd=payments.credits_per_usd, # type: ignore[arg-type]
103+
credits_per_usd=payments.credits_per_usd,
104104
)
105105
return None
106106

services/web/server/src/simcore_service_webserver/products/_invitations_handlers.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,13 @@ async def generate_invitation(request: web.Request):
5555
assert generated.product == req_ctx.product_name # nosec
5656
assert generated.guest == body.guest # nosec
5757

58-
url = URL(generated.invitation_url)
58+
url = URL(f"{generated.invitation_url}")
5959
invitation_link = request.url.with_path(url.path).with_fragment(url.raw_fragment)
6060

6161
invitation = InvitationGenerated(
6262
product_name=generated.product,
6363
issuer=generated.issuer,
64-
guest=generated.guest, # type: ignore[arg-type]
64+
guest=generated.guest,
6565
trial_account_days=generated.trial_account_days,
6666
extra_credits_in_usd=generated.extra_credits_in_usd,
6767
created=generated.created,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ async def lock_project(
5353
blocking=False,
5454
token=ProjectLocked(
5555
value=True,
56-
owner=Owner(user_id=user_id, **user_fullname), # type: ignore[arg-type]
56+
owner=Owner(user_id=user_id, **user_fullname),
5757
status=status,
5858
).json(),
5959
):

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1418,7 +1418,7 @@ async def _get_project_lock_state(
14181418
)
14191419
return ProjectLocked(
14201420
value=False,
1421-
owner=Owner(user_id=list(set_user_ids)[0], **usernames[0]), # type: ignore[arg-type]
1421+
owner=Owner(user_id=list(set_user_ids)[0], **usernames[0]),
14221422
status=ProjectStatus.OPENED,
14231423
)
14241424
# the project is opened in another tab or browser, or by another user, both case resolves to the project being locked, and opened
@@ -1429,7 +1429,7 @@ async def _get_project_lock_state(
14291429
)
14301430
return ProjectLocked(
14311431
value=True,
1432-
owner=Owner(user_id=list(set_user_ids)[0], **usernames[0]), # type: ignore[arg-type]
1432+
owner=Owner(user_id=list(set_user_ids)[0], **usernames[0]),
14331433
status=ProjectStatus.OPENED,
14341434
)
14351435

services/web/server/src/simcore_service_webserver/resource_usage/_service_runs_handlers.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,9 @@ async def list_resource_usage_services(request: web.Request):
165165
offset=query_params.offset,
166166
limit=query_params.limit,
167167
order_by=TypeAdapter(OrderBy).validate_python(query_params.order_by),
168-
filters=TypeAdapter(ServiceResourceUsagesFilters | None).validate_python(query_params.filters), # type: ignore[arg-type] # from pydantic v2 --> https://github.com/pydantic/pydantic/discussions/4950
168+
filters=TypeAdapter(ServiceResourceUsagesFilters | None).validate_python(
169+
query_params.filters
170+
),
169171
)
170172

171173
page = Page[dict[str, Any]].model_validate(
@@ -242,7 +244,9 @@ async def export_resource_usage_services(request: web.Request):
242244
user_id=req_ctx.user_id,
243245
product_name=req_ctx.product_name,
244246
wallet_id=query_params.wallet_id,
245-
order_by=TypeAdapter(OrderBy | None).validate_python(query_params.order_by), # type: ignore[arg-type] # from pydantic v2 --> https://github.com/pydantic/pydantic/discussions/4950
246-
filters=TypeAdapter(ServiceResourceUsagesFilters | None).validate_python(query_params.filters), # type: ignore[arg-type] # from pydantic v2 --> https://github.com/pydantic/pydantic/discussions/4950
247+
order_by=TypeAdapter(OrderBy | None).validate_python(query_params.order_by),
248+
filters=TypeAdapter(ServiceResourceUsagesFilters | None).validate_python(
249+
query_params.filters
250+
),
247251
)
248252
raise web.HTTPFound(location=f"{download_url}")

services/web/server/src/simcore_service_webserver/studies_dispatcher/_projects.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ def _create_file_picker(download_link: str, output_label: str | None):
7171
label="File Picker",
7272
inputs={},
7373
inputNodes=[],
74-
outputs={output_id: output}, # type: ignore[dict-item]
74+
outputs={output_id: output},
7575
progress=0,
7676
)
7777
return node, output_id
@@ -96,12 +96,12 @@ def _create_project(
9696
uuid=project_id,
9797
name=name,
9898
description=description,
99-
thumbnail=thumbnail, # type: ignore[arg-type]
99+
thumbnail=thumbnail,
100100
prjOwner=owner.email,
101101
accessRights={owner.primary_gid: access_rights}, # type: ignore[dict-item]
102102
creationDate=DateTimeStr(now_str()),
103103
lastChangeDate=DateTimeStr(now_str()),
104-
workbench=workbench, # type: ignore[arg-type]
104+
workbench=workbench,
105105
ui=StudyUI(workbench=workbench_ui), # type: ignore[arg-type]
106106
)
107107

@@ -155,7 +155,7 @@ def _create_project_with_filepicker_and_service(
155155
version=viewer_info.version,
156156
label=viewer_info.label,
157157
inputs={
158-
viewer_info.input_port_key: PortLink( # type: ignore[dict-item]
158+
viewer_info.input_port_key: PortLink(
159159
nodeUuid=file_picker_id,
160160
output=file_picker_output_id,
161161
)

0 commit comments

Comments
 (0)