pass application name

Author: sanderegg

packages/simcore-sdk/tests/conftest.py

@@ -10,6 +10,7 @@
 
 import pytest
 import simcore_sdk
+from faker import Faker
 from helpers.utils_port_v2 import CONSTANT_UUID
 from pytest_mock.plugin import MockerFixture
 from pytest_simcore.helpers.postgres_tools import PostgresTestConfig
@@ -85,3 +86,8 @@ def constant_uuid4(mocker: MockerFixture) -> None:
         "simcore_sdk.node_ports_common.data_items_utils.uuid4",
         return_value=CONSTANT_UUID,
     )
+
+
+@pytest.fixture
+def mock_app_name(faker: Faker) -> str:
+    return faker.pystr()

packages/simcore-sdk/tests/integration/test_node_ports_common_dbmanager.py

@@ -21,8 +21,9 @@ async def test_db_manager_read_config(
     node_uuid: str,
     node_ports_config: None,
     default_configuration: dict,
+    mock_app_name: str,
 ):
-    db_manager = DBManager()
+    db_manager = DBManager(application_name=mock_app_name)
     ports_configuration_str = await db_manager.get_ports_configuration_from_node_uuid(
         project_id, node_uuid
     )
@@ -37,13 +38,14 @@ async def test_db_manager_write_config(
     node_ports_config: None,
     create_special_configuration: Callable[..., Awaitable[tuple[dict, str, str]]],
     default_configuration_file: Path,
+    mock_app_name: str,
 ):
     # create an empty config
     await create_special_configuration()
     # read the default config
     json_configuration = default_configuration_file.read_text()
     # write the default config to the database
-    db_manager = DBManager()
+    db_manager = DBManager(application_name=mock_app_name)
     await db_manager.write_ports_configuration(
         json_configuration, project_id, node_uuid
     )

packages/simcore-sdk/tests/unit/conftest.py

@@ -3,7 +3,7 @@
 # pylint:disable=redefined-outer-name
 
 import json
-from collections.abc import AsyncIterator, Callable
+from collections.abc import Callable
 from random import randint
 from typing import Any
 from uuid import uuid4
@@ -32,7 +32,8 @@ async def mock_db_manager(
     monkeypatch,
     project_id: str,
     node_uuid: str,
-) -> AsyncIterator[Callable]:
+    mock_app_name: str,
+) -> Callable[[dict[str, Any]], DBManager]:
     def _mock_db_manager(port_cfg: dict[str, Any]) -> DBManager:
         async def mock_get_ports_configuration_from_node_uuid(*args, **kwargs) -> str:
             return json.dumps(port_cfg)
@@ -55,7 +56,6 @@ async def mock_write_ports_configuration(
             mock_write_ports_configuration,
         )
 
-        db_manager = DBManager()
-        return db_manager
+        return DBManager(application_name=mock_app_name)
 
     return _mock_db_manager

services/api-server/src/simcore_service_api_server/services_http/solver_job_outputs.py

@@ -1,13 +1,14 @@
 import logging
 from typing import Any, TypeAlias
 
-from models_library.projects import ProjectID, ProjectIDStr
-from models_library.projects_nodes_io import BaseFileLink, NodeID, NodeIDStr
+from models_library.projects import ProjectID
+from models_library.projects_nodes_io import BaseFileLink, NodeID
 from pydantic import StrictBool, StrictFloat, StrictInt, TypeAdapter
 from simcore_sdk import node_ports_v2
 from simcore_sdk.node_ports_v2 import DBManager, Nodeports
 from sqlalchemy.ext.asyncio import AsyncEngine
 
+from .._meta import APP_NAME
 from ..exceptions.backend_errors import SolverOutputNotFoundError
 
 log = logging.getLogger(__name__)
@@ -26,13 +27,13 @@ async def get_solver_output_results(
     """
 
     # get the DB engine
-    db_manager = DBManager(db_engine=db_engine)
+    db_manager = DBManager(db_engine=db_engine, application_name=APP_NAME)
 
     try:
         solver: Nodeports = await node_ports_v2.ports(
             user_id=user_id,
-            project_id=ProjectIDStr(f"{project_uuid}"),
-            node_uuid=NodeIDStr(f"{node_uuid}"),
+            project_id=f"{project_uuid}",
+            node_uuid=f"{node_uuid}",
             db_manager=db_manager,
         )
         solver_output_results: dict[str, Any] = {}

services/director-v2/src/simcore_service_director_v2/utils/dask.py

@@ -22,7 +22,7 @@
 from models_library.api_schemas_directorv2.services import NodeRequirements
 from models_library.docker import DockerLabelKey, StandardSimcoreDockerLabels
 from models_library.errors import ErrorDict
-from models_library.projects import ProjectID, ProjectIDStr
+from models_library.projects import ProjectID
 from models_library.projects_nodes_io import NodeID, NodeIDStr
 from models_library.services import ServiceKey, ServiceVersion
 from models_library.services_types import ServiceRunID
@@ -92,7 +92,7 @@ async def create_node_ports(
         db_manager = node_ports_v2.DBManager(db_engine, application_name=APP_NAME)
         return await node_ports_v2.ports(
             user_id=user_id,
-            project_id=ProjectIDStr(f"{project_id}"),
+            project_id=f"{project_id}",
             node_uuid=TypeAdapter(NodeIDStr).validate_python(f"{node_id}"),
             db_manager=db_manager,
         )

services/director-v2/tests/integration/02/test_dynamic_sidecar_nodeports_integration.py

@@ -34,7 +34,6 @@
     NodesDict,
     ProjectAtDB,
     ProjectID,
-    ProjectIDStr,
 )
 from models_library.projects_networks import (
     PROJECT_NETWORK_PREFIX,
@@ -70,6 +69,7 @@
 from simcore_sdk.node_data import data_manager
 from simcore_sdk.node_ports_common.file_io_utils import LogRedirectCB
 from simcore_sdk.node_ports_v2 import DBManager, Nodeports, Port
+from simcore_service_director_v2._meta import APP_NAME
 from simcore_service_director_v2.constants import DYNAMIC_SIDECAR_SERVICE_PREFIX
 from simcore_service_director_v2.core.dynamic_services_settings.sidecar import (
     RCloneSettings,
@@ -327,7 +327,7 @@ def workbench_dynamic_services(
 
 @pytest.fixture
 async def db_manager(sqlalchemy_async_engine: AsyncEngine) -> DBManager:
-    return DBManager(sqlalchemy_async_engine)
+    return DBManager(sqlalchemy_async_engine, application_name=APP_NAME)
 
 
 def _is_docker_r_clone_plugin_installed() -> bool:
@@ -510,7 +510,7 @@ async def _get_mapped_nodeports_values(
     for node_uuid in workbench:
         PORTS: Nodeports = await node_ports_v2.ports(
             user_id=user_id,
-            project_id=ProjectIDStr(project_id),
+            project_id=project_id,
             node_uuid=TypeAdapter(NodeIDStr).validate_python(node_uuid),
             db_manager=db_manager,
         )