add project_tags to rut

matusdrobuliak66 · matusdrobuliak66 · commit f99af0a8be5b · 2024-11-14T13:45:47.000+01:00
diff --git a/packages/models-library/src/models_library/api_schemas_resource_usage_tracker/service_runs.py b/packages/models-library/src/models_library/api_schemas_resource_usage_tracker/service_runs.py
@@ -20,6 +20,7 @@ class ServiceRunGet(BaseModel):
     user_email: str
     project_id: ProjectID
     project_name: str
+    project_tags: list[str]
     node_id: NodeID
     node_name: str
     root_parent_project_id: ProjectID
diff --git a/packages/postgres-database/src/simcore_postgres_database/migration/versions/7b3a1c9a1e78_enhance_projects_tags_for_rut.py b/packages/postgres-database/src/simcore_postgres_database/migration/versions/7b3a1c9a1e78_enhance_projects_tags_for_rut.py
@@ -0,0 +1,63 @@
+"""enhance projects_tags for RUT
+
+Revision ID: 7b3a1c9a1e78
+Revises: 8bfe65a5e294
+Create Date: 2024-11-13 15:13:32.262499+00:00
+
+"""
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "7b3a1c9a1e78"
+down_revision = "8bfe65a5e294"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column(
+        "projects_tags", sa.Column("project_uuid", sa.String(), nullable=False)
+    )
+    op.alter_column(
+        "projects_tags", "project_id", existing_type=sa.BIGINT(), nullable=True
+    )
+    op.drop_constraint(
+        "study_tags_study_id_tag_id_key", "projects_tags", type_="unique"
+    )
+    op.create_unique_constraint(None, "projects_tags", ["project_uuid", "tag_id"])
+    op.drop_constraint("study_tags_study_id_fkey", "projects_tags", type_="foreignkey")
+    op.create_foreign_key(
+        None,
+        "projects_tags",
+        "projects",
+        ["project_id"],
+        ["id"],
+        onupdate="CASCADE",
+        ondelete="SET NULL",
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_constraint(None, "projects_tags", type_="foreignkey")
+    op.create_foreign_key(
+        "study_tags_study_id_fkey",
+        "projects_tags",
+        "projects",
+        ["project_id"],
+        ["id"],
+        onupdate="CASCADE",
+        ondelete="CASCADE",
+    )
+    op.drop_constraint(None, "projects_tags", type_="unique")
+    op.create_unique_constraint(
+        "study_tags_study_id_tag_id_key", "projects_tags", ["project_id", "tag_id"]
+    )
+    op.alter_column(
+        "projects_tags", "project_id", existing_type=sa.BIGINT(), nullable=False
+    )
+    op.drop_column("projects_tags", "project_uuid")
+    # ### end Alembic commands ###
diff --git a/packages/postgres-database/src/simcore_postgres_database/models/projects_tags.py b/packages/postgres-database/src/simcore_postgres_database/models/projects_tags.py
@@ -13,8 +13,8 @@
     sa.Column(
         "project_id",
         sa.BigInteger,
-        sa.ForeignKey(projects.c.id, onupdate="CASCADE", ondelete="CASCADE"),
-        nullable=False,
+        sa.ForeignKey(projects.c.id, onupdate="CASCADE", ondelete="SET NULL"),
+        nullable=True,  # <-- NULL means that project was deleted
         doc="NOTE that project.c.id != project.c.uuid",
     ),
     sa.Column(
@@ -23,5 +23,10 @@
         sa.ForeignKey(tags.c.id, onupdate="CASCADE", ondelete="CASCADE"),
         nullable=False,
     ),
-    sa.UniqueConstraint("project_id", "tag_id"),
+    sa.Column(
+        "project_uuid",
+        sa.String,
+        nullable=False,
+    ),
+    sa.UniqueConstraint("project_uuid", "tag_id"),
 )
diff --git a/services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/models/service_runs.py b/services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/models/service_runs.py
@@ -101,6 +101,7 @@ class Config:
 class ServiceRunWithCreditsDB(ServiceRunDB):
     osparc_credits: Decimal | None
     transaction_status: CreditTransactionStatus | None
+    project_tags: list[str]
 
     class Config:
         orm_mode = True
diff --git a/services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/services/modules/db/repositories/resource_tracker.py b/services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/services/modules/db/repositories/resource_tracker.py
@@ -28,6 +28,7 @@
 from models_library.users import UserID
 from models_library.wallets import WalletID
 from pydantic import PositiveInt
+from simcore_postgres_database.models.projects_tags import projects_tags
 from simcore_postgres_database.models.resource_tracker_credit_transactions import (
     resource_tracker_credit_transactions,
 )
@@ -46,6 +47,7 @@
 from simcore_postgres_database.models.resource_tracker_service_runs import (
     resource_tracker_service_runs,
 )
