port-ocean 0.24.17__tar.gz → 0.24.19__tar.gz

{port_ocean-0.24.17 → port_ocean-0.24.19}/PKG-INFO

@@ -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 → port_ocean-0.24.19}/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-0.24.17 → port_ocean-0.24.19}/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-0.24.17 → port_ocean-0.24.19}/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-0.24.17 → port_ocean-0.24.19}/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 → port_ocean-0.24.19}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "port-ocean"
-version = "0.24.17"
+version = "0.24.19"
 description = "Port Ocean is a CLI tool for managing your Port projects."
 readme = "README.md"
 homepage = "https://app.getport.io"