port-ocean 0.28.1__tar.gz → 0.28.3__tar.gz

{port_ocean-0.28.1 → port_ocean-0.28.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: port-ocean
-Version: 0.28.1
+Version: 0.28.3
 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.1 → port_ocean-0.28.3}/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:
@@ -59,7 +60,9 @@ class ResyncStateUpdater:
     async def update_after_resync(
         self,
         status: Literal[
-            IntegrationStateStatus.Completed, IntegrationStateStatus.Failed
+            IntegrationStateStatus.Completed,
+            IntegrationStateStatus.Failed,
+            IntegrationStateStatus.Aborted,
         ] = IntegrationStateStatus.Completed,
         interval: int | None = None,
         custom_start_time: datetime.datetime | None = None,
@@ -99,3 +102,4 @@ class ResyncStateUpdater:
         await ocean.metrics.report_sync_metrics(
             kinds=[ocean.metrics.current_resource_kind()]
         )
+        ocean.metrics.event_id = f"{ocean.metrics.event_id}-done"

{port_ocean-0.28.1 → port_ocean-0.28.3}/port_ocean/helpers/metric/metric.py

@@ -131,7 +131,7 @@ class Metrics:
         self.load_metrics()
         self._integration_version: Optional[str] = None
         self._ocean_version: Optional[str] = None
-        self.event_id = ""
+        self._event_id = ""
         self.sync_state = SyncState.PENDING
 
     @property

{port_ocean-0.28.1 → port_ocean-0.28.3}/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-0.28.1 → port_ocean-0.28.3}/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.find("-done") == -1:
+                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-0.28.1 → port_ocean-0.28.3}/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-0.28.1 → port_ocean-0.28.3}/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.1 → port_ocean-0.28.3}/pyproject.toml

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