port-ocean 0.22.1__tar.gz → 0.22.3__tar.gz

{port_ocean-0.22.1 → port_ocean-0.22.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: port-ocean
-Version: 0.22.1
+Version: 0.22.3
 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 → port_ocean-0.22.3}/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-0.22.1 → port_ocean-0.22.3}/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-0.22.1 → port_ocean-0.22.3}/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-0.22.1 → port_ocean-0.22.3}/port_ocean/log/logger_setup.py

@@ -1,4 +1,5 @@
 import sys
+import os
 from logging import LogRecord
 from logging.handlers import QueueHandler, QueueListener
 from queue import Queue
@@ -12,8 +13,9 @@ from port_ocean.log.sensetive import sensitive_log_filter
 from port_ocean.utils.signal import signal_handler
 
 
-def setup_logger(level: LogLevelType, enable_http_handler: bool) -> None:
+def setup_logger(level: LogLevelType, enable_http_handler: bool, instance: str) -> None:
     logger.remove()
+    logger.configure(extra={"hostname": try_get_hostname(), "instance": instance})
     _stdout_loguru_handler(level)
     if enable_http_handler:
         _http_loguru_handler(level)
@@ -23,6 +25,8 @@ def _stdout_loguru_handler(level: LogLevelType) -> None:
     logger_format = (
         "<green>{time:YYYY-MM-DD HH:mm:ss.SSS}</green> | "
         "<level>{level: <8}</level> | "
+        "<cyan>{extra[integration_id]}</cyan> | "
+        "<magenta>{extra[hostname]}</magenta> | "
         "<level>{message}</level>"
     )
     if level == "DEBUG":
@@ -72,3 +76,10 @@ def exception_deserializer(record: "loguru.Record") -> None:
     if exception is not None:
         fixed = Exception(str(exception.value))
         record["exception"] = exception._replace(value=fixed)
+
+
+def try_get_hostname() -> str:
+    try:
+        return os.uname().nodename
+    except Exception:
+        return "unknown"

{port_ocean-0.22.1 → port_ocean-0.22.3}/port_ocean/run.py

@@ -1,6 +1,7 @@
 import asyncio
 from inspect import getmembers
 from typing import Dict, Any, Type
+import uuid
 
 import uvicorn
 from pydantic import BaseModel
@@ -33,11 +34,13 @@ def run(
     config_override: Dict[str, Any] | None = None,
 ) -> None:
     application_settings = ApplicationSettings(log_level=log_level, port=port)
+    instance = str(uuid.uuid4())
 
     init_signal_handler()
     setup_logger(
         application_settings.log_level,
         enable_http_handler=application_settings.enable_http_logging,
+        instance=instance,
     )
 
     config_factory = _get_default_config_factory()

{port_ocean-0.22.1 → port_ocean-0.22.3}/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-0.22.1 → port_ocean-0.22.3}/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-0.22.1 → port_ocean-0.22.3}/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-0.22.1 → port_ocean-0.22.3}/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 → port_ocean-0.22.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "port-ocean"
-version = "0.22.1"
+version = "0.22.3"
 description = "Port Ocean is a CLI tool for managing your Port projects."
 readme = "README.md"
 homepage = "https://app.getport.io"
@@ -63,6 +63,7 @@ rich = { version = "^13.4.1", optional = true }
 cookiecutter = { version = "^2.1.1", optional = true }
 jinja2-time = { version = "^0.2.0", optional = true }
 prometheus-client = "^0.21.1"
+pytest-cov = "^6.0.0"
 
 [tool.poetry.extras]
 cli = ["click", "rich", "cookiecutter", "jinja2-time"]