Skip to content

♻️ Refactors projects plugin sub-modules as controller-service-repository #4389

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Jun 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/4_pre_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ body:
label: What Changed
description: |
List of commit messages in this release. Add a list of links to the corresponding PRs. This way we can trace the release of every single PR. TIP: use the autogenerate changelog feature during the draft release
(TIP: use regex replace for better visualization ``\*.+ by (@\w+) in (https:.*)`` -> ``* $2 by $1``).
(TIP: use regex replace for better visualization ``\*.+ by (@[\w-]+) in (https:.*)`` -> ``* $2 by $1``).
validations:
required: false
- type: textarea
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/5_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ body:
description: |
Changes introduced by this release.
List links to the PRs associated to every commit in the release. This will automatically create references between PRs and this release that will be very valuable for traceability.
TIP: use the autogenerate changelog feature during the draft release. (TIP: use regex replace for better visualization ``\*.+ by (@\w+) in (https:.*)`` -> ``* $2 by $1``)
TIP: use the autogenerate changelog feature during the draft release. (TIP: use regex replace for better visualization ``\*.+ by (@[\w-]+) in (https:.*)`` -> ``* $2 by $1``)
validations:
required: false
- type: textarea
Expand Down
110 changes: 0 additions & 110 deletions api/specs/webserver/openapi-node-v0.0.1.yaml

This file was deleted.

