port-ocean 0.24.2__tar.gz → 0.24.4__tar.gz

{port_ocean-0.24.2 → port_ocean-0.24.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: port-ocean
-Version: 0.24.2
+Version: 0.24.4
 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.2 → port_ocean-0.24.4}/port_ocean/clients/port/mixins/entities.py

@@ -353,66 +353,60 @@ class EntityClientMixin:
         entities_results: list[tuple[bool, Entity]] = []
         blueprint = entities[0].blueprint
 
-        if ocean.app.is_saas():
-            bulk_size = self.calculate_entities_batch_size(entities)
-            bulks = [
-                entities[i : i + bulk_size] for i in range(0, len(entities), bulk_size)
-            ]
-
-            bulk_results = await asyncio.gather(
-                *(
-                    self.upsert_entities_bulk(
-                        blueprint,
-                        bulk,
-                        request_options,
-                        user_agent_type,
-                        should_raise=should_raise,
-                    )
-                    for bulk in bulks
-                ),
-                return_exceptions=True,
-            )
+        bulk_size = self.calculate_entities_batch_size(entities)
+        bulks = [
+            entities[i : i + bulk_size] for i in range(0, len(entities), bulk_size)
+        ]
+
+        bulk_results = await asyncio.gather(
+            *(
+                self.upsert_entities_bulk(
+                    blueprint,
+                    bulk,
+                    request_options,
+                    user_agent_type,
+                    should_raise=should_raise,
+                )
+                for bulk in bulks
+            ),
+            return_exceptions=True,
+        )
 
