pcrespov
diff --git a/‎.env-devel
+1-2 b/‎.env-devel
+1-2
diff --git a/‎.pyup.yml
+4 b/‎.pyup.yml
+4
diff --git a/‎.travis.yml
+7 b/‎.travis.yml
+7
diff --git a/‎Makefile
+44-6 b/‎Makefile
+44-6
diff --git a/‎api/specs/shared/schemas/node-output-tree-api-v0.0.1.yaml
+53 b/‎api/specs/shared/schemas/node-output-tree-api-v0.0.1.yaml
+53
diff --git a/‎api/specs/webserver/v0/components/schemas/error.yaml
+1 b/‎api/specs/webserver/v0/components/schemas/error.yaml
+1
diff --git a/‎api/specs/webserver/v0/components/schemas/fake.yaml
-4 b/‎api/specs/webserver/v0/components/schemas/fake.yaml
-4
diff --git a/‎api/specs/webserver/v0/components/schemas/health_check.yaml
-4 b/‎api/specs/webserver/v0/components/schemas/health_check.yaml
-4
diff --git a/‎api/specs/webserver/v0/components/schemas/log_message.yaml
-4 b/‎api/specs/webserver/v0/components/schemas/log_message.yaml
-4
diff --git a/‎api/specs/webserver/v0/components/schemas/login.yaml
-4 b/‎api/specs/webserver/v0/components/schemas/login.yaml
-4
diff --git a/‎api/specs/webserver/v0/components/schemas/my.yaml
+75 b/‎api/specs/webserver/v0/components/schemas/my.yaml
+75
diff --git a/‎api/specs/webserver/v0/components/schemas/registration.yaml
-4 b/‎api/specs/webserver/v0/components/schemas/registration.yaml
-4
diff --git a/‎api/specs/webserver/v0/node-v0.0.1.yaml
+8-8 b/‎api/specs/webserver/v0/node-v0.0.1.yaml
+8-8
@@ -10,12 +10,11 @@ POSTGRES_ENDPOINT=postgres:5432
 POSTGRES_USER=simcore
 POSTGRES_PASSWORD=simcore
 POSTGRES_DB=simcoredb
-POSTGRES_HOST=postgres
-POSTGRES_PORT=5432
 RABBITMQ_USER=simcore
 RABBITMQ_PASSWORD=simcore
 RABBITMQ_PROGRESS_CHANNEL=comp.backend.channels.progress
 RABBITMQ_LOG_CHANNEL=comp.backend.channels.log
+REGISTRY_URL=masu.speag.com
 S3_ENDPOINT=minio:9000
 S3_ACCESS_KEY=12345678
 S3_SECRET_KEY=12345678
 
@@ -0,0 +1,4 @@
+# autogenerated pyup.io config file 
+# see https://pyup.io/docs/configuration/ for all available options
+
+schedule: every month
@@ -3,6 +3,11 @@ matrix:
     - language: node_js
       node_js:
         - "8"
+
+      cache:
+        directories:
+          - .npm
+
       install:
         - npm install -g npm@latest
         - npm install --save-dev eslint
@@ -23,6 +28,8 @@ matrix:
       services:
         - docker
 
+      cache: pip
+
       before_install:
         - python --version
         - uname -a
 
@@ -3,6 +3,7 @@
 # TODO: add flavours by combinging docker-compose files. Namely development, test and production.
 VERSION := $(shell uname -a)
 # SAN this is a hack so that docker-compose works in the linux virtual environment under Windows
+WINDOWS_MODE=OFF
 ifneq (,$(findstring Microsoft,$(VERSION)))
 $(info    detected WSL)
 export DOCKER_COMPOSE=docker-compose
@@ -11,13 +12,22 @@ export RUN_DOCKER_ENGINE_ROOT=1
 # Windows does not have these things defined... but they are needed to execute a local swarm
 export DOCKER_GID=1042
 export HOST_GID=1000
+WINDOWS_MODE=ON
 else ifeq ($(OS), Windows_NT)
 $(info    detected Powershell/CMD)
 export DOCKER_COMPOSE=docker-compose.exe
 export DOCKER=docker.exe
 export RUN_DOCKER_ENGINE_ROOT=1
 export DOCKER_GID=1042
 export HOST_GID=1000