8 changes: 4 additions & 4 deletions api/specs/webserver/openapi-projects-comments.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ components:
- comment_id
- project_uuid
- user_id
- content
- contents
- created
- modified
type: object
Expand All @@ -217,10 +217,10 @@ components:
type: integer
description: user reference for this table
minimum: 0
content:
title: Content
contents:
title: Contents
type: string
description: Content of the comment
description: Contents of the comment
created:
title: Created
type: string
Expand Down
52 changes: 26 additions & 26 deletions api/specs/webserver/openapi-projects-nodes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ paths:
content:
application/json:
schema:
$ref: '#/components/schemas/Envelope_list_simcore_service_webserver.projects._handlers_project_nodes._ProjectNodePreview__'
$ref: '#/components/schemas/Envelope_list_simcore_service_webserver.projects._nodes_handlers._ProjectNodePreview__'
/projects/{project_id}/nodes/{node_id}/preview:
get:
tags:
Expand Down Expand Up @@ -97,8 +97,8 @@ components:
$ref: '#/components/schemas/_ProjectNodePreview'
error:
title: Error
Envelope_list_simcore_service_webserver.projects._handlers_project_nodes._ProjectNodePreview__:
title: Envelope[list[simcore_service_webserver.projects._handlers_project_nodes._ProjectNodePreview]]
Envelope_list_simcore_service_webserver.projects._nodes_handlers._ProjectNodePreview__:
title: Envelope[list[simcore_service_webserver.projects._nodes_handlers._ProjectNodePreview]]
type: object
properties:
data:
Expand All @@ -108,27 +108,8 @@ components:
$ref: '#/components/schemas/_ProjectNodePreview'
error:
title: Error
ServiceKeyVersion:
title: ServiceKeyVersion
required:
- key
- version
type: object
properties:
key:
title: Key
pattern: ^simcore/services/((comp|dynamic|frontend))/([a-z0-9][a-z0-9_.-]*/)*([a-z0-9-_]+[a-z0-9])$
type: string
description: distinctive name for the node based on the docker registry
path
version:
title: Version
pattern: ^(0|[1-9]\d*)(\.(0|[1-9]\d*)){2}(-(0|[1-9]\d*|\d*[-a-zA-Z][-\da-zA-Z]*)(\.(0|[1-9]\d*|\d*[-a-zA-Z][-\da-zA-Z]*))*)?(\+[-\da-zA-Z]+(\.[-\da-zA-Z-]+)*)?$
type: string
description: service version number
description: This pair uniquely identifies a services
_NodeScreenshot:
title: _NodeScreenshot
NodeScreenshot:
title: NodeScreenshot
required:
- thumbnail_url
- file_url
Expand All @@ -149,8 +130,27 @@ components:
mimetype:
title: Mimetype
type: string
description: File's media type. SEE https://www.iana.org/assignments/media-types/media-types.xhtml
description: File's media type or None if unknown. SEE https://www.iana.org/assignments/media-types/media-types.xhtml
example: image/jpeg
ServiceKeyVersion:
title: ServiceKeyVersion
required:
- key
- version
type: object
properties:
key:
title: Key
pattern: ^simcore/services/((comp|dynamic|frontend))/([a-z0-9][a-z0-9_.-]*/)*([a-z0-9-_]+[a-z0-9])$
type: string
description: distinctive name for the node based on the docker registry
path
version:
title: Version
pattern: ^(0|[1-9]\d*)(\.(0|[1-9]\d*)){2}(-(0|[1-9]\d*|\d*[-a-zA-Z][-\da-zA-Z]*)(\.(0|[1-9]\d*|\d*[-a-zA-Z][-\da-zA-Z]*))*)?(\+[-\da-zA-Z]+(\.[-\da-zA-Z-]+)*)?$
type: string
description: service version number
description: This pair uniquely identifies a services
_ProjectGroupAccess:
title: _ProjectGroupAccess
required:
Expand Down Expand Up @@ -190,4 +190,4 @@ components:
title: Screenshots
type: array
items:
$ref: '#/components/schemas/_NodeScreenshot'
$ref: '#/components/schemas/NodeScreenshot'
20 changes: 10 additions & 10 deletions api/specs/webserver/openapi-projects-ports.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ paths:
content:
application/json:
schema:
$ref: '#/components/schemas/Envelope_dict_uuid.UUID__simcore_service_webserver.projects._handlers_project_ports.ProjectInputGet__'
$ref: '#/components/schemas/Envelope_dict_uuid.UUID__simcore_service_webserver.projects._ports_handlers.ProjectInputGet__'
patch:
tags:
- project
Expand Down Expand Up @@ -50,7 +50,7 @@ paths:
content:
application/json:
schema:
$ref: '#/components/schemas/Envelope_dict_uuid.UUID__simcore_service_webserver.projects._handlers_project_ports.ProjectInputGet__'
$ref: '#/components/schemas/Envelope_dict_uuid.UUID__simcore_service_webserver.projects._ports_handlers.ProjectInputGet__'
/projects/{project_id}/outputs:
get:
tags:
Expand All @@ -72,7 +72,7 @@ paths:
content:
application/json:
schema:
$ref: '#/components/schemas/Envelope_dict_uuid.UUID__simcore_service_webserver.projects._handlers_project_ports.ProjectOutputGet__'
$ref: '#/components/schemas/Envelope_dict_uuid.UUID__simcore_service_webserver.projects._ports_handlers.ProjectOutputGet__'
/projects/{project_id}/metadata/ports:
get:
tags:
Expand All @@ -94,11 +94,11 @@ paths:
content:
application/json:
schema:
$ref: '#/components/schemas/Envelope_list_simcore_service_webserver.projects._handlers_project_ports.ProjectMetadataPortGet__'
$ref: '#/components/schemas/Envelope_list_simcore_service_webserver.projects._ports_handlers.ProjectMetadataPortGet__'
components:
schemas:
Envelope_dict_uuid.UUID__simcore_service_webserver.projects._handlers_project_ports.ProjectInputGet__:
title: Envelope[dict[uuid.UUID, simcore_service_webserver.projects._handlers_project_ports.ProjectInputGet]]
Envelope_dict_uuid.UUID__simcore_service_webserver.projects._ports_handlers.ProjectInputGet__:
title: Envelope[dict[uuid.UUID, simcore_service_webserver.projects._ports_handlers.ProjectInputGet]]
type: object
properties:
data:
Expand All @@ -108,8 +108,8 @@ components:
$ref: '#/components/schemas/ProjectInputGet'
error:
title: Error
Envelope_dict_uuid.UUID__simcore_service_webserver.projects._handlers_project_ports.ProjectOutputGet__:
title: Envelope[dict[uuid.UUID, simcore_service_webserver.projects._handlers_project_ports.ProjectOutputGet]]
Envelope_dict_uuid.UUID__simcore_service_webserver.projects._ports_handlers.ProjectOutputGet__:
title: Envelope[dict[uuid.UUID, simcore_service_webserver.projects._ports_handlers.ProjectOutputGet]]
type: object
properties:
data:
Expand All @@ -119,8 +119,8 @@ components:
$ref: '#/components/schemas/ProjectOutputGet'
error:
title: Error
Envelope_list_simcore_service_webserver.projects._handlers_project_ports.ProjectMetadataPortGet__:
title: Envelope[list[simcore_service_webserver.projects._handlers_project_ports.ProjectMetadataPortGet]]
Envelope_list_simcore_service_webserver.projects._ports_handlers.ProjectMetadataPortGet__:
title: Envelope[list[simcore_service_webserver.projects._ports_handlers.ProjectMetadataPortGet]]
type: object
properties:
data:
Expand Down
12 changes: 1 addition & 11 deletions api/specs/webserver/openapi.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
openapi: 3.0.0
info:
title: "osparc-simcore web API"
version: 0.22.0
version: 0.23.0
description: "API designed for the front-end app"
contact:
name: IT'IS Foundation
Expand Down Expand Up @@ -32,7 +32,6 @@ tags:
- name: configuration
- name: maintenance
- name: nih-sparc
- name: node
- name: project
- name: publication
- name: repository
Expand Down Expand Up @@ -257,15 +256,6 @@ paths:
/projects/{project_id}/metadata/ports:
$ref: "./openapi-projects-ports.yaml#/paths/~1projects~1{project_id}~1metadata~1ports"

