Skip to content

Commit 05235b4

Browse files
sandereggsanderegg
committed
reverted large changes
1 parent 7bdf96a commit 05235b4

File tree

6 files changed

+54
-264
lines changed

6 files changed

+54
-264
lines changed

‎packages/pytest-simcore/src/pytest_simcore/db_entries_mocks.py‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,11 @@
1010
import pytest
1111
import sqlalchemy as sa
1212
from faker import Faker
13-
from models_library.products import ProductName
1413
from models_library.projects import ProjectAtDB, ProjectID
1514
from models_library.projects_nodes_io import NodeID
1615
from simcore_postgres_database.models.comp_pipeline import StateType, comp_pipeline
1716
from simcore_postgres_database.models.comp_tasks import comp_tasks
1817
from simcore_postgres_database.models.projects import ProjectType, projects
19-
from simcore_postgres_database.models.projects_to_products import projects_to_products
2018
from simcore_postgres_database.models.users import UserRole, UserStatus, users
2119
from simcore_postgres_database.utils_projects_nodes import (
2220
ProjectNodeCreate,
@@ -66,7 +64,7 @@ def creator(**user_kwargs) -> dict[str, Any]:
6664

6765
@pytest.fixture
6866
async def project(
69-
sqlalchemy_async_engine: AsyncEngine, faker: Faker, product_name: ProductName
67+
sqlalchemy_async_engine: AsyncEngine, faker: Faker
7068
) -> AsyncIterator[Callable[..., Awaitable[ProjectAtDB]]]:
7169
created_project_ids: list[str] = []
7270

@@ -114,12 +112,6 @@ async def creator(
114112
for node_id in inserted_project.workbench
115113
],
116114
)
117-
await con.execute(
118-
projects_to_products.insert().values(
119-
project_uuid=f"{inserted_project.uuid}",
120-
product_name=product_name,
121-
)
122-
)
123115
print(f"--> created {inserted_project=}")
124116
created_project_ids.append(f"{inserted_project.uuid}")
125117
return inserted_project

‎services/director-v2/tests/conftest.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
"pytest_simcore.docker_registry",
4444
"pytest_simcore.docker_swarm",
4545
"pytest_simcore.environment_configs",
46-
"pytest_simcore.faker_products_data",
4746
"pytest_simcore.faker_projects_data",
4847
"pytest_simcore.faker_users_data",
4948
"pytest_simcore.minio_service",
@@ -356,6 +355,7 @@ async def wrapper(*args, **kwargs):
356355

357356
@pytest.fixture
358357
def mock_osparc_variables_api_auth_rpc(mocker: MockerFixture) -> None:
358+
359359
fake_data = ApiKeyGet.model_validate(ApiKeyGet.model_json_schema()["examples"][0])
360360

