port-ocean 0.22.1__py3-none-any.whl → 0.22.2__py3-none-any.whl

port_ocean/core/handlers/port_app_config/models.py

@@ -51,6 +51,7 @@ class ResourceConfig(BaseModel):
 
 
 class PortAppConfig(BaseModel):
+    _default_entity_deletion_threshold: float = 0.9
     enable_merge_entity: bool = Field(alias="enableMergeEntity", default=True)
     delete_dependent_entities: bool = Field(
         alias="deleteDependentEntities", default=True
@@ -58,8 +59,8 @@ class PortAppConfig(BaseModel):
     create_missing_related_entities: bool = Field(
         alias="createMissingRelatedEntities", default=True
     )
-    entity_deletion_threshold: float = Field(
-        alias="entityDeletionThreshold", default=0.9
+    entity_deletion_threshold: float | None = Field(
+        alias="entityDeletionThreshold", default=None
     )
     resources: list[ResourceConfig] = Field(default_factory=list)
 
@@ -71,8 +72,13 @@ class PortAppConfig(BaseModel):
             "validation_only": False,
         }
 
+    def get_entity_deletion_threshold(self) -> float | None:
+        if self.entity_deletion_threshold is not None:
+            return self.entity_deletion_threshold
+        return self._default_entity_deletion_threshold
+
     def to_request(self) -> dict[str, Any]:
-        return {
+        mapping = {
             "deleteDependentEntities": self.delete_dependent_entities,
             "createMissingRelatedEntities": self.create_missing_related_entities,
             "enableMergeEntity": self.enable_merge_entity,
@@ -81,6 +87,9 @@ class PortAppConfig(BaseModel):
                 for resource in self.resources
             ],
         }
+        if self.entity_deletion_threshold is not None:
+            mapping["entityDeletionThreshold"] = self.entity_deletion_threshold
+        return mapping
 
     class Config:
         allow_population_by_field_name = True

port_ocean/core/integrations/mixins/sync.py

@@ -102,7 +102,7 @@ class SyncMixin(HandlerMixin):
             entities, user_agent_type
         )
         await self.entities_state_applier.delete_diff(
-            {"before": entities_at_port, "after": modified_entities}, user_agent_type, app_config.entity_deletion_threshold
+            {"before": entities_at_port, "after": modified_entities}, user_agent_type, app_config.get_entity_deletion_threshold()
         )
 
         logger.info("Finished syncing change")

port_ocean/core/integrations/mixins/sync_raw.py

@@ -671,7 +671,7 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
                     )
                     await self.entities_state_applier.delete_diff(
                         {"before": entities_at_port, "after": generated_entities},
-                        user_agent_type, app_config.entity_deletion_threshold
+                        user_agent_type, app_config.get_entity_deletion_threshold()
                     )
 
                     logger.info("Resync finished successfully")

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

