port-ocean 0.24.17__py3-none-any.whl → 0.24.19__py3-none-any.whl

port_ocean/core/handlers/entities_state_applier/port/applier.py

@@ -1,3 +1,4 @@
+from collections import defaultdict
 from loguru import logger
 
 from port_ocean.clients.port.types import UserAgentType
@@ -125,20 +126,27 @@ class HttpEntitiesStateApplier(BaseEntitiesStateApplier):
     ) -> list[Entity]:
         logger.info(f"Upserting {len(entities)} entities")
         modified_entities: list[Entity] = []
-        upserted_entities: list[tuple[bool, Entity]] = []
 
-        upserted_entities = await self.context.port_client.upsert_entities_in_batches(
-            entities,
-            event.port_app_config.get_port_request_options(),
-            user_agent_type,
-            should_raise=False,
-        )
+        blueprint_groups: dict[str, list[Entity]] = defaultdict(list)
+        for entity in entities:
+            blueprint_groups[entity.blueprint].append(entity)
+
+        for blueprint_entities in blueprint_groups.values():
+            upserted_entities = (
+                await self.context.port_client.upsert_entities_in_batches(
+                    blueprint_entities,
+                    event.port_app_config.get_port_request_options(),
+                    user_agent_type,
+                    should_raise=False,
+                )
+            )
+
+            for is_upserted, entity in upserted_entities:
+                if is_upserted:
+                    modified_entities.append(entity)
+                else:
+                    event.entity_topological_sorter.register_entity(entity)
 
