port-ocean 0.28.0__py3-none-any.whl → 0.28.2__py3-none-any.whl

port_ocean/core/handlers/resync_state_updater/updater.py

@@ -1,10 +1,11 @@
 import datetime
 from typing import Any, Literal
+
 from port_ocean.clients.port.client import PortClient
+from port_ocean.context.ocean import ocean
+from port_ocean.helpers.metric.metric import MetricPhase, MetricType
 from port_ocean.utils.misc import IntegrationStateStatus
 from port_ocean.utils.time import get_next_occurrence
-from port_ocean.context.ocean import ocean
-from port_ocean.helpers.metric.metric import MetricType, MetricPhase
 
 
 class ResyncStateUpdater:
@@ -99,3 +100,4 @@ class ResyncStateUpdater:
         await ocean.metrics.report_sync_metrics(
             kinds=[ocean.metrics.current_resource_kind()]
         )
+        ocean.metrics.event_id = ""

port_ocean/core/integrations/mixins/sync_raw.py

@@ -455,16 +455,16 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
             ],
             value=number_of_transformed_entities,
         )
-
-        ocean.metrics.inc_metric(
-            name=MetricType.OBJECT_COUNT_NAME,
-            labels=[
-                ocean.metrics.current_resource_kind(),
-                MetricPhase.TRANSFORM,
-                MetricPhase.TransformResult.FILTERED_OUT,
-            ],
-            value=number_of_raw_results - number_of_transformed_entities,
-        )
+        if 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.FILTERED_OUT,
+                ],
+                value=number_of_raw_results - number_of_transformed_entities,
+            )
 
         return passed_entities, errors
 

port_ocean/log/logger_setup.py

@@ -1,9 +1,9 @@
-import sys
 import os
+import sys
+import uuid
 from logging import LogRecord
 from logging.handlers import QueueHandler, QueueListener
 from queue import Queue
-import uuid
 
 import loguru
 from loguru import logger
@@ -60,8 +60,10 @@ def _http_loguru_handler(level: LogLevelType) -> None:
     logger.configure(patcher=exception_deserializer)
 
     http_memory_handler = HTTPMemoryHandler()
-    signal_handler.register(http_memory_handler.wait_for_lingering_threads)
-    signal_handler.register(http_memory_handler.flush)
+    signal_handler.register(
+        http_memory_handler.wait_for_lingering_threads, priority=-200
+    )
+    signal_handler.register(http_memory_handler.flush, priority=-200)
 
     queue_listener = QueueListener(queue, http_memory_handler)
     queue_listener.start()

port_ocean/ocean.py

@@ -97,6 +97,22 @@ class Ocean:
         )
         self.app_initialized = False
 
+        signal_handler.register(self._report_resync_aborted)
+
+    async def _report_resync_aborted(self) -> None:
+        """
+        Report resync status as aborted when the app receives a kill signal.
+        This ensures Port is notified that the integration was interrupted.
+        """
+        try:
+            if self.metrics.event_id != "":
+                await self.resync_state_updater.update_after_resync(
+                    IntegrationStateStatus.Aborted
+                )
+                logger.info("Resync status reported as aborted due to app shutdown")
+        except Exception as e:
+            logger.warning(f"Failed to report resync status on shutdown: {e}")
+
     def _get_process_execution_mode(self) -> ProcessExecutionMode:
         if self.config.process_execution_mode:
             return self.config.process_execution_mode

port_ocean/utils/misc.py

@@ -1,11 +1,12 @@
-from enum import Enum
 import inspect
-from importlib.util import spec_from_file_location, module_from_spec
+from enum import Enum
+from importlib.util import module_from_spec, spec_from_file_location
 from pathlib import Path
 from time import time
 from types import ModuleType
-from typing import Callable, Any
+from typing import Any, Callable
 from uuid import uuid4
+
 import tomli
 import yaml
 
@@ -14,6 +15,7 @@ class IntegrationStateStatus(Enum):
     Running = "running"
     Failed = "failed"
     Completed = "completed"
+    Aborted = "aborted"
 
 
 def get_time(seconds_precision: bool = True) -> float:

port_ocean/utils/signal.py

@@ -1,37 +1,52 @@
 from asyncio import iscoroutinefunction
-from typing import Callable, Any
+from typing import Any, Callable
 
 from werkzeug.local import LocalProxy, LocalStack
 
 from port_ocean.exceptions.utils import (
-    SignalHandlerNotInitialized,
     SignalHandlerAlreadyInitialized,
+    SignalHandlerNotInitialized,
 )
 from port_ocean.utils.misc import generate_uuid
 
 
 class SignalHandler:
     def __init__(self) -> None:
