Merge branch 'master' into feature/on-share-project-email

Author: odeimaiz

packages/common-library/src/common_library/json_serialization.py

@@ -1,6 +1,6 @@
-""" Helpers for json serialization
-    - built-in json-like API
-    - implemented using orjson, which  performs better. SEE https://github.com/ijl/orjson?tab=readme-ov-file#performance
+"""Helpers for json serialization
+- built-in json-like API
+- implemented using orjson, which  performs better. SEE https://github.com/ijl/orjson?tab=readme-ov-file#performance
 """
 
 import datetime
@@ -118,6 +118,28 @@ def pydantic_encoder(obj: Any) -> Any:
     raise TypeError(msg)
 
 
+def representation_encoder(obj: Any):
+    """
+    A fallback encoder that uses `pydantic_encoder` to serialize objects.
+    If serialization fails, it falls back to using `str(obj)`.
+
+    This is practical for representation purposes, such as logging or debugging.
+
+    Example:
+        >>> from common_library.json_serialization import json_dumps, representation_encoder
+        >>> class CustomObject:
+        ...     def __str__(self):
+        ...         return "CustomObjectRepresentation"
+        >>> obj = CustomObject()
+        >>> json_dumps(obj, default=representation_encoder)
+        '"CustomObjectRepresentation"'
+    """
+    try:
+        return pydantic_encoder(obj)
+    except TypeError:
+        return str(obj)
+
+
 def json_dumps(
     obj: Any,
     *,

packages/common-library/tests/test_json_serialization.py

@@ -13,6 +13,7 @@
     SeparatorTuple,
     json_dumps,
     json_loads,
+    representation_encoder,
 )
 from faker import Faker
 from pydantic import AnyHttpUrl, AnyUrl, BaseModel, Field, HttpUrl, TypeAdapter
@@ -110,3 +111,25 @@ class M(BaseModel):
         http_url=faker.url(),
     )
     json_dumps(obj)
+
+
+def test_json_dumps_with_representation_encoder():
+    class CustomObject:
+        def __str__(self):
+            return "CustomObjectRepresentation"
+
+    class SomeModel(BaseModel):
+        x: int
+
+    obj = {
+        "custom": CustomObject(),
+        "some": SomeModel(x=42),
+    }
+
+    # Using representation_encoder as the default encoder
+    result = json_dumps(obj, default=representation_encoder, indent=1)
+
+    assert (
+        result
+        == '{\n  "custom": "CustomObjectRepresentation",\n  "some": {\n    "x": 42\n  }\n}'
+    )

packages/postgres-database/src/simcore_postgres_database/migration/versions/cf8f743fd0b7_add_indexes.py

@@ -0,0 +1,90 @@
+"""add indexes
+
+Revision ID: cf8f743fd0b7
+Revises: 48604dfdc5f4
+Create Date: 2025-04-04 09:46:38.853675+00:00
+
+"""
+
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "cf8f743fd0b7"
+down_revision = "48604dfdc5f4"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_index(
+        "idx_project_to_groups_gid", "project_to_groups", ["gid"], unique=False
+    )
+    op.create_index(
+        "idx_projects_last_change_date_desc",
+        "projects",
+        ["last_change_date"],
+        unique=False,
+        postgresql_using="btree",
+        postgresql_ops={"last_change_date": "DESC"},
+    )
+    op.create_index(
+        "ix_projects_partial_type",
+        "projects",
+        ["type"],
+        unique=False,
+        postgresql_where=sa.text("type = 'TEMPLATE'"),
+    )
+    op.create_index(
+        "idx_project_to_folders_project_uuid",
+        "projects_to_folders",
+        ["project_uuid"],
+        unique=False,
+    )
+    op.create_index(
+        "idx_project_to_folders_user_id",
+        "projects_to_folders",
+        ["user_id"],
+        unique=False,
+    )
+    op.create_index(
+        "idx_projects_to_products_product_name",
+        "projects_to_products",
+        ["product_name"],
+        unique=False,
+    )
+    op.create_index(
+        "idx_workspaces_access_rights_gid",
+        "workspaces_access_rights",
+        ["gid"],
+        unique=False,
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_index(
+        "idx_workspaces_access_rights_gid", table_name="workspaces_access_rights"
+    )
+    op.drop_index(
+        "idx_projects_to_products_product_name", table_name="projects_to_products"
+    )
+    op.drop_index("idx_project_to_folders_user_id", table_name="projects_to_folders")
+    op.drop_index(
+        "idx_project_to_folders_project_uuid", table_name="projects_to_folders"
+    )
+    op.drop_index(
+        "ix_projects_partial_type",
+        table_name="projects",
+        postgresql_where=sa.text("type = 'TEMPLATE'"),
+    )
+    op.drop_index(
+        "idx_projects_last_change_date_desc",
+        table_name="projects",
+        postgresql_using="btree",
+        postgresql_ops={"last_change_date": "DESC"},
+    )
+    op.drop_index("idx_project_to_groups_gid", table_name="project_to_groups")
+    # ### end Alembic commands ###

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

@@ -60,4 +60,5 @@
     column_created_datetime(timezone=True),
     column_modified_datetime(timezone=True),
     sa.UniqueConstraint("project_uuid", "gid"),
+    sa.Index("idx_project_to_groups_gid", "gid"),
 )

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

@@ -1,6 +1,5 @@
-""" Projects table
+"""Projects table"""
 