-        for is_upserted, entity in upserted_entities:
-            if is_upserted:
-                modified_entities.append(entity)
-            else:
-                event.entity_topological_sorter.register_entity(entity)
         return modified_entities
 
     async def delete(

port_ocean/core/integrations/mixins/sync_raw.py

@@ -735,6 +735,8 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
 
             logger.info("Finished executing resync_complete hooks")
 
+        return True
+
 
     @TimeMetric(MetricPhase.RESYNC)
     async def sync_raw_all(
@@ -805,7 +807,7 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
                 logger.warning("Resync aborted successfully, skipping delete phase. This leads to an incomplete state")
                 raise
             else:
-                await self.resync_reconciliation(
+                success = await self.resync_reconciliation(
                     creation_results,
                     did_fetched_current_state,
                     user_agent_type,
@@ -813,6 +815,7 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
                     silent
                 )
                 await ocean.metrics.report_sync_metrics(kinds=[MetricResourceKind.RECONCILIATION])
+                return success
             finally:
                 await ocean.app.cache_provider.clear()
                 if ocean.app.process_execution_mode == ProcessExecutionMode.multi_process:

port_ocean/tests/core/handlers/entities_state_applier/test_applier.py

@@ -228,3 +228,61 @@ async def test_using_create_entity_helper(
 
         mock_upsert.assert_called_once()
         assert len(result) == 1
+
+
+@pytest.mark.asyncio
+async def test_upsert_groups_entities_by_blueprint(
+    mock_ocean: Ocean,
+    mock_context: PortOceanContext,
+    mock_port_app_config: PortAppConfig,
+) -> None:
+    """Test that upsert groups entities by blueprint and calls upsert_entities_in_batches separately for each group."""
+    applier = HttpEntitiesStateApplier(mock_context)
+
+    # Create entities with different blueprints
+    service_entity_1 = Entity(identifier="service_1", blueprint="service")
+    service_entity_2 = Entity(identifier="service_2", blueprint="service")
+    deployment_entity = Entity(identifier="deployment_1", blueprint="deployment")
+    user_entity = Entity(identifier="user_1", blueprint="user")
+
+    entities = [service_entity_1, deployment_entity, service_entity_2, user_entity]
+
+    async with event_context(EventType.RESYNC, trigger_type="machine") as event:
+        event.port_app_config = mock_port_app_config
+
+        mock_ocean.config.upsert_entities_batch_max_length = 100
+        mock_ocean.config.upsert_entities_batch_max_size_in_bytes = 1000
+
+        # Mock the upsert_entities_in_batches method to track calls
+        mock_upsert = AsyncMock()
+        mock_upsert.side_effect = [
+            [
+                (True, service_entity_1),
+                (True, service_entity_2),
+            ],  # First call for "service" blueprint
+            [(True, deployment_entity)],  # Second call for "deployment" blueprint
+            [(True, user_entity)],  # Third call for "user" blueprint
+        ]
+        setattr(mock_ocean.port_client, "upsert_entities_in_batches", mock_upsert)
+
+        result = await applier.upsert(entities, UserAgentType.exporter)
+
+        assert mock_upsert.call_count == 3
+
+        assert len(result) == 4
+
+        calls = mock_upsert.call_args_list
+
+        called_entities_groups = [call[0][0] for call in calls]
+        blueprint_counts = {}
+        for entities_group in called_entities_groups:
+            blueprint = entities_group[0].blueprint
+            for entity in entities_group:
+                assert entity.blueprint == blueprint
+            blueprint_counts[blueprint] = len(entities_group)
+
+        # Verify the expected blueprint counts
+        assert blueprint_counts["service"] == 2
+        assert blueprint_counts["deployment"] == 1
+        assert blueprint_counts["user"] == 1
+        assert len(blueprint_counts) == 3

port_ocean/tests/core/handlers/mixins/test_sync_raw.py

@@ -139,9 +139,10 @@ async def test_sync_raw_mixin_self_dependency(
                 mock_order_by_entities_dependencies,
             ):
 
-                await mock_sync_raw_mixin.sync_raw_all(
+                res = await mock_sync_raw_mixin.sync_raw_all(
                     trigger_type="machine", user_agent_type=UserAgentType.exporter
                 )
+                assert res is True
 
                 assert (
                     len(event.entity_topological_sorter.entities) == 1
@@ -276,9 +277,10 @@ async def test_sync_raw_mixin_circular_dependency(
                 mock_order_by_entities_dependencies,
             ):
 
-                await mock_sync_raw_mixin.sync_raw_all(
+                res = await mock_sync_raw_mixin.sync_raw_all(
                     trigger_type="machine", user_agent_type=UserAgentType.exporter
                 )
+                assert res is True
 
                 assert (
                     len(event.entity_topological_sorter.entities) == 2
@@ -420,9 +422,10 @@ async def test_sync_raw_mixin_dependency(
                 mock_order_by_entities_dependencies,
             ):
 
-                await mock_sync_raw_mixin.sync_raw_all(
+                res = await mock_sync_raw_mixin.sync_raw_all(
                     trigger_type="machine", user_agent_type=UserAgentType.exporter
                 )
+                assert res is True
 
                 assert event.entity_topological_sorter.register_entity.call_count == 5
                 assert (

{port_ocean-0.24.17.dist-info → port_ocean-0.24.19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: port-ocean
-Version: 0.24.17
+Version: 0.24.19
 Summary: Port Ocean is a CLI tool for managing your Port projects.
 Home-page: https://app.getport.io
 Keywords: ocean,port-ocean,port

{port_ocean-0.24.17.dist-info → port_ocean-0.24.19.dist-info}/RECORD

@@ -95,7 +95,7 @@ port_ocean/core/handlers/base.py,sha256=cTarblazu8yh8xz2FpB-dzDKuXxtoi143XJgPbV_
 port_ocean/core/handlers/entities_state_applier/__init__.py,sha256=kgLZDCeCEzi4r-0nzW9k78haOZNf6PX7mJOUr34A4c8,173
 port_ocean/core/handlers/entities_state_applier/base.py,sha256=5wHL0icfFAYRPqk8iV_wN49GdJ3aRUtO8tumSxBi4Wo,2268
 port_ocean/core/handlers/entities_state_applier/port/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-port_ocean/core/handlers/entities_state_applier/port/applier.py,sha256=QzN8OWgp-i4bRwslnLo5qjS7rt93Stceq9C4FD11Vy4,6372
+port_ocean/core/handlers/entities_state_applier/port/applier.py,sha256=NsLW35H1dhP5FFD7kHZxA2ndSBcD_-btan7qNWfvWrs,6683
 port_ocean/core/handlers/entities_state_applier/port/get_related_entities.py,sha256=1zncwCbE-Gej0xaWKlzZgoXxOBe9bgs_YxlZ8QW3NdI,1751
 port_ocean/core/handlers/entities_state_applier/port/order_by_entities_dependencies.py,sha256=lyv6xKzhYfd6TioUgR3AVRSJqj7JpAaj1LxxU2xAqeo,1720
 port_ocean/core/handlers/entity_processor/__init__.py,sha256=FvFCunFg44wNQoqlybem9MthOs7p1Wawac87uSXz9U8,156
@@ -121,7 +121,7 @@ port_ocean/core/integrations/mixins/events.py,sha256=2L7P3Jhp8XBqddh2_o9Cn4N261n
 port_ocean/core/integrations/mixins/handler.py,sha256=mZ7-0UlG3LcrwJttFbMe-R4xcOU2H_g33tZar7PwTv8,3771
 port_ocean/core/integrations/mixins/live_events.py,sha256=zM24dhNc7uHx9XYZ6toVhDADPA90EnpOmZxgDegFZbA,4196
 port_ocean/core/integrations/mixins/sync.py,sha256=Vm_898pLKBwfVewtwouDWsXoxcOLicnAy6pzyqqk6U8,4053
-port_ocean/core/integrations/mixins/sync_raw.py,sha256=0wFpyWSlKREIb3BNfkUg1Tj6ueivsig2YjPmYchb-mY,33823
+port_ocean/core/integrations/mixins/sync_raw.py,sha256=NTclUHBYH_RK895zM3VGfd3MyPRYvfqnWudXYN5RFqQ,33885
 port_ocean/core/integrations/mixins/utils.py,sha256=N76dNu1Y6UEg0_pcSdF4RO6dQIZ8EBfX3xMelgWdMxM,3779
 port_ocean/core/models.py,sha256=DNbKpStMINI2lIekKprTqBevqkw_wFuFayN19w1aDfQ,2893
 port_ocean/core/ocean_types.py,sha256=4VipWFOHEh_d9LmWewQccwx1p2dtrRYW0YURVgNsAjo,1398
@@ -163,10 +163,10 @@ port_ocean/tests/clients/port/mixins/test_organization_mixin.py,sha256=zzKYz3h8d
 port_ocean/tests/conftest.py,sha256=JXASSS0IY0nnR6bxBflhzxS25kf4iNaABmThyZ0mZt8,101
 port_ocean/tests/core/conftest.py,sha256=7K_M1--wQ08VmiQRB0vo1nst2X00cwsuBS5UfERsnG8,7589
 port_ocean/tests/core/defaults/test_common.py,sha256=sR7RqB3ZYV6Xn6NIg-c8k5K6JcGsYZ2SCe_PYX5vLYM,5560
-port_ocean/tests/core/handlers/entities_state_applier/test_applier.py,sha256=eJYXc7AwrV0XRS6HpixwzghjB3pspT5Gxr9twvJE7fk,8290
+port_ocean/tests/core/handlers/entities_state_applier/test_applier.py,sha256=_CZyViY9_gnxjY6ogWcDdmEDuejvpALogf9ESjVAwFY,10675
 port_ocean/tests/core/handlers/entity_processor/test_jq_entity_processor.py,sha256=8WpMn559Mf0TFWmloRpZrVgr6yWwyA0C4n2lVHCtyq4,13596
 port_ocean/tests/core/handlers/mixins/test_live_events.py,sha256=iAwVpr3n3PIkXQLw7hxd-iB_SR_vyfletVXJLOmyz28,12480
-port_ocean/tests/core/handlers/mixins/test_sync_raw.py,sha256=-05ec3gRsmnMgmqzkIRjpm_yMdRZc3O3Br3RLFW2Kjw,44297
+port_ocean/tests/core/handlers/mixins/test_sync_raw.py,sha256=p1AyIc6Rx18miL6Sln9gNvhC39SkXXIqYQstyYDww1c,44420
 port_ocean/tests/core/handlers/port_app_config/test_api.py,sha256=eJZ6SuFBLz71y4ca3DNqKag6d6HUjNJS0aqQPwiLMTI,1999
 port_ocean/tests/core/handlers/port_app_config/test_base.py,sha256=hSh556bJM9zuELwhwnyKSfd9z06WqWXIfe-6hCl5iKI,9799
 port_ocean/tests/core/handlers/queue/test_local_queue.py,sha256=9Ly0HzZXbs6Rbl_bstsIdInC3h2bgABU3roP9S_PnJM,2582
@@ -200,8 +200,8 @@ port_ocean/utils/repeat.py,sha256=U2OeCkHPWXmRTVoPV-VcJRlQhcYqPWI5NfmPlb1JIbc,32
 port_ocean/utils/signal.py,sha256=mMVq-1Ab5YpNiqN4PkiyTGlV_G0wkUDMMjTZp5z3pb0,1514
 port_ocean/utils/time.py,sha256=pufAOH5ZQI7gXvOvJoQXZXZJV-Dqktoj9Qp9eiRwmJ4,1939
 port_ocean/version.py,sha256=UsuJdvdQlazzKGD3Hd5-U7N69STh8Dq9ggJzQFnu9fU,177
-port_ocean-0.24.17.dist-info/LICENSE.md,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-port_ocean-0.24.17.dist-info/METADATA,sha256=-kHdBYUARFg7MopioSN5dMmVtqE327eyVKUhQ8QcE1M,6856
-port_ocean-0.24.17.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-port_ocean-0.24.17.dist-info/entry_points.txt,sha256=F_DNUmGZU2Kme-8NsWM5LLE8piGMafYZygRYhOVtcjA,54
-port_ocean-0.24.17.dist-info/RECORD,,
+port_ocean-0.24.19.dist-info/LICENSE.md,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+port_ocean-0.24.19.dist-info/METADATA,sha256=HE9-dswSXnOaFu4p3hJkDWy6syqUIADmnYhVSN2F4Vg,6856
+port_ocean-0.24.19.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+port_ocean-0.24.19.dist-info/entry_points.txt,sha256=F_DNUmGZU2Kme-8NsWM5LLE8piGMafYZygRYhOVtcjA,54
+port_ocean-0.24.19.dist-info/RECORD,,