ruffed

Author: pcrespov

packages/postgres-database/src/simcore_postgres_database/__init__.py

@@ -7,8 +7,8 @@
 
 __all__: tuple[str, ...] = (
     "metadata",
-    "webserver_models",
     "storage_models",
+    "webserver_models",
 )
 
 # nopycln: file

packages/postgres-database/src/simcore_postgres_database/aiopg_errors.py

@@ -48,9 +48,9 @@
 
 __all__: tuple[str, ...] = (
     "CheckViolation",
-    "DatabaseError",
-    "DataError",
     "DBAPIError",
+    "DataError",
+    "DatabaseError",
     "ForeignKeyViolation",
     "IntegrityError",
     "InterfaceError",

packages/postgres-database/src/simcore_postgres_database/cli.py

@@ -1,6 +1,4 @@
-""" command line interface for migration
-
-"""
+"""command line interface for migration"""
 
 # pylint: disable=wildcard-import
 # pylint: disable=unused-wildcard-import
@@ -127,7 +125,7 @@ def _test_swarm() -> dict:
 
             return cfg
 
-        except Exception as err:  # pylint: disable=broad-except  # noqa: PERF203
+        except Exception as err:  # pylint: disable=broad-except
             inline_msg = str(err).replace("\n", ". ")
             click.echo(f"<- {test.__name__} failed : {inline_msg}")
 

packages/postgres-database/src/simcore_postgres_database/settings.py

@@ -7,4 +7,4 @@
 ]
 
 
-__all__ = ["target_metadatas", "build_url"]
+__all__ = ["build_url", "target_metadatas"]

packages/postgres-database/src/simcore_postgres_database/sidecar_models.py

@@ -1,16 +1,17 @@
-""" Facade for sidecar service
+"""Facade for sidecar service
 
-    Facade to direct access to models in the database by
-    the  sidecar service
+Facade to direct access to models in the database by
+the  sidecar service
 
 """
+
 from .models.comp_pipeline import StateType, comp_pipeline
 from .models.comp_tasks import comp_tasks
 
 __all__ = (
-    "comp_tasks",
+    "StateType",
     "comp_pipeline",
     "comp_pipeline",
-    "StateType",
+    "comp_tasks",
 )
 # nopycln: file

packages/postgres-database/src/simcore_postgres_database/storage_models.py

@@ -1,8 +1,9 @@
-""" Facade for storage service (tables manager)
+"""Facade for storage service (tables manager)
 
-    - Facade to direct access to models in the database by
-    the storage service
+- Facade to direct access to models in the database by
+the storage service
 """
+
 from .models.base import metadata
 from .models.file_meta_data import file_meta_data
 from .models.groups import groups, user_to_groups
@@ -11,12 +12,12 @@
 from .models.users import users
 
 __all__ = [
-    "tokens",
     "file_meta_data",
+    "groups",
     "metadata",
     "projects",
-    "users",
-    "groups",
+    "tokens",
     "user_to_groups",
+    "users",
 ]
 # nopycln: file

packages/postgres-database/src/simcore_postgres_database/utils_cli.py

@@ -57,17 +57,13 @@ def get_service_published_port(service_name: str) -> int:
         s for s in client.services.list() if service_name in getattr(s, "name", "")
     ]
     if not services:
-        raise RuntimeError(
-            "Cannot find published port for service '%s'. Probably services still not up"
-            % service_name
-        )
+        msg = f"Cannot find published port for service '{service_name}'. Probably services still not up"
+        raise RuntimeError(msg)
     service_endpoint = services[0].attrs["Endpoint"]
 
     if "Ports" not in service_endpoint or not service_endpoint["Ports"]:
-        raise RuntimeError(
-            "Cannot find published port for service '%s' in endpoint. Probably services still not up"
-            % service_name
-        )
+        msg = f"Cannot find published port for service '{service_name}' in endpoint. Probably services still not up"
+        raise RuntimeError(msg)
 
     published_port = service_endpoint["Ports"][0]["PublishedPort"]
     return int(published_port)
@@ -87,7 +83,7 @@ def load_cache(*, raise_if_error=False) -> dict:
 def reset_cache():
     if os.path.exists(DISCOVERED_CACHE):
         os.remove(DISCOVERED_CACHE)
-        click.echo("Removed %s" % DISCOVERED_CACHE)
+        click.echo(f"Removed {DISCOVERED_CACHE}")
 
 
 def get_alembic_config_from_cache(

packages/postgres-database/src/simcore_postgres_database/utils_projects_metadata.py

@@ -122,9 +122,7 @@ async def _project_has_any_child(
     get_stmt = sa.select(projects_metadata.c.project_uuid).where(
         projects_metadata.c.parent_project_uuid == f"{project_uuid}"
     )
-    if await connection.scalar(get_stmt) is not None:
-        return True
-    return False
+    return await connection.scalar(get_stmt) is not None
 
 
 async def _compute_root_parent_from_parent(

packages/postgres-database/src/simcore_postgres_database/webserver_models.py

@@ -1,9 +1,10 @@
-""" Facade for webserver service
+"""Facade for webserver service
 
-    Facade to direct access to models in the database by
-    the  webserver service
+Facade to direct access to models in the database by
+the  webserver service
 
 """
+
 from .models.api_keys import api_keys
 from .models.classifiers import group_classifiers
 from .models.comp_pipeline import StateType, comp_pipeline
@@ -21,29 +22,29 @@
 from .models.users import UserRole, UserStatus, users
 
 __all__ = (
+    "DB_CHANNEL_NAME",
+    "ConfirmationAction",
+    "GroupType",
+    "NodeClass",
+    "ProjectType",
+    "StateType",
+    "UserRole",
+    "UserStatus",
     "api_keys",
     "comp_pipeline",
     "comp_tasks",
-    "ConfirmationAction",
     "confirmations",
-    "DB_CHANNEL_NAME",
     "group_classifiers",
     "groups",
-    "GroupType",
-    "NodeClass",
     "products",
     "projects",
     "projects_nodes",
-    "ProjectType",
-    "scicrunch_resources",
-    "StateType",
     "projects_tags",
+    "projects_to_wallet",
+    "scicrunch_resources",
     "tags",
     "tokens",
     "user_to_groups",
-    "UserRole",
     "users",
-    "UserStatus",
-    "projects_to_wallet",
 )
 # nopycln: file