-        self._handlers: dict[str, Callable[[], Any]] = {}
+        self._handlers: dict[str, tuple[Callable[[], Any], int]] = {}
 
     async def exit(self) -> None:
         """
         Handles the exit signal.
+        Executes handlers in priority order (highest priority first).
         """
-        while self._handlers:
-            _, handler = self._handlers.popitem()
+        # Sort handlers by priority (highest first) and execute them
+        sorted_handlers = sorted(
+            self._handlers.items(), key=lambda x: x[1][1], reverse=True
+        )
+
+        for _id, (handler, _) in sorted_handlers:
             if iscoroutinefunction(handler):
                 await handler()
             else:
                 handler()
 
-    def register(self, callback: Callable[[], Any]) -> str:
-        _id = generate_uuid()
-        self._handlers[_id] = callback
+    def register(self, callback: Callable[[], Any], priority: int = 0) -> str:
+        """
+        Register a callback with a priority.
+
+        Args:
+            callback: The callback function to register
+            priority: Priority level (higher numbers execute first, default: 0)
 
+        Returns:
+            Unique identifier for the registered callback
+        """
+        _id = generate_uuid()
+        self._handlers[_id] = (callback, priority)
         return _id
 
     def unregister(self, _id: str) -> None:
+        """Unregister a callback by its ID."""
         del self._handlers[_id]
 
 

{port_ocean-0.28.0.dist-info → port_ocean-0.28.2.dist-info}/METADATA

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

@@ -111,7 +111,7 @@ port_ocean/core/handlers/queue/abstract_queue.py,sha256=SaivrYbqg8qsX6wtQlJZyxgc
 port_ocean/core/handlers/queue/group_queue.py,sha256=JvvJOwz9z_aI4CjPr7yQX-0rOgqLI5wMdxWk2x5x-34,4989
 port_ocean/core/handlers/queue/local_queue.py,sha256=Y6qabDbrQ8aOPTN6Ct3lnMU7JnT8O8iTpoxMoVt6lFs,643
 port_ocean/core/handlers/resync_state_updater/__init__.py,sha256=kG6y-JQGpPfuTHh912L_bctIDCzAK4DN-d00S7rguWU,81
-port_ocean/core/handlers/resync_state_updater/updater.py,sha256=R7K0n-MljKtOFEh2XZKi_fBUOWIdt4X6IZIw-2WMtv0,3813
+port_ocean/core/handlers/resync_state_updater/updater.py,sha256=9nv7KY9ueszdGpZKss25foyQ_GYYzpuVZyusEaMNjKU,3850
 port_ocean/core/handlers/webhook/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 port_ocean/core/handlers/webhook/abstract_webhook_processor.py,sha256=5KwZkdkDd5HdVkXPzKiqabodZKl-hOtMypkTKd8Hq3M,3891
 port_ocean/core/handlers/webhook/processor_manager.py,sha256=0KRPD1ae-7w0na2AZY-rq9_gY0IaMv9LdwEh6y4_OiQ,13282
@@ -123,7 +123,7 @@ port_ocean/core/integrations/mixins/events.py,sha256=2L7P3Jhp8XBqddh2_o9Cn4N261n
 port_ocean/core/integrations/mixins/handler.py,sha256=mZ7-0UlG3LcrwJttFbMe-R4xcOU2H_g33tZar7PwTv8,3771
 port_ocean/core/integrations/mixins/live_events.py,sha256=zM24dhNc7uHx9XYZ6toVhDADPA90EnpOmZxgDegFZbA,4196
 port_ocean/core/integrations/mixins/sync.py,sha256=Vm_898pLKBwfVewtwouDWsXoxcOLicnAy6pzyqqk6U8,4053
-port_ocean/core/integrations/mixins/sync_raw.py,sha256=50tklPFBYvVoucIcCx1yYU-gwzliXCOX7kJP6_dgsNI,40631
+port_ocean/core/integrations/mixins/sync_raw.py,sha256=EJLF0vMFVkQi4zJPQAFtg-VkQJsOGbya3yhEfWu2L1c,40734
 port_ocean/core/integrations/mixins/utils.py,sha256=ytnFX7Lyv6N3CgBnOXxYaI1cRDq5Z4NDrVFiwE6bn-M,5250
 port_ocean/core/models.py,sha256=DNbKpStMINI2lIekKprTqBevqkw_wFuFayN19w1aDfQ,2893
 port_ocean/core/ocean_types.py,sha256=bkLlTd8XfJK6_JDl0eXUHfE_NygqgiInSMwJ4YJH01Q,1399