-            for bulk, bulk_result in zip(bulks, bulk_results):
-                if isinstance(bulk_result, httpx.HTTPStatusError) or isinstance(
-                    bulk_result, Exception
+        for bulk, bulk_result in zip(bulks, bulk_results):
+            if isinstance(bulk_result, httpx.HTTPStatusError) or isinstance(
+                bulk_result, Exception
+            ):
+                if should_raise:
+                    raise bulk_result
+                # If should_raise is False, retry batch in sequential order as a fallback only for 413 errors
+                if (
+                    isinstance(bulk_result, httpx.HTTPStatusError)
+                    and bulk_result.response.status_code == 413
                 ):
-                    if should_raise:
-                        raise bulk_result
-                    # If should_raise is False, retry batch in sequential order as a fallback only for 413 errors
+                    individual_upsert_results = (
+                        await self._upsert_entities_batch_individually(
+                            bulk, request_options, user_agent_type, should_raise
+                        )
+                    )
+                    entities_results.extend(individual_upsert_results)
+                else:
+                    # For other errors, mark all entities in the batch as failed
+                    for entity in bulk:
+                        failed_result: tuple[bool, Entity] = (
+                            False,
+                            self._reduce_entity(entity),
+                        )
+                        entities_results.append(failed_result)
+            elif isinstance(bulk_result, list):
+                for status, entity in bulk_result:
                     if (
-                        isinstance(bulk_result, httpx.HTTPStatusError)
-                        and bulk_result.response.status_code == 413
-                    ):
-                        individual_upsert_results = (
-                            await self._upsert_entities_batch_individually(
-                                bulk, request_options, user_agent_type, should_raise
-                            )
+                        status is not None
+                    ):  # when using the search identifier we might not have an actual identifier
+                        bulk_result_tuple: tuple[bool, Entity] = (
+                            bool(status),
+                            entity,
                         )
-                        entities_results.extend(individual_upsert_results)
-                    else:
-                        # For other errors, mark all entities in the batch as failed
-                        for entity in bulk:
-                            failed_result: tuple[bool, Entity] = (
-                                False,
-                                self._reduce_entity(entity),
-                            )
-                            entities_results.append(failed_result)
-                elif isinstance(bulk_result, list):
-                    for status, entity in bulk_result:
-                        if (
-                            status is not None
-                        ):  # when using the search identifier we might not have an actual identifier
-                            bulk_result_tuple: tuple[bool, Entity] = (
-                                bool(status),
-                                entity,
-                            )
-                            entities_results.append(bulk_result_tuple)
-        else:
-            individual_upsert_results = await self._upsert_entities_batch_individually(
-                entities, request_options, user_agent_type, should_raise
-            )
-            entities_results.extend(individual_upsert_results)
+                        entities_results.append(bulk_result_tuple)
 
         return entities_results
 

{port_ocean-0.24.2 → port_ocean-0.24.4}/port_ocean/config/settings.py

@@ -108,7 +108,6 @@ class IntegrationConfiguration(BaseOceanSettings, extra=Extra.allow):
 
     upsert_entities_batch_max_length: int = 20
     upsert_entities_batch_max_size_in_bytes: int = 1024 * 1024
-    bulk_upserts_enabled: bool = False
 
     @validator("process_execution_mode")
     def validate_process_execution_mode(

{port_ocean-0.24.2 → port_ocean-0.24.4}/port_ocean/core/integrations/mixins/sync_raw.py

@@ -233,6 +233,13 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
         objects_diff = await self._calculate_raw(
             [(resource, results)], parse_all, send_raw_data_examples_amount
         )
+
+        ocean.metrics.inc_metric(
+            name=MetricType.OBJECT_COUNT_NAME,
+            labels=[ocean.metrics.current_resource_kind(), MetricPhase.TRANSFORM, MetricPhase.TransformResult.FAILED],
+            value=len(objects_diff[0].entity_selector_diff.failed)
+        )
+
         modified_objects = []
 
         if event.event_type == EventType.RESYNC:
@@ -395,12 +402,6 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
             value=number_of_raw_results -number_of_transformed_entities
         )
 
-        ocean.metrics.inc_metric(
-            name=MetricType.OBJECT_COUNT_NAME,
-            labels=[ocean.metrics.current_resource_kind(), MetricPhase.TRANSFORM , MetricPhase.TransformResult.FAILED],
-            value=len(errors)
-        )
-
         return passed_entities, errors
 
     async def register_raw(

{port_ocean-0.24.2 → port_ocean-0.24.4}/port_ocean/core/integrations/mixins/utils.py

@@ -21,7 +21,7 @@ from port_ocean.exceptions.core import (
 
 from port_ocean.utils.async_http import _http_client
 from port_ocean.clients.port.utils import _http_client as _port_http_client
-
+from port_ocean.helpers.metric.metric import MetricType, MetricPhase
 from port_ocean.context.ocean import ocean
 
 @contextmanager
@@ -61,6 +61,11 @@ async def resync_generator_wrapper(
                     yield validate_result(result)
             except OceanAbortException as error:
                 errors.append(error)
+                ocean.metrics.inc_metric(
+                    name=MetricType.OBJECT_COUNT_NAME,
+                    labels=[ocean.metrics.current_resource_kind(), MetricPhase.EXTRACT , MetricPhase.ExtractResult.FAILED],
+                    value=1
+                )
     except StopAsyncIteration:
         if errors:
             raise ExceptionGroup(

{port_ocean-0.24.2 → port_ocean-0.24.4}/port_ocean/helpers/metric/metric.py

@@ -37,6 +37,7 @@ class MetricPhase:
 
     class ExtractResult:
         EXTRACTED = "raw_extracted"
+        FAILED = "failed"
 
     class DeletionResult:
         DELETED = "deleted"

{port_ocean-0.24.2 → port_ocean-0.24.4}/port_ocean/tests/core/handlers/mixins/test_sync_raw.py

@@ -98,7 +98,6 @@ async def test_sync_raw_mixin_self_dependency(
 ) -> None:
     mock_ocean.config.upsert_entities_batch_max_length = 20
     mock_ocean.config.upsert_entities_batch_max_size_in_bytes = 1024 * 1024
-    mock_ocean.config.bulk_upserts_enabled = True
 
     entities_params = [
         ("entity_1", "service", {"service": "entity_1"}, True),
@@ -219,7 +218,6 @@ async def test_sync_raw_mixin_circular_dependency(
 ) -> None:
     mock_ocean.config.upsert_entities_batch_max_length = 20
     mock_ocean.config.upsert_entities_batch_max_size_in_bytes = 1024 * 1024
-    mock_ocean.config.bulk_upserts_enabled = True
 
     entities_params = [
         ("entity_1", "service", {"service": "entity_2"}, True),
@@ -359,7 +357,6 @@ async def test_sync_raw_mixin_dependency(
 ) -> None:
     mock_ocean.config.upsert_entities_batch_max_length = 20
     mock_ocean.config.upsert_entities_batch_max_size_in_bytes = 1024 * 1024
-    mock_ocean.config.bulk_upserts_enabled = True
 
     entities_params = [
         ("entity_1", "service", {"service": "entity_3"}, True),

{port_ocean-0.24.2 → port_ocean-0.24.4}/pyproject.toml

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