From 6939ced72fbcaf42ecc5b0870395fbcc08bffd4d Mon Sep 17 00:00:00 2001 From: Pedro Crespo-Valero <32402063+pcrespov@users.noreply.github.com> Date: Tue, 1 Mar 2022 10:10:42 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=97=91=EF=B8=8F=20Maintenance/=20cleanup?= =?UTF-8?q?=20unsued=20files=20(#2855)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/tests/test_repo_data.py | 27 +- .../src/pytest_simcore/helpers/utils_login.py | 1 + .../pytest_simcore/helpers/utils_projects.py | 50 +- services/api-server/setup.py | 5 - .../mocks/isolve-gpu-metadata.yml | 43 - .../mocks/isolve-metadata.yml | 36 - .../mocks/isolve-mpi-metadata.yml | 43 - .../mocks/opencor-metadata.yml | 34 - services/web/server/setup.py | 1 - .../fake-materialDB-LF-Material2Entities.json | 236 -- .../data/fake-materialDB-LF-getItem.json | 1926 ----------------- .../data/fake-materialDB-LF-getItemList.json | 210 -- .../data/fake-modeler-LF-getItemList.json | 526 ----- .../data/fake-template-projects.isan.json | 240 -- .../data/fake-template-projects.json | 118 - .../data/fake-template-projects.osparc.json | 67 - .../data/s4l_converter.py | 93 - services/web/server/tests/conftest.py | 4 +- ...ke-template-projects.hack08.notebooks.json | 65 + .../fake-template-projects.isan.2dplot.json | 51 + .../fake-template-projects.isan.matward.json | 26 + .../fake-template-projects.isan.paraview.json | 74 + .../fake-template-projects.isan.ucdavis.json | 87 + .../data/fake-template-projects.sleepers.json | 116 + .../integration/01/test_garbage_collection.py | 90 +- .../integration/01/test_project_workflow.py | 17 +- .../server/tests/integration/02/conftest.py | 11 +- .../server/tests/unit/isolated/conftest.py | 9 - .../unit/isolated/test_projects_utils.py | 60 +- .../isolated/test_security_access_model.py | 35 +- .../server/tests/unit/isolated/test_utils.py | 4 +- .../test_studies_dispatcher_studies_access.py | 17 +- .../server/tests/unit/with_dbs/06/conftest.py | 34 +- .../server/tests/unit/with_dbs/09/conftest.py | 34 +- .../unit/with_dbs/10/test_resource_manager.py | 23 +- .../with_dbs/10/version_control/conftest.py | 7 +- 36 files changed, 681 insertions(+), 3739 deletions(-) delete mode 100644 services/api-server/src/simcore_service_api_server/mocks/isolve-gpu-metadata.yml delete mode 100644 services/api-server/src/simcore_service_api_server/mocks/isolve-metadata.yml delete mode 100644 services/api-server/src/simcore_service_api_server/mocks/isolve-mpi-metadata.yml delete mode 100644 services/api-server/src/simcore_service_api_server/mocks/opencor-metadata.yml delete mode 100644 services/web/server/src/simcore_service_webserver/data/fake-materialDB-LF-Material2Entities.json delete mode 100644 services/web/server/src/simcore_service_webserver/data/fake-materialDB-LF-getItem.json delete mode 100644 services/web/server/src/simcore_service_webserver/data/fake-materialDB-LF-getItemList.json delete mode 100644 services/web/server/src/simcore_service_webserver/data/fake-modeler-LF-getItemList.json delete mode 100644 services/web/server/src/simcore_service_webserver/data/fake-template-projects.isan.json delete mode 100644 services/web/server/src/simcore_service_webserver/data/fake-template-projects.json delete mode 100644 services/web/server/src/simcore_service_webserver/data/fake-template-projects.osparc.json delete mode 100644 services/web/server/src/simcore_service_webserver/data/s4l_converter.py create mode 100644 services/web/server/tests/data/fake-template-projects.hack08.notebooks.json create mode 100644 services/web/server/tests/data/fake-template-projects.isan.2dplot.json create mode 100644 services/web/server/tests/data/fake-template-projects.isan.matward.json create mode 100644 services/web/server/tests/data/fake-template-projects.isan.paraview.json create mode 100644 services/web/server/tests/data/fake-template-projects.isan.ucdavis.json create mode 100644 services/web/server/tests/data/fake-template-projects.sleepers.json diff --git a/api/tests/test_repo_data.py b/api/tests/test_repo_data.py index 1714af0189d..f7f9ab3b234 100644 --- a/api/tests/test_repo_data.py +++ b/api/tests/test_repo_data.py @@ -7,7 +7,6 @@ import json from pathlib import Path -from typing import Dict, List import jsonschema import pytest @@ -19,23 +18,17 @@ "-converted.yaml", # equivalent openapi specs file (see scripts/json-schema-to-openapi-schema) ] - -# TODO: find json files under services with the word project or similar wildcard?? -PROJECTS_PATHS = [ - "services/web/server/tests/data/fake-project.json", - "services/web/server/tests/data/workbench_sleeper_payload.json", - "services/web/server/src/simcore_service_webserver/data/fake-template-projects.isan.json", - "services/web/server/src/simcore_service_webserver/data/fake-template-projects.osparc.json", - "services/web/server/src/simcore_service_webserver/data/fake-template-projects.json", +# Add here paths to files containing project's data that can be validated with projects schema +PROJECTS_NAMES = [ + "fake-project.json", + "fake-template-projects.hack08.notebooks.json", + "fake-template-projects.isan.2dplot.json", + "fake-template-projects.isan.matward.json", + "fake-template-projects.isan.paraview.json", + "fake-template-projects.isan.ucdavis.json", + "fake-template-projects.sleepers.json", ] - -# TODO: check schemas here!? -# ./src/simcore_service_webserver/data/fake-materialDB-LF-getItemList.json -# ./src/simcore_service_webserver/data/fake-modeler-LF-getItemList.json -# ./src/simcore_service_webserver/data/fake-materialDB-LF-getItem.json -# ./src/simcore_service_webserver/data/fake-materialDB-LF-Material2Entities.json -# ./tests/integration/02/workbench_sleeper_dag_adjacency_list.json -# ./tests/integration/02/workbench_sleeper_payload.json +PROJECTS_PATHS = [f"services/web/server/tests/data/{name}" for name in PROJECTS_NAMES] def _load_data(fpath: Path): diff --git a/packages/pytest-simcore/src/pytest_simcore/helpers/utils_login.py b/packages/pytest-simcore/src/pytest_simcore/helpers/utils_login.py index d2deacccb38..a8bcfc162dc 100644 --- a/packages/pytest-simcore/src/pytest_simcore/helpers/utils_login.py +++ b/packages/pytest-simcore/src/pytest_simcore/helpers/utils_login.py @@ -13,6 +13,7 @@ from .utils_assert import assert_status # WARNING: UserDict is already in https://docs.python.org/3/library/collections.html#collections.UserDict +# TODO: move this to future simcore_service_webserver.users_models.py AUserDict = Dict[str, Any] TEST_MARKS = re.compile(r"TEST (\w+):(.*)") diff --git a/packages/pytest-simcore/src/pytest_simcore/helpers/utils_projects.py b/packages/pytest-simcore/src/pytest_simcore/helpers/utils_projects.py index d351853924e..e3a21b70422 100644 --- a/packages/pytest-simcore/src/pytest_simcore/helpers/utils_projects.py +++ b/packages/pytest-simcore/src/pytest_simcore/helpers/utils_projects.py @@ -4,14 +4,13 @@ # pylint: disable=no-value-for-parameter import json -import re import uuid as uuidlib -from typing import Dict, Optional, Type +from pathlib import Path +from typing import Any, Dict, Optional, Type from aiohttp import web from aiohttp.test_utils import TestClient from models_library.projects_state import ProjectState -from simcore_service_webserver._resources import resources from simcore_service_webserver.projects.project_models import ProjectDict from simcore_service_webserver.projects.projects_db import ( APP_PROJECT_DBAPI, @@ -21,18 +20,6 @@ from .utils_assert import assert_status -fake_template_resources = [ - "data/" + name - for name in resources.listdir("data") - if re.match(r"^fake-template-(.+).json", name) -] - -fake_project_resources = [ - "data/" + name - for name in resources.listdir("data") - if re.match(r"^fake-user-(.+).json", name) -] - def empty_project_data(): return { @@ -47,18 +34,14 @@ def empty_project_data(): } -def load_data(name): - with resources.stream(name) as fp: - return json.load(fp) - - async def create_project( app: web.Application, - params_override: Dict = None, - user_id=None, + params_override: Optional[Dict[str, Any]] = None, + user_id: Optional[int] = None, *, - force_uuid=False, -) -> Dict: + default_project_json: Optional[Path] = None, + force_uuid: bool = False, +) -> ProjectDict: """Injects new project in database for user or as template :param params_override: predefined project properties (except for non-writeable e.g. uuid), defaults to None @@ -70,7 +53,12 @@ async def create_project( """ params_override = params_override or {} - project_data = load_data("data/fake-template-projects.isan.json")[0] + project_data = {} + if default_project_json is not None: + # uses default_project_json as base + assert default_project_json.exists(), f"{default_project_json}" + project_data = json.loads(default_project_json.read_text()) + project_data.update(params_override) db = app[APP_PROJECT_DBAPI] @@ -109,6 +97,7 @@ def __init__( clear_all: bool = True, user_id: Optional[int] = None, *, + tests_data_dir: Path, force_uuid: bool = False, ): assert app # nosec @@ -119,6 +108,10 @@ def __init__( self.prj = {} self.clear_all = clear_all self.force_uuid = force_uuid + self.tests_data_dir = tests_data_dir + + assert tests_data_dir.exists() + assert tests_data_dir.is_dir() if not self.clear_all: # TODO: add delete_project. Deleting a single project implies having to delete as well all dependencies created @@ -128,8 +121,13 @@ def __init__( async def __aenter__(self): assert self.app # nosec + self.prj = await create_project( - self.app, self.params_override, self.user_id, force_uuid=self.force_uuid + self.app, + self.params_override, + self.user_id, + force_uuid=self.force_uuid, + default_project_json=self.tests_data_dir / "fake-project.json", ) return self.prj diff --git a/services/api-server/setup.py b/services/api-server/setup.py index bd7f867f7fc..b40c203a3e0 100644 --- a/services/api-server/setup.py +++ b/services/api-server/setup.py @@ -54,11 +54,6 @@ def read_reqs(reqs_path: Path) -> Set[str]: "": "src", }, include_package_data=True, - package_data={ - "": [ - "mocks/*.y*ml", - ] - }, install_requires=PROD_REQUIREMENTS, test_suite="tests", tests_require=TEST_REQUIREMENTS, diff --git a/services/api-server/src/simcore_service_api_server/mocks/isolve-gpu-metadata.yml b/services/api-server/src/simcore_service_api_server/mocks/isolve-gpu-metadata.yml deleted file mode 100644 index 854a416b2e5..00000000000 --- a/services/api-server/src/simcore_service_api_server/mocks/isolve-gpu-metadata.yml +++ /dev/null @@ -1,43 +0,0 @@ -name: isolve-gpu -key: simcore/services/comp/isolve-gpu -type: computational -integration-version: 2.0.72 -version: 2.0.72 -description: GPU solvers for sim4life-master-3938 -contact: guidon@itis.swiss -authors: - - name: Manuel Guidon - email: guidon@itis.swiss - affiliation: ITIS Foundation - -inputs: - input_1: - displayOrder: 1 - label: input_file - description: Input file for the solver. Generated with sim4life - type: data:*/* - defaultValue: some_value(optional) - fileToKeyMap: - input.h5: input_1 - NGPU: - displayOrder: 2 - label: Number of GPUs - description: Defines the number of GPUs used for the computation (0 uses all) - type: integer - defaultValue: 1 - -outputs: - output_1: - displayOrder: 1 - label: output_file - description: Output file from solver. - type: data:*/* - fileToKeyMap: - output.h5: output_1 - output_2: - displayOrder: 2 - label: solver_logs - description: Log files from solver. - type: data:*/* - fileToKeyMap: - log.tgz: output_2 diff --git a/services/api-server/src/simcore_service_api_server/mocks/isolve-metadata.yml b/services/api-server/src/simcore_service_api_server/mocks/isolve-metadata.yml deleted file mode 100644 index 9267f0a727d..00000000000 --- a/services/api-server/src/simcore_service_api_server/mocks/isolve-metadata.yml +++ /dev/null @@ -1,36 +0,0 @@ -name: isolve -key: simcore/services/comp/isolve -type: computational -integration-version: 2.0.72 -version: 2.0.72 -description: Solvers for sim4life-master-3938 -contact: guidon@itis.swiss -authors: - - name: Manuel Guidon - email: guidon@itis.swiss - affiliation: ITIS Foundation -inputs: - input_1: - displayOrder: 1 - label: input_file - description: Input file for the solver. Generated with sim4life - type: data:*/* - defaultValue: some_value(optional) - fileToKeyMap: - input.h5: input_1 - -outputs: - output_1: - displayOrder: 1 - label: output_file - description: Output file from solver. - type: data:*/* - fileToKeyMap: - output.h5: output_1 - output_2: - displayOrder: 2 - label: solver_logs - description: Log files from solver. - type: data:*/* - fileToKeyMap: - log.tgz: output_2 diff --git a/services/api-server/src/simcore_service_api_server/mocks/isolve-mpi-metadata.yml b/services/api-server/src/simcore_service_api_server/mocks/isolve-mpi-metadata.yml deleted file mode 100644 index 7f1b3d5c441..00000000000 --- a/services/api-server/src/simcore_service_api_server/mocks/isolve-mpi-metadata.yml +++ /dev/null @@ -1,43 +0,0 @@ -name: isolve-mpi -key: simcore/services/comp/isolve-mpi -type: computational -integration-version: 2.0.72 -version: 2.0.72 -description: MPI solvers for sim4life-master-3938 -contact: guidon@itis.swiss -authors: - - name: Manuel Guidon - email: guidon@itis.swiss - affiliation: ITIS Foundation - -inputs: - input_1: - displayOrder: 1 - label: input_file - description: Input file for the solver. Generated with sim4life - type: data:*/* - defaultValue: some_value(optional) - fileToKeyMap: - input.h5: input_1 - NCPU: - displayOrder: 2 - label: Number of MPI Processes - description: Defines the number of processes used for the computation (0 uses all) - type: integer - defaultValue: 2 - -outputs: - output_1: - displayOrder: 1 - label: output_file - description: Output file from solver. - type: data:*/* - fileToKeyMap: - output.h5: output_1 - output_2: - displayOrder: 2 - label: solver_logs - description: Log files from solver. - type: data:*/* - fileToKeyMap: - log.tgz: output_2 diff --git a/services/api-server/src/simcore_service_api_server/mocks/opencor-metadata.yml b/services/api-server/src/simcore_service_api_server/mocks/opencor-metadata.yml deleted file mode 100644 index 6839af796c2..00000000000 --- a/services/api-server/src/simcore_service_api_server/mocks/opencor-metadata.yml +++ /dev/null @@ -1,34 +0,0 @@ -name: OpenCOR -key: simcore/services/comp/opencor -type: computational -integration-version: 1.0.0 -version: 1.0.4 -description: OpenCOR is a cross-platform modelling environment, which can be used to organise, edit, simulate and analyse CellML and SED-ML files. -contact: zhuang@itis.swiss -authors: - - name: Katie Zhuang - email: zhuang@itis.swiss - affiliation: IT'IS Foundation -inputs: - model_url: - displayOrder: 1 - label: Model URL - description: The URL of a CellML / SED-ML file that you would like to run. - type: string - defaultValue: https://models.physiomeproject.org/workspace/5f5/rawfile/125f548ce204c1d815298d2c8c1d9b774d89e3a7/mcintyre_richardson_grill_model_2001.sedml - config_file: - displayOrder: 2 - label: Configuration file (JSON) - optional - description: Used to configure the simulation, customise the initial state of the model, and specify the data that is to be outputted. - type: data:*/* - fileToKeyMap: - config.json: config_file - -outputs: - output_1: - displayOrder: 1 - label: Simulation output - description: JSON file containing output of the simulation. - type: data:application/json - fileToKeyMap: - output_data.json: output_1 diff --git a/services/web/server/setup.py b/services/web/server/setup.py index 4a2b5a40cd4..c0d60b02029 100644 --- a/services/web/server/setup.py +++ b/services/web/server/setup.py @@ -52,7 +52,6 @@ def read_reqs(reqs_path: Path) -> Set[str]: "": [ "api/v0/openapi.yaml", "api/v0/schemas/*.json", - "data/*.json", "templates/**/*.html", ] }, diff --git a/services/web/server/src/simcore_service_webserver/data/fake-materialDB-LF-Material2Entities.json b/services/web/server/src/simcore_service_webserver/data/fake-materialDB-LF-Material2Entities.json deleted file mode 100644 index 241fabd3d03..00000000000 --- a/services/web/server/src/simcore_service_webserver/data/fake-materialDB-LF-Material2Entities.json +++ /dev/null @@ -1,236 +0,0 @@ -{ - "Hypothalamus-UUID": [ - "Hypothalamus___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - ], - "Hypophysis-UUID": [ - "Hypophysis___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - ], - "Tongue-UUID": [ - "Tongue___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - ], - "Cerebellum-UUID": [ - "Cerebellum___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - ], - "Commissura_Anterior-UUID": [ - "Commissura_anterior___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - ], - "Bone_Marrow__Yellow_-UUID": [ - "Humerus_yellow_marrow_left___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID", - "Humerus_yellow_marrow_right___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID" - ], - "Medulla_Oblongata-UUID": [ - "Medulla_oblongata___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - ], - "Spinal_Cord-UUID": [ - "Spinal_cord___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - ], - "Skull_Cortical-UUID": [ - "Skull_cortical___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID" - ], - "Intervertebral_Disc-UUID": [ - "Intervertebral_disc___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - ], - "Cerebrospinal_Fluid-UUID": [ - "Cerebrospinal_fluid___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - ], - "Fat-UUID": [ - "Fat___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - ], - "Eye__Sclera_-UUID": [ - "Eye_sclera___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - ], - "Cartilage-UUID": [ - "Ear_cartilage_left___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID", - "Ear_cartilage_right___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID", - "Cartilage___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - ], - "Mucous_Membrane-UUID": [ - "Mucosa___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - ], - "Trachea_Lumen-UUID": [ - "Trachea_lumen___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - ], - "Pons-UUID": [ - "Pons___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - ], - "Skull_Cancellous-UUID": [ - "Skull_cancellous___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID" - ], - "Tooth-UUID": [ - "Tooth___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - ], - "Salivary_Gland-UUID": [ - "Salivary_gland___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - ], - "Eye__Vitreous_Humor_-UUID": [ - "Eye_vitreous_humor___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - ], - "Midbrain-UUID": [ - "Midbrain___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - ], - "Lymphnode-UUID": [ - "Lymph_node___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - ], - "SAT__Subcutaneous_Fat_-UUID": [ - "SAT___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - ], - "Eye__Cornea_-UUID": [ - "Eye_cornea___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - ], - "Nerve_2-UUID": [ - "Nerve___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - ], - "Brain__Grey_Matter_-UUID": [ - "Cerebrum_grey_matter___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - ], - "Lung-UUID": [ - "Lung___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - ], - "Thalamus-UUID": [ - "Thalamus___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - ], - "Esophagus_Lumen-UUID": [ - "Esophagus_lumen___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - ], - "Bronchi-UUID": [ - "Bronchus_wall___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - ], - "Commissura_Posterior-UUID": [ - "Commissura_posterior___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - ], - "Epineurium-UUID": [ - "Nerve___Surfaces_-UUID" - ], - "Silicone-UUID": [ - "Silicone___Electrode_-UUID" - ], - "Bone__Cortical_-UUID": [ - "Vertebra_cortical_C1___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID", - "Rib_cortical___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID", - "Vertebra_cortical_C5___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID", - "Humerus_cortical_left___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID", - "Humerus_cortical_right___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID", - "Vertebra_cortical_T1___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID", - "Vertebra_cortical_C2___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID", - "Scapula_cortical_left___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID", - "Hyoid_cortical___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID", - "Vertebra_cortical_T4___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID", - "Clavicle_cortical___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID", - "Scapula_cortical_right___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID", - "Mandible_cortical___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID", - "Vertebra_cortical_C3___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID", - "Vertebra_cortical_T3___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID", - "Vertebra_cortical_C6___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID", - "Vertebra_cortical_C4___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID", - "Sternum_cortical___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID", - "Vertebra_cortical_T2___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID", - "Vertebra_cortical_C7___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID" - ], - "Air-UUID": [ - "Background-UUID" - ], - "Hippocampus-UUID": [ - "Hippocampus___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - ], - "Tendon_Ligament-UUID": [ - "Tendon_ligament___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - ], - "Esophagus-UUID": [ - "Esophagus_wall___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - ], - "Trachea-UUID": [ - "Trachea_wall___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - ], - "Larynx-UUID": [ - "Larynx___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - ], - "Dura-UUID": [ - "Dura_mater___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - ], - "Muscle-UUID": [ - "Muscle___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - ], - "Thyroid_Gland-UUID": [ - "Thyroid_gland___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - ], - "Brain__White_Matter_-UUID": [ - "Corpus_callosum___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID", - "Cerebrum_white_matter___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - ], - "Skin-UUID": [ - "Ear_skin_right___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID", - "Skin___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID", - "Ear_skin_left___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - ], - "Air_1-UUID": [ - "Air_internal___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - ], - "Fascicles-UUID": [ - "Fascicle_0___Surfaces_-UUID", - "Fascicle_1___Surfaces_-UUID", - "Fascicle_2___Surfaces_-UUID", - "Fascicle_3___Surfaces_-UUID", - "Fascicle_4___Surfaces_-UUID", - "Fascicle_5___Surfaces_-UUID", - "Fascicle_6___Surfaces_-UUID", - "Fascicle_7___Surfaces_-UUID", - "Fascicle_8___Surfaces_-UUID", - "Fascicle_9___Surfaces_-UUID", - "Fascicle_10___Surfaces_-UUID", - "Fascicle_11___Surfaces_-UUID", - "Fascicle_12___Surfaces_-UUID", - "Fascicle_13___Surfaces_-UUID", - "Fascicle_14___Surfaces_-UUID", - "Fascicle_15___Surfaces_-UUID", - "Fascicle_16___Surfaces_-UUID", - "Fascicle_17___Surfaces_-UUID", - "Fascicle_18___Surfaces_-UUID", - "Fascicle_19___Surfaces_-UUID", - "Fascicle_20___Surfaces_-UUID", - "Fascicle_21___Surfaces_-UUID", - "Fascicle_22___Surfaces_-UUID", - "Fascicle_23___Surfaces_-UUID", - "Fascicle_24___Surfaces_-UUID", - "Fascicle_25___Surfaces_-UUID", - "Fascicle_26___Surfaces_-UUID", - "Fascicle_27___Surfaces_-UUID", - "Fascicle_28___Surfaces_-UUID", - "Fascicle_29___Surfaces_-UUID", - "Fascicle_30___Surfaces_-UUID", - "Fascicle_31___Surfaces_-UUID", - "Fascicle_32___Surfaces_-UUID", - "Fascicle_33___Surfaces_-UUID", - "Fascicle_34___Surfaces_-UUID" - ], - "Pineal_Body-UUID": [ - "Pineal_body___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - ], - "Blood-UUID": [ - "Vein___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID", - "Artery___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - ], - "Eye__Lens_-UUID": [ - "Eye_lens___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - ], - "Bone__Cancellous_-UUID": [ - "Mandible_cancellous___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID", - "Humerus_cancellous_right___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID", - "Vertebra_cancellous_T4___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID", - "Scapula_cancellous_right___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID", - "Vertebra_cancellous_C1___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID", - "Scapula_cancellous_left___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID", - "Sternum_cancellous___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID", - "Humerus_cancellous_left___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID", - "Rib_cancellous___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID", - "Vertebra_cancellous_C2___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID", - "Vertebra_cancellous_T2___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID", - "Vertebra_cancellous_C6___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID", - "Vertebra_cancellous_T3___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID", - "Vertebra_cancellous_T1___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID", - "Vertebra_cancellous_C7___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID", - "Vertebra_cancellous_C4___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID", - "Clavicle_cancellous___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID", - "Vertebra_cancellous_C3___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID", - "Vertebra_cancellous_C5___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID" - ] -} \ No newline at end of file diff --git a/services/web/server/src/simcore_service_webserver/data/fake-materialDB-LF-getItem.json b/services/web/server/src/simcore_service_webserver/data/fake-materialDB-LF-getItem.json deleted file mode 100644 index f3fbd9aefd2..00000000000 --- a/services/web/server/src/simcore_service_webserver/data/fake-materialDB-LF-getItem.json +++ /dev/null @@ -1,1926 +0,0 @@ -{ - "Hypothalamus-UUID": { - "RelativePermeability": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 4, - "label": "Relative Permeability" - }, - "MassDensity": { - "defaultValue": 1044.5, - "type": "number", - "unit": "kg/m^3", - "displayOrder": 0, - "label": "Mass Density" - }, - "RelativePermittivity": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 2, - "label": "Relative Permittivity" - }, - "ElectricConductivity": { - "defaultValue": 0.23914873606449, - "type": "number", - "unit": "S/m", - "displayOrder": 1, - "label": "Electric Conductivity" - }, - "MagneticConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "Ohm/m", - "displayOrder": 3, - "label": "Magnetic Conductivity" - } - }, - "Hypophysis-UUID": { - "RelativePermeability": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 4, - "label": "Relative Permeability" - }, - "MassDensity": { - "defaultValue": 1053.0, - "type": "number", - "unit": "kg/m^3", - "displayOrder": 0, - "label": "Mass Density" - }, - "RelativePermittivity": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 2, - "label": "Relative Permittivity" - }, - "ElectricConductivity": { - "defaultValue": 0.4811, - "type": "number", - "unit": "S/m", - "displayOrder": 1, - "label": "Electric Conductivity" - }, - "MagneticConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "Ohm/m", - "displayOrder": 3, - "label": "Magnetic Conductivity" - } - }, - "Tongue-UUID": { - "RelativePermeability": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 4, - "label": "Relative Permeability" - }, - "MassDensity": { - "defaultValue": 1090.4, - "type": "number", - "unit": "kg/m^3", - "displayOrder": 0, - "label": "Mass Density" - }, - "RelativePermittivity": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 2, - "label": "Relative Permittivity" - }, - "ElectricConductivity": { - "defaultValue": 0.355286874117476, - "type": "number", - "unit": "S/m", - "displayOrder": 1, - "label": "Electric Conductivity" - }, - "MagneticConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "Ohm/m", - "displayOrder": 3, - "label": "Magnetic Conductivity" - } - }, - "Cerebellum-UUID": { - "RelativePermeability": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 4, - "label": "Relative Permeability" - }, - "MassDensity": { - "defaultValue": 1045.0, - "type": "number", - "unit": "kg/m^3", - "displayOrder": 0, - "label": "Mass Density" - }, - "RelativePermittivity": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 2, - "label": "Relative Permittivity" - }, - "ElectricConductivity": { - "defaultValue": 0.659666666666667, - "type": "number", - "unit": "S/m", - "displayOrder": 1, - "label": "Electric Conductivity" - }, - "MagneticConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "Ohm/m", - "displayOrder": 3, - "label": "Magnetic Conductivity" - } - }, - "Commissura_Anterior-UUID": { - "RelativePermeability": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 4, - "label": "Relative Permeability" - }, - "MassDensity": { - "defaultValue": 1041.0, - "type": "number", - "unit": "kg/m^3", - "displayOrder": 0, - "label": "Mass Density" - }, - "RelativePermittivity": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 2, - "label": "Relative Permittivity" - }, - "ElectricConductivity": { - "defaultValue": 0.265075903212916, - "type": "number", - "unit": "S/m", - "displayOrder": 1, - "label": "Electric Conductivity" - }, - "MagneticConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "Ohm/m", - "displayOrder": 3, - "label": "Magnetic Conductivity" - } - }, - "Bone_Marrow__Yellow_-UUID": { - "RelativePermeability": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 4, - "label": "Relative Permeability" - }, - "MassDensity": { - "defaultValue": 980.0, - "type": "number", - "unit": "kg/m^3", - "displayOrder": 0, - "label": "Mass Density" - }, - "RelativePermittivity": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 2, - "label": "Relative Permittivity" - }, - "ElectricConductivity": { - "defaultValue": 0.00247168316831683, - "type": "number", - "unit": "S/m", - "displayOrder": 1, - "label": "Electric Conductivity" - }, - "MagneticConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "Ohm/m", - "displayOrder": 3, - "label": "Magnetic Conductivity" - } - }, - "Medulla_Oblongata-UUID": { - "RelativePermeability": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 4, - "label": "Relative Permeability" - }, - "MassDensity": { - "defaultValue": 1045.5, - "type": "number", - "unit": "kg/m^3", - "displayOrder": 0, - "label": "Mass Density" - }, - "RelativePermittivity": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 2, - "label": "Relative Permittivity" - }, - "ElectricConductivity": { - "defaultValue": 0.234006562252398, - "type": "number", - "unit": "S/m", - "displayOrder": 1, - "label": "Electric Conductivity" - }, - "MagneticConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "Ohm/m", - "displayOrder": 3, - "label": "Magnetic Conductivity" - } - }, - "Spinal_Cord-UUID": { - "RelativePermeability": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 4, - "label": "Relative Permeability" - }, - "MassDensity": { - "defaultValue": 1075.0, - "type": "number", - "unit": "kg/m^3", - "displayOrder": 0, - "label": "Mass Density" - }, - "RelativePermittivity": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 2, - "label": "Relative Permittivity" - }, - "ElectricConductivity": { - "defaultValue": 0.234006562252398, - "type": "number", - "unit": "S/m", - "displayOrder": 1, - "label": "Electric Conductivity" - }, - "MagneticConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "Ohm/m", - "displayOrder": 3, - "label": "Magnetic Conductivity" - } - }, - "Skull_Cortical-UUID": { - "RelativePermeability": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 4, - "label": "Relative Permeability" - }, - "MassDensity": { - "defaultValue": 1908.0, - "type": "number", - "unit": "kg/m^3", - "displayOrder": 0, - "label": "Mass Density" - }, - "RelativePermittivity": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 2, - "label": "Relative Permittivity" - }, - "ElectricConductivity": { - "defaultValue": 0.32, - "type": "number", - "unit": "S/m", - "displayOrder": 1, - "label": "Electric Conductivity" - }, - "MagneticConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "Ohm/m", - "displayOrder": 3, - "label": "Magnetic Conductivity" - } - }, - "Cerebrospinal_Fluid-UUID": { - "RelativePermeability": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 4, - "label": "Relative Permeability" - }, - "MassDensity": { - "defaultValue": 1007.0, - "type": "number", - "unit": "kg/m^3", - "displayOrder": 0, - "label": "Mass Density" - }, - "RelativePermittivity": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 2, - "label": "Relative Permittivity" - }, - "ElectricConductivity": { - "defaultValue": 1.7765, - "type": "number", - "unit": "S/m", - "displayOrder": 1, - "label": "Electric Conductivity" - }, - "MagneticConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "Ohm/m", - "displayOrder": 3, - "label": "Magnetic Conductivity" - } - }, - "Fat-UUID": { - "RelativePermeability": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 4, - "label": "Relative Permeability" - }, - "MassDensity": { - "defaultValue": 911.0, - "type": "number", - "unit": "kg/m^3", - "displayOrder": 0, - "label": "Mass Density" - }, - "RelativePermittivity": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 2, - "label": "Relative Permittivity" - }, - "ElectricConductivity": { - "defaultValue": 0.0573412363008279, - "type": "number", - "unit": "S/m", - "displayOrder": 1, - "label": "Electric Conductivity" - }, - "MagneticConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "Ohm/m", - "displayOrder": 3, - "label": "Magnetic Conductivity" - } - }, - "Eye__Sclera_-UUID": { - "RelativePermeability": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 4, - "label": "Relative Permeability" - }, - "MassDensity": { - "defaultValue": 1032.0, - "type": "number", - "unit": "kg/m^3", - "displayOrder": 0, - "label": "Mass Density" - }, - "RelativePermittivity": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 2, - "label": "Relative Permittivity" - }, - "ElectricConductivity": { - "defaultValue": 0.62, - "type": "number", - "unit": "S/m", - "displayOrder": 1, - "label": "Electric Conductivity" - }, - "MagneticConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "Ohm/m", - "displayOrder": 3, - "label": "Magnetic Conductivity" - } - }, - "Cartilage-UUID": { - "RelativePermeability": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 4, - "label": "Relative Permeability" - }, - "MassDensity": { - "defaultValue": 1099.5, - "type": "number", - "unit": "kg/m^3", - "displayOrder": 0, - "label": "Mass Density" - }, - "RelativePermittivity": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 2, - "label": "Relative Permittivity" - }, - "ElectricConductivity": { - "defaultValue": 1.01, - "type": "number", - "unit": "S/m", - "displayOrder": 1, - "label": "Electric Conductivity" - }, - "MagneticConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "Ohm/m", - "displayOrder": 3, - "label": "Magnetic Conductivity" - } - }, - "Mucous_Membrane-UUID": { - "RelativePermeability": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 4, - "label": "Relative Permeability" - }, - "MassDensity": { - "defaultValue": 1102.0, - "type": "number", - "unit": "kg/m^3", - "displayOrder": 0, - "label": "Mass Density" - }, - "RelativePermittivity": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 2, - "label": "Relative Permittivity" - }, - "ElectricConductivity": { - "defaultValue": 0.355286874117476, - "type": "number", - "unit": "S/m", - "displayOrder": 1, - "label": "Electric Conductivity" - }, - "MagneticConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "Ohm/m", - "displayOrder": 3, - "label": "Magnetic Conductivity" - } - }, - "Trachea_Lumen-UUID": { - "RelativePermeability": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 4, - "label": "Relative Permeability" - }, - "MassDensity": { - "defaultValue": 1.16409155293818, - "type": "number", - "unit": "kg/m^3", - "displayOrder": 0, - "label": "Mass Density" - }, - "RelativePermittivity": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 2, - "label": "Relative Permittivity" - }, - "ElectricConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "S/m", - "displayOrder": 1, - "label": "Electric Conductivity" - }, - "MagneticConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "Ohm/m", - "displayOrder": 3, - "label": "Magnetic Conductivity" - } - }, - "Dura-UUID": { - "RelativePermeability": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 4, - "label": "Relative Permeability" - }, - "MassDensity": { - "defaultValue": 1174.0, - "type": "number", - "unit": "kg/m^3", - "displayOrder": 0, - "label": "Mass Density" - }, - "RelativePermittivity": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 2, - "label": "Relative Permittivity" - }, - "ElectricConductivity": { - "defaultValue": 0.367577227722772, - "type": "number", - "unit": "S/m", - "displayOrder": 1, - "label": "Electric Conductivity" - }, - "MagneticConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "Ohm/m", - "displayOrder": 3, - "label": "Magnetic Conductivity" - } - }, - "Skull_Cancellous-UUID": { - "RelativePermeability": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 4, - "label": "Relative Permeability" - }, - "MassDensity": { - "defaultValue": 1178.33333333333, - "type": "number", - "unit": "kg/m^3", - "displayOrder": 0, - "label": "Mass Density" - }, - "RelativePermittivity": { - "defaultValue": 12320.035797440474, - "type": "number", - "unit": "", - "displayOrder": 2, - "label": "Relative Permittivity" - }, - "ElectricConductivity": { - "defaultValue": 0.08152999458394551, - "type": "number", - "unit": "S/m", - "displayOrder": 1, - "label": "Electric Conductivity" - }, - "MagneticConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "Ohm/m", - "displayOrder": 3, - "label": "Magnetic Conductivity" - } - }, - "Tooth-UUID": { - "RelativePermeability": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 4, - "label": "Relative Permeability" - }, - "MassDensity": { - "defaultValue": 2180.0, - "type": "number", - "unit": "kg/m^3", - "displayOrder": 0, - "label": "Mass Density" - }, - "RelativePermittivity": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 2, - "label": "Relative Permittivity" - }, - "ElectricConductivity": { - "defaultValue": 0.0035039941902687, - "type": "number", - "unit": "S/m", - "displayOrder": 1, - "label": "Electric Conductivity" - }, - "MagneticConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "Ohm/m", - "displayOrder": 3, - "label": "Magnetic Conductivity" - } - }, - "Salivary_Gland-UUID": { - "RelativePermeability": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 4, - "label": "Relative Permeability" - }, - "MassDensity": { - "defaultValue": 1048.0, - "type": "number", - "unit": "kg/m^3", - "displayOrder": 0, - "label": "Mass Density" - }, - "RelativePermittivity": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 2, - "label": "Relative Permittivity" - }, - "ElectricConductivity": { - "defaultValue": 0.67, - "type": "number", - "unit": "S/m", - "displayOrder": 1, - "label": "Electric Conductivity" - }, - "MagneticConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "Ohm/m", - "displayOrder": 3, - "label": "Magnetic Conductivity" - } - }, - "Eye__Vitreous_Humor_-UUID": { - "RelativePermeability": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 4, - "label": "Relative Permeability" - }, - "MassDensity": { - "defaultValue": 1004.5, - "type": "number", - "unit": "kg/m^3", - "displayOrder": 0, - "label": "Mass Density" - }, - "RelativePermittivity": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 2, - "label": "Relative Permittivity" - }, - "ElectricConductivity": { - "defaultValue": 1.55, - "type": "number", - "unit": "S/m", - "displayOrder": 1, - "label": "Electric Conductivity" - }, - "MagneticConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "Ohm/m", - "displayOrder": 3, - "label": "Magnetic Conductivity" - } - }, - "Midbrain-UUID": { - "RelativePermeability": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 4, - "label": "Relative Permeability" - }, - "MassDensity": { - "defaultValue": 1045.5, - "type": "number", - "unit": "kg/m^3", - "displayOrder": 0, - "label": "Mass Density" - }, - "RelativePermittivity": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 2, - "label": "Relative Permittivity" - }, - "ElectricConductivity": { - "defaultValue": 0.234006562252398, - "type": "number", - "unit": "S/m", - "displayOrder": 1, - "label": "Electric Conductivity" - }, - "MagneticConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "Ohm/m", - "displayOrder": 3, - "label": "Magnetic Conductivity" - } - }, - "Lymphnode-UUID": { - "RelativePermeability": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 4, - "label": "Relative Permeability" - }, - "MassDensity": { - "defaultValue": 1035.0, - "type": "number", - "unit": "kg/m^3", - "displayOrder": 0, - "label": "Mass Density" - }, - "RelativePermittivity": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 2, - "label": "Relative Permittivity" - }, - "ElectricConductivity": { - "defaultValue": 0.293380448454906, - "type": "number", - "unit": "S/m", - "displayOrder": 1, - "label": "Electric Conductivity" - }, - "MagneticConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "Ohm/m", - "displayOrder": 3, - "label": "Magnetic Conductivity" - } - }, - "SAT__Subcutaneous_Fat_-UUID": { - "RelativePermeability": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 4, - "label": "Relative Permeability" - }, - "MassDensity": { - "defaultValue": 911.0, - "type": "number", - "unit": "kg/m^3", - "displayOrder": 0, - "label": "Mass Density" - }, - "RelativePermittivity": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 2, - "label": "Relative Permittivity" - }, - "ElectricConductivity": { - "defaultValue": 0.0573412363008279, - "type": "number", - "unit": "S/m", - "displayOrder": 1, - "label": "Electric Conductivity" - }, - "MagneticConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "Ohm/m", - "displayOrder": 3, - "label": "Magnetic Conductivity" - } - }, - "Eye__Cornea_-UUID": { - "RelativePermeability": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 4, - "label": "Relative Permeability" - }, - "MassDensity": { - "defaultValue": 1050.5, - "type": "number", - "unit": "kg/m^3", - "displayOrder": 0, - "label": "Mass Density" - }, - "RelativePermittivity": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 2, - "label": "Relative Permittivity" - }, - "ElectricConductivity": { - "defaultValue": 0.62, - "type": "number", - "unit": "S/m", - "displayOrder": 1, - "label": "Electric Conductivity" - }, - "MagneticConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "Ohm/m", - "displayOrder": 3, - "label": "Magnetic Conductivity" - } - }, - "Nerve_2-UUID": { - "RelativePermeability": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 4, - "label": "Relative Permeability" - }, - "MassDensity": { - "defaultValue": 1075.0, - "type": "number", - "unit": "kg/m^3", - "displayOrder": 0, - "label": "Mass Density" - }, - "RelativePermittivity": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 2, - "label": "Relative Permittivity" - }, - "ElectricConductivity": { - "defaultValue": 0.265075903212916, - "type": "number", - "unit": "S/m", - "displayOrder": 1, - "label": "Electric Conductivity" - }, - "MagneticConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "Ohm/m", - "displayOrder": 3, - "label": "Magnetic Conductivity" - } - }, - "Brain__Grey_Matter_-UUID": { - "RelativePermeability": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 4, - "label": "Relative Permeability" - }, - "MassDensity": { - "defaultValue": 1044.5, - "type": "number", - "unit": "kg/m^3", - "displayOrder": 0, - "label": "Mass Density" - }, - "RelativePermittivity": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 2, - "label": "Relative Permittivity" - }, - "ElectricConductivity": { - "defaultValue": 0.23914873606449, - "type": "number", - "unit": "S/m", - "displayOrder": 1, - "label": "Electric Conductivity" - }, - "MagneticConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "Ohm/m", - "displayOrder": 3, - "label": "Magnetic Conductivity" - } - }, - "Lung-UUID": { - "RelativePermeability": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 4, - "label": "Relative Permeability" - }, - "MassDensity": { - "defaultValue": 394.0, - "type": "number", - "unit": "kg/m^3", - "displayOrder": 0, - "label": "Mass Density" - }, - "RelativePermittivity": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 2, - "label": "Relative Permittivity" - }, - "ElectricConductivity": { - "defaultValue": 0.104965456996338, - "type": "number", - "unit": "S/m", - "displayOrder": 1, - "label": "Electric Conductivity" - }, - "MagneticConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "Ohm/m", - "displayOrder": 3, - "label": "Magnetic Conductivity" - } - }, - "Thalamus-UUID": { - "RelativePermeability": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 4, - "label": "Relative Permeability" - }, - "MassDensity": { - "defaultValue": 1044.5, - "type": "number", - "unit": "kg/m^3", - "displayOrder": 0, - "label": "Mass Density" - }, - "RelativePermittivity": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 2, - "label": "Relative Permittivity" - }, - "ElectricConductivity": { - "defaultValue": 0.23914873606449, - "type": "number", - "unit": "S/m", - "displayOrder": 1, - "label": "Electric Conductivity" - }, - "MagneticConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "Ohm/m", - "displayOrder": 3, - "label": "Magnetic Conductivity" - } - }, - "Esophagus_Lumen-UUID": { - "RelativePermeability": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 4, - "label": "Relative Permeability" - }, - "MassDensity": { - "defaultValue": 1.16409155293818, - "type": "number", - "unit": "kg/m^3", - "displayOrder": 0, - "label": "Mass Density" - }, - "RelativePermittivity": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 2, - "label": "Relative Permittivity" - }, - "ElectricConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "S/m", - "displayOrder": 1, - "label": "Electric Conductivity" - }, - "MagneticConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "Ohm/m", - "displayOrder": 3, - "label": "Magnetic Conductivity" - } - }, - "Bronchi-UUID": { - "RelativePermeability": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 4, - "label": "Relative Permeability" - }, - "MassDensity": { - "defaultValue": 1101.5, - "type": "number", - "unit": "kg/m^3", - "displayOrder": 0, - "label": "Mass Density" - }, - "RelativePermittivity": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 2, - "label": "Relative Permittivity" - }, - "ElectricConductivity": { - "defaultValue": 0.231971604938272, - "type": "number", - "unit": "S/m", - "displayOrder": 1, - "label": "Electric Conductivity" - }, - "MagneticConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "Ohm/m", - "displayOrder": 3, - "label": "Magnetic Conductivity" - } - }, - "Commissura_Posterior-UUID": { - "RelativePermeability": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 4, - "label": "Relative Permeability" - }, - "MassDensity": { - "defaultValue": 1041.0, - "type": "number", - "unit": "kg/m^3", - "displayOrder": 0, - "label": "Mass Density" - }, - "RelativePermittivity": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 2, - "label": "Relative Permittivity" - }, - "ElectricConductivity": { - "defaultValue": 0.265075903212916, - "type": "number", - "unit": "S/m", - "displayOrder": 1, - "label": "Electric Conductivity" - }, - "MagneticConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "Ohm/m", - "displayOrder": 3, - "label": "Magnetic Conductivity" - } - }, - "Epineurium-UUID": { - "RelativePermeability": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 4, - "label": "Relative Permeability" - }, - "MassDensity": { - "defaultValue": 1000.0, - "type": "number", - "unit": "kg/m^3", - "displayOrder": 0, - "label": "Mass Density" - }, - "RelativePermittivity": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 2, - "label": "Relative Permittivity" - }, - "ElectricConductivity": { - "defaultValue": 0.25, - "type": "number", - "unit": "S/m", - "displayOrder": 1, - "label": "Electric Conductivity" - }, - "MagneticConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "Ohm/m", - "displayOrder": 3, - "label": "Magnetic Conductivity" - } - }, - "Silicone-UUID": { - "RelativePermeability": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 4, - "label": "Relative Permeability" - }, - "MassDensity": { - "defaultValue": 1000.0, - "type": "number", - "unit": "kg/m^3", - "displayOrder": 0, - "label": "Mass Density" - }, - "RelativePermittivity": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 2, - "label": "Relative Permittivity" - }, - "ElectricConductivity": { - "defaultValue": 1e-12, - "type": "number", - "unit": "S/m", - "displayOrder": 1, - "label": "Electric Conductivity" - }, - "MagneticConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "Ohm/m", - "displayOrder": 3, - "label": "Magnetic Conductivity" - } - }, - "Bone__Cortical_-UUID": { - "RelativePermeability": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 4, - "label": "Relative Permeability" - }, - "MassDensity": { - "defaultValue": 1908.0, - "type": "number", - "unit": "kg/m^3", - "displayOrder": 0, - "label": "Mass Density" - }, - "RelativePermittivity": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 2, - "label": "Relative Permittivity" - }, - "ElectricConductivity": { - "defaultValue": 0.0035039941902687, - "type": "number", - "unit": "S/m", - "displayOrder": 1, - "label": "Electric Conductivity" - }, - "MagneticConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "Ohm/m", - "displayOrder": 3, - "label": "Magnetic Conductivity" - } - }, - "Air-UUID": { - "RelativePermeability": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 4, - "label": "Relative Permeability" - }, - "MassDensity": { - "defaultValue": 1.205, - "type": "number", - "unit": "kg/m^3", - "displayOrder": 0, - "label": "Mass Density" - }, - "RelativePermittivity": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 2, - "label": "Relative Permittivity" - }, - "ElectricConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "S/m", - "displayOrder": 1, - "label": "Electric Conductivity" - }, - "MagneticConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "Ohm/m", - "displayOrder": 3, - "label": "Magnetic Conductivity" - } - }, - "Hippocampus-UUID": { - "RelativePermeability": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 4, - "label": "Relative Permeability" - }, - "MassDensity": { - "defaultValue": 1044.5, - "type": "number", - "unit": "kg/m^3", - "displayOrder": 0, - "label": "Mass Density" - }, - "RelativePermittivity": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 2, - "label": "Relative Permittivity" - }, - "ElectricConductivity": { - "defaultValue": 0.275633903133903, - "type": "number", - "unit": "S/m", - "displayOrder": 1, - "label": "Electric Conductivity" - }, - "MagneticConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "Ohm/m", - "displayOrder": 3, - "label": "Magnetic Conductivity" - } - }, - "Tendon_Ligament-UUID": { - "RelativePermeability": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 4, - "label": "Relative Permeability" - }, - "MassDensity": { - "defaultValue": 1142.0, - "type": "number", - "unit": "kg/m^3", - "displayOrder": 0, - "label": "Mass Density" - }, - "RelativePermittivity": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 2, - "label": "Relative Permittivity" - }, - "ElectricConductivity": { - "defaultValue": 0.367577227722772, - "type": "number", - "unit": "S/m", - "displayOrder": 1, - "label": "Electric Conductivity" - }, - "MagneticConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "Ohm/m", - "displayOrder": 3, - "label": "Magnetic Conductivity" - } - }, - "Esophagus-UUID": { - "RelativePermeability": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 4, - "label": "Relative Permeability" - }, - "MassDensity": { - "defaultValue": 1040.0, - "type": "number", - "unit": "kg/m^3", - "displayOrder": 0, - "label": "Mass Density" - }, - "RelativePermittivity": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 2, - "label": "Relative Permittivity" - }, - "ElectricConductivity": { - "defaultValue": 0.163535918367347, - "type": "number", - "unit": "S/m", - "displayOrder": 1, - "label": "Electric Conductivity" - }, - "MagneticConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "Ohm/m", - "displayOrder": 3, - "label": "Magnetic Conductivity" - } - }, - "Pons-UUID": { - "RelativePermeability": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 4, - "label": "Relative Permeability" - }, - "MassDensity": { - "defaultValue": 1045.5, - "type": "number", - "unit": "kg/m^3", - "displayOrder": 0, - "label": "Mass Density" - }, - "RelativePermittivity": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 2, - "label": "Relative Permittivity" - }, - "ElectricConductivity": { - "defaultValue": 0.234006562252398, - "type": "number", - "unit": "S/m", - "displayOrder": 1, - "label": "Electric Conductivity" - }, - "MagneticConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "Ohm/m", - "displayOrder": 3, - "label": "Magnetic Conductivity" - } - }, - "Fascicles-UUID": { - "RelativePermeability": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 4, - "label": "Relative Permeability" - }, - "MassDensity": { - "defaultValue": 1000.0, - "type": "number", - "unit": "kg/m^3", - "displayOrder": 0, - "label": "Mass Density" - }, - "RelativePermittivity": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 2, - "label": "Relative Permittivity" - }, - "ElectricConductivity": { - "defaultValue": 0.1, - "type": "number", - "unit": "S/m", - "displayOrder": 1, - "label": "Electric Conductivity" - }, - "MagneticConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "Ohm/m", - "displayOrder": 3, - "label": "Magnetic Conductivity" - } - }, - "Trachea-UUID": { - "RelativePermeability": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 4, - "label": "Relative Permeability" - }, - "MassDensity": { - "defaultValue": 1080.0, - "type": "number", - "unit": "kg/m^3", - "displayOrder": 0, - "label": "Mass Density" - }, - "RelativePermittivity": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 2, - "label": "Relative Permittivity" - }, - "ElectricConductivity": { - "defaultValue": 0.341986666666667, - "type": "number", - "unit": "S/m", - "displayOrder": 1, - "label": "Electric Conductivity" - }, - "MagneticConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "Ohm/m", - "displayOrder": 3, - "label": "Magnetic Conductivity" - } - }, - "Larynx-UUID": { - "RelativePermeability": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 4, - "label": "Relative Permeability" - }, - "MassDensity": { - "defaultValue": 1099.5, - "type": "number", - "unit": "kg/m^3", - "displayOrder": 0, - "label": "Mass Density" - }, - "RelativePermittivity": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 2, - "label": "Relative Permittivity" - }, - "ElectricConductivity": { - "defaultValue": 1.01, - "type": "number", - "unit": "S/m", - "displayOrder": 1, - "label": "Electric Conductivity" - }, - "MagneticConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "Ohm/m", - "displayOrder": 3, - "label": "Magnetic Conductivity" - } - }, - "Muscle-UUID": { - "RelativePermeability": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 4, - "label": "Relative Permeability" - }, - "MassDensity": { - "defaultValue": 1090.4, - "type": "number", - "unit": "kg/m^3", - "displayOrder": 0, - "label": "Mass Density" - }, - "RelativePermittivity": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 2, - "label": "Relative Permittivity" - }, - "ElectricConductivity": { - "defaultValue": 0.355286874117476, - "type": "number", - "unit": "S/m", - "displayOrder": 1, - "label": "Electric Conductivity" - }, - "MagneticConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "Ohm/m", - "displayOrder": 3, - "label": "Magnetic Conductivity" - } - }, - "Thyroid_Gland-UUID": { - "RelativePermeability": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 4, - "label": "Relative Permeability" - }, - "MassDensity": { - "defaultValue": 1050.0, - "type": "number", - "unit": "kg/m^3", - "displayOrder": 0, - "label": "Mass Density" - }, - "RelativePermittivity": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 2, - "label": "Relative Permittivity" - }, - "ElectricConductivity": { - "defaultValue": 0.4811, - "type": "number", - "unit": "S/m", - "displayOrder": 1, - "label": "Electric Conductivity" - }, - "MagneticConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "Ohm/m", - "displayOrder": 3, - "label": "Magnetic Conductivity" - } - }, - "Brain__White_Matter_-UUID": { - "RelativePermeability": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 4, - "label": "Relative Permeability" - }, - "MassDensity": { - "defaultValue": 1041.0, - "type": "number", - "unit": "kg/m^3", - "displayOrder": 0, - "label": "Mass Density" - }, - "RelativePermittivity": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 2, - "label": "Relative Permittivity" - }, - "ElectricConductivity": { - "defaultValue": 0.265075903212916, - "type": "number", - "unit": "S/m", - "displayOrder": 1, - "label": "Electric Conductivity" - }, - "MagneticConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "Ohm/m", - "displayOrder": 3, - "label": "Magnetic Conductivity" - } - }, - "Skin-UUID": { - "RelativePermeability": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 4, - "label": "Relative Permeability" - }, - "MassDensity": { - "defaultValue": 1109.0, - "type": "number", - "unit": "kg/m^3", - "displayOrder": 0, - "label": "Mass Density" - }, - "RelativePermittivity": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 2, - "label": "Relative Permittivity" - }, - "ElectricConductivity": { - "defaultValue": 0.17, - "type": "number", - "unit": "S/m", - "displayOrder": 1, - "label": "Electric Conductivity" - }, - "MagneticConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "Ohm/m", - "displayOrder": 3, - "label": "Magnetic Conductivity" - } - }, - "Air_1-UUID": { - "RelativePermeability": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 4, - "label": "Relative Permeability" - }, - "MassDensity": { - "defaultValue": 1.16409155293818, - "type": "number", - "unit": "kg/m^3", - "displayOrder": 0, - "label": "Mass Density" - }, - "RelativePermittivity": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 2, - "label": "Relative Permittivity" - }, - "ElectricConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "S/m", - "displayOrder": 1, - "label": "Electric Conductivity" - }, - "MagneticConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "Ohm/m", - "displayOrder": 3, - "label": "Magnetic Conductivity" - } - }, - "Intervertebral_Disc-UUID": { - "RelativePermeability": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 4, - "label": "Relative Permeability" - }, - "MassDensity": { - "defaultValue": 1099.5, - "type": "number", - "unit": "kg/m^3", - "displayOrder": 0, - "label": "Mass Density" - }, - "RelativePermittivity": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 2, - "label": "Relative Permittivity" - }, - "ElectricConductivity": { - "defaultValue": 1.01, - "type": "number", - "unit": "S/m", - "displayOrder": 1, - "label": "Electric Conductivity" - }, - "MagneticConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "Ohm/m", - "displayOrder": 3, - "label": "Magnetic Conductivity" - } - }, - "Pineal_Body-UUID": { - "RelativePermeability": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 4, - "label": "Relative Permeability" - }, - "MassDensity": { - "defaultValue": 1053.0, - "type": "number", - "unit": "kg/m^3", - "displayOrder": 0, - "label": "Mass Density" - }, - "RelativePermittivity": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 2, - "label": "Relative Permittivity" - }, - "ElectricConductivity": { - "defaultValue": 0.4811, - "type": "number", - "unit": "S/m", - "displayOrder": 1, - "label": "Electric Conductivity" - }, - "MagneticConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "Ohm/m", - "displayOrder": 3, - "label": "Magnetic Conductivity" - } - }, - "Bone__Cancellous_-UUID": { - "RelativePermeability": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 4, - "label": "Relative Permeability" - }, - "MassDensity": { - "defaultValue": 1178.33333333333, - "type": "number", - "unit": "kg/m^3", - "displayOrder": 0, - "label": "Mass Density" - }, - "RelativePermittivity": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 2, - "label": "Relative Permittivity" - }, - "ElectricConductivity": { - "defaultValue": 0.0820712643678161, - "type": "number", - "unit": "S/m", - "displayOrder": 1, - "label": "Electric Conductivity" - }, - "MagneticConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "Ohm/m", - "displayOrder": 3, - "label": "Magnetic Conductivity" - } - }, - "Eye__Lens_-UUID": { - "RelativePermeability": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 4, - "label": "Relative Permeability" - }, - "MassDensity": { - "defaultValue": 1075.5, - "type": "number", - "unit": "kg/m^3", - "displayOrder": 0, - "label": "Mass Density" - }, - "RelativePermittivity": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 2, - "label": "Relative Permittivity" - }, - "ElectricConductivity": { - "defaultValue": 0.345333333333333, - "type": "number", - "unit": "S/m", - "displayOrder": 1, - "label": "Electric Conductivity" - }, - "MagneticConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "Ohm/m", - "displayOrder": 3, - "label": "Magnetic Conductivity" - } - }, - "Blood-UUID": { - "RelativePermeability": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 4, - "label": "Relative Permeability" - }, - "MassDensity": { - "defaultValue": 1049.75, - "type": "number", - "unit": "kg/m^3", - "displayOrder": 0, - "label": "Mass Density" - }, - "RelativePermittivity": { - "defaultValue": 1.0, - "type": "number", - "unit": "", - "displayOrder": 2, - "label": "Relative Permittivity" - }, - "ElectricConductivity": { - "defaultValue": 0.659851590289857, - "type": "number", - "unit": "S/m", - "displayOrder": 1, - "label": "Electric Conductivity" - }, - "MagneticConductivity": { - "defaultValue": 0.0, - "type": "number", - "unit": "Ohm/m", - "displayOrder": 3, - "label": "Magnetic Conductivity" - } - } -} \ No newline at end of file diff --git a/services/web/server/src/simcore_service_webserver/data/fake-materialDB-LF-getItemList.json b/services/web/server/src/simcore_service_webserver/data/fake-materialDB-LF-getItemList.json deleted file mode 100644 index 498ceb6a1f0..00000000000 --- a/services/web/server/src/simcore_service_webserver/data/fake-materialDB-LF-getItemList.json +++ /dev/null @@ -1,210 +0,0 @@ -[ - { - "label": "Air", - "key": "Air-UUID" - }, - { - "label": "Cerebellum", - "key": "Cerebellum-UUID" - }, - { - "label": "Cerebrospinal Fluid", - "key": "Cerebrospinal_Fluid-UUID" - }, - { - "label": "Bronchi", - "key": "Bronchi-UUID" - }, - { - "label": "Commissura Posterior", - "key": "Commissura_Posterior-UUID" - }, - { - "label": "Blood", - "key": "Blood-UUID" - }, - { - "label": "Commissura Anterior", - "key": "Commissura_Anterior-UUID" - }, - { - "label": "Brain (White Matter)", - "key": "Brain__White_Matter_-UUID" - }, - { - "label": "Cartilage", - "key": "Cartilage-UUID" - }, - { - "label": "Brain (Grey Matter)", - "key": "Brain__Grey_Matter_-UUID" - }, - { - "label": "Air 1", - "key": "Air_1-UUID" - }, - { - "label": "Eye (Vitreous Humor)", - "key": "Eye__Vitreous_Humor_-UUID" - }, - { - "label": "Eye (Lens)", - "key": "Eye__Lens_-UUID" - }, - { - "label": "Skin", - "key": "Skin-UUID" - }, - { - "label": "Dura", - "key": "Dura-UUID" - }, - { - "label": "Esophagus Lumen", - "key": "Esophagus_Lumen-UUID" - }, - { - "label": "Esophagus", - "key": "Esophagus-UUID" - }, - { - "label": "Eye (Cornea)", - "key": "Eye__Cornea_-UUID" - }, - { - "label": "Eye (Sclera)", - "key": "Eye__Sclera_-UUID" - }, - { - "label": "Lymphnode", - "key": "Lymphnode-UUID" - }, - { - "label": "Fat", - "key": "Fat-UUID" - }, - { - "label": "Lung", - "key": "Lung-UUID" - }, - { - "label": "Hippocampus", - "key": "Hippocampus-UUID" - }, - { - "label": "Intervertebral Disc", - "key": "Intervertebral_Disc-UUID" - }, - { - "label": "Medulla Oblongata", - "key": "Medulla_Oblongata-UUID" - }, - { - "label": "Hypophysis", - "key": "Hypophysis-UUID" - }, - { - "label": "Midbrain", - "key": "Midbrain-UUID" - }, - { - "label": "Hypothalamus", - "key": "Hypothalamus-UUID" - }, - { - "label": "Larynx", - "key": "Larynx-UUID" - }, - { - "label": "Spinal Cord", - "key": "Spinal_Cord-UUID" - }, - { - "label": "Nerve 2", - "key": "Nerve_2-UUID" - }, - { - "label": "Pineal Body", - "key": "Pineal_Body-UUID" - }, - { - "label": "Tendon Ligament", - "key": "Tendon_Ligament-UUID" - }, - { - "label": "Thalamus", - "key": "Thalamus-UUID" - }, - { - "label": "Muscle", - "key": "Muscle-UUID" - }, - { - "label": "Pons", - "key": "Pons-UUID" - }, - { - "label": "Salivary Gland", - "key": "Salivary_Gland-UUID" - }, - { - "label": "Mucous Membrane", - "key": "Mucous_Membrane-UUID" - }, - { - "label": "SAT (Subcutaneous Fat)", - "key": "SAT__Subcutaneous_Fat_-UUID" - }, - { - "label": "Tongue", - "key": "Tongue-UUID" - }, - { - "label": "Tooth", - "key": "Tooth-UUID" - }, - { - "label": "Thyroid Gland", - "key": "Thyroid_Gland-UUID" - }, - { - "label": "Trachea Lumen", - "key": "Trachea_Lumen-UUID" - }, - { - "label": "Trachea", - "key": "Trachea-UUID" - }, - { - "label": "Bone Marrow (Yellow)", - "key": "Bone_Marrow__Yellow_-UUID" - }, - { - "label": "Bone (Cancellous)", - "key": "Bone__Cancellous_-UUID" - }, - { - "label": "Bone (Cortical)", - "key": "Bone__Cortical_-UUID" - }, - { - "label": "Skull Cortical", - "key": "Skull_Cortical-UUID" - }, - { - "label": "Skull Cancellous", - "key": "Skull_Cancellous-UUID" - }, - { - "label": "Silicone", - "key": "Silicone-UUID" - }, - { - "label": "Fascicles", - "key": "Fascicles-UUID" - }, - { - "label": "Epineurium", - "key": "Epineurium-UUID" - } -] \ No newline at end of file diff --git a/services/web/server/src/simcore_service_webserver/data/fake-modeler-LF-getItemList.json b/services/web/server/src/simcore_service_webserver/data/fake-modeler-LF-getItemList.json deleted file mode 100644 index f9cfbe2e4c6..00000000000 --- a/services/web/server/src/simcore_service_webserver/data/fake-modeler-LF-getItemList.json +++ /dev/null @@ -1,526 +0,0 @@ -[ - { - "label": "Surfaces/Fascicle_0", - "key": "Fascicle_0___Surfaces_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Bones/Vertebra_cortical_C1", - "key": "Vertebra_cortical_C1___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Spinal_cord", - "key": "Spinal_cord___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - }, - { - "label": "Surfaces/Fascicle_1", - "key": "Fascicle_1___Surfaces_-UUID" - }, - { - "label": "Surfaces/Fascicle_2", - "key": "Fascicle_2___Surfaces_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Bones/Rib_cortical", - "key": "Rib_cortical___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID" - }, - { - "label": "Surfaces/Fascicle_3", - "key": "Fascicle_3___Surfaces_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Larynx", - "key": "Larynx___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Bones/Vertebra_cortical_C5", - "key": "Vertebra_cortical_C5___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Bones/Mandible_cancellous", - "key": "Mandible_cancellous___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Lymph_node", - "key": "Lymph_node___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Pons", - "key": "Pons___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Lung", - "key": "Lung___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Thalamus", - "key": "Thalamus___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Bones/Humerus_cortical_left", - "key": "Humerus_cortical_left___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID" - }, - { - "label": "Surfaces/Fascicle_4", - "key": "Fascicle_4___Surfaces_-UUID" - }, - { - "label": "Surfaces/Fascicle_5", - "key": "Fascicle_5___Surfaces_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Bones/Humerus_cortical_right", - "key": "Humerus_cortical_right___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID" - }, - { - "label": "Surfaces/Fascicle_6", - "key": "Fascicle_6___Surfaces_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Bones/Vertebra_cortical_T1", - "key": "Vertebra_cortical_T1___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Bones/Humerus_cancellous_right", - "key": "Humerus_cancellous_right___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Dura_mater", - "key": "Dura_mater___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Esophagus_lumen", - "key": "Esophagus_lumen___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Bones/Skull_cortical", - "key": "Skull_cortical___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Tongue", - "key": "Tongue___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Eye_lens", - "key": "Eye_lens___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Ear_cartilage_left", - "key": "Ear_cartilage_left___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Muscle", - "key": "Muscle___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - }, - { - "label": "Surfaces/Fascicle_7", - "key": "Fascicle_7___Surfaces_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Bones/Vertebra_cortical_C2", - "key": "Vertebra_cortical_C2___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Bones/Scapula_cortical_left", - "key": "Scapula_cortical_left___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID" - }, - { - "label": "Surfaces/Fascicle_8", - "key": "Fascicle_8___Surfaces_-UUID" - }, - { - "label": "Surfaces/Fascicle_9", - "key": "Fascicle_9___Surfaces_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Bones/Hyoid_cortical", - "key": "Hyoid_cortical___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID" - }, - { - "label": "Surfaces/Fascicle_10", - "key": "Fascicle_10___Surfaces_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Cerebrospinal_fluid", - "key": "Cerebrospinal_fluid___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Bones/Vertebra_cancellous_T4", - "key": "Vertebra_cancellous_T4___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Eye_cornea", - "key": "Eye_cornea___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Fat", - "key": "Fat___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Ear_cartilage_right", - "key": "Ear_cartilage_right___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Bones/Vertebra_cortical_T4", - "key": "Vertebra_cortical_T4___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Bones/Clavicle_cortical", - "key": "Clavicle_cortical___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Hypophysis", - "key": "Hypophysis___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Bones/Scapula_cancellous_right", - "key": "Scapula_cancellous_right___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID" - }, - { - "label": "Surfaces/Fascicle_11", - "key": "Fascicle_11___Surfaces_-UUID" - }, - { - "label": "Surfaces/Fascicle_12", - "key": "Fascicle_12___Surfaces_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Esophagus_wall", - "key": "Esophagus_wall___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Corpus_callosum", - "key": "Corpus_callosum___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - }, - { - "label": "Surfaces/Fascicle_13", - "key": "Fascicle_13___Surfaces_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Bones/Vertebra_cancellous_C1", - "key": "Vertebra_cancellous_C1___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Bronchus_wall", - "key": "Bronchus_wall___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - }, - { - "label": "Surfaces/Fascicle_14", - "key": "Fascicle_14___Surfaces_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Bones/Scapula_cancellous_left", - "key": "Scapula_cancellous_left___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Bones/Humerus_yellow_marrow_left", - "key": "Humerus_yellow_marrow_left___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Mucosa", - "key": "Mucosa___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Bones/Sternum_cancellous", - "key": "Sternum_cancellous___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID" - }, - { - "label": "Surfaces/Fascicle_15", - "key": "Fascicle_15___Surfaces_-UUID" - }, - { - "label": "Surfaces/Fascicle_16", - "key": "Fascicle_16___Surfaces_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Bones/Humerus_cancellous_left", - "key": "Humerus_cancellous_left___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Eye_vitreous_humor", - "key": "Eye_vitreous_humor___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Midbrain", - "key": "Midbrain___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Air_internal", - "key": "Air_internal___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - }, - { - "label": "Surfaces/Fascicle_17", - "key": "Fascicle_17___Surfaces_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Bones/Rib_cancellous", - "key": "Rib_cancellous___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Cerebrum_white_matter", - "key": "Cerebrum_white_matter___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - }, - { - "label": "Electrode/Silicone", - "key": "Silicone___Electrode_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Salivary_gland", - "key": "Salivary_gland___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - }, - { - "label": "Surfaces/Fascicle_18", - "key": "Fascicle_18___Surfaces_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Pineal_body", - "key": "Pineal_body___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Tendon_ligament", - "key": "Tendon_ligament___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Bones/Vertebra_cancellous_C2", - "key": "Vertebra_cancellous_C2___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Bones/Vertebra_cancellous_T2", - "key": "Vertebra_cancellous_T2___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Bones/Skull_cancellous", - "key": "Skull_cancellous___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Eye_sclera", - "key": "Eye_sclera___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Vein", - "key": "Vein___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/SAT", - "key": "SAT___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Bones/Scapula_cortical_right", - "key": "Scapula_cortical_right___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID" - }, - { - "label": "Surfaces/Fascicle_19", - "key": "Fascicle_19___Surfaces_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Artery", - "key": "Artery___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - }, - { - "label": "Surfaces/Fascicle_20", - "key": "Fascicle_20___Surfaces_-UUID" - }, - { - "label": "Surfaces/Nerve", - "key": "Nerve___Surfaces_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Bones/Vertebra_cancellous_C6", - "key": "Vertebra_cancellous_C6___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Bones/Mandible_cortical", - "key": "Mandible_cortical___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Ear_skin_right", - "key": "Ear_skin_right___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Skin", - "key": "Skin___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Bones/Vertebra_cancellous_T3", - "key": "Vertebra_cancellous_T3___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Bones/Vertebra_cancellous_T1", - "key": "Vertebra_cancellous_T1___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Bones/Vertebra_cortical_C3", - "key": "Vertebra_cortical_C3___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Ear_skin_left", - "key": "Ear_skin_left___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Cerebellum", - "key": "Cerebellum___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - }, - { - "label": "Surfaces/Fascicle_21", - "key": "Fascicle_21___Surfaces_-UUID" - }, - { - "label": "Surfaces/Fascicle_22", - "key": "Fascicle_22___Surfaces_-UUID" - }, - { - "label": "Surfaces/Fascicle_23", - "key": "Fascicle_23___Surfaces_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Thyroid_gland", - "key": "Thyroid_gland___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Bones/Vertebra_cancellous_C7", - "key": "Vertebra_cancellous_C7___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Bones/Vertebra_cortical_T3", - "key": "Vertebra_cortical_T3___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID" - }, - { - "label": "Surfaces/Fascicle_24", - "key": "Fascicle_24___Surfaces_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Hypothalamus", - "key": "Hypothalamus___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - }, - { - "label": "Surfaces/Fascicle_25", - "key": "Fascicle_25___Surfaces_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Bones/Vertebra_cancellous_C4", - "key": "Vertebra_cancellous_C4___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Intervertebral_disc", - "key": "Intervertebral_disc___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - }, - { - "label": "Surfaces/Fascicle_26", - "key": "Fascicle_26___Surfaces_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Cerebrum_grey_matter", - "key": "Cerebrum_grey_matter___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Bones/Clavicle_cancellous", - "key": "Clavicle_cancellous___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID" - }, - { - "label": "Surfaces/Fascicle_27", - "key": "Fascicle_27___Surfaces_-UUID" - }, - { - "label": "Surfaces/Fascicle_28", - "key": "Fascicle_28___Surfaces_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Commissura_posterior", - "key": "Commissura_posterior___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Bones/Vertebra_cancellous_C3", - "key": "Vertebra_cancellous_C3___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Nerve", - "key": "Nerve___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Trachea_lumen", - "key": "Trachea_lumen___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Bones/Vertebra_cortical_C6", - "key": "Vertebra_cortical_C6___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Commissura_anterior", - "key": "Commissura_anterior___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Bones/Vertebra_cortical_C4", - "key": "Vertebra_cortical_C4___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID" - }, - { - "label": "Electrode/El2", - "key": "El2___Electrode_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Trachea_wall", - "key": "Trachea_wall___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Bones/Sternum_cortical", - "key": "Sternum_cortical___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Bones/Vertebra_cancellous_C5", - "key": "Vertebra_cancellous_C5___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Bones/Vertebra_cortical_T2", - "key": "Vertebra_cortical_T2___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID" - }, - { - "label": "Surfaces/Fascicle_29", - "key": "Fascicle_29___Surfaces_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Hippocampus", - "key": "Hippocampus___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Cartilage", - "key": "Cartilage___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Bones/Vertebra_cortical_C7", - "key": "Vertebra_cortical_C7___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Tooth", - "key": "Tooth___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Medulla_oblongata", - "key": "Medulla_oblongata___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_-UUID" - }, - { - "label": "Surfaces/Fascicle_30", - "key": "Fascicle_30___Surfaces_-UUID" - }, - { - "label": "Surfaces/Fascicle_31", - "key": "Fascicle_31___Surfaces_-UUID" - }, - { - "label": "20181113_Yoon-sun_V4_preview/20181113_Yoonsun_V3style/Bones/Humerus_yellow_marrow_right", - "key": "Humerus_yellow_marrow_right___20181113_Yoon_sun_V4_preview_20181113_Yoonsun_V3style_Bones_-UUID" - }, - { - "label": "Surfaces/Fascicle_32", - "key": "Fascicle_32___Surfaces_-UUID" - }, - { - "label": "Surfaces/Fascicle_33", - "key": "Fascicle_33___Surfaces_-UUID" - }, - { - "label": "Surfaces/Fascicle_34", - "key": "Fascicle_34___Surfaces_-UUID" - }, - { - "label": "Electrode/El1", - "key": "El1___Electrode_-UUID" - } -] \ No newline at end of file diff --git a/services/web/server/src/simcore_service_webserver/data/fake-template-projects.isan.json b/services/web/server/src/simcore_service_webserver/data/fake-template-projects.isan.json deleted file mode 100644 index a1428d7d496..00000000000 --- a/services/web/server/src/simcore_service_webserver/data/fake-template-projects.isan.json +++ /dev/null @@ -1,240 +0,0 @@ -[ - { - "uuid": "de2578c5-431e-4d5e-b80e-401c8066782f", - "name": "ISAN: 2D Plot", - "description": "2D RawGraphs viewer with one input", - "thumbnail": "", - "prjOwner": "maiz", - "creationDate": "2019-05-24T10:36:57.813Z", - "lastChangeDate": "2019-05-24T11:36:12.015Z", - "tags": [], - "accessRights": {}, - "workbench": { - "de2578c5-431e-48eb-a9d2-aaad6b72400a": { - "key": "simcore/services/frontend/file-picker", - "version": "1.0.0", - "label": "File Picker", - "inputs": {}, - "inputNodes": [], - "outputs": { - "outFile": { - "store": 1, - "path": "Shared Data/Height-Weight" - } - }, - "progress": 100, - "position": { - "x": 100, - "y": 100 - } - }, - "de2578c5-431e-4c63-a705-03a2c339646c": { - "key": "simcore/services/dynamic/raw-graphs", - "version": "2.8.0", - "label": "2D plot", - "inputs": { - "input_1": { - "nodeUuid": "de2578c5-431e-48eb-a9d2-aaad6b72400a", - "output": "outFile" - } - }, - "inputNodes": [ - "de2578c5-431e-48eb-a9d2-aaad6b72400a" - ], - "outputs": {}, - "progress": 0, - "position": { - "x": 400, - "y": 100 - } - } - } - }, - { - "uuid": "de2578c5-431e-4d5e-b80e-401c8066781f", - "name": "ISAN: 3D Paraview", - "description": "3D Paraview viewer with two inputs", - "thumbnail": "", - "prjOwner": "maiz", - "creationDate": "2019-05-24T10:36:57.813Z", - "lastChangeDate": " 2019-05-24T10:38:12.888Z", - "tags": [], - "accessRights": {}, - "workbench": { - "de2578c5-431e-403e-865a-8c5ca30671c6": { - "key": "simcore/services/frontend/file-picker", - "version": "1.0.0", - "label": "File Picker 1", - "inputs": {}, - "inputNodes": [], - "outputs": { - "outFile": { - "store": 1, - "path": "Shared Data/HField_Big.vtk" - } - }, - "progress": 100, - "position": { - "x": 100, - "y": 100 - } - }, - "de2578c5-431e-421f-be24-d44d112cc5c1": { - "key": "simcore/services/frontend/file-picker", - "version": "1.0.0", - "label": "File Picker 2", - "inputs": {}, - "inputNodes": [], - "outputs": { - "outFile": { - "store": 1, - "path": "Shared Data/bunny.vtk" - } - }, - "progress": 100, - "position": { - "x": 100, - "y": 250 - } - }, - "de2578c5-431e-4ecd-9636-62e619a9ca69": { - "key": "simcore/services/dynamic/3d-viewer", - "version": "2.10.0", - "label": "3D ParaViewer", - "inputs": { - "A": { - "nodeUuid": "de2578c5-431e-403e-865a-8c5ca30671c6", - "output": "outFile" - }, - "B": { - "nodeUuid": "de2578c5-431e-421f-be24-d44d112cc5c1", - "output": "outFile" - } - }, - "inputNodes": [ - "de2578c5-431e-403e-865a-8c5ca30671c6", - "de2578c5-431e-421f-be24-d44d112cc5c1" - ], - "outputs": {}, - "progress": 0, - "position": { - "x": 400, - "y": 175 - } - } - } - }, - { - "uuid": "de2578c5-431e-420d-b82d-e80bfa272ebd", - "name": "ISAN: MattWard use case", - "description": "MattWard Solver/PostPro viewer", - "thumbnail": "", - "prjOwner": "MattWard", - "creationDate": "2019-04-30T08:52:20.937Z", - "lastChangeDate": "2019-04-30T08:59:26.090Z", - "tags": [], - "accessRights": {}, - "workbench": { - "de2578c5-431e-4021-b2ef-b2e163bfbd16": { - "key": "simcore/services/dynamic/mattward-viewer", - "version": "2.9.0", - "label": "MattWard", - "inputs": {}, - "inputNodes": [], - "outputs": {}, - "progress": 0, - "position": { - "x": 100, - "y": 100 - } - } - } - }, - { - "uuid": "de2578c5-431e-1234-a1a7-f7d4f3a8f26b", - "name": "ISAN: UCDavis use case: 0D", - "description": "Colleen Clancy Single Cell solver with a file picker and PostPro viewer", - "thumbnail": "https://placeimg.com/171/96/tech/grayscale/?18.jpg", - "prjOwner": "Colleen Clancy", - "creationDate": "2018-10-22T09:13:13.360Z", - "lastChangeDate": "2018-10-22T09:33:41.858Z", - "tags": [], - "accessRights": {}, - "workbench": { - "de2578c5-431e-4674-b758-946151cae351": { - "key": "simcore/services/frontend/file-picker", - "version": "1.0.0", - "label": "File Picker 0D", - "inputs": {}, - "inputNodes": [], - "outputs": { - "outFile": { - "store": 1, - "path": "Shared Data/initial_WStates" - } - }, - "progress": 100, - "position": { - "x": 50, - "y": 150 - } - }, - "de2578c5-431e-409d-998c-c1f04de67f8b": { - "key": "simcore/services/comp/ucdavis-singlecell-cardiac-model", - "version": "1.0.0", - "label": "DBP-Clancy-Rabbit-Single-Cell solver", - "inputAccess": { - "Na": "ReadAndWrite", - "Kr": "ReadOnly", - "BCL": "ReadAndWrite", - "NBeats": "ReadOnly", - "Ligand": "Invisible", - "cAMKII": "Invisible" - }, - "inputs": { - "Na": 0, - "Kr": 0, - "BCL": 200, - "NBeats": 5, - "Ligand": 0, - "cAMKII": "WT", - "initfile": { - "nodeUuid": "de2578c5-431e-4674-b758-946151cae351", - "output": "outFile" - } - }, - "inputNodes": [ - "de2578c5-431e-4674-b758-946151cae351" - ], - "outputs": {}, - "position": { - "x": 300, - "y": 150 - } - }, - "de2578c5-431e-43e7-9fda-cf9625e59986": { - "key": "simcore/services/dynamic/cc-0d-viewer", - "version": "2.8.0", - "label": "cc-0d-viewer", - "inputs": { - "vm_1Hz": { - "nodeUuid": "de2578c5-431e-409d-998c-c1f04de67f8b", - "output": "out_4" - }, - "all_results_1Hz": { - "nodeUuid": "de2578c5-431e-409d-998c-c1f04de67f8b", - "output": "out_1" - } - }, - "inputNodes": [ - "de2578c5-431e-409d-998c-c1f04de67f8b" - ], - "outputs": {}, - "position": { - "x": 550, - "y": 150 - } - } - } - } -] diff --git a/services/web/server/src/simcore_service_webserver/data/fake-template-projects.json b/services/web/server/src/simcore_service_webserver/data/fake-template-projects.json deleted file mode 100644 index 024726a81ab..00000000000 --- a/services/web/server/src/simcore_service_webserver/data/fake-template-projects.json +++ /dev/null @@ -1,118 +0,0 @@ -[ - { - "uuid": "de2578c5-431e-4d5e-9b09-ddcc63121ef4", - "name": "Sleepers", - "description": "", - "thumbnail": "", - "prjOwner": "Maiz", - "creationDate": "2018-07-09T16:02:22Z", - "lastChangeDate": "2018-07-09T16:02:22Z", - "accessRights": {}, - "workbench": { - "de2578c5-431e-4434-9504-d4a9bebeda37": { - "key": "simcore/services/comp/itis/sleeper", - "version": "1.0.0", - "label": "sleeper 0", - "inputAccess": { - "in_1": "Invisible", - "in_2": "ReadOnly" - }, - "inputs": { - "in_2": 2 - }, - "inputNodes": [], - "outputs": {}, - "position": { - "x": 50, - "y": 300 - } - }, - "de2578c5-431e-45ac-b2cd-2052ffc64608": { - "key": "simcore/services/comp/itis/sleeper", - "version": "1.0.0", - "label": "sleeper 1", - "inputs": { - "in_1": { - "nodeUuid": "de2578c5-431e-4434-9504-d4a9bebeda37", - "output": "out_1" - }, - "in_2": 2 - }, - "inputNodes": [ - "de2578c5-431e-4434-9504-d4a9bebeda37" - ], - "outputs": {}, - "position": { - "x": 300, - "y": 200 - } - }, - "de2578c5-431e-4dae-9f64-94ab71317e99": { - "key": "simcore/services/comp/itis/sleeper", - "version": "1.0.0", - "label": "sleeper 2", - "inputs": { - "in_1": { - "nodeUuid": "de2578c5-431e-45ac-b2cd-2052ffc64608", - "output": "out_1" - }, - "in_2": { - "nodeUuid": "de2578c5-431e-45ac-b2cd-2052ffc64608", - "output": "out_2" - } - }, - "inputNodes": [ - "de2578c5-431e-45ac-b2cd-2052ffc64608" - ], - "outputs": {}, - "position": { - "x": 550, - "y": 200 - } - }, - "de2578c5-431e-499e-86d6-9980c33dc8bb": { - "key": "simcore/services/comp/itis/sleeper", - "version": "1.0.0", - "label": "sleeper 3", - "inputs": { - "in_2": { - "nodeUuid": "de2578c5-431e-4434-9504-d4a9bebeda37", - "output": "out_2" - } - }, - "inputNodes": [ - "de2578c5-431e-4434-9504-d4a9bebeda37" - ], - "outputs": {}, - "position": { - "x": 420, - "y": 400 - } - }, - "de2578c5-431e-4ac7-aff6-6bb537766c2d": { - "key": "simcore/services/comp/itis/sleeper", - "version": "1.0.0", - "label": "sleeper 4", - "inputs": { - "in_1": { - "nodeUuid": "de2578c5-431e-4dae-9f64-94ab71317e99", - "output": "out_1" - }, - "in_2": { - "nodeUuid": "de2578c5-431e-499e-86d6-9980c33dc8bb", - "output": "out_2" - } - }, - "inputNodes": [ - "de2578c5-431e-4dae-9f64-94ab71317e99", - "de2578c5-431e-499e-86d6-9980c33dc8bb" - ], - "outputs": {}, - "position": { - "x": 800, - "y": 300 - } - } - } - } -] diff --git a/services/web/server/src/simcore_service_webserver/data/fake-template-projects.osparc.json b/services/web/server/src/simcore_service_webserver/data/fake-template-projects.osparc.json deleted file mode 100644 index 6b091dc8b56..00000000000 --- a/services/web/server/src/simcore_service_webserver/data/fake-template-projects.osparc.json +++ /dev/null @@ -1,67 +0,0 @@ -[ - { - "uuid": "de2578c5-431e-4537-9f2d-2fbcbee4afb1", - "name": "NIH SPARC Hackathon 2018", - "description": "NIH SPARC Hackathon 2018 template consisting of a FilePicker, and two notebooks", - "thumbnail": "https://placeimg.com/171/96/tech/grayscale/?18.jpg", - "prjOwner": "SIM-CORE", - "creationDate": "2018-12-05T21:13:13.360Z", - "lastChangeDate": "2018-12-05T21:13:13.360Z", - "accessRights": {}, - "workbench": { - "de2578c5-431e-4261-b92f-7343aecaab44": { - "key": "simcore/services/frontend/file-picker", - "version": "1.0.0", - "label": "File Picker", - "inputs": {}, - "inputNodes": [], - "outputs": {}, - "parent": null, - "position": { - "x": 50, - "y": 150 - } - }, - "de2578c5-431e-49b0-968d-a6545f9dc878": { - "key": "simcore/services/dynamic/jupyter-scipy-notebook", - "version": "1.7.0", - "label": "Jupyter SciPy notebook", - "inputs": { - "input_1": { - "nodeUuid": "de2578c5-431e-4261-b92f-7343aecaab44", - "output": "outFile" - } - }, - "inputNodes": [ - "de2578c5-431e-4261-b92f-7343aecaab44" - ], - "outputs": {}, - "parent": null, - "position": { - "x": 300, - "y": 150 - } - }, - "de2578c5-431e-4a0e-bf7e-abad5e22e054": { - "key": "simcore/services/dynamic/jupyter-base-notebook", - "version": "1.7.0", - "label": "Jupyter base notebook", - "inputs": { - "input_1": { - "nodeUuid": "de2578c5-431e-49b0-968d-a6545f9dc878", - "output": "output_1" - } - }, - "inputNodes": [ - "de2578c5-431e-49b0-968d-a6545f9dc878" - ], - "outputs": {}, - "parent": null, - "position": { - "x": 550, - "y": 150 - } - } - } - } -] diff --git a/services/web/server/src/simcore_service_webserver/data/s4l_converter.py b/services/web/server/src/simcore_service_webserver/data/s4l_converter.py deleted file mode 100644 index 006d1816e4b..00000000000 --- a/services/web/server/src/simcore_service_webserver/data/s4l_converter.py +++ /dev/null @@ -1,93 +0,0 @@ -import json -import os -import re -import sys -from collections import defaultdict - -import s4l_v1.document as document -from s4l_v1.simulation.emlf import MaterialSettings - -here = os.path.dirname(sys.argv[0]) - - -PATTERN = re.compile(r"\W") - - -def make_key(m): - return PATTERN.sub("_", m.Name) + "-UUID" - - -sims = document.AllSimulations -sim = sims[0] -materials = [s for s in sim.AllSettings if isinstance(s, MaterialSettings)] - - -def create_material_getitemlist(materials): - path = os.path.join(here, r"fake-materialDB-LF-getItemList.json") - with open(path, "wt") as f: - data = [dict(key=make_key(m), label=m.Name) for m in materials] - json.dump(data, f, indent=2) - - -def create_item(m): - props = [ - m.MassDensityProp, - m.ElectricProps.ConductivityProp, - m.ElectricProps.RelativePermittivityProp, - m.MagneticProps.ConductivityProp, - m.MagneticProps.RelativePermeabilityProp, - ] - - result = {} - for index, prop in enumerate(props): - result[prop.Name.replace(" ", "")] = { - "displayOrder": index, - "label": prop.Name, - "unit": str(prop.Unit or ""), - "type": "number", - "defaultValue": prop.Value, - } - - return result - - -def create_material_getitem(materials): - path = os.path.join(here, r"fake-materialDB-LF-getItem.json") - with open(path, "wt") as f: - data = {make_key(m): create_item(m) for m in materials} - json.dump(data, f, indent=2) - - -def create_material2entities(sim): - def create_map(sim): - result = defaultdict(list) - for c in sim.AllComponents: - materials = [s for s in c.ListSettings() if isinstance(s, MaterialSettings)] - for m in materials: - result[make_key(m)].append(make_key(c)) - return result - - path = os.path.join(here, r"fake-materialDB-LF-Material2Entities.json") - with open(path, "wt") as f: - data = create_map(sim) - json.dump(data, f, indent=2) - - -def get_name(ent): - name = ent.Name - group = ent.ParentGroup() - while group: - name = group.Name + "/" + name - group = group.ParentGroup() - name = name.replace("Model/", "") - return name - - -path = os.path.join(here, r"fake-modeler-LF-getItemList.json") -with open(path, "wt") as f: - data = [ - dict(key=make_key(c), label=get_name(c.Geometry)) - for c in sim.AllComponents - if c.Geometry - ] - json.dump(data, f, indent=2) diff --git a/services/web/server/tests/conftest.py b/services/web/server/tests/conftest.py index 1f79e6c9555..522d6fabb98 100644 --- a/services/web/server/tests/conftest.py +++ b/services/web/server/tests/conftest.py @@ -15,6 +15,7 @@ from servicelib.json_serialization import json_dumps from simcore_service_webserver.application_settings_utils import convert_to_environ_vars from simcore_service_webserver.db_models import UserRole +from simcore_service_webserver.projects.project_models import ProjectDict CURRENT_DIR = Path(sys.argv[0] if __name__ == "__main__" else __file__).resolve().parent @@ -84,7 +85,8 @@ def fake_data_dir(tests_data_dir: Path) -> Path: @pytest.fixture -def fake_project(tests_data_dir: Path) -> Dict: +def fake_project(tests_data_dir: Path) -> ProjectDict: + # TODO: rename as fake_project_data since it does not produce a BaseModel but its **data fpath = tests_data_dir / "fake-project.json" assert fpath.exists() return json.loads(fpath.read_text()) diff --git a/services/web/server/tests/data/fake-template-projects.hack08.notebooks.json b/services/web/server/tests/data/fake-template-projects.hack08.notebooks.json new file mode 100644 index 00000000000..0d2429e80c6 --- /dev/null +++ b/services/web/server/tests/data/fake-template-projects.hack08.notebooks.json @@ -0,0 +1,65 @@ +{ + "uuid": "de2578c5-431e-4537-9f2d-2fbcbee4afb1", + "name": "NIH SPARC Hackathon 2018", + "description": "NIH SPARC Hackathon 2018 template consisting of a FilePicker, and two notebooks", + "thumbnail": "https://placeimg.com/171/96/tech/grayscale/?18.jpg", + "prjOwner": "SIM-CORE", + "creationDate": "2018-12-05T21:13:13.360Z", + "lastChangeDate": "2018-12-05T21:13:13.360Z", + "accessRights": {}, + "workbench": { + "de2578c5-431e-4261-b92f-7343aecaab44": { + "key": "simcore/services/frontend/file-picker", + "version": "1.0.0", + "label": "File Picker", + "inputs": {}, + "inputNodes": [], + "outputs": {}, + "parent": null, + "position": { + "x": 50, + "y": 150 + } + }, + "de2578c5-431e-49b0-968d-a6545f9dc878": { + "key": "simcore/services/dynamic/jupyter-scipy-notebook", + "version": "1.7.0", + "label": "Jupyter SciPy notebook", + "inputs": { + "input_1": { + "nodeUuid": "de2578c5-431e-4261-b92f-7343aecaab44", + "output": "outFile" + } + }, + "inputNodes": [ + "de2578c5-431e-4261-b92f-7343aecaab44" + ], + "outputs": {}, + "parent": null, + "position": { + "x": 300, + "y": 150 + } + }, + "de2578c5-431e-4a0e-bf7e-abad5e22e054": { + "key": "simcore/services/dynamic/jupyter-base-notebook", + "version": "1.7.0", + "label": "Jupyter base notebook", + "inputs": { + "input_1": { + "nodeUuid": "de2578c5-431e-49b0-968d-a6545f9dc878", + "output": "output_1" + } + }, + "inputNodes": [ + "de2578c5-431e-49b0-968d-a6545f9dc878" + ], + "outputs": {}, + "parent": null, + "position": { + "x": 550, + "y": 150 + } + } + } +} diff --git a/services/web/server/tests/data/fake-template-projects.isan.2dplot.json b/services/web/server/tests/data/fake-template-projects.isan.2dplot.json new file mode 100644 index 00000000000..a46da113f18 --- /dev/null +++ b/services/web/server/tests/data/fake-template-projects.isan.2dplot.json @@ -0,0 +1,51 @@ +{ + "uuid": "de2578c5-431e-4d5e-b80e-401c8066782f", + "name": "ISAN: 2D Plot", + "description": "2D RawGraphs viewer with one input", + "thumbnail": "", + "prjOwner": "maiz", + "creationDate": "2019-05-24T10:36:57.813Z", + "lastChangeDate": "2019-05-24T11:36:12.015Z", + "tags": [], + "accessRights": {}, + "workbench": { + "de2578c5-431e-48eb-a9d2-aaad6b72400a": { + "key": "simcore/services/frontend/file-picker", + "version": "1.0.0", + "label": "File Picker", + "inputs": {}, + "inputNodes": [], + "outputs": { + "outFile": { + "store": 1, + "path": "Shared Data/Height-Weight" + } + }, + "progress": 100, + "position": { + "x": 100, + "y": 100 + } + }, + "de2578c5-431e-4c63-a705-03a2c339646c": { + "key": "simcore/services/dynamic/raw-graphs", + "version": "2.8.0", + "label": "2D plot", + "inputs": { + "input_1": { + "nodeUuid": "de2578c5-431e-48eb-a9d2-aaad6b72400a", + "output": "outFile" + } + }, + "inputNodes": [ + "de2578c5-431e-48eb-a9d2-aaad6b72400a" + ], + "outputs": {}, + "progress": 0, + "position": { + "x": 400, + "y": 100 + } + } + } +} diff --git a/services/web/server/tests/data/fake-template-projects.isan.matward.json b/services/web/server/tests/data/fake-template-projects.isan.matward.json new file mode 100644 index 00000000000..9057165b35c --- /dev/null +++ b/services/web/server/tests/data/fake-template-projects.isan.matward.json @@ -0,0 +1,26 @@ +{ + "uuid": "de2578c5-431e-420d-b82d-e80bfa272ebd", + "name": "ISAN: MattWard use case", + "description": "MattWard Solver/PostPro viewer", + "thumbnail": "", + "prjOwner": "MattWard", + "creationDate": "2019-04-30T08:52:20.937Z", + "lastChangeDate": "2019-04-30T08:59:26.090Z", + "tags": [], + "accessRights": {}, + "workbench": { + "de2578c5-431e-4021-b2ef-b2e163bfbd16": { + "key": "simcore/services/dynamic/mattward-viewer", + "version": "2.9.0", + "label": "MattWard", + "inputs": {}, + "inputNodes": [], + "outputs": {}, + "progress": 0, + "position": { + "x": 100, + "y": 100 + } + } + } +} diff --git a/services/web/server/tests/data/fake-template-projects.isan.paraview.json b/services/web/server/tests/data/fake-template-projects.isan.paraview.json new file mode 100644 index 00000000000..80062877578 --- /dev/null +++ b/services/web/server/tests/data/fake-template-projects.isan.paraview.json @@ -0,0 +1,74 @@ +{ + "uuid": "de2578c5-431e-4d5e-b80e-401c8066781f", + "name": "ISAN: 3D Paraview", + "description": "3D Paraview viewer with two inputs", + "thumbnail": "", + "prjOwner": "maiz", + "creationDate": "2019-05-24T10:36:57.813Z", + "lastChangeDate": " 2019-05-24T10:38:12.888Z", + "tags": [], + "accessRights": {}, + "workbench": { + "de2578c5-431e-403e-865a-8c5ca30671c6": { + "key": "simcore/services/frontend/file-picker", + "version": "1.0.0", + "label": "File Picker 1", + "inputs": {}, + "inputNodes": [], + "outputs": { + "outFile": { + "store": 1, + "path": "Shared Data/HField_Big.vtk" + } + }, + "progress": 100, + "position": { + "x": 100, + "y": 100 + } + }, + "de2578c5-431e-421f-be24-d44d112cc5c1": { + "key": "simcore/services/frontend/file-picker", + "version": "1.0.0", + "label": "File Picker 2", + "inputs": {}, + "inputNodes": [], + "outputs": { + "outFile": { + "store": 1, + "path": "Shared Data/bunny.vtk" + } + }, + "progress": 100, + "position": { + "x": 100, + "y": 250 + } + }, + "de2578c5-431e-4ecd-9636-62e619a9ca69": { + "key": "simcore/services/dynamic/3d-viewer", + "version": "2.10.0", + "label": "3D ParaViewer", + "inputs": { + "A": { + "nodeUuid": "de2578c5-431e-403e-865a-8c5ca30671c6", + "output": "outFile" + }, + "B": { + "nodeUuid": "de2578c5-431e-421f-be24-d44d112cc5c1", + "output": "outFile" + } + }, + "inputNodes": [ + "de2578c5-431e-403e-865a-8c5ca30671c6", + "de2578c5-431e-421f-be24-d44d112cc5c1" + ], + "outputs": {}, + "progress": 0, + "position": { + "x": 400, + "y": 175 + } + } + } +} diff --git a/services/web/server/tests/data/fake-template-projects.isan.ucdavis.json b/services/web/server/tests/data/fake-template-projects.isan.ucdavis.json new file mode 100644 index 00000000000..9bfd97e075a --- /dev/null +++ b/services/web/server/tests/data/fake-template-projects.isan.ucdavis.json @@ -0,0 +1,87 @@ + { + "uuid": "de2578c5-431e-1234-a1a7-f7d4f3a8f26b", + "name": "ISAN: UCDavis use case: 0D", + "description": "Colleen Clancy Single Cell solver with a file picker and PostPro viewer", + "thumbnail": "https://placeimg.com/171/96/tech/grayscale/?18.jpg", + "prjOwner": "Colleen Clancy", + "creationDate": "2018-10-22T09:13:13.360Z", + "lastChangeDate": "2018-10-22T09:33:41.858Z", + "tags": [], + "accessRights": {}, + "workbench": { + "de2578c5-431e-4674-b758-946151cae351": { + "key": "simcore/services/frontend/file-picker", + "version": "1.0.0", + "label": "File Picker 0D", + "inputs": {}, + "inputNodes": [], + "outputs": { + "outFile": { + "store": 1, + "path": "Shared Data/initial_WStates" + } + }, + "progress": 100, + "position": { + "x": 50, + "y": 150 + } + }, + "de2578c5-431e-409d-998c-c1f04de67f8b": { + "key": "simcore/services/comp/ucdavis-singlecell-cardiac-model", + "version": "1.0.0", + "label": "DBP-Clancy-Rabbit-Single-Cell solver", + "inputAccess": { + "Na": "ReadAndWrite", + "Kr": "ReadOnly", + "BCL": "ReadAndWrite", + "NBeats": "ReadOnly", + "Ligand": "Invisible", + "cAMKII": "Invisible" + }, + "inputs": { + "Na": 0, + "Kr": 0, + "BCL": 200, + "NBeats": 5, + "Ligand": 0, + "cAMKII": "WT", + "initfile": { + "nodeUuid": "de2578c5-431e-4674-b758-946151cae351", + "output": "outFile" + } + }, + "inputNodes": [ + "de2578c5-431e-4674-b758-946151cae351" + ], + "outputs": {}, + "position": { + "x": 300, + "y": 150 + } + }, + "de2578c5-431e-43e7-9fda-cf9625e59986": { + "key": "simcore/services/dynamic/cc-0d-viewer", + "version": "2.8.0", + "label": "cc-0d-viewer", + "inputs": { + "vm_1Hz": { + "nodeUuid": "de2578c5-431e-409d-998c-c1f04de67f8b", + "output": "out_4" + }, + "all_results_1Hz": { + "nodeUuid": "de2578c5-431e-409d-998c-c1f04de67f8b", + "output": "out_1" + } + }, + "inputNodes": [ + "de2578c5-431e-409d-998c-c1f04de67f8b" + ], + "outputs": {}, + "position": { + "x": 550, + "y": 150 + } + } + } + } diff --git a/services/web/server/tests/data/fake-template-projects.sleepers.json b/services/web/server/tests/data/fake-template-projects.sleepers.json new file mode 100644 index 00000000000..3e953d9f84d --- /dev/null +++ b/services/web/server/tests/data/fake-template-projects.sleepers.json @@ -0,0 +1,116 @@ +{ + "uuid": "de2578c5-431e-4d5e-9b09-ddcc63121ef4", + "name": "Sleepers", + "description": "", + "thumbnail": "", + "prjOwner": "Maiz", + "creationDate": "2018-07-09T16:02:22Z", + "lastChangeDate": "2018-07-09T16:02:22Z", + "accessRights": {}, + "workbench": { + "de2578c5-431e-4434-9504-d4a9bebeda37": { + "key": "simcore/services/comp/itis/sleeper", + "version": "1.0.0", + "label": "sleeper 0", + "inputAccess": { + "in_1": "Invisible", + "in_2": "ReadOnly" + }, + "inputs": { + "in_2": 2 + }, + "inputNodes": [], + "outputs": {}, + "position": { + "x": 50, + "y": 300 + } + }, + "de2578c5-431e-45ac-b2cd-2052ffc64608": { + "key": "simcore/services/comp/itis/sleeper", + "version": "1.0.0", + "label": "sleeper 1", + "inputs": { + "in_1": { + "nodeUuid": "de2578c5-431e-4434-9504-d4a9bebeda37", + "output": "out_1" + }, + "in_2": 2 + }, + "inputNodes": [ + "de2578c5-431e-4434-9504-d4a9bebeda37" + ], + "outputs": {}, + "position": { + "x": 300, + "y": 200 + } + }, + "de2578c5-431e-4dae-9f64-94ab71317e99": { + "key": "simcore/services/comp/itis/sleeper", + "version": "1.0.0", + "label": "sleeper 2", + "inputs": { + "in_1": { + "nodeUuid": "de2578c5-431e-45ac-b2cd-2052ffc64608", + "output": "out_1" + }, + "in_2": { + "nodeUuid": "de2578c5-431e-45ac-b2cd-2052ffc64608", + "output": "out_2" + } + }, + "inputNodes": [ + "de2578c5-431e-45ac-b2cd-2052ffc64608" + ], + "outputs": {}, + "position": { + "x": 550, + "y": 200 + } + }, + "de2578c5-431e-499e-86d6-9980c33dc8bb": { + "key": "simcore/services/comp/itis/sleeper", + "version": "1.0.0", + "label": "sleeper 3", + "inputs": { + "in_2": { + "nodeUuid": "de2578c5-431e-4434-9504-d4a9bebeda37", + "output": "out_2" + } + }, + "inputNodes": [ + "de2578c5-431e-4434-9504-d4a9bebeda37" + ], + "outputs": {}, + "position": { + "x": 420, + "y": 400 + } + }, + "de2578c5-431e-4ac7-aff6-6bb537766c2d": { + "key": "simcore/services/comp/itis/sleeper", + "version": "1.0.0", + "label": "sleeper 4", + "inputs": { + "in_1": { + "nodeUuid": "de2578c5-431e-4dae-9f64-94ab71317e99", + "output": "out_1" + }, + "in_2": { + "nodeUuid": "de2578c5-431e-499e-86d6-9980c33dc8bb", + "output": "out_2" + } + }, + "inputNodes": [ + "de2578c5-431e-4dae-9f64-94ab71317e99", + "de2578c5-431e-499e-86d6-9980c33dc8bb" + ], + "outputs": {}, + "position": { + "x": 800, + "y": 300 + } + } + } +} diff --git a/services/web/server/tests/integration/01/test_garbage_collection.py b/services/web/server/tests/integration/01/test_garbage_collection.py index 0a86b299f7b..a0b927f3591 100644 --- a/services/web/server/tests/integration/01/test_garbage_collection.py +++ b/services/web/server/tests/integration/01/test_garbage_collection.py @@ -6,15 +6,18 @@ import logging import re from copy import deepcopy -from typing import Callable, Dict, List +from pathlib import Path +from typing import Any, AsyncIterable, Callable, Dict, List, Optional from uuid import uuid4 import aiopg +import aiopg.sa import aioredis import pytest +from aiohttp.test_utils import TestClient from aioresponses import aioresponses from models_library.projects_state import RunningState -from pytest_simcore.helpers.utils_login import log_client_in +from pytest_simcore.helpers.utils_login import AUserDict, log_client_in from pytest_simcore.helpers.utils_projects import create_project, empty_project_data from servicelib.aiohttp.application import create_safe_application from settings_library.redis import RedisSettings @@ -32,6 +35,7 @@ ) from simcore_service_webserver.login.plugin import setup_login from simcore_service_webserver.projects.plugin import setup_projects +from simcore_service_webserver.projects.project_models import ProjectDict from simcore_service_webserver.resource_manager.plugin import setup_resource_manager from simcore_service_webserver.resource_manager.registry import get_registry from simcore_service_webserver.rest import setup_rest @@ -76,7 +80,7 @@ async def __delete_all_redis_keys__(redis_settings: RedisSettings): @pytest.fixture -async def director_v2_service_mock() -> aioresponses: +async def director_v2_service_mock() -> AsyncIterable[aioresponses]: """uses aioresponses to mock all calls of an aiohttpclient WARNING: any request done through the client will go through aioresponses. It is unfortunate but that means any valid request (like calling the test server) prefix must be set as passthrough. @@ -160,38 +164,59 @@ def client( ################ utils -async def login_user(client): +async def login_user(client: TestClient): """returns a logged in regular user""" return await log_client_in(client=client, user_data={"role": UserRole.USER.name}) -async def login_guest_user(client): +async def login_guest_user(client: TestClient): """returns a logged in Guest user""" return await log_client_in(client=client, user_data={"role": UserRole.GUEST.name}) -async def new_project(client, user, access_rights=None): +async def new_project( + client: TestClient, + user: AUserDict, + tests_data_dir: Path, + access_rights: Optional[Dict[str, Any]] = None, +): """returns a project for the given user""" project_data = empty_project_data() if access_rights is not None: project_data["accessRights"] = access_rights - return await create_project(client.app, project_data, user["id"]) + + return await create_project( + client.app, + project_data, + user["id"], + default_project_json=tests_data_dir / "fake-template-projects.isan.2dplot.json", + ) -async def get_template_project(client, user, project_data: Dict, access_rights=None): +async def get_template_project( + client: TestClient, + user: AUserDict, + project_data: ProjectDict, + access_rights=None, +): """returns a tempalte shared with all""" _, _, all_group = await list_user_groups(client.app, user["id"]) # the information comes from a file, randomize it - project_data["name"] = "Fake template" + str(uuid4()) - project_data["uuid"] = str(uuid4()) + project_data["name"] = f"Fake template {uuid4()}" + project_data["uuid"] = f"{uuid4()}" project_data["accessRights"] = { str(all_group["gid"]): {"read": True, "write": False, "delete": False} } if access_rights is not None: project_data["accessRights"].update(access_rights) - return await create_project(client.app, project_data, user["id"]) + return await create_project( + client.app, + project_data, + user["id"], + default_project_json=None, + ) async def get_group(client, user): @@ -225,7 +250,7 @@ async def change_user_role( async def connect_to_socketio(client, user, socketio_client_factory: Callable): """Connect a user to a socket.io""" socket_registry = get_registry(client.server.app) - cur_client_session_id = str(uuid4()) + cur_client_session_id = f"{uuid4()}" sio = await socketio_client_factory(cur_client_session_id, client) resource_key = { "user_id": str(user["id"]), @@ -370,10 +395,13 @@ async def test_t1_while_guest_is_connected_no_resources_are_removed( socketio_client_factory: Callable, aiopg_engine, redis_client, + tests_data_dir: Path, ): """while a GUEST user is connected GC will not remove none of its projects nor the user itself""" logged_guest_user = await login_guest_user(client) - empty_guest_user_project = await new_project(client, logged_guest_user) + empty_guest_user_project = await new_project( + client, logged_guest_user, tests_data_dir + ) assert await assert_users_count(aiopg_engine, 1) is True assert await assert_projects_count(aiopg_engine, 1) is True @@ -394,10 +422,13 @@ async def test_t2_cleanup_resources_after_browser_is_closed( socketio_client_factory: Callable, aiopg_engine, redis_client, + tests_data_dir: Path, ): """After a GUEST users with one opened project closes browser tab regularly (GC cleans everything)""" logged_guest_user = await login_guest_user(client) - empty_guest_user_project = await new_project(client, logged_guest_user) + empty_guest_user_project = await new_project( + client, logged_guest_user, tests_data_dir + ) assert await assert_users_count(aiopg_engine, 1) is True assert await assert_projects_count(aiopg_engine, 1) is True @@ -434,13 +465,15 @@ async def test_t3_gc_will_not_intervene_for_regular_users_and_their_resources( socketio_client_factory: Callable, aiopg_engine, fake_project: Dict, + tests_data_dir: Path, ): """after a USER disconnects the GC will remove none of its projects or templates nor the user itself""" number_of_projects = 5 number_of_templates = 5 logged_user = await login_user(client) user_projects = [ - await new_project(client, logged_user) for _ in range(number_of_projects) + await new_project(client, logged_user, tests_data_dir) + for _ in range(number_of_projects) ] user_template_projects = [ await get_template_project(client, logged_user, fake_project) @@ -474,7 +507,10 @@ async def assert_projects_and_users_are_present(): async def test_t4_project_shared_with_group_transferred_to_user_in_group_on_owner_removal( - simcore_services_ready, client, aiopg_engine + simcore_services_ready, + client, + aiopg_engine, + tests_data_dir: Path, ): """ USER "u1" creates a GROUP "g1" and invites USERS "u2" and "u3"; @@ -495,6 +531,7 @@ async def test_t4_project_shared_with_group_transferred_to_user_in_group_on_owne project = await new_project( client, u1, + tests_data_dir, access_rights={str(g1["gid"]): {"read": True, "write": True, "delete": False}}, ) @@ -513,7 +550,7 @@ async def test_t4_project_shared_with_group_transferred_to_user_in_group_on_owne async def test_t5_project_shared_with_other_users_transferred_to_one_of_them( - simcore_services_ready, client, aiopg_engine + simcore_services_ready, client, aiopg_engine, tests_data_dir: Path ): """ USER "u1" creates a project and shares it with "u2" and "u3"; @@ -531,6 +568,7 @@ async def test_t5_project_shared_with_other_users_transferred_to_one_of_them( project = await new_project( client, u1, + tests_data_dir, access_rights={ str(q_u2.primary_gid): {"read": True, "write": True, "delete": False}, str(q_u3.primary_gid): {"read": True, "write": True, "delete": False}, @@ -552,7 +590,7 @@ async def test_t5_project_shared_with_other_users_transferred_to_one_of_them( async def test_t6_project_shared_with_group_transferred_to_last_user_in_group_on_owner_removal( - simcore_services_ready, client, aiopg_engine + simcore_services_ready, client, aiopg_engine, tests_data_dir: Path ): """ USER "u1" creates a GROUP "g1" and invites USERS "u2" and "u3"; @@ -575,6 +613,7 @@ async def test_t6_project_shared_with_group_transferred_to_last_user_in_group_on project = await new_project( client, u1, + tests_data_dir, access_rights={str(g1["gid"]): {"read": True, "write": True, "delete": False}}, ) @@ -619,7 +658,7 @@ async def test_t6_project_shared_with_group_transferred_to_last_user_in_group_on async def test_t7_project_shared_with_group_transferred_from_one_member_to_the_last_and_all_is_removed( - simcore_services_ready, client, aiopg_engine + simcore_services_ready, client, aiopg_engine, tests_data_dir: Path ): """ USER "u1" creates a GROUP "g1" and invites USERS "u2" and "u3"; @@ -644,6 +683,7 @@ async def test_t7_project_shared_with_group_transferred_from_one_member_to_the_l project = await new_project( client, u1, + tests_data_dir, access_rights={str(g1["gid"]): {"read": True, "write": True, "delete": False}}, ) @@ -699,7 +739,7 @@ async def test_t7_project_shared_with_group_transferred_from_one_member_to_the_l async def test_t8_project_shared_with_other_users_transferred_to_one_of_them_until_one_user_remains( - simcore_services_ready, client, aiopg_engine + simcore_services_ready, client, aiopg_engine, tests_data_dir: Path ): """ USER "u1" creates a project and shares it with "u2" and "u3"; @@ -719,6 +759,7 @@ async def test_t8_project_shared_with_other_users_transferred_to_one_of_them_unt project = await new_project( client, u1, + tests_data_dir, access_rights={ str(q_u2.primary_gid): {"read": True, "write": True, "delete": False}, str(q_u3.primary_gid): {"read": True, "write": True, "delete": False}, @@ -768,7 +809,7 @@ async def test_t8_project_shared_with_other_users_transferred_to_one_of_them_unt async def test_t9_project_shared_with_other_users_transferred_between_them_and_then_removed( - simcore_services_ready, client, aiopg_engine + simcore_services_ready, client, aiopg_engine, tests_data_dir: Path ): """ USER "u1" creates a project and shares it with "u2" and "u3"; @@ -790,6 +831,7 @@ async def test_t9_project_shared_with_other_users_transferred_between_them_and_t project = await new_project( client, u1, + tests_data_dir, access_rights={ str(q_u2.primary_gid): {"read": True, "write": True, "delete": False}, str(q_u3.primary_gid): {"read": True, "write": True, "delete": False}, @@ -850,7 +892,7 @@ async def test_t9_project_shared_with_other_users_transferred_between_them_and_t async def test_t10_owner_and_all_shared_users_marked_as_guests( - simcore_services_ready, client, aiopg_engine + simcore_services_ready, client, aiopg_engine, tests_data_dir: Path ): """ USER "u1" creates a project and shares it with "u2" and "u3"; @@ -868,6 +910,7 @@ async def test_t10_owner_and_all_shared_users_marked_as_guests( project = await new_project( client, u1, + tests_data_dir, access_rights={ str(q_u2.primary_gid): {"read": True, "write": True, "delete": False}, str(q_u3.primary_gid): {"read": True, "write": True, "delete": False}, @@ -890,7 +933,7 @@ async def test_t10_owner_and_all_shared_users_marked_as_guests( async def test_t11_owner_and_all_users_in_group_marked_as_guests( - simcore_services_ready, client, aiopg_engine + simcore_services_ready, client, aiopg_engine, tests_data_dir: Path ): """ USER "u1" creates a group and invites "u2" and "u3"; @@ -911,6 +954,7 @@ async def test_t11_owner_and_all_users_in_group_marked_as_guests( project = await new_project( client, u1, + tests_data_dir, access_rights={str(g1["gid"]): {"read": True, "write": True, "delete": False}}, ) diff --git a/services/web/server/tests/integration/01/test_project_workflow.py b/services/web/server/tests/integration/01/test_project_workflow.py index f96fc61d59e..db42d17c7f7 100644 --- a/services/web/server/tests/integration/01/test_project_workflow.py +++ b/services/web/server/tests/integration/01/test_project_workflow.py @@ -9,9 +9,7 @@ """ import asyncio -import json from copy import deepcopy -from pathlib import Path from typing import Callable, Dict, List, Optional, Union from uuid import uuid4 @@ -30,6 +28,7 @@ from simcore_service_webserver.login.plugin import setup_login from simcore_service_webserver.products import setup_products from simcore_service_webserver.projects.plugin import setup_projects +from simcore_service_webserver.projects.project_models import ProjectDict from simcore_service_webserver.resource_manager.plugin import setup_resource_manager from simcore_service_webserver.rest import setup_rest from simcore_service_webserver.security import setup_security @@ -93,12 +92,6 @@ def client( ) -@pytest.fixture -def fake_project_data(fake_data_dir: Path) -> Dict: - with (fake_data_dir / "fake-project.json").open() as fp: - return json.load(fp) - - @pytest.fixture async def storage_subsystem_mock(loop, mocker): """ @@ -203,7 +196,7 @@ async def test_workflow( postgres_db: sa.engine.Engine, docker_registry: str, simcore_services_ready, - fake_project_data, + fake_project: ProjectDict, catalog_subsystem_mock, client, logged_user, @@ -217,8 +210,8 @@ async def test_workflow( assert not projects # creation - await _request_create(client, fake_project_data) - catalog_subsystem_mock([fake_project_data]) + await _request_create(client, fake_project) + catalog_subsystem_mock([fake_project]) # list not empty projects = await _request_list(client) assert len(projects) == 1 @@ -232,7 +225,7 @@ async def test_workflow( "lastChangeDate", "accessRights", ): - assert projects[0][key] == fake_project_data[key] + assert projects[0][key] == fake_project[key] assert projects[0]["prjOwner"] == logged_user["email"] assert projects[0]["accessRights"] == { str(primary_group["gid"]): {"read": True, "write": True, "delete": True} diff --git a/services/web/server/tests/integration/02/conftest.py b/services/web/server/tests/integration/02/conftest.py index 9e02ee46f66..810e6e877a6 100644 --- a/services/web/server/tests/integration/02/conftest.py +++ b/services/web/server/tests/integration/02/conftest.py @@ -35,12 +35,19 @@ def project_id() -> ProjectID: @pytest.fixture async def user_project( - client, fake_project: Dict, logged_user: Dict, project_id: ProjectID + client, + fake_project: Dict, + logged_user: Dict, + project_id: ProjectID, + tests_data_dir: Path, ) -> AsyncIterator[Dict]: fake_project["prjOwner"] = logged_user["name"] fake_project["uuid"] = f"{project_id}" async with NewProject( - fake_project, client.app, user_id=logged_user["id"] + fake_project, + client.app, + user_id=logged_user["id"], + tests_data_dir=tests_data_dir, ) as project: yield project diff --git a/services/web/server/tests/unit/isolated/conftest.py b/services/web/server/tests/unit/isolated/conftest.py index f5fd1b91aef..5ac4cbf3eb4 100644 --- a/services/web/server/tests/unit/isolated/conftest.py +++ b/services/web/server/tests/unit/isolated/conftest.py @@ -2,7 +2,6 @@ import os import random from pathlib import Path -from typing import Any, Dict import pytest from faker import Faker @@ -62,14 +61,6 @@ def make_subdirectories_with_content( return temp_dir_path -@pytest.fixture -def fake_project_data(fake_data_dir: Path) -> Dict[str, Any]: - # NOTE: avoids 'scope=session' because tests can - # change the fixture data. - with (fake_data_dir / "fake-project.json").open() as fp: - return json.load(fp) - - @pytest.fixture def app_config_for_production_legacy(test_data_dir: Path) -> ConfigDict: app_config = json.loads( diff --git a/services/web/server/tests/unit/isolated/test_projects_utils.py b/services/web/server/tests/unit/isolated/test_projects_utils.py index cfc3277bd97..8a3f3bb09cb 100644 --- a/services/web/server/tests/unit/isolated/test_projects_utils.py +++ b/services/web/server/tests/unit/isolated/test_projects_utils.py @@ -10,7 +10,6 @@ import jsonschema import pytest from jsonschema import ValidationError -from simcore_service_webserver._resources import resources from simcore_service_webserver.projects.project_models import ProjectDict from simcore_service_webserver.projects.projects_utils import ( any_node_inputs_changed, @@ -19,17 +18,6 @@ ) -def load_template_projects() -> Dict[str, Any]: - projects = [] - projects_names = [ - name for name in resources.listdir("data") if "template-projects" in name - ] - for name in projects_names: - with resources.stream(f"data/{name}") as fp: - projects.extend(json.load(fp)) - return projects - - @pytest.fixture def project_schema(project_schema_file: Path) -> Dict[str, Any]: with open(project_schema_file) as fh: @@ -38,29 +26,43 @@ def project_schema(project_schema_file: Path) -> Dict[str, Any]: @pytest.mark.parametrize( - "name,project", [(p["name"], p) for p in load_template_projects()] + "test_data_file_name", + [ + "fake-project.json", + "fake-template-projects.hack08.notebooks.json", + "fake-template-projects.isan.2dplot.json", + "fake-template-projects.isan.matward.json", + "fake-template-projects.isan.paraview.json", + "fake-template-projects.isan.ucdavis.json", + "fake-template-projects.sleepers.json", + ], ) def test_clone_project_document( - name: str, project: Dict[str, Any], project_schema: Dict[str, Any] + test_data_file_name: str, + project_schema: Dict[str, Any], + tests_data_dir: Path, ): + original_project: ProjectDict = json.loads( + (tests_data_dir / test_data_file_name).read_text() + ) - source = deepcopy(project) - clone, _ = clone_project_document(source) + source_project: ProjectDict = deepcopy(original_project) + clone, _ = clone_project_document(source_project) # was not modified by clone_project_document - assert source == project + assert source_project == original_project # valid clone - assert clone["uuid"] != project["uuid"] + assert clone["uuid"] != original_project["uuid"] - node_ids = project["workbench"].keys() + node_ids = original_project["workbench"].keys() for clone_node_id in clone["workbench"]: assert clone_node_id not in node_ids try: jsonschema.validate(instance=clone, schema=project_schema) except ValidationError as err: - pytest.fail(f"Invalid clone of '{name}': {err.message}") + pytest.fail(f"Invalid clone of '{test_data_file_name}': {err.message}") @pytest.mark.parametrize( @@ -77,31 +79,29 @@ def test_clone_project_document( ], ) async def test_project_get_depending_nodes( - fake_project_data: ProjectDict, node_uuid: str, expected_dependencies: Set[str] + fake_project: ProjectDict, node_uuid: str, expected_dependencies: Set[str] ): - set_of_depending_nodes = await project_get_depending_nodes( - fake_project_data, node_uuid - ) + set_of_depending_nodes = await project_get_depending_nodes(fake_project, node_uuid) assert set_of_depending_nodes == expected_dependencies -def test_any_node_inputs_changed(fake_project_data: ProjectDict): +def test_any_node_inputs_changed(fake_project: ProjectDict): - current_project = deepcopy(fake_project_data) - updated_project = deepcopy(fake_project_data) + current_project = deepcopy(fake_project) + updated_project = deepcopy(fake_project) assert not any_node_inputs_changed(updated_project, current_project) assert ( - fake_project_data == current_project + fake_project == current_project ), "any_node_inputs_changed MUST NOT modify data " assert ( - fake_project_data == updated_project + fake_project == updated_project ), "any_node_inputs_changed MUST NOT modify data" # add new node w/ a link fake_node = deepcopy( - fake_project_data["workbench"]["5739e377-17f7-4f09-a6ad-62659fb7fdec"] + fake_project["workbench"]["5739e377-17f7-4f09-a6ad-62659fb7fdec"] ) assert fake_node["inputs"] == { "Na": 0, diff --git a/services/web/server/tests/unit/isolated/test_security_access_model.py b/services/web/server/tests/unit/isolated/test_security_access_model.py index 19ebfb90398..484335ee656 100644 --- a/services/web/server/tests/unit/isolated/test_security_access_model.py +++ b/services/web/server/tests/unit/isolated/test_security_access_model.py @@ -8,10 +8,11 @@ import copy import json +from pathlib import Path import jsondiff import pytest -from simcore_service_webserver._resources import resources +from simcore_service_webserver.projects.project_models import ProjectDict from simcore_service_webserver.security_access_model import ( RoleBasedAccessModel, check_access, @@ -20,7 +21,7 @@ @pytest.fixture -def access_model(): +def access_model() -> RoleBasedAccessModel: def can_update_inputs(context): current_data = context["current"] candidate_data = context["candidate"] @@ -119,7 +120,7 @@ def test_access_model_loads(): assert not all_roles.difference(roles_with_permissions) -async def test_named_permissions(access_model): +async def test_named_permissions(access_model: RoleBasedAccessModel): R = UserRole # alias @@ -136,7 +137,7 @@ async def test_named_permissions(access_model): assert R.TESTER in who_can_delete -async def test_permissions_inheritance(access_model): +async def test_permissions_inheritance(access_model: RoleBasedAccessModel): # ANONYMOUS <--- USER <--- TESTER R = UserRole @@ -162,21 +163,17 @@ async def test_permissions_inheritance(access_model): assert not await access_model.can(R.TESTER, OPERATION) -@pytest.mark.skip(reason="REVIEW") -async def test_checked_permissions(access_model): +async def test_checked_permissions( + access_model: RoleBasedAccessModel, tests_data_dir: Path +): R = UserRole # alias - MOCKPATH = "data/fake-template-projects.json" - with resources.stream(MOCKPATH) as fh: - data = json.load(fh) - - current = {} - for prj in data: - if prj["uuid"] == "de2578c5-431e-1234-a1a7-f7d4f3a8f26b": - current = prj - break - - assert current, "Did '%s' changed??" % MOCKPATH + current: ProjectDict = json.loads( + (tests_data_dir / "fake-template-projects.isan.ucdavis.json").read_text() + ) + assert ( + current["uuid"] == "de2578c5-431e-1234-a1a7-f7d4f3a8f26b" + ), "Did uuids of the fake changed" # updates both allowed and not allowed fields candidate = copy.deepcopy(current) @@ -215,7 +212,7 @@ async def test_checked_permissions(access_model): ) -async def test_async_checked_permissions(access_model): +async def test_async_checked_permissions(access_model: RoleBasedAccessModel): R = UserRole # alias # add checked permissions @@ -233,7 +230,7 @@ async def async_callback(context) -> bool: ) -async def test_check_access_expressions(access_model): +async def test_check_access_expressions(access_model: RoleBasedAccessModel): R = UserRole assert await check_access(access_model, R.ANONYMOUS, "study.stop") diff --git a/services/web/server/tests/unit/isolated/test_utils.py b/services/web/server/tests/unit/isolated/test_utils.py index b97e7079751..1976dbf2e22 100644 --- a/services/web/server/tests/unit/isolated/test_utils.py +++ b/services/web/server/tests/unit/isolated/test_utils.py @@ -91,7 +91,7 @@ def test_yarl_url_compose_changed_with_latest_release(): @pytest.mark.skip(reason="DEV-demo") -async def test_compute_sha1_on_small_dataset(fake_project_data: Dict): +async def test_compute_sha1_on_small_dataset(fake_project: Dict): # Based on GitHK review https://github.com/ITISFoundation/osparc-simcore/pull/2556: # From what I know, these having function tend to be a bit CPU intensive, based on the size of the dataset. # Could we maybe have an async version of this function here, run it on an executor? @@ -108,7 +108,7 @@ def timeit_ctx(what): # dataset is N copies of a project dataset (typical dataset 'unit' in this module) N = 10_000 data = [ - fake_project_data, + fake_project, ] * N print("-" * 100) diff --git a/services/web/server/tests/unit/with_dbs/02/test_studies_dispatcher_studies_access.py b/services/web/server/tests/unit/with_dbs/02/test_studies_dispatcher_studies_access.py index cb61b0f6c1b..4b0afc9c152 100644 --- a/services/web/server/tests/unit/with_dbs/02/test_studies_dispatcher_studies_access.py +++ b/services/web/server/tests/unit/with_dbs/02/test_studies_dispatcher_studies_access.py @@ -10,6 +10,7 @@ import logging import re from copy import deepcopy +from pathlib import Path from pprint import pprint from typing import AsyncIterator, Callable, Dict @@ -87,27 +88,35 @@ def app_cfg( @pytest.fixture -async def published_project(client, fake_project) -> Dict: +async def published_project(client, fake_project, tests_data_dir: Path) -> Dict: project_data = deepcopy(fake_project) project_data["name"] = "Published project" project_data["uuid"] = SHARED_STUDY_UUID project_data["published"] = True async with NewProject( - project_data, client.app, user_id=None, clear_all=True + project_data, + client.app, + user_id=None, + clear_all=True, + tests_data_dir=tests_data_dir, ) as template_project: yield template_project @pytest.fixture -async def unpublished_project(client, fake_project): +async def unpublished_project(client, fake_project, tests_data_dir: Path): project_data = deepcopy(fake_project) project_data["name"] = "Template Unpublished project" project_data["uuid"] = "b134a337-a74f-40ff-a127-b36a1ccbede6" project_data["published"] = False async with NewProject( - project_data, client.app, user_id=None, clear_all=True + project_data, + client.app, + user_id=None, + clear_all=True, + tests_data_dir=tests_data_dir, ) as template_project: yield template_project diff --git a/services/web/server/tests/unit/with_dbs/06/conftest.py b/services/web/server/tests/unit/with_dbs/06/conftest.py index d91f5e88c32..70853126a1b 100644 --- a/services/web/server/tests/unit/with_dbs/06/conftest.py +++ b/services/web/server/tests/unit/with_dbs/06/conftest.py @@ -3,6 +3,7 @@ # pylint:disable=redefined-outer-name from copy import deepcopy +from pathlib import Path from typing import Callable, Dict, List, Optional, Union import pytest @@ -85,9 +86,17 @@ def client( @pytest.fixture -async def user_project(client, fake_project, logged_user): +async def user_project( + client, + fake_project, + logged_user, + tests_data_dir: Path, +): async with NewProject( - fake_project, client.app, user_id=logged_user["id"] + fake_project, + client.app, + user_id=logged_user["id"], + tests_data_dir=tests_data_dir, ) as project: print("-----> added project", project["name"]) yield project @@ -95,7 +104,13 @@ async def user_project(client, fake_project, logged_user): @pytest.fixture -async def shared_project(client, fake_project, logged_user, all_group): +async def shared_project( + client, + fake_project, + logged_user, + all_group, + tests_data_dir: Path, +): fake_project.update( { "accessRights": { @@ -107,6 +122,7 @@ async def shared_project(client, fake_project, logged_user, all_group): fake_project, client.app, user_id=logged_user["id"], + tests_data_dir=tests_data_dir, ) as project: print("-----> added project", project["name"]) yield project @@ -115,7 +131,11 @@ async def shared_project(client, fake_project, logged_user, all_group): @pytest.fixture async def template_project( - client, fake_project, logged_user, all_group: Dict[str, str] + client, + fake_project, + logged_user, + all_group: Dict[str, str], + tests_data_dir: Path, ): project_data = deepcopy(fake_project) project_data["name"] = "Fake template" @@ -125,7 +145,11 @@ async def template_project( } async with NewProject( - project_data, client.app, user_id=None, clear_all=True + project_data, + client.app, + user_id=None, + clear_all=True, + tests_data_dir=tests_data_dir, ) as template_project: print("-----> added template project", template_project["name"]) yield template_project diff --git a/services/web/server/tests/unit/with_dbs/09/conftest.py b/services/web/server/tests/unit/with_dbs/09/conftest.py index 67e2c786768..e3ab1b46e8c 100644 --- a/services/web/server/tests/unit/with_dbs/09/conftest.py +++ b/services/web/server/tests/unit/with_dbs/09/conftest.py @@ -4,6 +4,7 @@ # pylint: disable=unused-variable from copy import deepcopy +from pathlib import Path from typing import Any, AsyncIterable, Callable, Dict, List, Optional, Type, Union import pytest @@ -126,9 +127,17 @@ def mocks_on_projects_api(mocker, logged_user) -> None: @pytest.fixture -async def user_project(client, fake_project, logged_user): +async def user_project( + client, + fake_project, + logged_user, + tests_data_dir: Path, +): async with NewProject( - fake_project, client.app, user_id=logged_user["id"] + fake_project, + client.app, + user_id=logged_user["id"], + tests_data_dir=tests_data_dir, ) as project: print("-----> added project", project["name"]) yield project @@ -136,7 +145,13 @@ async def user_project(client, fake_project, logged_user): @pytest.fixture -async def shared_project(client, fake_project, logged_user, all_group): +async def shared_project( + client, + fake_project, + logged_user, + all_group, + tests_data_dir: Path, +): fake_project.update( { "accessRights": { @@ -148,6 +163,7 @@ async def shared_project(client, fake_project, logged_user, all_group): fake_project, client.app, user_id=logged_user["id"], + tests_data_dir=tests_data_dir, ) as project: print("-----> added project", project["name"]) yield project @@ -156,7 +172,11 @@ async def shared_project(client, fake_project, logged_user, all_group): @pytest.fixture async def template_project( - client, fake_project, logged_user, all_group: Dict[str, str] + client, + fake_project, + logged_user, + all_group: Dict[str, str], + tests_data_dir: Path, ) -> AsyncIterable[Dict[str, Any]]: project_data = deepcopy(fake_project) project_data["name"] = "Fake template" @@ -166,7 +186,11 @@ async def template_project( } async with NewProject( - project_data, client.app, user_id=None, clear_all=True + project_data, + client.app, + user_id=None, + clear_all=True, + tests_data_dir=tests_data_dir, ) as template_project: print("-----> added template project", template_project["name"]) yield template_project diff --git a/services/web/server/tests/unit/with_dbs/10/test_resource_manager.py b/services/web/server/tests/unit/with_dbs/10/test_resource_manager.py index ab718a76186..19569dbe2a5 100644 --- a/services/web/server/tests/unit/with_dbs/10/test_resource_manager.py +++ b/services/web/server/tests/unit/with_dbs/10/test_resource_manager.py @@ -8,6 +8,7 @@ import logging from asyncio import Future from copy import deepcopy +from pathlib import Path from typing import Any, Callable, Dict from unittest import mock from unittest.mock import call @@ -152,18 +153,32 @@ def socket_registry(client: TestClient) -> RedisResourceRegistry: @pytest.fixture -async def empty_user_project(client, empty_project, logged_user) -> Dict[str, Any]: +async def empty_user_project( + client, + empty_project, + logged_user, + tests_data_dir: Path, +) -> Dict[str, Any]: project = empty_project() - async with NewProject(project, client.app, user_id=logged_user["id"]) as project: + async with NewProject( + project, client.app, user_id=logged_user["id"], tests_data_dir=tests_data_dir + ) as project: print("-----> added project", project["name"]) yield project print("<----- removed project", project["name"]) @pytest.fixture -async def empty_user_project2(client, empty_project, logged_user) -> Dict[str, Any]: +async def empty_user_project2( + client, + empty_project, + logged_user, + tests_data_dir: Path, +) -> Dict[str, Any]: project = empty_project() - async with NewProject(project, client.app, user_id=logged_user["id"]) as project: + async with NewProject( + project, client.app, user_id=logged_user["id"], tests_data_dir=tests_data_dir + ) as project: print("-----> added project", project["name"]) yield project print("<----- removed project", project["name"]) diff --git a/services/web/server/tests/unit/with_dbs/10/version_control/conftest.py b/services/web/server/tests/unit/with_dbs/10/version_control/conftest.py index b596c1e9d03..eea07eb0467 100644 --- a/services/web/server/tests/unit/with_dbs/10/version_control/conftest.py +++ b/services/web/server/tests/unit/with_dbs/10/version_control/conftest.py @@ -4,6 +4,7 @@ import logging from copy import deepcopy +from pathlib import Path from typing import Any, AsyncIterator, Awaitable, Callable, Dict from uuid import UUID @@ -142,11 +143,13 @@ def project_uuid(user_project: ProjectDict) -> ProjectID: @pytest.fixture async def user_project( - client: TestClient, fake_project: ProjectDict, user_id + client: TestClient, fake_project: ProjectDict, user_id: int, tests_data_dir: Path ) -> AsyncIterator[ProjectDict]: # pylint: disable=no-value-for-parameter - async with NewProject(fake_project, client.app, user_id=user_id) as project: + async with NewProject( + fake_project, client.app, user_id=user_id, tests_data_dir=tests_data_dir + ) as project: yield project