/nodes/{nodeInstanceUUID}/outputUi/{outputKey}:
$ref: "./openapi-node-v0.0.1.yaml#/paths/~1nodes~1{nodeInstanceUUID}~1outputUi~1{outputKey}"

/nodes/{nodeInstanceUUID}/outputUi/{outputKey}/{apiCall}:
$ref: "./openapi-node-v0.0.1.yaml#/paths/~1nodes~1{nodeInstanceUUID}~1outputUi~1{outputKey}~1{apiCall}"

/nodes/{nodeInstanceUUID}/iframe:
$ref: "./openapi-node-v0.0.1.yaml#/paths/~1nodes~1{nodeInstanceUUID}~1iframe"

/projects/{study_uuid}/tags/{tag_id}:
$ref: "./openapi-projects.yaml#/paths/~1projects~1{study_uuid}~1tags~1{tag_id}"

Expand Down
2 changes: 1 addition & 1 deletion api/specs/webserver/scripts/openapi_projects_nodes.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from models_library.projects_nodes_io import NodeID
from models_library.users import GroupID
from simcore_service_webserver.projects._handlers_crud import ProjectPathParams
from simcore_service_webserver.projects._handlers_project_nodes import (
from simcore_service_webserver.projects._nodes_handlers import (
_NodePathParams,
_ProjectGroupAccess,
_ProjectNodePreview,
Expand Down
2 changes: 1 addition & 1 deletion api/specs/webserver/scripts/openapi_projects_ports.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
from models_library.generics import Envelope
from models_library.projects import ProjectID
from models_library.projects_nodes import NodeID
from simcore_service_webserver.projects._handlers_project_ports import (
from simcore_service_webserver.projects._ports_handlers import (
ProjectInputGet,
ProjectInputUpdate,
ProjectMetadataPortGet,
Expand Down
2 changes: 1 addition & 1 deletion services/web/server/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.22.0
0.23.0
2 changes: 1 addition & 1 deletion services/web/server/setup.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.22.0
current_version = 0.23.0
commit = True
message = services/webserver api version: {current_version} → {new_version}
tag = False
Expand Down
Loading