port-ocean 0.30.0__py3-none-any.whl → 0.30.1__py3-none-any.whl

port_ocean/clients/port/mixins/entities.py

@@ -1,5 +1,6 @@
 import asyncio
 import json
+from collections import Counter
 from typing import Any, Literal
 from urllib.parse import quote_plus
 
@@ -355,6 +356,19 @@ class EntityClientMixin:
         entities_results: list[tuple[bool, Entity]] = []
         blueprint = entities[0].blueprint
 
+        identifier_counts = Counter((e.blueprint, e.identifier) for e in entities)
+        duplicate_count = sum(
+            count - 1 for count in identifier_counts.values() if count > 1
+        )
+
+        if duplicate_count:
+            duplicate_examples = [
+                key for key, cnt in identifier_counts.items() if cnt > 1
+            ][:5]
+            logger.warning(
+                f"Detected {duplicate_count} duplicate entities (by blueprint and identifier) that may not be ingested because an identical identifier existed. Examples: {duplicate_examples}"
+            )
+
         bulk_size = self.calculate_entities_batch_size(entities)
         bulks = [
             entities[i : i + bulk_size] for i in range(0, len(entities), bulk_size)

port_ocean/core/handlers/entity_processor/jq_entity_processor.py

@@ -1,19 +1,27 @@
 import asyncio
+import json
+import re
 from asyncio import Task
 from dataclasses import dataclass, field
 from functools import lru_cache
-import json
 from typing import Any, Optional
+
 import jq  # type: ignore
 from loguru import logger
+
 from port_ocean.context.ocean import ocean
 from port_ocean.core.handlers.entity_processor.base import BaseEntityProcessor
+from port_ocean.core.handlers.entity_processor.jq_input_evaluator import (
+    InputClassifyingResult,
+    can_expression_run_with_no_input,
+    classify_input,
+)
 from port_ocean.core.handlers.port_app_config.models import ResourceConfig
 from port_ocean.core.models import Entity
 from port_ocean.core.ocean_types import (
     RAW_ITEM,
-    EntitySelectorDiff,
     CalculationResult,
+    EntitySelectorDiff,
 )
 from port_ocean.core.utils.utils import (
     gather_and_split_errors_from_results,
@@ -21,11 +29,6 @@ from port_ocean.core.utils.utils import (
 )
 from port_ocean.exceptions.core import EntityProcessorException
 from port_ocean.utils.queue_utils import process_in_queue
-from port_ocean.core.handlers.entity_processor.jq_input_evaluator import (
-    InputClassifyingResult,
-    classify_input,
-    can_expression_run_with_no_input,
-)
 
 
 class ExampleStates:
@@ -92,8 +95,29 @@ class JQEntityProcessor(BaseEntityProcessor):
     searching for data in dictionaries, and transforming data based on object mappings.
     """
 
+    @staticmethod
+    def _format_filter(filter: str) -> str:
+        """
+        Convert single quotes to double quotes in JQ expressions.
+        Only replaces single quotes that are opening or closing string delimiters,
+        not single quotes that are part of string content.
+        """
+        # Escape single quotes only if they are opening or closing a string
+        # Pattern matches:
+        # - Single quote at start of string or after whitespace (opening quote)
+        # - Single quote before whitespace or end of string (closing quote)
+        # Uses negative lookahead/lookbehind to avoid replacing quotes inside strings
+        # \1 and \2 will be empty for the alternative that didn't match, so \1"\2 works for both cases
+        # This matches the TypeScript pattern: /(^|\s)'(?!\s|")|(?<!\s|")'(\s|$)/g
+        formatted_filter = re.sub(
+            r'(^|\s)\'(?!\s|")|(?<!\s|")\'(\s|$)', r'\1"\2', filter
+        )
+        return formatted_filter
+
     @lru_cache
     def _compile(self, pattern: str) -> Any:
+        # Convert single quotes to double quotes for JQ compatibility
+        pattern = self._format_filter(pattern)
         if not ocean.config.allow_environment_variables_jq_access:
             pattern = "def env: {}; {} as $ENV | " + pattern
         return jq.compile(pattern)
@@ -119,7 +143,6 @@ class JQEntityProcessor(BaseEntityProcessor):
         missing_required_fields: bool,
         entity_mapping_fault_counter: int,
     ) -> None:
-
         if len(entity_misconfigurations) > 0:
             logger.info(
                 f"Unable to find valid data for: {entity_misconfigurations} (null, missing, or misconfigured)"
@@ -444,7 +467,6 @@ class JQEntityProcessor(BaseEntityProcessor):
         key: str,
         value: dict[str, Any],
     ) -> None:
-
         if key in ["properties", "relations"]:
             mapping_dicts: dict[InputClassifyingResult, dict[str, Any]] = {
                 InputClassifyingResult.SINGLE: {},

port_ocean/tests/core/handlers/entity_processor/test_jq_entity_processor.py

@@ -1,8 +1,9 @@
-from typing import cast, Any
-from unittest.mock import AsyncMock, Mock
-from loguru import logger
-import pytest
 from io import StringIO
+from typing import Any, cast
+from unittest.mock import AsyncMock, Mock, patch
+
+import pytest
+from loguru import logger
 
 from port_ocean.context.ocean import PortOceanContext
 from port_ocean.core.handlers.entity_processor.jq_entity_processor import (
@@ -10,12 +11,10 @@ from port_ocean.core.handlers.entity_processor.jq_entity_processor import (
 )
 from port_ocean.core.ocean_types import CalculationResult
 from port_ocean.exceptions.core import EntityProcessorException
-from unittest.mock import patch
 
 
 @pytest.mark.asyncio
 class TestJQEntityProcessor:
-
     @pytest.fixture
     def mocked_processor(self, monkeypatch: Any) -> JQEntityProcessor:
         mock_context = AsyncMock()
@@ -33,6 +32,30 @@ class TestJQEntityProcessor:
         result = await mocked_processor._search(data, pattern)
         assert result == "bar"
 
+    async def test_search_with_single_quotes(
+        self, mocked_processor: JQEntityProcessor
+    ) -> None:
+        data = {"repository": "ocean", "organization": "port"}
+        pattern = ".organization + '/' + .repository"
+        result = await mocked_processor._search(data, pattern)
+        assert result == "port/ocean"
+
+    async def test_search_with_single_quotes_in_the_end(
+        self, mocked_processor: JQEntityProcessor
+    ) -> None:
+        data = {"organization": "port"}
+        pattern = ".organization + '/'"
+        result = await mocked_processor._search(data, pattern)
+        assert result == "port/"
+
+    async def test_search_with_single_quotes_in_the_start(
+        self, mocked_processor: JQEntityProcessor
+    ) -> None:
+        data = {"organization": "port"}
+        pattern = "'/' + .organization"
+        result = await mocked_processor._search(data, pattern)
+        assert result == "/port"
+
     async def test_search_as_bool(self, mocked_processor: JQEntityProcessor) -> None:
         data = {"foo": True}
         pattern = ".foo"

{port_ocean-0.30.0.dist-info → port_ocean-0.30.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: port-ocean
-Version: 0.30.0
+Version: 0.30.1
 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.30.0.dist-info → port_ocean-0.30.1.dist-info}/RECORD

@@ -61,7 +61,7 @@ port_ocean/clients/port/client.py,sha256=LHR6zKgCCCyhe3aPWH0kRFYS02BN-lIDZMPQbaz
 port_ocean/clients/port/mixins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 port_ocean/clients/port/mixins/actions.py,sha256=XkmK1C1zH-u8hy04No-SzsVh5iH6csKkYsEtyBzb84E,3479
 port_ocean/clients/port/mixins/blueprints.py,sha256=iAKwguhDpUL-YLd7GRNjS-monVgOG8UyKJFOengO_zM,4291
-port_ocean/clients/port/mixins/entities.py,sha256=UiVssYYqJeHhrLahx1mW24B7oGVMZV2WVvUze_htuBk,25279
+port_ocean/clients/port/mixins/entities.py,sha256=n2Cwc944TADpQaLboZUJi7P7ibAa7mDCxvOAVKWJIRI,25900
 port_ocean/clients/port/mixins/integrations.py,sha256=rzmfv3BfsBXX21VZrhZLsH5B5spvVBo6xIiXKxOwNvg,12236
 port_ocean/clients/port/mixins/migrations.py,sha256=vdL_A_NNUogvzujyaRLIoZEu5vmKDY2BxTjoGP94YzI,1467
 port_ocean/clients/port/mixins/organization.py,sha256=A2cP5V49KnjoAXxjmnm_XGth4ftPSU0qURNfnyUyS_Y,1041
@@ -106,7 +106,7 @@ port_ocean/core/handlers/entities_state_applier/port/get_related_entities.py,sha
 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
 port_ocean/core/handlers/entity_processor/base.py,sha256=PsnpNRqjHth9xwOvDRe7gKu8cjnVV0XGmTIHGvOelX0,1867
-port_ocean/core/handlers/entity_processor/jq_entity_processor.py,sha256=Z0njO1z2FUh8hX4GTdH7CmO0Afv-WeYRtxPs34mxKWE,32181
+port_ocean/core/handlers/entity_processor/jq_entity_processor.py,sha256=_ldJ71UIfZuNcLOgV5FYKllFohrtK13rDT9dI78ekPc,33279
 port_ocean/core/handlers/entity_processor/jq_input_evaluator.py,sha256=R88wf69RVtBl8t5m2IKGTmgt4JEQSbct_AmHI_tUOjg,5350
 port_ocean/core/handlers/port_app_config/__init__.py,sha256=8AAT5OthiVM7KCcM34iEgEeXtn2pRMrT4Dze5r1Ixbk,134
 port_ocean/core/handlers/port_app_config/api.py,sha256=r_Th66NEw38IpRdnXZcRvI8ACfvxW_A6V62WLwjWXlQ,1044
@@ -178,7 +178,7 @@ port_ocean/tests/core/defaults/test_common.py,sha256=sR7RqB3ZYV6Xn6NIg-c8k5K6JcG
 port_ocean/tests/core/event_listener/test_kafka.py,sha256=RN_JOCy4aRDUNvyQocO6WFvUMH2XeAZy-PIWHOYnD9M,2888
 port_ocean/tests/core/handlers/actions/test_execution_manager.py,sha256=5bOlcQ9qcXF_leoSFtw3FzTa7C1awUPo6TSss5e_76w,30753
 port_ocean/tests/core/handlers/entities_state_applier/test_applier.py,sha256=7XWgwUB9uVYRov4VbIz1A-7n2YLbHTTYT-4rKJxjB0A,10711
-port_ocean/tests/core/handlers/entity_processor/test_jq_entity_processor.py,sha256=-kLAOGuoA5yN1TT_T3SIPgGnsOqg1iK0qjVOQ9KiU3c,58498
+port_ocean/tests/core/handlers/entity_processor/test_jq_entity_processor.py,sha256=gyyWbkQop50NsPaHGq1K1wlUD_SYYdnquQfOTqTbnGc,59403
 port_ocean/tests/core/handlers/entity_processor/test_jq_input_evaluator.py,sha256=xNlDK8d8YQOplgjZGSBq4rZYZx_atg2R5YyQnH0qfI4,42151
 port_ocean/tests/core/handlers/mixins/test_live_events.py,sha256=Sbv9IZAGQoZDhf27xDjMMVYxUSie9mHltDtxLSqckmM,12548
 port_ocean/tests/core/handlers/mixins/test_sync_raw.py,sha256=-Jd2rUG63fZM8LuyKtCp1tt4WEqO2m5woESjs1c91sU,44428
@@ -219,8 +219,8 @@ port_ocean/utils/repeat.py,sha256=U2OeCkHPWXmRTVoPV-VcJRlQhcYqPWI5NfmPlb1JIbc,32
 port_ocean/utils/signal.py,sha256=J1sI-e_32VHP_VUa5bskLMFoJjJOAk5isrnewKDikUI,2125
 port_ocean/utils/time.py,sha256=pufAOH5ZQI7gXvOvJoQXZXZJV-Dqktoj9Qp9eiRwmJ4,1939
 port_ocean/version.py,sha256=UsuJdvdQlazzKGD3Hd5-U7N69STh8Dq9ggJzQFnu9fU,177
-port_ocean-0.30.0.dist-info/LICENSE.md,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-port_ocean-0.30.0.dist-info/METADATA,sha256=uglxgjupYpTwJ-w_rUz6Tf17jeaTcdvT4xz1QNCsFpc,7054
-port_ocean-0.30.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-port_ocean-0.30.0.dist-info/entry_points.txt,sha256=F_DNUmGZU2Kme-8NsWM5LLE8piGMafYZygRYhOVtcjA,54
-port_ocean-0.30.0.dist-info/RECORD,,
+port_ocean-0.30.1.dist-info/LICENSE.md,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+port_ocean-0.30.1.dist-info/METADATA,sha256=yi01OJ2_QzuHHCv43m_K8j1JdM9cCwBbCMkBEG4ncfw,7054
+port_ocean-0.30.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+port_ocean-0.30.1.dist-info/entry_points.txt,sha256=F_DNUmGZU2Kme-8NsWM5LLE8piGMafYZygRYhOVtcjA,54
+port_ocean-0.30.1.dist-info/RECORD,,