361361
async def _create(

‎services/director-v2/tests/unit/with_dbs/comp_scheduler/test_api_route_computations.py‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,11 @@ def _mocked_get_pricing_unit(request, pricing_plan_id: int) -> httpx.Response:
363363
yield respx_mock
364364

365365

366+
@pytest.fixture
367+
def product_name(faker: Faker) -> str:
368+
return faker.name()
369+
370+
366371
@pytest.fixture
367372
def product_api_base_url(faker: Faker) -> AnyHttpUrl:
368373
return TypeAdapter(AnyHttpUrl).validate_python(faker.url())
@@ -906,7 +911,7 @@ async def test_get_computation_from_not_started_computation_task(
906911
node_states={
907912
t.node_id: NodeState(
908913
modified=True,
909-
current_status=RunningState.NOT_STARTED,
914+
currentStatus=RunningState.NOT_STARTED,
910915
progress=None,
911916
dependencies={
912917
NodeID(node)
@@ -978,7 +983,7 @@ async def test_get_computation_from_published_computation_task(
978983
node_states={
979984
t.node_id: NodeState(
980985
modified=True,
981-
current_status=RunningState.PUBLISHED,
986+
currentStatus=RunningState.PUBLISHED,
982987
dependencies={
983988
NodeID(node)
984989
for node, next_nodes in fake_workbench_adjacency.items()

‎services/web/server/src/simcore_service_webserver/db_listener/_db_comp_tasks_listening_task.py‎

Lines changed: 45 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
from models_library.projects_state import RunningState
1919
from pydantic.types import PositiveInt
2020
from servicelib.background_task import periodic_task
21-
from servicelib.logging_utils import log_catch
2221
from simcore_postgres_database.models.comp_tasks import comp_tasks
2322
from simcore_postgres_database.webserver_models import DB_CHANNEL_NAME, projects
2423
from sqlalchemy.sql import select
@@ -74,57 +73,56 @@ async def _get_changed_comp_task_row(
7473
async def _handle_db_notification(
7574
app: web.Application, payload: CompTaskNotificationPayload, conn: SAConnection
7675
) -> None:
77-
with log_catch(_logger, reraise=False):
78-
try:
79-
the_project_owner = await _get_project_owner(conn, payload.project_id)
80-
changed_row = await _get_changed_comp_task_row(conn, payload.task_id)
81-
if not changed_row:
82-
_logger.warning(
83-
"No comp_tasks row found for project_id=%s node_id=%s",
84-
payload.project_id,
85-
payload.node_id,
86-
)
87-
return
88-
89-
if any(f in payload.changes for f in ["outputs", "run_hash"]):
90-
await update_node_outputs(
91-
app,
92-
the_project_owner,
93-
payload.project_id,
94-
payload.node_id,
95-
changed_row.outputs,
96-
changed_row.run_hash,
97-
node_errors=changed_row.errors,
98-
ui_changed_keys=None,
99-
)
100-
101-
if "state" in payload.changes and (changed_row.state is not None):
102-
await _update_project_state(
103-
app,
104-
the_project_owner,
105-
payload.project_id,
106-
payload.node_id,
107-
convert_state_from_db(changed_row.state),
108-
node_errors=changed_row.errors,
109-
)
110-
111-
except exceptions.ProjectNotFoundError as exc:
76+
try:
77+
the_project_owner = await _get_project_owner(conn, payload.project_id)
78+
changed_row = await _get_changed_comp_task_row(conn, payload.task_id)
79+
if not changed_row:
11280
_logger.warning(
113-
"Project %s was not found and cannot be updated. Maybe was it deleted?",
114-
exc.project_uuid,
81+
"No comp_tasks row found for project_id=%s node_id=%s",
82+
payload.project_id,
83+
payload.node_id,
11584
)
116-
except exceptions.ProjectOwnerNotFoundError as exc:
117-
_logger.warning(
118-
"Project owner of project %s could not be found, is the project valid?",
119-
exc.project_uuid,
85+
return
86+
87+
if any(f in payload.changes for f in ["outputs", "run_hash"]):
88+
await update_node_outputs(
89+
app,
90+
the_project_owner,
91+
payload.project_id,
92+
payload.node_id,
93+
changed_row.outputs,
94+
changed_row.run_hash,
95+
node_errors=changed_row.errors,
96+
ui_changed_keys=None,
12097
)
121-
except exceptions.NodeNotFoundError as exc:
122-
_logger.warning(
123-
"Node %s of project %s not found and cannot be updated. Maybe was it deleted?",
124-
exc.node_uuid,
125-
exc.project_uuid,
98+
99+
if "state" in payload.changes and (changed_row.state is not None):
100+
await _update_project_state(
101+
app,
102+
the_project_owner,
103+
payload.project_id,
104+
payload.node_id,
105+
convert_state_from_db(changed_row.state),
106+
node_errors=changed_row.errors,
126107
)
127108

109+
except exceptions.ProjectNotFoundError as exc:
110+
_logger.warning(
111+
"Project %s was not found and cannot be updated. Maybe was it deleted?",
112+
exc.project_uuid,
113+
)
114+
except exceptions.ProjectOwnerNotFoundError as exc:
115+
_logger.warning(
116+
"Project owner of project %s could not be found, is the project valid?",
117+
exc.project_uuid,
118+
)
119+
except exceptions.NodeNotFoundError as exc:
120+
_logger.warning(
121+
"Node %s of project %s not found and cannot be updated. Maybe was it deleted?",
122+
exc.node_uuid,
123+
exc.project_uuid,
124+
)
125+
128126

129127
async def _listen(app: web.Application) -> NoReturn:
130128
listen_query = f"LISTEN {DB_CHANNEL_NAME};"

‎services/web/server/tests/data/workbench_2connected_jupyterlabs.json‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

0 commit comments

Comments
 (0)