+WINDOWS_MODE=ON
+else ifneq (,$(findstring Darwin,$(VERSION)))
+$(info    detected OSX)
+export DOCKER_COMPOSE=docker-compose
+export DOCKER=docker
+export RUN_DOCKER_ENGINE_ROOT=1
+export DOCKER_GID=1042
+export HOST_GID=1000
 else
 $(info    detected native linux)
 export DOCKER_COMPOSE=docker-compose
@@ -28,7 +38,9 @@ export HOST_GID=1000
 # TODO: Add a meaningfull call to retrieve the local docker group ID and the user ID in linux.
 endif
 
-PY_FILES = $(strip $(shell find services packages -iname '*.py' -not -path "*egg*" -not -path "*contrib*" -not -path "*-sdk/python*" -not -path "*generated_code*" -not -path "*datcore.py"))
+PY_FILES = $(strip $(shell find services packages -iname '*.py' -not -path "*egg*" -not -path "*contrib*" -not -path "*-sdk/python*" -not -path "*generated_code*" -not -path "*datcore.py" -not -path "*web/server*"))
+
+TEMPCOMPOSE := $(shell mktemp)
 
 export PYTHONPATH=${CURDIR}/packages/s3wrapper/src:${CURDIR}/packages/simcore-sdk/src
 
@@ -49,6 +61,10 @@ rebuild-devel:
 up-devel:
 	${DOCKER_COMPOSE} -f services/docker-compose.yml -f services/docker-compose.devel.yml -f services/docker-compose.tools.yml up
 
+up-webclient-devel: up-swarm-devel remove-intermediate-file file-watcher
+	${DOCKER} service rm services_webclient
+	${DOCKER_COMPOSE} -f services/web/client/docker-compose.yml up qx
+
 build:
 	${DOCKER_COMPOSE} -f services/docker-compose.yml build
 
@@ -60,14 +76,36 @@ up:
 
 up-swarm:
 	${DOCKER} swarm init
-	${DOCKER} stack deploy -c services/docker-compose.yml -c services/docker-compose.deploy.yml  -c services/docker-compose.tools.yml services
+	${DOCKER_COMPOSE} -f services/docker-compose.yml -f services/docker-compose.deploy.yml -f services/docker-compose.tools.yml config > $(TEMPCOMPOSE).tmp-compose.yml ;
+	${DOCKER} stack deploy -c $(TEMPCOMPOSE).tmp-compose.yml services
 
 up-swarm-devel:
 	${DOCKER} swarm init
-	${DOCKER} stack deploy -c services/docker-compose.yml -c services/docker-compose.devel.yml -c services/docker-compose.deploy.devel.yml  -c services/docker-compose.tools.yml services
+	${DOCKER_COMPOSE} -f services/docker-compose.yml -f services/docker-compose.devel.yml -f services/docker-compose.deploy.devel.yml -f services/docker-compose.tools.yml config > $(TEMPCOMPOSE).tmp-compose.yml
+	${DOCKER} stack deploy -c $(TEMPCOMPOSE).tmp-compose.yml services
+
+ifeq ($(WINDOWS_MODE),ON)
+remove-intermediate-file:
+	$(info    .tmp-compose.yml not removed)
+else
+remove-intermediate-file:
+	rm $(TEMPCOMPOSE).tmp-compose.yml
+endif
+
+ifeq ($(WINDOWS_MODE),ON)
+file-watcher:
+	pip install docker-windows-volume-watcher
+	# unfortunately this is not working properly at the moment
+	# docker-windows-volume-watcher python package will be installed but not executed
+	# you will have to run 'docker-volume-watcher *qx*' in a different process in ./services/web/client/source
+	# docker-volume-watcher &
+else
+file-watcher:
+	true
+endif
 
 down:
