adds deepdiff

Author: pcrespov

services/web/server/requirements/_base.in

@@ -32,6 +32,7 @@ aiosmtplib # email
 asyncpg # db
 captcha
 cryptography # security
+deepdiff[optimize] # diffs data-structures
 faker # Only used in dev-mode for proof-of-concepts
 gunicorn[setproctitle]
 httpx

services/web/server/requirements/_base.txt

@@ -189,6 +189,8 @@ cryptography==41.0.7
     #   -c requirements/../../../../requirements/constraints.txt
     #   -r requirements/_base.in
     #   aiohttp-session
+deepdiff==8.1.1
+    # via -r requirements/_base.in
 deprecated==1.2.14
     # via
     #   opentelemetry-api
@@ -455,6 +457,8 @@ opentelemetry-util-http==0.48b0
     #   opentelemetry-instrumentation-aiohttp-client
     #   opentelemetry-instrumentation-aiohttp-server
     #   opentelemetry-instrumentation-requests
+orderly-set==5.2.3
+    # via deepdiff
 orjson==3.10.0
     # via
     #   -c requirements/../../../../packages/common-library/requirements/../../../requirements/constraints.txt
@@ -504,6 +508,7 @@ orjson==3.10.0
     #   -r requirements/../../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/_base.in
     #   -r requirements/../../../../packages/simcore-sdk/requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/_base.in
     #   -r requirements/_base.in
+    #   deepdiff
 packaging==24.1
     # via
     #   -r requirements/../../../../packages/simcore-sdk/requirements/_base.in

services/web/server/src/simcore_service_webserver/licenses/_licensed_items_service.py

@@ -7,6 +7,7 @@
 from typing import NamedTuple
 
 from aiohttp import web
+from deepdiff import DeepDiff
 from models_library.licensed_items import (
     LicensedItemDB,
     LicensedItemID,
@@ -48,18 +49,6 @@ class RegistrationResult(NamedTuple):
     message: str | None
 
 
-def _compute_difference(old_data: dict, new_data: dict):
-    differences = {
-        k: {"old": old_data[k], "new": new_data[k]}
-        for k in old_data
-        if old_data[k] != new_data.get(k)
-    }
-    differences.update(
-        {k: {"old": None, "new": new_data[k]} for k in new_data if k not in old_data}
-    )
-    return differences
-
-
 async def register_resource_as_licensed_item(
     app: web.Application,
     *,
@@ -77,6 +66,8 @@ async def register_resource_as_licensed_item(
     #
     # This approach not only reduces unnecessary error logs but also helps prevent race conditions
     # when multiple concurrent calls attempt to register the same resource.
+
+    resource_key = f"{licensed_resource_type}, {licensed_resource_name}"
     new_licensed_resource_data = licensed_resource_data.model_dump(
         mode="json", exclude_unset=True
     )
@@ -89,20 +80,21 @@ async def register_resource_as_licensed_item(
         )
 
         if licensed_item.licensed_resource_data != new_licensed_resource_data:
-            # differences = _compute_difference(
-            #    licensed_item.licensed_resource_data or {},
-            #    new_licensed_resource_data,
-            # )
-            differences = "there are differences TMP"
-            msg = f"DIFFERENT_RESOURCE: {licensed_resource_name}, {licensed_resource_type}. Difference:\n{pformat(differences)}"
+            ddiff = DeepDiff(
+                licensed_item.licensed_resource_data, new_licensed_resource_data
+            )
+            msg = (
+                f"DIFFERENT_RESOURCE: {resource_key=} found in licensed_item_id={licensed_item.licensed_item_id} with different data. "
+                f"Diff:\n\t{pformat(ddiff, indent=2, width=200)}"
+            )
             return RegistrationResult(
                 licensed_item, RegistrationState.DIFFERENT_RESOURCE, msg
             )
 
         return RegistrationResult(
             licensed_item,
             RegistrationState.ALREADY_REGISTERED,
-            f"ALREADY_REGISTERED: {licensed_resource_name}, {licensed_resource_type}",
+            f"ALREADY_REGISTERED: {resource_key=} found in licensed_item_id={licensed_item.licensed_item_id}",
         )
 
     except LicensedItemNotFoundError:
@@ -119,7 +111,7 @@ async def register_resource_as_licensed_item(
         return RegistrationResult(
             licensed_item,
             RegistrationState.NEWLY_REGISTERED,
-            f"NEWLY_REGISTERED: {licensed_resource_name}, {licensed_resource_type}",
+            f"NEWLY_REGISTERED: {resource_key=} registered with licensed_item_id={licensed_item.licensed_item_id}",
         )
 
 

services/web/server/tests/unit/with_dbs/04/licenses/test_itis_vip_service.py

@@ -189,7 +189,7 @@ async def test_sync_itis_vip_as_licensed_items(
                 (
                     licensed_item3,
                     state3,
-                    _,
+                    msg,
                 ) = await _licensed_items_service.register_resource_as_licensed_item(
                     client.app,
                     licensed_resource_name=f"{category}/{vip.id}",
@@ -204,9 +204,10 @@ async def test_sync_itis_vip_as_licensed_items(
                     ),
                     licensed_item_display_name="foo",
                 )
-
                 assert state3 == RegistrationState.DIFFERENT_RESOURCE
                 assert licensed_item2 == licensed_item3
+                # {'values_changed': {"root['features']['functionality']": {'new_value': 'Non-Posable', 'old_value': 'Posable'}}}
+                assert "functionality" in msg
 
 
 async def test_itis_vip_syncer_service(