partial work

Author: matusdrobuliak66

packages/models-library/src/models_library/rabbitmq_messages.py

@@ -199,7 +199,7 @@ class RabbitResourceTrackingProjectSyncMessage(RabbitMessageBase):
         default="io.simcore.service.tracking-project-sync", const=True
     )
 
-    project_id: ProjectID
+    project_id: ProjectID | None = None
     project_name: str | None = None
     project_tags: list[tuple[int, str]] | None = None
     created_at: datetime.datetime = Field(
@@ -210,6 +210,8 @@ class RabbitResourceTrackingProjectSyncMessage(RabbitMessageBase):
     def routing_key(self) -> str | None:
         return None
 
+    # MD: Add validation ...
+
 
 class DynamicServiceRunningMessage(RabbitMessageBase):
     channel_name: Literal["io.simcore.service.dynamic-service-running"] = Field(

services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/services/modules/db/repositories/resource_tracker.py

@@ -476,7 +476,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,
@@ -485,13 +487,19 @@ 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,
+                    resource_tracker_project_metadata.c.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(
+                        resource_tracker_project_metadata,
+                        resource_tracker_service_runs.c.project_id
+                        == resource_tracker_project_metadata.c.project_id,
+                        isouter=True,
                     )
                 )
                 .where(resource_tracker_service_runs.c.product_name == product_name)

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

@@ -6,8 +6,13 @@
 
 from aiohttp import web
 from models_library.projects import ProjectID
+from models_library.rabbitmq_messages import RabbitResourceTrackingProjectSyncMessage
 from models_library.users import UserID
 from models_library.workspaces import UserWorkspaceAccessRightsDB
+from servicelib.aiohttp.db_asyncpg_engine import get_async_engine
+from simcore_postgres_database.utils_tags import TagsRepo
+from simcore_service_webserver.rabbitmq import get_rabbitmq_client
+from sqlalchemy.ext.asyncio import AsyncEngine
 
 from ..workspaces import _workspaces_db as workspaces_db
 from ._access_rights_api import check_user_project_permission
@@ -28,13 +33,29 @@ async def add_tag(
         project_id=project_uuid,
         user_id=user_id,
         product_name=product_name,
-        permission="write",  # NOTE: before there was only read access necessary
+        permission="write",
     )
 
     project: ProjectDict = await db.add_tag(
         project_uuid=f"{project_uuid}", user_id=user_id, tag_id=int(tag_id)
     )
 
+    # Inform RUT about tag change
+    engine: AsyncEngine = get_async_engine(app)
+    tags_repo = TagsRepo(engine)
+    project_tags = await tags_repo.list_tag_ids_and_names_by_project_uuid(
+        project_uuid=project_uuid
+    )
+
+    rabbit_client = get_rabbitmq_client(app)
+    await rabbit_client.publish(
+        RabbitResourceTrackingProjectSyncMessage.channel_name,
+        RabbitResourceTrackingProjectSyncMessage(
+            project_id=project_uuid, project_tags=project_tags
+        ),
+    )
+
+    # Override project access rights
     if project["workspaceId"] is not None:
         workspace_db: UserWorkspaceAccessRightsDB = (
             await workspaces_db.get_workspace_for_user(
@@ -62,7 +83,7 @@ async def remove_tag(
         project_id=project_uuid,
         user_id=user_id,
         product_name=product_name,
-        permission="write",  # NOTE: before there was only read access necessary
+        permission="write",
     )
 
     project: ProjectDict = await db.remove_tag(

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

@@ -645,6 +645,7 @@ async def list_projects_uuids(self, user_id: int) -> list[str]:
                 )
             ]
 
+    # NOTE: MD: Do not use this function anymore.
     async def get_project(
         self,
         project_uuid: str,
@@ -780,6 +781,7 @@ async def get_pure_project_access_rights_without_workspace(
                 )
             return UserProjectAccessRightsDB.from_orm(row)
 
+    # NOTE: MD: Do not use this function anymore (currently used only in some unit tests)
     async def replace_project(
         self,
         new_project_data: ProjectDict,

services/web/server/src/simcore_service_webserver/tags/_api.py

@@ -3,6 +3,8 @@
 
 from aiohttp import web
 from models_library.basic_types import IdInt
+from models_library.projects import ProjectID
+from models_library.rabbitmq_messages import RabbitResourceTrackingProjectSyncMessage
 from models_library.users import UserID
 from servicelib.aiohttp.db_asyncpg_engine import get_async_engine
 from simcore_postgres_database.utils_tags import TagsRepo
@@ -11,6 +13,24 @@
 from .schemas import TagCreate, TagGet, TagUpdate
 
 
+async def inform_rut_about_tag_change(tags_repo: TagsRepo, rabbit_client, project_id: ProjectID | None, ):
+    # Inform RUT about tag change
+
+
+    if project_id:
+        project_tags = await tags_repo.list_tag_ids_and_names_by_project_uuid(
+            project_uuid=project_id
+        )
+
+
+    await rabbit_client.publish(
+        RabbitResourceTrackingProjectSyncMessage.channel_name,
+        RabbitResourceTrackingProjectSyncMessage(
+            project_tags=project_tags
+        ),
+    )
+
+
 async def create_tag(
     app: web.Application, user_id: UserID, new_tag: TagCreate
 ) -> TagGet:
@@ -43,16 +63,26 @@ async def update_tag(
     engine: AsyncEngine = get_async_engine(app)
 
     repo = TagsRepo(engine)
+    _tags_updates_exclude_unset = tag_updates.dict(exclude_unset=True)
     tag = await repo.update(
         user_id=user_id,
         tag_id=tag_id,
-        **tag_updates.dict(exclude_unset=True),
+        **_tags_updates_exclude_unset,
     )
+
+    # If tag_updates name
+    if _tags_updates_exclude_unset.get("name") is not None:
+        await inform_rut_about_tag_change(tags_repo=repo, rabbit_client=)
+
     return TagGet.from_db(tag)
 
 
 async def delete_tag(app: web.Application, user_id: UserID, tag_id: IdInt):
     engine: AsyncEngine = get_async_engine(app)
 
     repo = TagsRepo(engine)
+
+    # Sync with RUT
+    # NOTE: Careful this will delete all the tags also historitically in the RUT
+
     await repo.delete(user_id=user_id, tag_id=tag_id)