Skip to content

Commit e526d2a

Browse files
committed
mypy
1 parent df84132 commit e526d2a

File tree

2 files changed

+16
-10
lines changed
  • packages/models-library/src/models_library
  • services/web/server/src/simcore_service_webserver/studies_dispatcher

2 files changed

+16
-10
lines changed

packages/models-library/src/models_library/projects.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,17 +144,17 @@ class Project(BaseProjectModel):
144144
]
145145

146146
# Lifecycle
147-
creation_date: Annotated[
147+
creation_date: Annotated[ # type: ignore[assignment]
148148
DateTimeStr,
149-
Field( # type: ignore[assignment]
149+
Field(
150150
description="project creation date",
151151
examples=["2018-07-01T11:13:43Z"],
152152
alias="creationDate",
153153
),
154154
]
155-
last_change_date: Annotated[
155+
last_change_date: Annotated[ # type: ignore[assignment]
156156
DateTimeStr,
157-
Field( # type: ignore[assignment]
157+
Field(
158158
description="last save date",
159159
examples=["2018-07-01T11:13:43Z"],
160160
alias="lastChangeDate",
@@ -214,4 +214,5 @@ class Project(BaseProjectModel):
214214
model_config = ConfigDict(
215215
# NOTE: this is a security measure until we get rid of the ProjectDict variants
216216
extra="forbid",
217+
populate_by_name=True,
217218
)

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

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
from typing import NamedTuple
1313

1414
from aiohttp import web
15-
from models_library.projects import DateTimeStr, Project, ProjectID, StudyUIDict
15+
from models_library.api_schemas_webserver.projects_ui import StudyUI
16+
from models_library.projects import DateTimeStr, Project, ProjectID
1617
from models_library.projects_access import AccessRights, GroupIDStr
1718
from models_library.projects_nodes import Node
1819
from models_library.projects_nodes_io import DownloadLink, NodeID, PortLink
@@ -96,12 +97,16 @@ def _create_project(
9697
name=name,
9798
description=description,
9899
thumbnail=thumbnail,
99-
prjOwner=owner.email,
100-
accessRights={GroupIDStr(owner.primary_gid): access_rights},
101-
creationDate=DateTimeStr(now_str()),
102-
lastChangeDate=DateTimeStr(now_str()),
100+
prj_owner=owner.email,
101+
access_rights={GroupIDStr(owner.primary_gid): access_rights},
102+
creation_date=DateTimeStr(now_str()),
103+
last_change_date=DateTimeStr(now_str()),
103104
workbench=workbench,
104-
ui=StudyUIDict(workbench=workbench_ui), # type: ignore[arg-type]
105+
ui=StudyUI.model_validate(
106+
{
107+
"workbench": workbench_ui,
108+
}
109+
).model_dump(mode="json", exclude_unset=True),
105110
)
106111

107112

0 commit comments

Comments
 (0)