@@ -95,6 +95,30 @@ async def test_delete_diff_custom_threshold_above_threshold_not_deleted(
     mock_safe_delete.assert_not_called()
 
 
+@pytest.mark.asyncio
+async def test_delete_diff_custom_threshold_0_not_deleted(
+    mock_context: PortOceanContext,
+) -> None:
+    applier = HttpEntitiesStateApplier(mock_context)
+    entities = EntityDiff(
+        before=[
+            Entity(identifier="1", blueprint="test"),
+            Entity(identifier="2", blueprint="test"),
+        ],
+        after=[
+            Entity(identifier="2", blueprint="test"),
+            Entity(identifier="3", blueprint="test"),
+        ],
+    )
+
+    with patch.object(applier, "_safe_delete") as mock_safe_delete:
+        await applier.delete_diff(
+            entities, UserAgentType.exporter, entity_deletion_threshold=0
+        )
+
+    mock_safe_delete.assert_not_called()
+
+
 @pytest.mark.asyncio
 async def test_applier_with_mock_context(
     mock_ocean: Ocean,

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

@@ -249,7 +249,7 @@ class TestJQEntityProcessor:
             result = await mocked_processor._search(data, pattern)
             assert result == "bar"
 
-    @pytest.mark.timeout(15)
+    @pytest.mark.timeout(30)
     async def test_parse_items_performance_10000(
         self, mocked_processor: JQEntityProcessor
     ) -> None:

port_ocean/tests/core/handlers/port_app_config/test_base.py

@@ -78,6 +78,88 @@ async def test_get_port_app_config_success(
         result.resources[0].port.entity.mappings.properties["defaultBranch"]
         == ".default_branch"
     )
+    assert result.entity_deletion_threshold is None
+    port_app_config_handler.mock_get_port_app_config.assert_called_once()
+
+
+@pytest.mark.asyncio
+async def test_get_port_app_config_get_entity_deletion_threshold_with_flag_defined(
+    port_app_config_handler: MockPortAppConfig,
+) -> None:
+    # Arrange
+    valid_config = {
+        "entityDeletionThreshold": 0.1,
+        "resources": [
+            {
+                "kind": "repository",
+                "selector": {"query": "true"},
+                "port": {
+                    "entity": {
+                        "mappings": {
+                            "identifier": ".name",
+                            "title": ".name",
+                            "blueprint": '"service"',
+                            "properties": {
+                                "description": ".description",
+                                "url": ".html_url",
+                                "defaultBranch": ".default_branch",
+                            },
+                        }
+                    }
+                },
+            }
+        ],
+    }
+    port_app_config_handler.mock_get_port_app_config.return_value = valid_config
+
+    # Act
+    async with event_context(EventType.RESYNC, trigger_type="machine"):
+        result = await port_app_config_handler.get_port_app_config()
+        deletion_threshold = result.get_entity_deletion_threshold()
+
+    # Assert
+    assert isinstance(result, PortAppConfig)
+    assert deletion_threshold == 0.1
+    port_app_config_handler.mock_get_port_app_config.assert_called_once()
+
+
+@pytest.mark.asyncio
+async def test_get_port_app_config_get_entity_deletion_threshold_with_flag_not_defined(
+    port_app_config_handler: MockPortAppConfig,
+) -> None:
+    # Arrange
+    valid_config = {
+        "resources": [
+            {
+                "kind": "repository",
+                "selector": {"query": "true"},
+                "port": {
+                    "entity": {
+                        "mappings": {
+                            "identifier": ".name",
+                            "title": ".name",
+                            "blueprint": '"service"',
+                            "properties": {
+                                "description": ".description",
+                                "url": ".html_url",
+                                "defaultBranch": ".default_branch",
+                            },
+                        }
+                    }
+                },
+            }
+        ]
+    }
+    port_app_config_handler.mock_get_port_app_config.return_value = valid_config
+
+    # Act
+    async with event_context(EventType.RESYNC, trigger_type="machine"):
+        result = await port_app_config_handler.get_port_app_config()
+        deletion_threshold = result.get_entity_deletion_threshold()
+
+    # Assert
+    assert isinstance(result, PortAppConfig)
+    assert deletion_threshold == result._default_entity_deletion_threshold
     port_app_config_handler.mock_get_port_app_config.assert_called_once()
 
 

port_ocean/tests/helpers/fixtures.py

@@ -2,7 +2,6 @@ from os import path
 from typing import Any, Callable, Dict, List, Tuple, Union
 
 import pytest
-import pytest_asyncio
 
 from port_ocean.clients.port.client import PortClient
 from port_ocean.core.handlers.port_app_config.models import ResourceConfig
@@ -26,7 +25,7 @@ def port_client_for_fake_integration() -> Tuple[SmokeTestDetails, PortClient]:
     return smoke_test_details, port_client
 
 
-@pytest_asyncio.fixture
+@pytest.fixture
 def get_mocked_ocean_app(request: Any) -> Callable[[], Ocean]:
     test_dir = path.join(path.dirname(request.module.__file__), "..")
 
@@ -36,7 +35,7 @@ def get_mocked_ocean_app(request: Any) -> Callable[[], Ocean]:
     return get_ocean_app
 
 
-@pytest_asyncio.fixture
+@pytest.fixture
 def get_mock_ocean_resource_configs(request: Any) -> Callable[[], List[ResourceConfig]]:
     module_dir = path.join(path.dirname(request.module.__file__), "..")
 

{port_ocean-0.22.1.dist-info → port_ocean-0.22.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: port-ocean
-Version: 0.22.1
+Version: 0.22.2
 Summary: Port Ocean is a CLI tool for managing your Port projects.
 Home-page: https://app.getport.io
 Keywords: ocean,port-ocean,port
@@ -35,6 +35,7 @@ Requires-Dist: prometheus-client (>=0.21.1,<0.22.0)
 Requires-Dist: pydantic[dotenv] (>=1.10.8,<2.0.0)
 Requires-Dist: pydispatcher (>=2.0.7,<3.0.0)
 Requires-Dist: pyhumps (>=3.8.0,<4.0.0)
+Requires-Dist: pytest-cov (>=6.0.0,<7.0.0)
 Requires-Dist: python-dateutil (>=2.9.0.post0,<3.0.0)
 Requires-Dist: pyyaml (>=6.0,<7.0)
 Requires-Dist: rich (>=13.4.1,<14.0.0) ; extra == "cli"

{port_ocean-0.22.1.dist-info → port_ocean-0.22.2.dist-info}/RECORD

@@ -96,7 +96,7 @@ port_ocean/core/handlers/entity_processor/jq_entity_processor.py,sha256=C6zJbS3m
 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
 port_ocean/core/handlers/port_app_config/base.py,sha256=4Nxt2g8voEIHJ4Y1Km5NJcaG2iSbCklw5P8-Kus7Y9k,3007
-port_ocean/core/handlers/port_app_config/models.py,sha256=dzX1t-9BLiIm-_wI_vse3bl5HA4BSwWtcJOoe8EpZZQ,2469
+port_ocean/core/handlers/port_app_config/models.py,sha256=Rf01rQpQZRse2qfr5PwgOz4pKwb53y0LuW9yp7v_ZoI,2912
 port_ocean/core/handlers/queue/__init__.py,sha256=1fICM0ZLATmmj6f7cdq_eV2kmw0_jy7y2INuLQIpzIE,121
 port_ocean/core/handlers/queue/abstract_queue.py,sha256=q_gpaWFFZHxM3XovEbgsDn8jEOLM45iAZWVC81Paxto,620
 port_ocean/core/handlers/queue/local_queue.py,sha256=EzqsGIX43xbVAcePwTcCg5QDrXATQpy-VzWxxN_OyAM,574
@@ -112,8 +112,8 @@ port_ocean/core/integrations/mixins/__init__.py,sha256=FA1FEKMM6P-L2_m7Q4L20mFa4
 port_ocean/core/integrations/mixins/events.py,sha256=2L7P3Jhp8XBqddh2_o9Cn4N261nN1SySfrEdJoqLrIw,2714
 port_ocean/core/integrations/mixins/handler.py,sha256=mZ7-0UlG3LcrwJttFbMe-R4xcOU2H_g33tZar7PwTv8,3771
 port_ocean/core/integrations/mixins/live_events.py,sha256=8HklZmlyffYY_LeDe8xbt3Tb08rlLkqVhFF-2NQeJP4,4126
-port_ocean/core/integrations/mixins/sync.py,sha256=GHiFbnw0XrBfl7aCTH_w67f_N7EZbcUgssc-0fPujNU,4047
-port_ocean/core/integrations/mixins/sync_raw.py,sha256=eUupD__avxQZKsgEvGWa7ibTidYShwsKWBq_wakiQAc,27481
+port_ocean/core/integrations/mixins/sync.py,sha256=Vm_898pLKBwfVewtwouDWsXoxcOLicnAy6pzyqqk6U8,4053
+port_ocean/core/integrations/mixins/sync_raw.py,sha256=uATzik6gSmkpKlIhbcRavlDo-xtkUvMwNp1wZltJj-I,27487
 port_ocean/core/integrations/mixins/utils.py,sha256=oN4Okz6xlaefpid1_Pud8HPSw9BwwjRohyNsknq-Myg,2309
 port_ocean/core/models.py,sha256=YpJ2XOB3Zt9_M-rcMrMjugFNzBDg2hCUKgqvEt7now0,2348
 port_ocean/core/ocean_types.py,sha256=4VipWFOHEh_d9LmWewQccwx1p2dtrRYW0YURVgNsAjo,1398
@@ -152,12 +152,12 @@ port_ocean/tests/clients/port/mixins/test_organization_mixin.py,sha256=-8iHM33Oe
 port_ocean/tests/conftest.py,sha256=JXASSS0IY0nnR6bxBflhzxS25kf4iNaABmThyZ0mZt8,101
 port_ocean/tests/core/conftest.py,sha256=BHfi7egDVNRpg61lHZlWj81_ohUG7DEVMdFe9yX-vkc,5517
 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=s_n8w08rt8fDbaAe-xVAFAq-PsLn9ecgal4JALsJLk0,8230
-port_ocean/tests/core/handlers/entity_processor/test_jq_entity_processor.py,sha256=FnEnaDjuoAbKvKyv6xJ46n3j0ZcaT70Sg2zc7oy7HAA,13596
+port_ocean/tests/core/handlers/entities_state_applier/test_applier.py,sha256=WNg1fWZsXu0MDnz9-ahRiPb_OPofWx7E8wxBx0cyZKs,8946
+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=RTkHU2QS9f-Lt3u0OCBPPEeiaM2_9h5vOQxqLnrbQro,33560
 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=tdjpFUnUZ6TNMxc3trKkzmMTGTb7oKIeu3rRXv_fV3g,6872
+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
 port_ocean/tests/core/handlers/webhook/test_abstract_webhook_processor.py,sha256=zKwHhPAYEZoZ5Z2UETp1t--mbkS8uyvlXThB0obZTTc,3340
 port_ocean/tests/core/handlers/webhook/test_processor_manager.py,sha256=6Zap3rKBd8Td7-a9af6_FWOGNDN4oZhNdWeeaICsLD0,49386
@@ -167,7 +167,7 @@ port_ocean/tests/core/utils/test_entity_topological_sorter.py,sha256=zuq5WSPy_88
 port_ocean/tests/core/utils/test_resolve_entities_diff.py,sha256=nSB0H87Gk6iFw7RMq9YfiZtC_u6X20ao5vmvywP5HsE,17945
 port_ocean/tests/helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 port_ocean/tests/helpers/fake_port_api.py,sha256=9rtjC6iTQMfzWK6WipkDzzG0b1IIaRmvdJLOyV613vE,6479
-port_ocean/tests/helpers/fixtures.py,sha256=IQEplbHhRgjrAsZlnXrgSYA5YQEn25I9HgO3_Fjibxg,1481
+port_ocean/tests/helpers/fixtures.py,sha256=dinEucKDTGAD2tKwbOqqHZSHNPsDLN2HxnLqA-WXGeI,1443
 port_ocean/tests/helpers/integration.py,sha256=_RxS-RHpu11lrbhUXYPZp862HLWx8AoD7iZM6iXN8rs,1104
 port_ocean/tests/helpers/ocean_app.py,sha256=N06vcNI1klqdcNFq-PXL5vm77u-hODsOSXnj9p8d1AI,2249
 port_ocean/tests/helpers/port_client.py,sha256=5d6GNr8vNNSOkrz1AdOhxBUKuusr_-UPDP7AVpHasQw,599
@@ -188,8 +188,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.22.1.dist-info/LICENSE.md,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-port_ocean-0.22.1.dist-info/METADATA,sha256=i1afU-Np0jz3idI3hspGcRwWHGolswzvs7pI6mBHpBs,6721
-port_ocean-0.22.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-port_ocean-0.22.1.dist-info/entry_points.txt,sha256=F_DNUmGZU2Kme-8NsWM5LLE8piGMafYZygRYhOVtcjA,54
-port_ocean-0.22.1.dist-info/RECORD,,
+port_ocean-0.22.2.dist-info/LICENSE.md,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+port_ocean-0.22.2.dist-info/METADATA,sha256=Gnljw5UH_wpBycjJttdo1rAf8C8s7EeOP_KS5Ur6jWI,6764
+port_ocean-0.22.2.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+port_ocean-0.22.2.dist-info/entry_points.txt,sha256=F_DNUmGZU2Kme-8NsWM5LLE8piGMafYZygRYhOVtcjA,54
+port_ocean-0.22.2.dist-info/RECORD,,