Skip to content
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

WIP - api for tree output widgets #290

Closed
wants to merge 14 commits into from

Conversation

oetiker
Copy link
Member

@oetiker oetiker commented Oct 30, 2018

What do these changes do?

Related issue number

Checklist

  • I think the code is well written
  • Unit tests for the changes exist
  • Documentation reflects the changes
  • If you design a new module, add your user to .github/CODEOWNERS

@ghost ghost assigned oetiker Oct 30, 2018
@ghost ghost added the review label Oct 30, 2018
oetiker and others added 11 commits October 30, 2018 14:01
## What do these changes do?
Business logic for:
- user session
- login/logout/registration/confirmation/rest
- new modules in servicelib for aipg, aiohttp ext ...
- added deploytools: merges docker files, creates

## Related issue number
Resolves ITISFoundation#200 


## Important commits

* Modified app's config to accomodate options for smtp server
Added new keys for db's pool

* Login:
 - created setup
 - added test_login, test_registration
 - shorten config

* Cleanup testing. Disabled old tests and modifying testing configuration

* tests/login/test_login passes
 - login setup connected on app startup
 - added smtp to config file
 - asyncpg needs enum names (not values)

* servicelib: created response_utils

* test_registration passes
 - activated renderer for email
 - fixes openapi formatters (openapicore does not support uuid formatter marshaling)
 - template resources

* test_logout
 - refactoring test utils
 - moved all routes under login

* Replacing cfg.STORAGE singleton by application storage

* test_login runs
added change email
other fixes in utils

* servicelib new utils

* Fixes null parameters in configuration
 - adds testing for configs

* Added email setup and hides renderer setup

* Started deploy tools (prototype)
 - finds services/docker-compose* files
 - merges docker-compose files
 - resolves services/docker-compose files and produces a  docker-compose for deployment
* Fixes typos in client after bad merge

* Fixes volumes bind in  docker-compose for apihub. Was using old api skeleton
* File Picker: double click selects file
* NewPrjDlg: Project title required (validated) + Blank Project selected by default
* TreeTool: pressing F2 pops up a rename node window
* /start_pipeline: sends "project_id" and "workbench"
* SettingsView renamed to NodeView
Mockup data added for demo
odeimaiz added a commit that referenced this pull request Nov 10, 2018
* Nicer port representation (with value if available) for input nodes
* Nicer link representation in form: Linked to [nodeLabel]: [portLabel]
* Fake data moved from Store to Fake data
* From #290: api specs for tree output widgets
* Port compatibility check
@ghost ghost assigned odeimaiz Nov 10, 2018
@odeimaiz
Copy link
Member

@oetiker already merged in #321

pcrespov pushed a commit to pcrespov/osparc-simcore that referenced this pull request Nov 14, 2018
Squashed commit of the following:

commit f7eec98
Merge: 0806917 b1f7ad9
Author: Pedro Crespo <[email protected]>
Date:   Wed Nov 14 11:36:07 2018 +0100

    Merge branch 'is309/webserver-uses-apihub' of github.com:pcrespov/osparc-simcore into is309/webserver-uses-apihub

commit 0806917
Merge: 89563a3 ed07bfd
Author: Pedro Crespo <[email protected]>
Date:   Wed Nov 14 11:35:25 2018 +0100

    Merge branch 'master' into is309/webserver-uses-apihub

commit ed07bfd
Merge: 0156ec8 c258483
Author: Pedro Crespo <[email protected]>
Date:   Wed Nov 14 11:31:37 2018 +0100

    Merge remote-tracking branch 'upstream/master'

