♻️ Refactor products plugin before extension (#4741)

Author: pcrespov

packages/postgres-database/tests/products/conftest.py

@@ -4,7 +4,7 @@
 # pylint: disable=unused-argument
 
 
-from typing import Callable
+from collections.abc import Callable
 
 import pytest
 from aiopg.sa.exc import ResourceClosedError
@@ -38,12 +38,12 @@ async def _make(conn) -> None:
                 )
                 .on_conflict_do_update(
                     index_elements=[products.c.name],
-                    set_=dict(
-                        display_name=f"Product {name.capitalize()}",
-                        short_name=name[:3].lower(),
-                        host_regex=regex,
-                        priority=n,
-                    ),
+                    set_={
+                        "display_name": f"Product {name.capitalize()}",
+                        "short_name": name[:3].lower(),
+                        "host_regex": regex,
+                        "priority": n,
+                    },
                 )
             )
 

packages/postgres-database/tests/products/test_models_products.py

@@ -5,9 +5,9 @@
 
 
 import json
+from collections.abc import Callable
 from pathlib import Path
 from pprint import pprint
-from typing import Callable
 
 import sqlalchemy as sa
 from aiopg.sa.engine import Engine

packages/postgres-database/tests/products/test_utils_products.py

@@ -5,7 +5,7 @@
 
 
 import asyncio
-from typing import Callable
+from collections.abc import Callable
 
 import pytest
 import sqlalchemy as sa
@@ -118,10 +118,10 @@ async def _auto_create_products_groups():
                 )
             ):
                 # get or create
-                product_group_id = await get_or_create_product_group(
+                return await get_or_create_product_group(
                     conn, product_name=product_row.name
                 )
-                return product_group_id
+            return None
 
     tasks = [asyncio.create_task(_auto_create_products_groups()) for _ in range(5)]
 

services/web/server/src/simcore_service_webserver/announcements/_handlers.py

@@ -3,7 +3,7 @@
 from aiohttp import web
 
 from .._meta import api_version_prefix
-from ..products.plugin import get_product_name
+from ..products.api import get_product_name
 from ..utils_aiohttp import envelope_json_response
 from . import _api
 from ._models import Announcement

services/web/server/src/simcore_service_webserver/email/_handlers.py

@@ -8,7 +8,7 @@
 
 from .._meta import API_VTAG
 from ..login.decorators import login_required
-from ..products.plugin import Product, get_current_product, get_product_template_path
+from ..products.api import Product, get_current_product, get_product_template_path
 from ..security.decorators import permission_required
 from ..utils import get_traceback_string
 from ..utils_aiohttp import envelope_json_response

services/web/server/src/simcore_service_webserver/groups/_handlers.py

@@ -24,7 +24,7 @@
 from .._constants import RQT_USERID_KEY
 from .._meta import API_VTAG
 from ..login.decorators import login_required
-from ..products.plugin import Product, get_current_product
+from ..products.api import Product, get_current_product
 from ..scicrunch.db import ResearchResourceRepository
 from ..scicrunch.errors import InvalidRRID, ScicrunchError
 from ..scicrunch.models import ResearchResource, ResourceHit

services/web/server/src/simcore_service_webserver/login/handlers_2fa.py

@@ -10,7 +10,7 @@
 from servicelib.error_codes import create_error_code
 from servicelib.mimetype_constants import MIMETYPE_APPLICATION_JSON
 
-from ..products.plugin import Product, get_current_product
+from ..products.api import Product, get_current_product
 from ..session.access_policies import session_access_required
 from ._2fa import (
     create_2fa_code,

services/web/server/src/simcore_service_webserver/login/handlers_auth.py

@@ -13,7 +13,7 @@
 from simcore_postgres_database.models.users import UserRole
 
 from .._meta import API_VTAG
-from ..products.plugin import Product, get_current_product
+from ..products.api import Product, get_current_product
 from ..security.api import check_password, forget
 from ..session.access_policies import (
     on_success_grant_session_access_to,

services/web/server/src/simcore_service_webserver/login/handlers_change.py

@@ -9,7 +9,7 @@
 from servicelib.request_keys import RQT_USERID_KEY
 
 from .._meta import API_VTAG
-from ..products.plugin import Product, get_current_product
+from ..products.api import Product, get_current_product
 from ..security.api import check_password, encrypt_password
 from ..utils import HOUR
 from ..utils_rate_limiting import global_rate_limit_route

services/web/server/src/simcore_service_webserver/login/handlers_confirmation.py

@@ -13,7 +13,7 @@
 from simcore_postgres_database.errors import UniqueViolation
 from yarl import URL
 
-from ..products.plugin import Product, get_current_product
+from ..products.api import Product, get_current_product
 from ..security.api import encrypt_password
 from ..session.access_policies import session_access_required
 from ..utils import MINUTE