Merge branch 'master' into feature/trash-bin

Author: odeimaiz

api/specs/web-server/_folders.py

@@ -63,6 +63,28 @@ async def list_folders(
     ...
 
 
+@router.get(
+    "/folders:search",
+    response_model=Envelope[list[FolderGet]],
+)
+async def list_folders_full_search(
+    params: Annotated[PageQueryParameters, Depends()],
+    text: str | None = None,
+    order_by: Annotated[
+        Json,
+        Query(
+            description="Order by field (modified_at|name|description) and direction (asc|desc). The default sorting order is ascending.",
+            example='{"field": "name", "direction": "desc"}',
+        ),
+    ] = '{"field": "modified_at", "direction": "desc"}',
+    filters: Annotated[
+        Json | None,
+        Query(description=FolderFilters.schema_json(indent=1)),
+    ] = None,
+):
+    ...
+
+
 @router.get(
     "/folders/{folder_id}",
     response_model=Envelope[FolderGet],

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

@@ -1,13 +1,42 @@
 from datetime import datetime
+from enum import auto
 from typing import TypeAlias
 
-from models_library.users import GroupID, UserID
-from models_library.workspaces import WorkspaceID
-from pydantic import BaseModel, Field, PositiveInt
+from pydantic import BaseModel, Field, PositiveInt, validator
+
+from .access_rights import AccessRights
+from .users import GroupID, UserID
+from .utils.enums import StrAutoEnum
+from .workspaces import WorkspaceID
 
 FolderID: TypeAlias = PositiveInt
 
 
+class FolderScope(StrAutoEnum):
+    ROOT = auto()
+    SPECIFIC = auto()
+    ALL = auto()
+
+
+class FolderQuery(BaseModel):
+    folder_scope: FolderScope
+    folder_id: PositiveInt | None = None
+
+    @validator("folder_id", pre=True, always=True)
+    @classmethod
+    def validate_folder_id(cls, value, values):
+        scope = values.get("folder_scope")
+        if scope == FolderScope.SPECIFIC and value is None:
+            raise ValueError(
+                "folder_id must be provided when folder_scope is SPECIFIC."
+            )
+        if scope != FolderScope.SPECIFIC and value is not None:
+            raise ValueError(
+                "folder_id should be None when folder_scope is not SPECIFIC."
+            )
+        return value
+
+
 #
 # DB
 #
@@ -38,3 +67,10 @@ class FolderDB(BaseModel):
 
     class Config:
         orm_mode = True
+
+
+class UserFolderAccessRightsDB(FolderDB):
+    my_access_rights: AccessRights
+
+    class Config:
+        orm_mode = True

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

@@ -1,13 +1,41 @@
 from datetime import datetime
+from enum import auto
 from typing import TypeAlias
 
-from models_library.access_rights import AccessRights
-from models_library.users import GroupID
-from pydantic import BaseModel, Field, PositiveInt
+from pydantic import BaseModel, Field, PositiveInt, validator
+
+from .access_rights import AccessRights
+from .users import GroupID
+from .utils.enums import StrAutoEnum
 
 WorkspaceID: TypeAlias = PositiveInt
 
 
+class WorkspaceScope(StrAutoEnum):
+    PRIVATE = auto()
+    SHARED = auto()
+    ALL = auto()
+
+
+class WorkspaceQuery(BaseModel):
+    workspace_scope: WorkspaceScope
+    workspace_id: PositiveInt | None = None
+
+    @validator("workspace_id", pre=True, always=True)
+    @classmethod
+    def validate_workspace_id(cls, value, values):
+        scope = values.get("workspace_scope")
+        if scope == WorkspaceScope.SHARED and value is None:
+            raise ValueError(
+                "workspace_id must be provided when workspace_scope is SHARED."
+            )
+        if scope != WorkspaceScope.SHARED and value is not None:
+            raise ValueError(
+                "workspace_id should be None when workspace_scope is not SHARED."
+            )
+        return value
+
+
 #
 # DB
 #

packages/postgres-database/src/simcore_postgres_database/migration/versions/8bfe65a5e294_add_cancellation_mark.py

@@ -0,0 +1,29 @@
+"""add cancellation mark
+
+Revision ID: 8bfe65a5e294
+Revises: 5ad02358751a
+Create Date: 2024-11-08 14:40:59.266181+00:00
+
+"""
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "8bfe65a5e294"
+down_revision = "5ad02358751a"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column(
+        "comp_runs", sa.Column("cancelled", sa.DateTime(timezone=True), nullable=True)
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column("comp_runs", "cancelled")
+    # ### end Alembic commands ###

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

@@ -99,6 +99,12 @@
         nullable=True,
         doc="When the run was finished",
     ),
+    sa.Column(
+        "cancelled",
+        sa.DateTime(timezone=True),
+        nullable=True,
+        doc="If filled, when cancellation was requested",
+    ),
     sa.Column("metadata", JSONB, nullable=True, doc="the run optional metadata"),
     sa.Column(
         "use_on_demand_clusters",

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

@@ -0,0 +1,6 @@
+def assemble_array_groups(user_group_ids: list[int]) -> str:
+    return (
+        "array[]::text[]"
+        if len(user_group_ids) == 0
+        else f"""array[{', '.join(f"'{group_id}'" for group_id in user_group_ids)}]"""
+    )

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

@@ -0,0 +1,30 @@
+from simcore_postgres_database.models.groups import user_to_groups
+from simcore_postgres_database.models.workspaces_access_rights import (
+    workspaces_access_rights,
+)
+from sqlalchemy import func
+from sqlalchemy.dialects.postgresql import BOOLEAN, INTEGER
+from sqlalchemy.sql import Subquery, select
+
+
+def create_my_workspace_access_rights_subquery(user_id: int) -> Subquery:
+    return (
+        select(
+            workspaces_access_rights.c.workspace_id,
+            func.json_build_object(
+                "read",
+                func.max(workspaces_access_rights.c.read.cast(INTEGER)).cast(BOOLEAN),
+                "write",
+                func.max(workspaces_access_rights.c.write.cast(INTEGER)).cast(BOOLEAN),
+                "delete",
+                func.max(workspaces_access_rights.c.delete.cast(INTEGER)).cast(BOOLEAN),
+            ).label("my_access_rights"),
+        )
+        .select_from(
+            workspaces_access_rights.join(
+                user_to_groups, user_to_groups.c.gid == workspaces_access_rights.c.gid
+            )
+        )
+        .where(user_to_groups.c.uid == user_id)
+        .group_by(workspaces_access_rights.c.workspace_id)
+    ).subquery("my_workspace_access_rights_subquery")

packages/service-library/src/servicelib/redis.py

@@ -60,6 +60,7 @@ async def _cancel_or_warn(task: Task) -> None:
 @dataclass
 class RedisClientSDK:
     redis_dsn: str
+    client_name: str
     decode_responses: bool = _DEFAULT_DECODE_RESPONSES
     health_check_interval: datetime.timedelta = _DEFAULT_HEALTH_CHECK_INTERVAL
 
@@ -86,7 +87,7 @@ def __post_init__(self):
             socket_connect_timeout=_DEFAULT_SOCKET_TIMEOUT.total_seconds(),
             encoding="utf-8",
             decode_responses=self.decode_responses,
-            auto_close_connection_pool=True,
+            client_name=self.client_name,
         )
 
     @retry(**RedisRetryPolicyUponInitialization(_logger).kwargs)
@@ -238,6 +239,7 @@ class RedisClientsManager:
 
     databases_configs: set[RedisManagerDBConfig]
     settings: RedisSettings
+    client_name: str
 
     _client_sdks: dict[RedisDatabase, RedisClientSDK] = field(default_factory=dict)
 
@@ -247,6 +249,7 @@ async def setup(self) -> None:
                 redis_dsn=self.settings.build_redis_dsn(config.database),
                 decode_responses=config.decode_responses,
                 health_check_interval=config.health_check_interval,
+                client_name=f"{self.client_name}",
             )
 
         for client in self._client_sdks.values():

packages/service-library/tests/conftest.py

@@ -80,9 +80,12 @@ async def _(
         database: RedisDatabase, decode_response: bool = True  # noqa: FBT002
     ) -> AsyncIterator[RedisClientSDK]:
         redis_resources_dns = redis_service.build_redis_dsn(database)
-        client = RedisClientSDK(redis_resources_dns, decode_responses=decode_response)
+        client = RedisClientSDK(
+            redis_resources_dns, decode_responses=decode_response, client_name="pytest"
+        )
         assert client
         assert client.redis_dsn == redis_resources_dns
+        assert client.client_name == "pytest"
         await client.setup()
 
         yield client
@@ -94,7 +97,9 @@ async def _cleanup_redis_data(clients_manager: RedisClientsManager) -> None:
             await clients_manager.client(db).redis.flushall()
 
     async with RedisClientsManager(
-        {RedisManagerDBConfig(db) for db in RedisDatabase}, redis_service
+        {RedisManagerDBConfig(db) for db in RedisDatabase},
+        redis_service,
+        client_name="pytest",
     ) as clients_manager:
         await _cleanup_redis_data(clients_manager)
         yield _

packages/service-library/tests/deferred_tasks/example_app.py

@@ -60,6 +60,7 @@ def __init__(self, redis_settings: RedisSettings, port: int) -> None:
         self.redis: Redis = RedisClientSDK(
             redis_settings.build_redis_dsn(RedisDatabase.DEFERRED_TASKS),
             decode_responses=True,
+            client_name="example_app",
         ).redis
         self.port = port
 
@@ -84,6 +85,7 @@ def __init__(
         self._redis_client = RedisClientSDK(
             redis_settings.build_redis_dsn(RedisDatabase.DEFERRED_TASKS),
             decode_responses=False,
+            client_name="example_app",
         )
         self._manager = DeferredManager(
             rabbit_settings,