@@ -147,10 +147,10 @@ port_ocean/helpers/retry.py,sha256=QM04mzaevIUlg8HnHjeY9UT_D4k26BHx3hVkCjV_jnY,2
 port_ocean/helpers/stream.py,sha256=_UwsThzXynxWzL8OlBT1pmb2evZBi9HaaqeAGNuTuOI,2338
 port_ocean/log/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 port_ocean/log/handlers.py,sha256=LJ1WAfq7wYCrBpeLPihMKmWjdSahKKXNHFMRYkbk0Co,3630
-port_ocean/log/logger_setup.py,sha256=0K3zVG0YYrYOWEV8-rCGks1o-bMRxgHXlqawu9w_tSw,2656
+port_ocean/log/logger_setup.py,sha256=5JxGlg7TKDbYD2ladgaHufCv6PTJXvdQJ8l6cP3MKFA,2700
 port_ocean/log/sensetive.py,sha256=lVKiZH6b7TkrZAMmhEJRhcl67HNM94e56x12DwFgCQk,2920
 port_ocean/middlewares.py,sha256=9wYCdyzRZGK1vjEJ28FY_DkfwDNENmXp504UKPf5NaQ,2727
-port_ocean/ocean.py,sha256=IhsLnPqEJ2SflnBAt-byxGl9w_ULkdvd6-sxBbVQtJw,8874
+port_ocean/ocean.py,sha256=erUfBUJLsHs9uAaoHY-cPczqbICG4Gu02luK0nfoJAQ,9556
 port_ocean/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 port_ocean/run.py,sha256=CmKz14bxfdOooNbQ5QqH1MwX-XLYVG4NgT4KbrzFaqI,2216
 port_ocean/sonar-project.properties,sha256=X_wLzDOkEVmpGLRMb2fg9Rb0DxWwUFSvESId8qpvrPI,73
@@ -202,14 +202,14 @@ port_ocean/utils/async_http.py,sha256=aDsw3gQIMwt6qLegbZtkHqD8em48tKvbITnblsrTY3
 port_ocean/utils/async_iterators.py,sha256=CPXskYWkhkZtAG-ducEwM8537t3z5usPEqXR9vcivzw,3715
 port_ocean/utils/cache.py,sha256=tRwPomG2VIxx8ZNi4QYH6Yc47d9yYV1A7Hx-L_fX4Dg,4494
 port_ocean/utils/ipc.py,sha256=eTjTTvsKl6IXYeOkIjP5iyrw-8gLQ9rf15WeyxCqXog,912
-port_ocean/utils/misc.py,sha256=0q2cJ5psqxn_5u_56pT7vOVQ3shDM02iC1lzyWQ_zl0,2098
+port_ocean/utils/misc.py,sha256=cQGBWL9IN7ER6s7xyHzeKvj60ntW70WiYIq9MyLe1nY,2123
 port_ocean/utils/queue_utils.py,sha256=KWWl8YVnG-glcfIHhM6nefY-2sou_C6DVP1VynQwzB4,2762
 port_ocean/utils/repeat.py,sha256=U2OeCkHPWXmRTVoPV-VcJRlQhcYqPWI5NfmPlb1JIbc,3229
-port_ocean/utils/signal.py,sha256=mMVq-1Ab5YpNiqN4PkiyTGlV_G0wkUDMMjTZp5z3pb0,1514
+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.28.0.dist-info/LICENSE.md,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-port_ocean-0.28.0.dist-info/METADATA,sha256=uN_b7aeBqjyt-s49n-_xgjLjFsCAzgBgf0VJACg_qHA,7015
-port_ocean-0.28.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-port_ocean-0.28.0.dist-info/entry_points.txt,sha256=F_DNUmGZU2Kme-8NsWM5LLE8piGMafYZygRYhOVtcjA,54
-port_ocean-0.28.0.dist-info/RECORD,,
+port_ocean-0.28.2.dist-info/LICENSE.md,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+port_ocean-0.28.2.dist-info/METADATA,sha256=5T2f0NQsbLtV8Ero37oN7KmSDdG6VY5YbgjCX1S64fo,7015
+port_ocean-0.28.2.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+port_ocean-0.28.2.dist-info/entry_points.txt,sha256=F_DNUmGZU2Kme-8NsWM5LLE8piGMafYZygRYhOVtcjA,54
+port_ocean-0.28.2.dist-info/RECORD,,