commit c258483
Author: Tobias Oetiker <[email protected]>
Date:   Wed Nov 14 11:29:25 2018 +0100

    Build Environment Fixes (ITISFoundation#314)

    * make swarm work on osx

    * use compose to create input for docker stack

    * have a separate target for launching the qxbuild

    * do NOT put explicit dns into the compose file!!!
    rather make sure the /etc/resolve.conf on the host where docker is
    running is setup correctly!

    * do not rely on boot.sh exec permissions when starting sidecar

    * allow override of REGISTRY_URL from .env

    * better targets for fontent dev

    * Working Makefile for PowerShell

commit a8c7664
Author: Tobias Oetiker <[email protected]>
Date:   Wed Nov 14 10:49:03 2018 +0100

    Better password save (ITISFoundation#329)

    * properly trigger the password save popup

commit b1f7ad9
Merge: 89563a3 ff0ac55
Author: Pedro Crespo <[email protected]>
Date:   Tue Nov 13 22:11:36 2018 +0100

    Merge branch 'master' into is309/webserver-uses-apihub

commit 0156ec8
Merge: e71ed59 ff0ac55
Author: Pedro Crespo <[email protected]>
Date:   Tue Nov 13 21:31:06 2018 +0100

    Merge remote-tracking branch 'upstream/master'

commit ff0ac55
Author: pyup.io bot <[email protected]>
Date:   Tue Nov 13 12:29:46 2018 -0800

    Config file for pyup.io (ITISFoundation#319)

    * Fixes typos in client after bad merge
    * create pyup.io config file
    * Updated requests to 2.20.1

commit 89563a3
Author: Pedro Crespo <[email protected]>
Date:   Tue Nov 13 19:26:45 2018 +0100

    Fixes retrieving openapi to webserver.

commit c166bc0
Author: Pedro Crespo <[email protected]>
Date:   Tue Nov 13 18:08:39 2018 +0100

    Fixes makefile filter (see previous commit)
    Removed deprecated modules from merge
    Fixed container_environ fixture
    Added +x to entrypoint.sh otherwise container does not have execution permissions

commit 05d5423
Author: Pedro Crespo <[email protected]>
Date:   Tue Nov 13 17:42:45 2018 +0100

    Fixes bad merge in test_reverser_proxy.
    Disabled web/server pylint from makefile since test_package has a linter test and single-file pylint checks
    produces false positives with relative imports

commit 63df90c
Merge: bd48b1e e71ed59
Author: Pedro Crespo <[email protected]>
Date:   Tue Nov 13 17:29:43 2018 +0100

    Merge branch 'master' into is309/webserver-uses-apihub

commit e71ed59
Merge: 5320cef 2fbeba2
Author: Pedro Crespo <[email protected]>
Date:   Tue Nov 13 17:27:33 2018 +0100

    Merge remote-tracking branch 'upstream/master'

commit bd48b1e
Author: Pedro Crespo <[email protected]>
Date:   Tue Nov 13 17:25:09 2018 +0100

    Fixes login tests. Added new variable in config

commit f85a452
Author: Pedro Crespo <[email protected]>
Date:   Tue Nov 13 17:19:29 2018 +0100

    Replaced main.disable_services by "enabled" flags in every service

commit 2fbeba2
Author: Odei Maiz <[email protected]>
Date:   Tue Nov 13 16:40:25 2018 +0100

    LinkBase refactoring (ITISFoundation#327)

    * LinkModel class created which is now used in LinkBase
    * Link creation/deletion moved to WorkbenchModel from WorkbenchView

commit 376f652
Author: Pedro Crespo <[email protected]>
Date:   Tue Nov 13 16:40:25 2018 +0100

    Fixes enveloped schemas to have null error.
    Modifies the test_conventions... to adapt to new criteria

commit c034676
Author: Pedro Crespo <[email protected]>
Date:   Tue Nov 13 16:31:26 2018 +0100

    Added custom variables (OSPARC_SIMCORE_REPO_ROOTDIR) for the config file
    Fixes config folder key

commit a6f9444
Author: Pedro Crespo <[email protected]>
Date:   Tue Nov 13 15:28:54 2018 +0100

    Is207/reverse proxy webserver (ITISFoundation#318)

    - 1st version of the reverse proxy subsystem (see ``src/simcore_service_webserver/reverse_proxy``)
       - configurable upon setup
       - well decoupled
       - unit tests in ``tests/unit/test_reverse_proxy.py``
    - customized handlers : default, jupyter and preview (drafts)
    - still not integrated w/  other subsystems in webserver (will do in separated pull-request)
    - connected to ITISFoundation#207

commit 04fa857
Author: Tobias Oetiker <[email protected]>
Date:   Tue Nov 13 14:21:18 2018 +0100

    fix iframe positioning (ITISFoundation#326)

    fix iframe positioning

commit c366592
Author: Tobias Oetiker <[email protected]>
Date:   Tue Nov 13 14:11:05 2018 +0100

    add svg logos (ITISFoundation#325)

    * add svg logos

commit f1a0a42
Author: Pedro Crespo <[email protected]>
Date:   Tue Nov 13 13:35:42 2018 +0100

    Fixed linter error

commit 5161825
Author: Pedro Crespo <[email protected]>
Date:   Tue Nov 13 12:01:37 2018 +0100

    fixes on schema my.yaml test failures

commit 0fbcd81
Author: Pedro Crespo <[email protected]>
Date:   Tue Nov 13 11:38:58 2018 +0100

    Removed deprecated tests

commit c774d67
Merge: 1df73de 359a12c
Author: Pedro Crespo <[email protected]>
Date:   Tue Nov 13 11:35:52 2018 +0100

    Merge branch 'is309/webserver-uses-apihub' of github.com:pcrespov/osparc-simcore into is309/webserver-uses-apihub

commit 359a12c
Merge: 6b35214 ff41cf4
Author: Pedro Crespo <[email protected]>
Date:   Tue Nov 13 11:32:42 2018 +0100

    Merge branch 'master' into is309/webserver-uses-apihub

commit ff41cf4
Author: Odei Maiz <[email protected]>
Date:   Tue Nov 13 09:24:29 2018 +0100

    Binding labels (ITISFoundation#323)

    Binding NodeModel to labels in:
    * NodeBase
    * NavigationBar
    * NodeInput
    * NodeExposed
    * NodePorts

commit 1df73de
Merge: fec4dd3 6b35214
Author: Pedro Crespo <[email protected]>
Date:   Mon Nov 12 16:49:09 2018 +0100

    Merge branch 'is309/webserver-uses-apihub' of github.com:pcrespov/osparc-simcore into is309/webserver-uses-apihub

commit 6b35214
Author: Pedro Crespo-Valero <[email protected]>
Date:   Mon Nov 12 16:01:00 2018 +0100

    complement previous commit

commit 352fc5e
Author: Pedro Crespo-Valero <[email protected]>
Date:   Mon Nov 12 15:58:35 2018 +0100

    Upgrade requests to version 2.20.0 to solve vulnerability alarm

commit 19c7596
Merge: 5746dd5 f51d68b
Author: Pedro Crespo <[email protected]>
Date:   Mon Nov 12 15:56:31 2018 +0100

    Merge branch 'master' into is309/webserver-uses-apihub

commit 5746dd5
Author: Pedro Crespo-Valero <[email protected]>
Date:   Mon Nov 12 15:46:56 2018 +0100

    Removed resouces_keys

commit fec4dd3
Author: Pedro Crespo <[email protected]>
Date:   Mon Nov 12 15:25:04 2018 +0100

    Fixes login ests

commit 26845b1
Author: Pedro Crespo <[email protected]>
Date:   Mon Nov 12 15:13:57 2018 +0100

    Removed application_keys.py

commit b3d7d9c
Author: Pedro Crespo <[email protected]>
Date:   Mon Nov 12 15:13:57 2018 +0100

    Removed application_keys.py

commit 984c9b8
Author: Pedro Crespo <[email protected]>
Date:   Mon Nov 12 15:09:59 2018 +0100

    Cleanup rest. test_rest running

commit 4597c24
Author: Pedro Crespo <[email protected]>
Date:   Mon Nov 12 12:16:07 2018 +0100

    Gathered all director subsystem's  modules under a folder

commit a815a3e
Author: Pedro Crespo <[email protected]>
Date:   Mon Nov 12 11:58:46 2018 +0100

    Renamed comp_backend as computation
    Minor

commit 0ff6c01
Author: Pedro Crespo <[email protected]>
Date:   Mon Nov 12 11:57:24 2018 +0100

    Split sockets subsystem into setup and handlers
    Added s3 subsystem

commit 5098583
Author: Pedro Crespo <[email protected]>
Date:   Mon Nov 12 10:55:20 2018 +0100

    Adapted configurations to latest schema.
    Added environs to docker-compose and removed from .env-devel hosts and ports (should be hard-coded in docker-compose)

commit cff674b
Author: Pedro Crespo <[email protected]>
Date:   Mon Nov 12 10:54:54 2018 +0100

    Synced some requirements

commit de4f9dc
Author: Pedro Crespo <[email protected]>
Date:   Sat Nov 10 21:21:28 2018 +0100

    - every subsystem defines its own config section: computation, db, email, rest, director . All have their own *_config.py
    - created directory submodule and its config
    - added tests for config sections
    - renamed settings as application_config
    - renamed computational_backend as computation

commit f51d68b
Author: Odei Maiz <[email protected]>
Date:   Sat Nov 10 17:30:14 2018 +0100

    Prettier output-port and link representation in NodeView (ITISFoundation#321)

    * Nicer port representation (with value if available) for input nodes
    * Nicer link representation in form: Linked to [nodeLabel]: [portLabel]
    * Fake data moved from Store to Fake data
    * From ITISFoundation#290: api specs for tree output widgets
    * Port compatibility check

commit 4bde625
Author: Pedro Crespo <[email protected]>
Date:   Fri Nov 9 20:10:34 2018 +0100

    WIP

commit 5320cef
Merge: cf6c63a 062f221
Author: Pedro Crespo <[email protected]>
Date:   Fri Nov 9 17:17:34 2018 +0100

    Merge remote-tracking branch 'upstream/master'

commit 062f221
Author: Pedro Crespo <[email protected]>
Date:   Fri Nov 9 16:47:48 2018 +0100

    Is310/valid api response (ITISFoundation#311)

    Updates servicelib
    - validation of api-response against openapi specs
    - automatic routing of handles against operation-id in specs
    - middleware factories to envelop responses and errors. Configurable per api version.
    - package testing
    - BUG: response validator only works with single-file oas (currently disabled in webserver and storage!)

commit 4bc1e78
Author: Odei Maiz <[email protected]>
Date:   Fri Nov 9 15:30:29 2018 +0100

    Neuroman service (ITISFoundation#317)

    * Neuroman service has "node-output-list-icon-api-v0.0.1" as default input, which is "node-output-list-api-v0.0.1" with a field for an icon path
    * Widgets created to support "node-output-list-icon-api-v0.0.1" (NodeOutputListItem and NodeOutputListItemIcon)
    * Converter added for "fromAPIListToVirtualListModel"
    * Showing "Loading OSparc..." website while service is started, then points to the proper url
    * Drag&Drop mechanism for Form improved
    * Some clean up
@odeimaiz odeimaiz closed this Nov 14, 2018
@ghost ghost removed the review label Nov 14, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants