Autoformats web-server

Author: pcrespov

services/web/server/src/simcore_service_webserver/__version__.py

@@ -2,7 +2,6 @@
 
 """
 import pkg_resources
-
 from semantic_version import Version
 
 __version__: str = pkg_resources.get_distribution("simcore_service_webserver").version

services/web/server/src/simcore_service_webserver/activity/__init__.py

@@ -2,6 +2,7 @@
 import logging
 
 from aiohttp import web
+
 from servicelib.application_keys import APP_CONFIG_KEY
 from servicelib.application_setup import ModuleCategory, app_module_setup
 from servicelib.rest_routing import (

services/web/server/src/simcore_service_webserver/application.py

@@ -9,7 +9,6 @@
 
 from servicelib.application import create_safe_application
 
-
 from .activity import setup_activity
 from .application_proxy import setup_app_proxy
 from .catalog import setup_catalog
@@ -20,6 +19,7 @@
 from .email import setup_email
 from .login import setup_login
 from .projects import setup_projects
+from .publications import setup_publications
 from .resource_manager import setup_resource_manager
 from .rest import setup_rest
 from .security import setup_security
@@ -31,7 +31,6 @@
 from .tags import setup_tags
 from .tracing import setup_app_tracing
 from .users import setup_users
-from .publications import setup_publications
 
 log = logging.getLogger(__name__)
 

services/web/server/src/simcore_service_webserver/application_config.py

@@ -20,9 +20,10 @@
 from typing import Dict
 
 import trafaret as T
+from trafaret_config.simple import read_and_validate
+
 from servicelib import application_keys  # pylint:disable=unused-import
 from servicelib.config_schema_utils import addon_section, minimal_addon_schema
-from trafaret_config.simple import read_and_validate
 
 from . import (
     catalog_config,

services/web/server/src/simcore_service_webserver/cli.py

@@ -18,8 +18,8 @@
 from argparse import ArgumentParser
 from typing import Dict, List, Optional
 
-from aiohttp.log import access_logger
 from aiodebug import log_slow_callbacks
+from aiohttp.log import access_logger
 
 from .application import run_service
 from .application_config import CLI_DEFAULT_CONFIGFILE, app_schema

services/web/server/src/simcore_service_webserver/cli_config.py

@@ -1,6 +1,6 @@
 import argparse
-import os
 import logging
+import os
 
 import trafaret_config
 import trafaret_config.commandline as commandline

services/web/server/src/simcore_service_webserver/computation_handlers.py

@@ -83,7 +83,7 @@ async def start_pipeline(request: web.Request) -> web.Response:
     log.debug(
         "Task (user_id=%s, project_id=%s) submitted for execution.", user_id, project_id
     )
-    
+
     # answer the client while task has been spawned
     data = {
         # TODO: PC->SAN: some name with task id. e.g. to distinguish two projects with identical pipeline?

services/web/server/src/simcore_service_webserver/computation_subscribe.py

@@ -81,9 +81,13 @@ async def instrumentation_message_handler(
 ) -> None:
     data = json.loads(message.body)
     if data["metrics"] == "service_started":
-        service_started(app, **{key:value for key, value in data.items() if key != "metrics"})
+        service_started(
+            app, **{key: value for key, value in data.items() if key != "metrics"}
+        )
     elif data["metrics"] == "service_stopped":
-        service_stopped(app, **{key:value for key, value in data.items() if key != "metrics"})
+        service_stopped(
+            app, **{key: value for key, value in data.items() if key != "metrics"}
+        )
     await message.ack()
 
 

services/web/server/src/simcore_service_webserver/db.py

@@ -5,6 +5,8 @@
 import logging
 
 from aiohttp import web
+from tenacity import Retrying
+
 from servicelib.aiopg_utils import (
     DataSourceName,
     PostgresRetryPolicyUponInitialization,
@@ -15,7 +17,6 @@
 )
 from servicelib.application_keys import APP_CONFIG_KEY, APP_DB_ENGINE_KEY
 from servicelib.application_setup import ModuleCategory, app_module_setup
-from tenacity import Retrying
 
 from .db_config import CONFIG_SECTION_NAME
 from .db_models import metadata

services/web/server/src/simcore_service_webserver/db_models.py

@@ -4,17 +4,17 @@
 from simcore_postgres_database.models.base import metadata
 from simcore_postgres_database.webserver_models import (
     ConfirmationAction,
+    GroupType,
     UserRole,
     UserStatus,
+    api_keys,
     confirmations,
-    tokens,
-    users,
     groups,
-    GroupType,
-    user_to_groups,
-    tags,
     study_tags,
-    api_keys,
+    tags,
+    tokens,
+    user_to_groups,
+    users,
 )
 
 # TODO: roles table that maps every role with allowed tasks e.g. read/write,...??

services/web/server/src/simcore_service_webserver/diagnostics_monitoring.py

@@ -10,9 +10,10 @@
 from prometheus_client import CONTENT_TYPE_LATEST, Counter, Gauge, Histogram
 from prometheus_client.registry import CollectorRegistry
 
-from .diagnostics_core import DelayWindowProbe, kLATENCY_PROBE
 from servicelib.monitor_services import add_instrumentation
 
+from .diagnostics_core import DelayWindowProbe, kLATENCY_PROBE
+
 log = logging.getLogger(__name__)
 
 kSTART_TIME = f"{__name__}.start_time"

services/web/server/src/simcore_service_webserver/director/config.py

@@ -7,9 +7,10 @@
 
 import trafaret as T
 from aiohttp import ClientSession, web
-from servicelib.application_keys import APP_CONFIG_KEY, APP_CLIENT_SESSION_KEY
 from yarl import URL
 
+from servicelib.application_keys import APP_CLIENT_SESSION_KEY, APP_CONFIG_KEY
+
 APP_DIRECTOR_API_KEY = __name__ + ".director_api"
 
 CONFIG_SECTION_NAME = "director"

services/web/server/src/simcore_service_webserver/email_config.py

@@ -5,7 +5,6 @@
 """
 import trafaret as T
 
-
 CONFIG_SECTION_NAME = "smtp"
 
 

services/web/server/src/simcore_service_webserver/login/__init__.py

@@ -9,6 +9,7 @@
 
 import asyncpg
 from aiohttp import web
+
 from servicelib.aiopg_utils import DSN
 from servicelib.application_keys import APP_CONFIG_KEY
 from servicelib.application_setup import ModuleCategory, app_module_setup

services/web/server/src/simcore_service_webserver/login/decorators.py

@@ -1,6 +1,7 @@
 from functools import wraps
 
 from aiohttp_security.api import check_authorized
+
 from servicelib.request_keys import RQT_USERID_KEY
 from servicelib.requests_utils import get_request
 

services/web/server/src/simcore_service_webserver/login/handlers.py

@@ -1,9 +1,10 @@
 import logging
 
 from aiohttp import web
+from yarl import URL
+
 from servicelib import observer
 from servicelib.rest_utils import extract_and_validate
-from yarl import URL
 
 from ..db_models import ConfirmationAction, UserRole, UserStatus
 from ..security_api import check_password, encrypt_password, forget, remember

services/web/server/src/simcore_service_webserver/login/routes.py

@@ -12,8 +12,8 @@
 from servicelib import openapi
 from servicelib.rest_routing import iter_path_operations, map_handlers_with_operations
 
-from . import handlers as login_handlers
 from . import api_keys_handlers
+from . import handlers as login_handlers
 
 log = logging.getLogger(__name__)
 

services/web/server/src/simcore_service_webserver/login/settings.py

@@ -1,6 +1,5 @@
 from aiohttp import web
 
-
 APP_LOGIN_CONFIG = __name__ + ".config"
 CFG_LOGIN_STORAGE = "STORAGE"  # Needs to match login.cfg!!!
 

services/web/server/src/simcore_service_webserver/login/sql.py

@@ -1,6 +1,5 @@
 from logging import getLogger
 
-
 log = getLogger(__name__)
 LOG_TPL = "%s <--%s"
 

services/web/server/src/simcore_service_webserver/login/storage.py

@@ -1,13 +1,12 @@
-from logging import getLogger
-from datetime import datetime
 import enum
+from datetime import datetime
+from logging import getLogger
+
 import asyncpg
 
-from .utils import get_random_string
+from ..db_models import ConfirmationAction, UserRole, UserStatus
 from . import sql
-
-from ..db_models import UserRole, UserStatus, ConfirmationAction
-
+from .utils import get_random_string
 
 log = getLogger(__name__)
 

services/web/server/src/simcore_service_webserver/login/utils.py

@@ -7,15 +7,15 @@
 from logging import getLogger
 from os.path import join
 from pprint import pformat
-from typing import Mapping, Optional, Tuple, List
-
-import attr
+from typing import List, Mapping, Optional, Tuple
 
 import aiosmtplib
+import attr
 import passlib.hash
 from aiohttp import web
 from aiohttp_jinja2 import render_string
 from passlib import pwd
+
 from servicelib.rest_models import LogMessageType
 
 from ..resources import resources

services/web/server/src/simcore_service_webserver/projects/__init__.py