-	${DOCKER_COMPOSE} -f services/docker-compose.yml  -f services/docker-compose.tools.yml down
+	${DOCKER_COMPOSE} -f services/docker-compose.yml -f services/docker-compose.tools.yml down
 	${DOCKER_COMPOSE} -f services/docker-compose.yml -f services/docker-compose.devel.yml down
 
 down-swarm:
@@ -100,7 +138,7 @@ run_test:
 	pytest -v services/apihub/tests
 	pytest --cov=pytest_docker -v packages/pytest_docker/tests
 	pytest --cov=s3wrapper -v packages/s3wrapper/tests
-	pytest --cov=simcore_sdk -v packages/simcore-sdk/tests
+	pytest --cov=servicelib -v packages/service-library/tests
 	pytest --cov=simcore_service_webserver -v services/web/server/tests/unit
 	pytest --cov=simcore_service_webserver -v services/web/server/tests/login
 	pytest --cov=simcore_service_director -v services/director/tests
@@ -155,4 +193,4 @@ push_platform_images:
 
 
 
-.PHONY: all clean build-devel rebuild-devel up-devel build up down test after_test push_platform_images
+.PHONY: all clean build-devel rebuild-devel up-devel build up down test after_test push_platform_images file-watcher up-webclient-devel
@@ -0,0 +1,53 @@
+$schema: http://json-schema.org/draft-07/schema#
+$id: https://simcore.io/api/specs/shared/schemas/node-output-tree-api-v0.0.1.yaml
+
+title: node output tree api
+description: nodes using the tree representation for the output
+  must be able to handle the following requests
+type: object
+required:
+  # the validator does not appreciate when required is missing here... and
+  # sadly does not throw any meaningful error about it... so for now I put this...
+  - getItemList
+  - getItem
+properties:
+  getItemList:
+    description: a list of items making up one level of the tree
+    type: object
+    properties:
+      request:
+        summary: oa3 json schema description of the request structure.
+        description: |
+          If no `rootKey` is specified, the first level of the tree is returned.
+          The `filter` will return any items matching the filter string as well as any
+          folder items containing matching items further down the tree.
+        type: object
+        properties:
+          rootKey:
+            type: string
+          filter:
+            type: string
+      response:
+        type: array
+        items:
+          type: object
+          properties:
+            key:
+              type: string
+            label:
+              type: string
+            folder:
+              type: boolean
+  getItem:
+    description: get details about an item in the list
+    type: object
+    properties:
+      request:
+        type: object
+        required:
+          - key
+        properties:
+          key:
+            type: string
+      response:
+        type: object
@@ -22,6 +22,7 @@ ErrorType:
 #     - e.g. metadata can serialize an exception in server that can be reproduced in client side
 #
   type: object
+  nullable: true
   properties:
     logs:
       description: log messages
 
@@ -2,14 +2,10 @@ FakeEnveloped:
   type: object
   required:
     - data
-    - error
   properties:
     data:
       $ref: '#/FakeType'
-      nullable: true
-      default: null
     error:
-      $ref: "./error.yaml#/ErrorType"
       nullable: true
       default: null
 
 
@@ -2,14 +2,10 @@ HealthCheckEnveloped:
   type: object
   required:
     - data
-    - error
   properties:
     data:
       $ref: '#/HealthCheckType'
-      nullable: true
-      default: null
     error:
-      $ref: "./error.yaml#/ErrorType"
       nullable: true
       default: null
 
 
@@ -2,14 +2,10 @@ LogMessageEnveloped:
   type: object
   required:
     - data
-    - error
   properties:
     data:
       $ref: "#/LogMessageType"
-      nullable: true
-      default: null
     error:
-      $ref: "./error.yaml#/ErrorType"
       nullable: true
       default: null
 
 
@@ -2,14 +2,10 @@ LoginEnveloped:
   type: object
   required:
     - data
-    - error
   properties:
     data:
       $ref: '#/LoginFormType'
-      nullable: true
-      default: null
     error:
-      $ref: "./error.yaml#/ErrorType"
       nullable: true
       default: null
 
 
