review @sanderegg

Author: matusdrobuliak66

packages/postgres-database/src/simcore_postgres_database/migration/versions/42ec7816c0b4_computational_collection_runs.py

@@ -20,7 +20,7 @@
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
     op.create_table(
-        "comp_run_collections",
+        "comp_runs_collections",
         sa.Column(
             "collection_run_id",
             postgresql.UUID(as_uuid=True),
@@ -47,8 +47,8 @@ def upgrade():
         sa.PrimaryKeyConstraint("collection_run_id"),
     )
     op.create_index(
-        "ix_comp_run_collections_client_or_system_generated_id",
-        "comp_run_collections",
+        "ix_comp_runs_collections_client_or_system_generated_id",
+        "comp_runs_collections",
         ["client_or_system_generated_id"],
         unique=False,
     )
@@ -64,7 +64,7 @@ def upgrade():
     # Data migration: Create collection run records for existing comp_runs
     op.execute(
         """
-        INSERT INTO comp_run_collections (
+        INSERT INTO comp_runs_collections (
             collection_run_id,
             client_or_system_generated_id,
             client_or_system_generated_display_name,
@@ -86,7 +86,7 @@ def upgrade():
         UPDATE comp_runs
         SET collection_run_id = (
             SELECT collection_run_id::text
-            FROM comp_run_collections
+            FROM comp_runs_collections
             WHERE client_or_system_generated_id LIKE 'migration-generated-%'
             LIMIT 1
         )
@@ -115,8 +115,8 @@ def downgrade():
     op.drop_index("ix_comp_runs_collection_run_id", table_name="comp_runs")
     op.drop_column("comp_runs", "collection_run_id")
     op.drop_index(
-        "ix_comp_run_collections_client_or_system_generated_id",
-        table_name="comp_run_collections",
+        "ix_comp_runs_collections_client_or_system_generated_id",
+        table_name="comp_runs_collections",
     )
-    op.drop_table("comp_run_collections")
+    op.drop_table("comp_runs_collections")
     # ### end Alembic commands ###

packages/postgres-database/src/simcore_postgres_database/models/comp_run_collections.py

@@ -6,8 +6,8 @@
 from ._common import column_created_datetime, column_modified_datetime
 from .base import metadata
 
-comp_run_collections = sa.Table(
-    "comp_run_collections",
+comp_runs_collections = sa.Table(
+    "comp_runs_collections",
     metadata,
     sa.Column(
         "collection_run_id",
@@ -34,7 +34,7 @@
     column_created_datetime(timezone=True),
     column_modified_datetime(timezone=True),
     sa.Index(
-        "ix_comp_run_collections_client_or_system_generated_id",
+        "ix_comp_runs_collections_client_or_system_generated_id",
         "client_or_system_generated_id",
     ),
 )

services/web/server/src/simcore_service_webserver/director_v2/_comp_run_collections_repository.py

@@ -3,10 +3,10 @@
 
 from models_library.computations import CollectionRunID
 from pydantic import TypeAdapter
-from simcore_postgres_database.models.comp_run_collections import comp_run_collections
+from simcore_postgres_database.models.comp_runs_collections import comp_runs_collections
 from sqlalchemy import func
 
-from ._comp_run_collections_models import CompRunCollectionDBGet
+from ._comp_runs_collections_models import CompRunCollectionDBGet
 
 _logger = logging.getLogger(__name__)
 
@@ -22,15 +22,15 @@ async def create_comp_run_collection(
 ) -> CollectionRunID:
     """Create a new computational run collection."""
     result = await conn.execute(
-        comp_run_collections.insert()
+        comp_runs_collections.insert()
         .values(
             client_or_system_generated_id=client_or_system_generated_id,
             client_or_system_generated_display_name=client_or_system_generated_display_name,
             generated_by_system=generated_by_system,
             created=func.now(),
             modified=func.now(),
         )
-        .returning(comp_run_collections.c.collection_run_id)
+        .returning(comp_runs_collections.c.collection_run_id)
     )
     collection_id_tuple: tuple[UUID] = await result.first()
     return TypeAdapter(CollectionRunID).validate_python(collection_id_tuple[0])
@@ -40,8 +40,8 @@ async def get_comp_run_collection_or_none_by_id(
     conn, collection_run_id: CollectionRunID
 ) -> CompRunCollectionDBGet | None:
     result = await conn.execute(
-        comp_run_collections.select().where(
-            comp_run_collections.c.collection_run_id == f"{collection_run_id}"
+        comp_runs_collections.select().where(
+            comp_runs_collections.c.collection_run_id == f"{collection_run_id}"
         )
     )
     row = await result.first()
@@ -54,8 +54,8 @@ async def get_comp_run_collection_or_none_by_client_generated_id(
     conn, client_or_system_generated_id: str
 ) -> CompRunCollectionDBGet | None:
     result = await conn.execute(
-        comp_run_collections.select().where(
-            comp_run_collections.c.client_or_system_generated_id
+        comp_runs_collections.select().where(
+            comp_runs_collections.c.client_or_system_generated_id
             == client_or_system_generated_id
         )
     )

services/web/server/src/simcore_service_webserver/director_v2/_comp_run_collections_service.py

@@ -4,8 +4,8 @@
 from models_library.computations import CollectionRunID
 
 from ..db.plugin import get_database_engine
-from . import _comp_run_collections_repository
-from ._comp_run_collections_models import CompRunCollectionDBGet
+from . import _comp_runs_collections_repository
+from ._comp_runs_collections_models import CompRunCollectionDBGet
 
 _logger = logging.getLogger(__name__)
 
@@ -18,7 +18,7 @@ async def create_comp_run_collection(
 ) -> CollectionRunID:
     """raises: ProjectNotFoundError"""
     async with get_database_engine(app).acquire() as conn:
-        return await _comp_run_collections_repository.create_comp_run_collection(
+        return await _comp_runs_collections_repository.create_comp_run_collection(
             conn=conn,
             client_or_system_generated_id=client_or_system_generated_id,
             client_or_system_generated_display_name=client_or_system_generated_display_name,
@@ -30,7 +30,7 @@ async def get_comp_run_collection_or_none_by_id(
     app: web.Application, collection_run_id: CollectionRunID
 ) -> CompRunCollectionDBGet | None:
     async with get_database_engine(app).acquire() as conn:
-        return await _comp_run_collections_repository.get_comp_run_collection_or_none_by_id(
+        return await _comp_runs_collections_repository.get_comp_run_collection_or_none_by_id(
             conn=conn, collection_run_id=collection_run_id
         )
 
@@ -40,6 +40,6 @@ async def get_comp_run_collection_or_none_by_client_generated_id(
     client_or_system_generated_id: str,
 ) -> CompRunCollectionDBGet | None:
     async with get_database_engine(app).acquire() as conn:
-        return await _comp_run_collections_repository.get_comp_run_collection_or_none_by_client_generated_id(
+        return await _comp_runs_collections_repository.get_comp_run_collection_or_none_by_client_generated_id(
             conn=conn, client_or_system_generated_id=client_or_system_generated_id
         )

services/web/server/src/simcore_service_webserver/director_v2/_computations_service.py

@@ -41,7 +41,7 @@
     get_project_uuids_by_root_parent_project_id,
 )
 from ..rabbitmq import get_rabbitmq_rpc_client
-from ._comp_run_collections_service import get_comp_run_collection_or_none_by_id
+from ._comp_runs_collections_service import get_comp_run_collection_or_none_by_id
 
 
 async def _get_projects_metadata(
@@ -350,7 +350,7 @@ async def list_computation_collection_runs(
     )
 
     # NOTE: MD: can be improved with a single batch call
-    _comp_run_collections = await limited_gather(
+    _comp_runs_collections = await limited_gather(
         *[
             get_comp_run_collection_or_none_by_id(
                 app, collection_run_id=_run.collection_run_id
@@ -378,7 +378,7 @@ async def list_computation_collection_runs(
             ),
         )
         for item, run_collection, project_root_name in zip(
-            _runs_get.items, _comp_run_collections, _projects_root_names, strict=True
+            _runs_get.items, _comp_runs_collections, _projects_root_names, strict=True
         )
     ]
 

services/web/server/src/simcore_service_webserver/director_v2/_controller/rest.py

@@ -34,8 +34,8 @@
 from ...utils_aiohttp import envelope_json_response, get_api_base_url
 from .. import _director_v2_service
 from .._client import DirectorV2RestClient
-from .._comp_run_collections_models import CompRunCollectionDBGet
-from .._comp_run_collections_service import (
+from .._comp_runs_collections_models import CompRunCollectionDBGet
+from .._comp_runs_collections_service import (
     create_comp_run_collection,
     get_comp_run_collection_or_none_by_client_generated_id,
 )

services/web/server/tests/unit/with_dbs/01/test_director_v2_handlers.py

@@ -33,7 +33,7 @@
 )
 from pytest_simcore.services_api_mocks_for_aiohttp_clients import AioResponsesMock
 from servicelib.aiohttp import status
-from simcore_postgres_database.models.comp_run_collections import comp_run_collections
+from simcore_postgres_database.models.comp_runs_collections import comp_runs_collections
 from simcore_postgres_database.models.projects_metadata import projects_metadata
 from simcore_service_webserver.db.models import UserRole
 from simcore_service_webserver.projects.models import ProjectDict
@@ -398,7 +398,7 @@ async def populated_comp_run_collection(
 
     with postgres_db.connect() as con:
         con.execute(
-            comp_run_collections.insert()
+            comp_runs_collections.insert()
             .values(
                 collection_run_id=collection_run_id,
                 client_or_system_generated_id=collection_run_id,
@@ -407,10 +407,10 @@ async def populated_comp_run_collection(
                 created=sa.func.now(),
                 modified=sa.func.now(),
             )
-            .returning(comp_run_collections.c.collection_run_id)
+            .returning(comp_runs_collections.c.collection_run_id)
         )
         yield
-        con.execute(comp_run_collections.delete())
+        con.execute(comp_runs_collections.delete())
 
 
 @pytest.mark.parametrize(*standard_role_response(), ids=str)