@@ -4,11 +4,11 @@
     It contains metadata about the study (e.g. name, description, owner, etc) and a workbench section that describes the study pipeline
 """
 import asyncio
+import json
 import logging
 from pprint import pformat
 
 import jsonschema
-import json
 from aiohttp import ClientSession, web
 from tenacity import before_sleep_log, retry, stop_after_attempt, wait_fixed
 

services/web/server/src/simcore_service_webserver/projects/nodes_handlers.py

@@ -6,10 +6,11 @@
 
 :raises NotImplementedError
 """
-from aiohttp import web
 import logging
-from ..login.decorators import login_required
 
+from aiohttp import web
+
+from ..login.decorators import login_required
 
 log = logging.getLogger(__name__)
 

services/web/server/src/simcore_service_webserver/projects/projects_access.py

@@ -1,7 +1,7 @@
 import jsondiff
 from aiohttp import web
 
-from ..security_api import get_access_model, UserRole
+from ..security_api import UserRole, get_access_model
 
 
 async def can_update_node_inputs(context):

services/web/server/src/simcore_service_webserver/projects/projects_api.py

@@ -22,10 +22,11 @@
 
 from ..computation_api import delete_pipeline_db
 from ..director import director_api
-from ..storage_api import \
-    copy_data_folders_from_project  # mocked in unit-tests
-from ..storage_api import (delete_data_folders_of_project,
-                           delete_data_folders_of_project_node)
+from ..storage_api import copy_data_folders_from_project  # mocked in unit-tests
+from ..storage_api import (
+    delete_data_folders_of_project,
+    delete_data_folders_of_project_node,
+)
 from .config import CONFIG_SECTION_NAME
 from .projects_db import APP_PROJECT_DBAPI
 from .projects_exceptions import NodeNotFoundError
@@ -291,7 +292,9 @@ async def update_project_node_outputs(
     if data:
         # NOTE: update outputs (not required) if necessary as the UI expects a
         # dataset/label field that is missing
-        outputs: Dict[str,Any] = project["workbench"][node_id].setdefault("outputs", {})
+        outputs: Dict[str, Any] = project["workbench"][node_id].setdefault(
+            "outputs", {}
+        )
         outputs.update(data)
 
         for output_key in outputs.keys():
@@ -308,6 +311,7 @@ async def update_project_node_outputs(
         await db.update_user_project(project, user_id, project_id)
     return project["workbench"][node_id]
 
+
 async def get_workbench_node_ids_from_project_uuid(
     app: web.Application, project_uuid: str,
 ) -> Set[str]:

services/web/server/src/simcore_service_webserver/projects/projects_db.py

@@ -16,14 +16,13 @@
 from aiopg.sa import Engine
 from aiopg.sa.connection import SAConnection
 from aiopg.sa.result import ResultProxy, RowProxy
-
 from change_case import ChangeCase
 from psycopg2 import IntegrityError
 from sqlalchemy.sql import and_, select
 
 from servicelib.application_keys import APP_DB_ENGINE_KEY
 
-from ..db_models import study_tags, users, user_to_groups
+from ..db_models import study_tags, user_to_groups, users
 from ..utils import format_datetime, now_str
 from .projects_exceptions import (
     ProjectInvalidRightsError,
@@ -188,7 +187,9 @@ async def add_project(
                     )
                     await conn.execute(query)
                 except IntegrityError as exc:
-                    log.exception("Cannot associate project %d to user %d", project_id, user_id)
+                    log.exception(
+                        "Cannot associate project %d to user %d", project_id, user_id
+                    )
 
                     # rollback projects database
                     query = projects.delete().where(projects.c.id == project_id)

services/web/server/src/simcore_service_webserver/projects/projects_handlers.py

@@ -17,7 +17,13 @@
 from .projects_db import APP_PROJECT_DBAPI
 from .projects_exceptions import ProjectInvalidRightsError, ProjectNotFoundError
 
-OVERRIDABLE_DOCUMENT_KEYS = ["name", "description", "thumbnail", "prjOwner", "accessRights"]
+OVERRIDABLE_DOCUMENT_KEYS = [
+    "name",
+    "description",
+    "thumbnail",
+    "prjOwner",
+    "accessRights",
+]
 # TODO: validate these against api/specs/webserver/v0/components/schemas/project-v0.0.1.json
 
 log = logging.getLogger(__name__)

services/web/server/src/simcore_service_webserver/publication_handlers.py

@@ -25,7 +25,7 @@ async def service_submission(request: web.Request):
 
     # Read multipart email
     while True:
-        part = await reader.next() # pylint: disable=not-callable
+        part = await reader.next()  # pylint: disable=not-callable
         if part is None:
             break
         if part.headers[hdrs.CONTENT_TYPE] == "application/json":