Skip to content

Commit f61cfb2

Browse files
committed
rest schemas
1 parent 485f6fb commit f61cfb2

File tree

4 files changed

+20
-22
lines changed

4 files changed

+20
-22
lines changed

api/specs/web-server/_projects.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,9 @@
3737
from simcore_service_webserver.projects._controller._rest_schemas import (
3838
ProjectPathParams,
3939
)
40-
from simcore_service_webserver.projects._controller.projects_rest import (
41-
ProjectCreateQueryParams,
42-
)
43-
from simcore_service_webserver.projects._crud_handlers_models import (
40+
from simcore_service_webserver.projects._controller.projects_rest_schemas import (
4441
ProjectActiveQueryParams,
42+
ProjectCreateQueryParams,
4543
ProjectsListQueryParams,
4644
ProjectsSearchQueryParams,
4745
)

services/web/server/src/simcore_service_webserver/projects/_controller/_rest_schemas.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
from models_library.projects import ProjectID
2-
from pydantic import BaseModel, ConfigDict, Field
2+
from pydantic import (
3+
BaseModel,
4+
ConfigDict,
5+
Field,
6+
)
37

48
from ...models import RequestContext
59

services/web/server/src/simcore_service_webserver/projects/_controller/projects_rest.py

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,20 +37,23 @@
3737
from ...users.api import get_user_fullname
3838
from ...utils_aiohttp import envelope_json_response
3939
from .. import _crud_api_create, _crud_api_read, _projects_service
40-
from .._crud_handlers_models import (
40+
from .._permalink_service import update_or_pop_permalink_in_project
41+
from ..models import ProjectDict
42+
from ..utils import get_project_unavailable_services, project_uses_available_services
43+
from . import _rest_utils
44+
from ._rest_exceptions import handle_plugin_requests_exceptions
45+
from ._rest_schemas import (
46+
ProjectPathParams,
47+
RequestContext,
48+
)
49+
from .projects_rest_schemas import (
4150
ProjectActiveQueryParams,
4251
ProjectCreateHeaders,
4352
ProjectCreateQueryParams,
4453
ProjectFilters,
4554
ProjectsListQueryParams,
4655
ProjectsSearchQueryParams,
4756
)
48-
from .._permalink_service import update_or_pop_permalink_in_project
49-
from ..models import ProjectDict
50-
from ..utils import get_project_unavailable_services, project_uses_available_services
51-
from . import _rest_utils
52-
from ._rest_exceptions import handle_plugin_requests_exceptions
53-
from ._rest_schemas import ProjectPathParams, RequestContext
5457

5558
# When the user requests a project with a repo, the working copy might differ from
5659
# the repo project. A middleware in the meta module (if active) will resolve

services/web/server/src/simcore_service_webserver/projects/_crud_handlers_models.py renamed to services/web/server/src/simcore_service_webserver/projects/_controller/projects_rest_schemas.py

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
""" Handlers for STANDARD methods on /projects colletions
2-
3-
Standard methods or CRUD that states for Create+Read(Get&List)+Update+Delete
4-
5-
"""
6-
71
from typing import Annotated, Self
82

93
from models_library.basic_types import IDStr
@@ -38,8 +32,8 @@
3832
X_SIMCORE_USER_AGENT,
3933
)
4034

41-
from .exceptions import WrongTagIdsInQueryError
42-
from .models import ProjectTypeAPI
35+
from ..exceptions import WrongTagIdsInQueryError
36+
from ..models import ProjectTypeAPI
4337

4438

4539
class ProjectCreateHeaders(BaseModel):
@@ -159,8 +153,7 @@ class ProjectsListQueryParams(
159153
ProjectsListOrderParams, # type: ignore[misc, valid-type]
160154
FiltersQueryParameters[ProjectFilters],
161155
ProjectsListExtraQueryParams,
162-
):
163-
...
156+
): ...
164157

165158

166159
class ProjectActiveQueryParams(BaseModel):

0 commit comments

Comments
 (0)