review @GitHK @pcrespov

Author: matusdrobuliak66

packages/service-library/src/servicelib/redis/__init__.py

@@ -11,8 +11,7 @@
 from ._project_document_version import (
     PROJECT_DB_UPDATE_REDIS_LOCK_KEY,
     PROJECT_DOCUMENT_VERSION_KEY,
-    get_and_increment_project_document_version,
-    get_project_document_version,
+    increment_and_return_project_document_version,
 )
 from ._project_lock import (
     get_project_locked_state,
@@ -25,8 +24,7 @@
     "CouldNotAcquireLockError",
     "CouldNotConnectToRedisError",
     "exclusive",
-    "get_and_increment_project_document_version",
-    "get_project_document_version",
+    "increment_and_return_project_document_version",
     "get_project_locked_state",
     "handle_redis_returns_union_types",
     "is_project_locked",

packages/service-library/src/servicelib/redis/_project_document_version.py

@@ -16,11 +16,11 @@
 PROJECT_DB_UPDATE_REDIS_LOCK_KEY: Final[str] = "project_db_update:{}"
 
 
-async def get_and_increment_project_document_version(
+async def increment_and_return_project_document_version(
     redis_client: RedisClientSDK, project_uuid: ProjectID
 ) -> int:
     """
-    Atomically gets and increments the project document version using Redis.
+    Atomically increments and returns the project document version using Redis.
     Returns the incremented version number.
 
     This function ensures thread-safe version incrementing by using Redis INCR command
@@ -37,21 +37,3 @@ async def get_and_increment_project_document_version(
     # If key doesn't exist, it's created with value 0 and then incremented to 1
     output = await redis_client.redis.incr(version_key)
     return int(output)
-
-
-async def get_project_document_version(
-    redis_client: RedisClientSDK, project_uuid: ProjectID
-) -> int:
-    """
-    Gets the current project document version without incrementing it.
-
-    Args:
-        redis_client: The Redis client SDK instance
-        project_uuid: The project UUID to get version for
-
-    Returns:
-        The current version number (0 if no version exists yet)
-    """
-    version_key = PROJECT_DOCUMENT_VERSION_KEY.format(project_uuid)
-    version = await redis_client.redis.get(version_key)
-    return int(version) if version is not None else 0

packages/service-library/tests/redis/test_project_document_version.py

@@ -9,8 +9,7 @@
 from models_library.projects import ProjectID
 from servicelib.redis import RedisClientSDK
 from servicelib.redis._project_document_version import (
-    get_and_increment_project_document_version,
-    get_project_document_version,
+    increment_and_return_project_document_version,
 )
 
 pytest_simcore_core_services_selection = [
@@ -31,38 +30,21 @@ async def test_project_document_version_workflow(
 ):
     """Test the complete workflow of getting and incrementing project document versions."""
 
-    # Initially, version should be 0 (no version exists yet)
-    current_version = await get_project_document_version(redis_client_sdk, project_uuid)
-    assert current_version == 0
-
     # First increment should return 1
-    new_version = await get_and_increment_project_document_version(
+    new_version = await increment_and_return_project_document_version(
         redis_client_sdk, project_uuid
     )
     assert new_version == 1
 
-    # Getting current version should now return 1
-    current_version = await get_project_document_version(redis_client_sdk, project_uuid)
-    assert current_version == 1
-
     # Second increment should return 2
-    new_version = await get_and_increment_project_document_version(
+    new_version = await increment_and_return_project_document_version(
         redis_client_sdk, project_uuid
     )
     assert new_version == 2
 
-    # Getting current version should now return 2
-    current_version = await get_project_document_version(redis_client_sdk, project_uuid)
-    assert current_version == 2
-
     # Multiple increments should work correctly
     for expected_version in range(3, 6):
-        new_version = await get_and_increment_project_document_version(
+        new_version = await increment_and_return_project_document_version(
             redis_client_sdk, project_uuid
         )
         assert new_version == expected_version
-
-        current_version = await get_project_document_version(
-            redis_client_sdk, project_uuid
-        )
-        assert current_version == expected_version

services/web/server/src/simcore_service_webserver/projects/_projects_repository_legacy.py

@@ -48,7 +48,7 @@
 from servicelib.redis import (
     PROJECT_DB_UPDATE_REDIS_LOCK_KEY,
     exclusive,
-    get_and_increment_project_document_version,
+    increment_and_return_project_document_version,
 )
 from simcore_postgres_database.aiopg_errors import UniqueViolation
 from simcore_postgres_database.models.groups import user_to_groups
@@ -1001,7 +1001,7 @@ async def _update_workbench_and_notify() -> (
 
             # Increment document version and notify users
             redis_client_sdk = get_redis_document_manager_client_sdk(self._app)
-            document_version = await get_and_increment_project_document_version(
+            document_version = await increment_and_return_project_document_version(
                 redis_client=redis_client_sdk, project_uuid=project_uuid
             )
             await notify_project_document_updated(

services/web/server/src/simcore_service_webserver/projects/_projects_service.py

@@ -86,8 +86,8 @@
 from servicelib.redis import (
     PROJECT_DB_UPDATE_REDIS_LOCK_KEY,
     exclusive,
-    get_and_increment_project_document_version,
     get_project_locked_state,
+    increment_and_return_project_document_version,
     is_project_locked,
     with_project_locked,
 )
@@ -232,7 +232,7 @@ async def _patch_and_notify() -> None:
             ),
         )
         redis_client_sdk = get_redis_document_manager_client_sdk(app)
-        document_version = await get_and_increment_project_document_version(
+        document_version = await increment_and_return_project_document_version(
             redis_client=redis_client_sdk, project_uuid=project_uuid
         )
         await notify_project_document_updated(

services/web/server/tests/unit/with_dbs/02/test_projects_patch_project_and_notify_users_locking.py

@@ -20,7 +20,7 @@
 from models_library.projects import ProjectID
 from pytest_simcore.helpers.webserver_users import UserInfoDict
 from servicelib.aiohttp import status
-from servicelib.redis import get_and_increment_project_document_version
+from servicelib.redis import increment_and_return_project_document_version
 from simcore_service_webserver.db.models import UserRole
 from simcore_service_webserver.projects._projects_service import (
     patch_project_and_notify_users,
@@ -73,7 +73,7 @@ async def test_patch_project_and_notify_users_sequential(
 
     # Get version after first patch
     redis_client = get_redis_document_manager_client_sdk(client.app)
-    version_1 = await get_and_increment_project_document_version(
+    version_1 = await increment_and_return_project_document_version(
         redis_client=redis_client, project_uuid=project_uuid
     )
 
@@ -86,7 +86,7 @@ async def test_patch_project_and_notify_users_sequential(
     )
 
     # Get version after second patch
-    version_2 = await get_and_increment_project_document_version(
+    version_2 = await increment_and_return_project_document_version(
         redis_client=redis_client, project_uuid=project_uuid
     )
 
@@ -115,7 +115,7 @@ async def test_patch_project_and_notify_users_concurrent_locking(
 
     # Get initial version
     redis_client = get_redis_document_manager_client_sdk(client.app)
-    initial_version = await get_and_increment_project_document_version(
+    initial_version = await increment_and_return_project_document_version(
         redis_client=redis_client, project_uuid=project_uuid
     )
 
@@ -134,7 +134,7 @@ async def test_patch_project_and_notify_users_concurrent_locking(
     await asyncio.gather(*tasks)
 
     # Get final version
-    final_version = await get_and_increment_project_document_version(
+    final_version = await increment_and_return_project_document_version(
         redis_client=redis_client, project_uuid=project_uuid
     )
 
@@ -169,13 +169,13 @@ async def test_patch_project_and_notify_users_concurrent_different_projects(
     redis_client = get_redis_document_manager_client_sdk(client.app)
 
     # Get initial versions
-    initial_version_1 = await get_and_increment_project_document_version(
+    initial_version_1 = await increment_and_return_project_document_version(
         redis_client=redis_client, project_uuid=project_uuid_1
     )
-    initial_version_2 = await get_and_increment_project_document_version(
+    initial_version_2 = await increment_and_return_project_document_version(
         redis_client=redis_client, project_uuid=project_uuid_2
     )
-    initial_version_3 = await get_and_increment_project_document_version(
+    initial_version_3 = await increment_and_return_project_document_version(
         redis_client=redis_client, project_uuid=project_uuid_3
     )
 
@@ -192,13 +192,13 @@ async def test_patch_project_and_notify_users_concurrent_different_projects(
     )
 
     # Get final versions
-    final_version_1 = await get_and_increment_project_document_version(
+    final_version_1 = await increment_and_return_project_document_version(
         redis_client=redis_client, project_uuid=project_uuid_1
     )
-    final_version_2 = await get_and_increment_project_document_version(
+    final_version_2 = await increment_and_return_project_document_version(
         redis_client=redis_client, project_uuid=project_uuid_2
     )
-    final_version_3 = await get_and_increment_project_document_version(
+    final_version_3 = await increment_and_return_project_document_version(
         redis_client=redis_client, project_uuid=project_uuid_3
     )