models-library is not included

Author: sanderegg

packages/postgres-database/tests/conftest.py

@@ -19,7 +19,6 @@
 from aiopg.sa.engine import Engine
 from aiopg.sa.result import ResultProxy, RowProxy
 from faker import Faker
-from models_library.products import ProductName
 from pytest_simcore.helpers import postgres_tools
 from pytest_simcore.helpers.faker_factories import (
     random_group,
@@ -328,10 +327,10 @@ async def _creator(project_uuid: uuid.UUID) -> ProjectNode:
 @pytest.fixture
 async def create_fake_product(
     asyncpg_engine: AsyncEngine,
-) -> AsyncIterator[Callable[[ProductName], Awaitable[Row]]]:
+) -> AsyncIterator[Callable[[str], Awaitable[Row]]]:
     created_product_names = set()
 
-    async def _creator(product_name: ProductName) -> Row:
+    async def _creator(product_name: str) -> Row:
         async with asyncpg_engine.begin() as connection:
             result = await connection.execute(
                 sa.insert(products)

packages/postgres-database/tests/test_utils_groups_extra_properties.py

@@ -11,7 +11,6 @@
 import sqlalchemy
 from aiopg.sa.result import RowProxy
 from faker import Faker
-from models_library.products import ProductName
 from simcore_postgres_database.models.groups import GroupType, groups, user_to_groups
 from simcore_postgres_database.models.groups_extra_properties import (
     groups_extra_properties,
@@ -86,7 +85,7 @@ async def test_get(
     connection: aiopg.sa.connection.SAConnection,
     registered_user: RowProxy,
     product_name: str,
-    create_fake_product: Callable[[ProductName], Awaitable[Row]],
+    create_fake_product: Callable[[str], Awaitable[Row]],
     create_fake_group_extra_properties: Callable[..., Awaitable[GroupExtraProperties]],
 ):
     with pytest.raises(GroupExtraPropertiesNotFoundError):
@@ -108,7 +107,7 @@ async def test_get_v2(
     asyncpg_engine: AsyncEngine,
     registered_user: RowProxy,
     product_name: str,
-    create_fake_product: Callable[[ProductName], Awaitable[Row]],
+    create_fake_product: Callable[[str], Awaitable[Row]],
     create_fake_group_extra_properties: Callable[..., Awaitable[GroupExtraProperties]],
 ):
     with pytest.raises(GroupExtraPropertiesNotFoundError):
@@ -159,7 +158,7 @@ async def test_get_aggregated_properties_for_user_returns_properties_in_expected
     connection: aiopg.sa.connection.SAConnection,
     product_name: str,
     registered_user: RowProxy,
-    create_fake_product: Callable[[ProductName], Awaitable[Row]],
+    create_fake_product: Callable[[str], Awaitable[Row]],
     create_fake_group: Callable[..., Awaitable[RowProxy]],
     create_fake_group_extra_properties: Callable[..., Awaitable[GroupExtraProperties]],
     everyone_group_id: int,
@@ -229,7 +228,7 @@ async def test_get_aggregated_properties_for_user_returns_properties_in_expected
     connection: aiopg.sa.connection.SAConnection,
     product_name: str,
     registered_user: RowProxy,
-    create_fake_product: Callable[[ProductName], Awaitable[Row]],
+    create_fake_product: Callable[[str], Awaitable[Row]],
     create_fake_group: Callable[..., Awaitable[RowProxy]],
     create_fake_group_extra_properties: Callable[..., Awaitable[GroupExtraProperties]],
     everyone_group_id: int,
@@ -276,7 +275,7 @@ async def test_get_aggregated_properties_for_user_returns_property_values_as_tru
     connection: aiopg.sa.connection.SAConnection,
     product_name: str,
     registered_user: RowProxy,
-    create_fake_product: Callable[[ProductName], Awaitable[Row]],
+    create_fake_product: Callable[[str], Awaitable[Row]],
     create_fake_group: Callable[..., Awaitable[RowProxy]],
     create_fake_group_extra_properties: Callable[..., Awaitable[GroupExtraProperties]],
     everyone_group_id: int,
@@ -387,7 +386,7 @@ async def test_get_aggregated_properties_for_user_returns_property_values_as_tru
     connection: aiopg.sa.connection.SAConnection,
     product_name: str,
     registered_user: RowProxy,
-    create_fake_product: Callable[[ProductName], Awaitable[Row]],
+    create_fake_product: Callable[[str], Awaitable[Row]],
     create_fake_group: Callable[..., Awaitable[RowProxy]],
     create_fake_group_extra_properties: Callable[..., Awaitable[GroupExtraProperties]],
     everyone_group_id: int,

packages/postgres-database/tests/test_utils_user_preferences.py

@@ -29,7 +29,7 @@ def preference_two() -> str:
 
 @pytest.fixture
 async def product_name(
-    create_fake_product: Callable[[ProductName], Awaitable[Row]],
+    create_fake_product: Callable[[str], Awaitable[Row]],
 ) -> str:
     product = await create_fake_product("fake-product")
     return product[0]
@@ -204,7 +204,7 @@ async def test__same_preference_name_product_name__different_users(
 
 async def test__same_user_preference_name__different_product_name(
     connection: AsyncConnection,
-    create_fake_product: Callable[[ProductName], Awaitable[Row]],
+    create_fake_product: Callable[[str], Awaitable[Row]],
     preference_repo: type[BasePreferencesRepo],
     preference_one: str,
     faker: Faker,