+from simcore_postgres_database.models.tags import tags
 from sqlalchemy.dialects.postgresql import ARRAY, INTEGER
 
 from .....exceptions.errors import (
@@ -212,6 +214,15 @@ async def get_service_run_by_id(
             return None
         return ServiceRunDB.from_orm(row)
 
+    _project_tags_subquery = (
+        sa.select(
+            projects_tags.c.project_uuid,
+            sa.func.array_agg(tags.c.name).label("project_tags"),
+        )
+        .select_from(projects_tags.join(tags, projects_tags.c.tag_id == tags.c.id))
+        .group_by(projects_tags.c.project_uuid)
+    ).subquery("project_tags_subquery")
+
     async def list_service_runs_by_product_and_user_and_wallet(
         self,
         product_name: ProductName,
@@ -260,6 +271,10 @@ async def list_service_runs_by_product_and_user_and_wallet(
                     resource_tracker_service_runs.c.missed_heartbeat_counter,
                     resource_tracker_credit_transactions.c.osparc_credits,
                     resource_tracker_credit_transactions.c.transaction_status,
+                    sa.func.coalesce(
+                        self._project_tags_subquery.c.tags,
+                        sa.cast(sa.text("'{}'"), sa.ARRAY(sa.String)),
+                    ).label("project_tags"),
                 )
                 .select_from(
                     resource_tracker_service_runs.join(
@@ -273,6 +288,11 @@ async def list_service_runs_by_product_and_user_and_wallet(
                             == resource_tracker_credit_transactions.c.service_run_id
                         ),
                         isouter=True,
+                    ).join(
+                        self._project_tags_subquery,
+                        resource_tracker_service_runs.c.project_id
+                        == self._project_tags_subquery.c.project_uuid,
+                        isouter=True,
                     )
                 )
                 .where(resource_tracker_service_runs.c.product_name == product_name)
@@ -436,7 +456,9 @@ async def export_service_runs_table_to_s3(
                     resource_tracker_service_runs.c.service_run_id,
                     resource_tracker_service_runs.c.wallet_name,
                     resource_tracker_service_runs.c.user_email,
-                    resource_tracker_service_runs.c.project_name,
+                    resource_tracker_service_runs.c.root_parent_project_name.label(
+                        "project_name"
+                    ),
                     resource_tracker_service_runs.c.node_name,
                     resource_tracker_service_runs.c.service_key,
                     resource_tracker_service_runs.c.service_version,
@@ -445,13 +467,22 @@ async def export_service_runs_table_to_s3(
                     resource_tracker_service_runs.c.stopped_at,
                     resource_tracker_credit_transactions.c.osparc_credits,
                     resource_tracker_credit_transactions.c.transaction_status,
+                    sa.func.coalesce(
+                        self._project_tags_subquery.c.tags,
+                        sa.cast(sa.text("'{}'"), sa.ARRAY(sa.String)),
+                    ).label("project_tags"),
                 )
                 .select_from(
                     resource_tracker_service_runs.join(
                         resource_tracker_credit_transactions,
                         resource_tracker_service_runs.c.service_run_id
                         == resource_tracker_credit_transactions.c.service_run_id,
                         isouter=True,
+                    ).join(
+                        self._project_tags_subquery,
+                        resource_tracker_service_runs.c.project_id
+                        == self._project_tags_subquery.c.project_uuid,
+                        isouter=True,
                     )
                 )
                 .where(resource_tracker_service_runs.c.product_name == product_name)
diff --git a/services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/services/service_runs.py b/services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/services/service_runs.py
@@ -121,6 +121,7 @@ async def list_service_runs(
                 user_email=service.user_email,
                 project_id=service.project_id,
                 project_name=service.project_name,
+                project_tags=service.project_tags,
                 root_parent_project_id=service.root_parent_project_id,
                 root_parent_project_name=service.root_parent_project_name,
                 node_id=service.node_id,
diff --git a/services/resource-usage-tracker/tests/unit/with_dbs/conftest.py b/services/resource-usage-tracker/tests/unit/with_dbs/conftest.py
@@ -51,6 +51,7 @@ def mock_env(monkeypatch: pytest.MonkeyPatch) -> EnvVarsDict:
         "SC_BOOT_MODE": "production",
         "POSTGRES_CLIENT_NAME": "postgres_test_client",
         "RESOURCE_USAGE_TRACKER_MISSED_HEARTBEAT_CHECK_ENABLED": "0",
+        "RESOURCE_USAGE_TRACKER_TRACING": "null",
     }
     setenvs_from_dict(monkeypatch, env_vars)
     return env_vars

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ def mock_env(monkeypatch: pytest.MonkeyPatch) -> EnvVarsDict:`
`51`	`51`	`"SC_BOOT_MODE": "production",`
`52`	`52`	`"POSTGRES_CLIENT_NAME": "postgres_test_client",`
`53`	`53`	`"RESOURCE_USAGE_TRACKER_MISSED_HEARTBEAT_CHECK_ENABLED": "0",`
	`54`	`+ "RESOURCE_USAGE_TRACKER_TRACING": "null",`
`54`	`55`	`}`
`55`	`56`	`setenvs_from_dict(monkeypatch, env_vars)`
`56`	`57`	`return env_vars`