@@ -0,0 +1,75 @@
+Profile:
+  type: object
+  properties:
+    login:
+      type: string
+      format: email
+    gravatar_id:
+      type: string
+    tokens_url:
+      type: string
+      format: url
+  example:
+    login: [email protected]
+    gravatar_id: 205e460b479e2e5b48aec07710c08d50
+    tokens_url: http://simcore.io/my/tokens
+
+Token:
+  description: api keys for third party services
+  type: object
+  properties:
+    service:
+      description: where this token is needed
+      type: string
+    token_key:
+      description: basic token key
+      type: string
+      format: uuid
+    token_secret:
+      type: string
+      format: uuid
+  required:
+    - service
+    - token_key
+  example:
+    service: 'github-api-v1'
+    token_key: foo
+
+# enveloped and array versions --------------------------
+
+ProfileEnveloped:
+  type: object
+  required:
+    - data
+  properties:
+    data:
+      $ref: '#/Profile'
+    error:
+      nullable: true
+      default: null
+
+
+TokenEnveloped:
+  type: object
+  required:
+    - data
+  properties:
+    data:
+      $ref: '#/Token'
+    error:
+      nullable: true
+      default: null
+
+
+TokensArrayEnveloped:
+  type: object
+  required:
+    - data
+  properties:
+    data:
+      type: array
+      items:
+        $ref: '#/Token'
+    error:
+      nullable: true
+      default: null
@@ -2,14 +2,10 @@ RegistrationEnveloped:
   type: object
   required:
     - data
-    - error
   properties:
     data:
       $ref: '#/RegistrationType'
-      nullable: true
-      default: null
     error:
-      $ref: "./error.yaml#/ErrorType"
       nullable: true
       default: null
 
 
@@ -69,8 +69,10 @@ paths:
               schema:
                 type: object
                 # oneOf:
-                #   - $ref: '../../shared/schemas/node-output-list-api-v0.0.1.yaml#/properties/getItemList/request'
-                #   - $ref: '../../shared/schemas/node-output-list-api-v0.0.1.yaml#/properties/getItem/request'
+                #    - $ref: '../../shared/schemas/node-output-list-api-v0.0.1.yaml#/properties/getItemList/properties/request'
+                #    - $ref: '../../shared/schemas/node-output-list-api-v0.0.1.yaml#/properties/getItem/properties/request'
+                #    - $ref: '../../shared/schemas/node-output-tree-api-v0.0.1.yaml#/properties/getItemList/properties/request'
+                #    - $ref: '../../shared/schemas/node-output-tree-api-v0.0.1.yaml#/properties/getItem/properties/request'
       responses:
         default:
           description: node type specific api call according to the node type presented
@@ -79,8 +81,10 @@ paths:
               schema:
                 type: object
                 # oneOf:
-                #   - $ref: '../../shared/schemas/node-output-list-api-v0.0.1.yaml#/properties/getItemList/response'
-                #   - $ref: '../../shared/schemas/node-output-list-api-v0.0.1.yaml#/properties/getItem/response'
+                #    - $ref: '../../shared/schemas/node-output-list-api-v0.0.1.yaml#/properties/getItemList/properties/response'
+                #    - $ref: '../../shared/schemas/node-output-list-api-v0.0.1.yaml#/properties/getItem/properties/response'
+                #    - $ref: '../../shared/schemas/node-output-tree-api-v0.0.1.yaml#/properties/getItemList/properties/response'
+                #    - $ref: '../../shared/schemas/node-output-tree-api-v0.0.1.yaml#/properties/getItem/properties/response'
 
   /node/{nodeInstanceUUID}/iframe:
     get:
@@ -122,10 +126,6 @@ components:
           type: string
         config:
           type: object
-        apiCalls:
-          type: object
-          # oneOf:
-          #     - $ref: '../../shared/schemas/node-output-list-api-v0.0.1.yaml#/properties'
     outputApiCall:
       type: object
       properties:
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ ErrorType:`
`22`	`22`	`# - e.g. metadata can serialize an exception in server that can be reproduced in client side`
`23`	`23`	`#`
`24`	`24`	`type: object`
	`25`	`+ nullable: true`
`25`	`26`	`properties:`
`26`	`27`	`logs:`
`27`	`28`	`description: log messages`