port-ocean 0.29.10__tar.gz → 0.30.1__tar.gz

{port_ocean-0.29.10 → port_ocean-0.30.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: port-ocean
-Version: 0.29.10
+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.29.10 → port_ocean-0.30.1}/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-0.29.10 → port_ocean-0.30.1}/port_ocean/core/handlers/actions/execution_manager.py

@@ -13,7 +13,6 @@ from port_ocean.core.handlers.webhook.processor_manager import (
     LiveEventsProcessorManager,
 )
 from port_ocean.context.ocean import ocean
-from port_ocean.core.models import IntegrationFeatureFlag
 from port_ocean.exceptions.execution_manager import (
     DuplicateActionExecutorError,
     PartitionKeyNotFoundError,
@@ -132,13 +131,6 @@ class ExecutionManager:
         """
         Start polling and processing action runs for all registered actions.
         """
-        flags = await ocean.port_client.get_organization_feature_flags()
-        if IntegrationFeatureFlag.OCEAN_ACTIONS_PROCESSING_ENABLED not in flags:
-            logger.warning(
-                "Actions processing is not allowed for your organization, skipping actions processing"
-            )
-            return
-
         if not await ocean.port_client.auth.is_machine_user():
             logger.warning(
                 "Actions processing is allowed only for machine users, skipping actions processing"

{port_ocean-0.29.10 → port_ocean-0.30.1}/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-0.29.10 → port_ocean-0.30.1}/port_ocean/core/models.py

@@ -134,7 +134,6 @@ class EntityPortDiff:
 class IntegrationFeatureFlag(StrEnum):
     USE_PROVISIONED_DEFAULTS = "USE_PROVISIONED_DEFAULTS"
     LAKEHOUSE_ELIGIBLE = "LAKEHOUSE_ELIGIBLE"
-    OCEAN_ACTIONS_PROCESSING_ENABLED = "OCEAN_ACTIONS_PROCESSING_ENABLED"
 
 
 class RunStatus(StrEnum):

{port_ocean-0.29.10 → port_ocean-0.30.1}/port_ocean/tests/core/handlers/actions/test_execution_manager.py

@@ -25,7 +25,6 @@ from port_ocean.core.handlers.webhook.processor_manager import (
 from port_ocean.core.models import (
     ActionRun,
     IntegrationActionInvocationPayload,
-    IntegrationFeatureFlag,
     RunStatus,
 )
 from port_ocean.exceptions.execution_manager import (
@@ -62,9 +61,6 @@ def mock_port_client() -> MagicMock:
     mock_port_client.get_run_by_external_id = AsyncMock()
     mock_port_client.patch_run = AsyncMock()
     mock_port_client.post_run_log = AsyncMock()
-    mock_port_client.get_organization_feature_flags = AsyncMock(
-        return_value=[IntegrationFeatureFlag.OCEAN_ACTIONS_PROCESSING_ENABLED]
-    )
     mock_port_client.auth = AsyncMock(spec=PortAuthentication)
     mock_port_client.auth.is_machine_user = AsyncMock(return_value=True)
     return mock_port_client

{port_ocean-0.29.10 → port_ocean-0.30.1}/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.29.10 → port_ocean-0.30.1}/pyproject.toml

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