Skip to content

General fixes to import/export #2120

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 31 commits into from
Feb 12, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
413ef0b
quality was missing from serialization
Feb 1, 2021
ad425ba
Merge branch 'master' into fixes-import-export
GitHK Feb 2, 2021
4f8c558
Merge branch 'master' into fixes-import-export
GitHK Feb 8, 2021
43eda8f
archving upgraded for better extract performance
Feb 8, 2021
3b786ff
updated openapi specs
Feb 8, 2021
34f0180
added study duplication API
Feb 8, 2021
ed84b6f
Merge branch 'master' into fixes-import-export
GitHK Feb 8, 2021
3685a8a
fixed module arhciving tests
Feb 8, 2021
9a8784e
fixed archiving tests
Feb 11, 2021
f66b47f
archiving was refactored:
Feb 11, 2021
ae6ff54
minor refactor
Feb 11, 2021
7700e6c
using new archiving interface
Feb 11, 2021
6bbcf3c
added tests to check duplication of project
Feb 11, 2021
22989db
Merge branch 'master' into fixes-import-export
GitHK Feb 11, 2021
b4bcb27
Merge branch 'fixes-import-export' of github.com:GitHK/osparc-simcore…
Feb 11, 2021
79f3000
removed comment
Feb 11, 2021
4309616
test no longer hangs
Feb 11, 2021
cbae075
adding loop to all the tests
Feb 11, 2021
0c8e9a3
explicitly adding loop
Feb 11, 2021
2a16137
fixing pylint
Feb 11, 2021
a6e06c8
removing comment
Feb 12, 2021
2dfc602
replaced with TempraryDirectory
Feb 12, 2021
095c663
moved comment to a better spot
Feb 12, 2021
5fb1dce
renaming function
Feb 12, 2021
fed06be
removing uncecessary loop
Feb 12, 2021
34f2c31
removing loop where not needed
Feb 12, 2021
137e2fb
removing loop
Feb 12, 2021
1762211
minor refactor
Feb 12, 2021
85ac5d5
added storage file checksum checking
Feb 12, 2021
a8a996c
removing adminer
Feb 12, 2021
b72e52f
renmed properly
Feb 12, 2021
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
38 changes: 30 additions & 8 deletions api/specs/webserver/openapi-projects.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -201,11 +201,6 @@ paths:
required: true
schema:
type: string
- name: compressed
in: query
required: false
schema:
type: boolean
post:
tags:
- exporter
Expand All @@ -222,6 +217,31 @@ paths:
default:
$ref: "#/components/responses/DefaultErrorResponse"

/projects/{project_id}/duplicate:
parameters:
- name: project_id
in: path
required: true
schema:
type: string
post:
tags:
- exporter
summary: duplicates an existing project
operationId: duplicate_project
responses:
"200":
description: project was duplicated correctly
content:
application/json:
schema:
type: object
properties:
uuid:
type: string
default:
$ref: "#/components/responses/DefaultErrorResponse"

/projects/import:
post:
tags:
Expand All @@ -238,13 +258,15 @@ paths:
type: string
format: binary
responses:
"201":
"200":
description: creates a new project from an archive
content:
application/json:
schema:
#TODO: change this with an OK response
$ref: "#/components/schemas/ProjectEnveloped"
type: object
properties:
uuid:
type: string
default:
$ref: "#/components/responses/DefaultErrorResponse"

Expand Down
3 changes: 3 additions & 0 deletions api/specs/webserver/openapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,9 @@ paths:
/projects/{project_id}:xport:
$ref: "./openapi-projects.yaml#/paths/~1projects~1{project_id}~1xport"

/projects/{project_id}:duplicate:
$ref: "./openapi-projects.yaml#/paths/~1projects~1{project_id}~1duplicate"

/projects:import:
$ref: "./openapi-projects.yaml#/paths/~1projects~1import"

Expand Down
4 changes: 3 additions & 1 deletion packages/models-library/src/models_library/projects.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,9 @@ class Project(BaseModel):
ui: Optional[StudyUI] = None

# Quality
quality: Dict[str, Any] = {}
quality: Dict[str, Any] = Field(
{}, description="stores the study quality assessment"
)

# Dev only
dev: Optional[Dict] = Field(description="object used for development purposes only")
Expand Down
Loading