-"""
 import enum
 
 import sqlalchemy as sa
@@ -171,6 +170,20 @@ class ProjectType(enum.Enum):
         server_default=sa.text("'{}'::jsonb"),
         doc="DEPRECATED: Read/write/delete access rights of each group (gid) on this project",
     ),
+    ### INDEXES ----------------------------
+    sa.Index(
+        "idx_projects_last_change_date_desc",
+        "last_change_date",
+        postgresql_using="btree",
+        postgresql_ops={"last_change_date": "DESC"},
+    ),
+)
+
+# We define the partial index
+sa.Index(
+    "ix_projects_partial_type",
+    projects.c.type,
+    postgresql_where=(projects.c.type == ProjectType.TEMPLATE),
 )
 
 

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

@@ -42,4 +42,6 @@
     column_created_datetime(timezone=True),
     column_modified_datetime(timezone=True),
     sa.UniqueConstraint("project_uuid", "folder_id", "user_id"),
+    sa.Index("idx_project_to_folders_project_uuid", "project_uuid"),
+    sa.Index("idx_project_to_folders_user_id", "user_id"),
 )

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

@@ -34,4 +34,5 @@
     column_created_datetime(timezone=False),
     column_modified_datetime(timezone=False),
     sa.UniqueConstraint("project_uuid", "product_name"),
+    sa.Index("idx_projects_to_products_product_name", "product_name"),
 )

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

@@ -57,4 +57,5 @@
     column_created_datetime(timezone=True),
     column_modified_datetime(timezone=True),
     sa.UniqueConstraint("workspace_id", "gid"),
+    sa.Index("idx_workspaces_access_rights_gid", "gid"),
 )

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

@@ -1,9 +1,9 @@
 import logging
-from pprint import pformat
 from typing import Any, TypedDict
 
 from common_library.error_codes import ErrorCodeStr
 from common_library.errors_classes import OsparcErrorMixin
+from common_library.json_serialization import json_dumps, representation_encoder
 
 from .logging_utils import LogExtra, get_log_record_extra
 
@@ -27,14 +27,15 @@ def create_troubleshotting_log_message(
         error_context -- Additional context surrounding the exception, such as environment variables or function-specific data. This can be derived from exc.error_context() (relevant when using the OsparcErrorMixin)
         tip -- Helpful suggestions or possible solutions explaining why the error may have occurred and how it could potentially be resolved
     """
-    debug_data = pformat(
+    debug_data = json_dumps(
         {
             "exception_type": f"{type(error)}",
             "exception_details": f"{error}",
             "error_code": error_code,
-            "context": pformat(error_context, indent=1),
+            "context": error_context,
             "tip": tip,
         },
+        default=representation_encoder,
         indent=1,
     )
 
@@ -82,7 +83,7 @@ def create_troubleshotting_log_kwargs(
         error=error,
         error_code=error_code,
         error_context=context,
-        tip=tip,
+        tip=tip or getattr(error, "tip", None),
     )
 
     return {

scripts/maintenance/computational-clusters/autoscaled_monitor/cli.py

@@ -177,7 +177,11 @@ def cancel_jobs(
 @app.command()
 def trigger_cluster_termination(
     user_id: Annotated[int, typer.Option(help="the user ID")],
-    wallet_id: Annotated[int, typer.Option(help="the wallet ID")],
+    wallet_id: Annotated[
+        Optional[int | None],  # noqa: UP007 # typer does not understand | syntax
+        typer.Option(help="the wallet ID"),
+    ] = None,
+    *,
     force: Annotated[bool, typer.Option(help="will not ask for confirmation")] = False,
 ) -> None:
     """this will set the Heartbeat tag on the primary machine to 1 hour, thus ensuring the