port-ocean 0.29.3__py3-none-any.whl → 0.29.4__py3-none-any.whl

integrations/_infra/init.sh

@@ -2,4 +2,4 @@ if test -e /usr/local/share/ca-certificates/cert.crt; then
   sudo update-ca-certificates
 fi
 
-ocean sail
+exec ocean sail

port_ocean/core/handlers/resync_state_updater/updater.py

@@ -102,4 +102,3 @@ 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/core/integrations/mixins/sync_raw.py

@@ -735,10 +735,15 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
                 self._register_in_batches(resource, user_agent_type)
             )
             event.on_abort(lambda: task.cancel())
-            kind_results: tuple[list[Entity], list[Exception]] = await task
 
-            if ocean.metrics.sync_state != SyncState.FAILED:
-                ocean.metrics.sync_state = SyncState.COMPLETED
+            try:
+                kind_results: tuple[list[Entity], list[Exception]] = await task
+                if ocean.metrics.sync_state != SyncState.FAILED:
+                    ocean.metrics.sync_state = SyncState.COMPLETED
+            except asyncio.CancelledError:
+                logger.warning(f"Resource {resource.kind} processing was aborted")
+                ocean.metrics.sync_state = SyncState.ABORTED
+                raise
 
             await ocean.metrics.send_metrics_to_webhook(kind=resource_kind_id)
             await ocean.metrics.report_kind_sync_metrics(
@@ -1022,7 +1027,7 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
                 )
 
                 async with metric_resource_context(MetricResourceKind.RUNTIME):
-                    ocean.metrics.sync_state = SyncState.FAILED
+                    ocean.metrics.sync_state = SyncState.ABORTED
                     await ocean.metrics.send_metrics_to_webhook(kind=MetricResourceKind.RUNTIME)
                     await ocean.metrics.report_sync_metrics(kinds=[MetricResourceKind.RUNTIME])
                 raise

port_ocean/helpers/metric/metric.py

@@ -57,6 +57,7 @@ class SyncState:
     COMPLETED = "completed"
     PENDING = "pending"
     FAILED = "failed"
+    ABORTED = "aborted"
 
 
 class MetricResourceKind:

port_ocean/ocean.py

@@ -108,7 +108,7 @@ class Ocean:
         )
         self.app_initialized = False
 
-        signal_handler.register(self._report_resync_aborted)
+        signal_handler.register(self._report_resync_aborted, priority=100)
 
     async def _report_resync_aborted(self) -> None:
         """
@@ -116,13 +116,26 @@ class Ocean:
         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
+            if self.resync_state_updater:
+                current_integration = await self.port_client.get_current_integration()
+                current_status = (
+                    current_integration.get("resyncState", {}).get("status")
+                    if current_integration
+                    else None
                 )
-                logger.info("Resync status reported as aborted due to app shutdown")
+                if current_status == IntegrationStateStatus.Running.value:
+                    await self.resync_state_updater.update_after_resync(
+                        status=IntegrationStateStatus.Aborted
+                    )
+                    logger.info(
+                        "Graceful shutdown completed - sync state set to aborted"
+                    )
+                else:
+                    logger.info(
+                        "Graceful shutdown completed - sync was already completed, status unchanged"
+                    )
         except Exception as e:
-            logger.warning(f"Failed to report resync status on shutdown: {e}")
+            logger.warning(f"Error during graceful shutdown: {e}")
 
     def _get_process_execution_mode(self) -> ProcessExecutionMode:
         if self.config.process_execution_mode:
@@ -160,7 +173,10 @@ class Ocean:
                 )
             except asyncio.CancelledError:
                 logger.warning(
-                    "resync was cancelled by the scheduled resync, skipping state update"
+                    "resync was cancelled by the scheduled resync, updating state to aborted"
+                )
+                await self.resync_state_updater.update_after_resync(
+                    IntegrationStateStatus.Aborted
                 )
             except Exception as e:
                 await self.resync_state_updater.update_after_resync(

{port_ocean-0.29.3.dist-info → port_ocean-0.29.4.dist-info}/METADATA

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

@@ -8,7 +8,7 @@ integrations/_infra/Makefile,sha256=YgLKvuF_Dw4IA7X98Nus6zIW_3cJ60M1QFGs3imj5c4,
 integrations/_infra/README.md,sha256=ZtJFSMCTU5zTeM8ddRuW1ZL1ga8z7Ic2F3mxmgOSjgo,1195
 integrations/_infra/entry_local.sh,sha256=Sn2TexTEpruH2ixIAGsk-fZV6Y7pT3jd2Pi9TxBeFuw,633
 integrations/_infra/grpcio.sh,sha256=m924poYznoRZ6Tt7Ct8Cs5AV_cmmOx598yIZ3z4DvZE,616
-integrations/_infra/init.sh,sha256=yyAall_O2PHRA1qS5_Pm-kGm7HKlASLFfzmyWGic6vg,104
+integrations/_infra/init.sh,sha256=oVsYmJDseEZXuuzcuicgXkFbKHNyN8F6AIBHDwIMPb8,109
 port_ocean/__init__.py,sha256=uMpjg5d_cXgnyCxA_LmICR8zqBmC6Fe9Ivu9hcvJ7EY,313
 port_ocean/bootstrap.py,sha256=CN1M5pVecZ7z_Vfu86Dk2HjFMiuiwt6E_SSOLFCYRMk,1321
 port_ocean/cache/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -117,7 +117,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=UWUwHX8-Sr6UxCjcpgInonM_2SbO2WWgawONtZJZQB8,3937
+port_ocean/core/handlers/resync_state_updater/updater.py,sha256=pbKhmqvTMY3DnnIgYjvSVKNt_A2P0wGLROhLRU8ofgo,3871
 port_ocean/core/handlers/webhook/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 port_ocean/core/handlers/webhook/abstract_webhook_processor.py,sha256=8oCYaJwr_b8HP-xS0oR1Zia0YYmwJT9vJ4fOvgDlvDY,4362
 port_ocean/core/handlers/webhook/processor_manager.py,sha256=QAidsITckOuYGLMEGA3OAzS4hBNfPiWds5WHdYvQ2qc,13751
@@ -129,7 +129,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=ed-f2t8Gb-Pjywhf8YxKBkQPAaYi23Mr81twINDYKQc,41054
+port_ocean/core/integrations/mixins/sync_raw.py,sha256=coBJZvPGRTVF-akRgnH6mQ4mDHdD6uq_aQ83FoiWrt0,41293
 port_ocean/core/integrations/mixins/utils.py,sha256=JegPuIQGBXMnywHBIX30i7gYz0gY7_bW_Jx5LUuQM9c,13718
 port_ocean/core/models.py,sha256=sN7viTJbqEEy7j8VEgeffusML31cQWgzI7k8JP64Mbg,3769
 port_ocean/core/ocean_types.py,sha256=bkLlTd8XfJK6_JDl0eXUHfE_NygqgiInSMwJ4YJH01Q,1399
@@ -148,7 +148,7 @@ port_ocean/exceptions/utils.py,sha256=gjOqpi-HpY1l4WlMFsGA9yzhxDhajhoGGdDDyGbLnq
 port_ocean/exceptions/webhook_processor.py,sha256=4SnkVzVwiacH_Ip4qs1hRHa6GanhnojW_TLTdQQtm7Y,363
 port_ocean/helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 port_ocean/helpers/async_client.py,sha256=M8gKUjX8ZwRbmJ-U6KNq-p-nfGr0CwHdS0eN_pbZAJ0,2103
-port_ocean/helpers/metric/metric.py,sha256=6SMxov1WcZAV0NehMGMqWiLoOIpw-2fOpVbtPWhmW1c,14544
+port_ocean/helpers/metric/metric.py,sha256=kBRMCSBrCmwloBt4qnlJWZoZWU-b9hm3Mvm7rCjhtDs,14568
 port_ocean/helpers/metric/utils.py,sha256=1lAgrxnZLuR_wUNDyPOPzLrm32b8cDdioob2lvnPQ1A,1619
 port_ocean/helpers/retry.py,sha256=yL0TJvA-0jol-zyUO57pYBCRmq3ZglkrgCdX3QZ6tHs,20288
 port_ocean/helpers/stream.py,sha256=_UwsThzXynxWzL8OlBT1pmb2evZBi9HaaqeAGNuTuOI,2338
@@ -157,7 +157,7 @@ port_ocean/log/handlers.py,sha256=LJ1WAfq7wYCrBpeLPihMKmWjdSahKKXNHFMRYkbk0Co,36
 port_ocean/log/logger_setup.py,sha256=wcr5WOkYRtng4pW6ZRl4Av3GqtZ2omSWIqYhB_8Duuc,2700
 port_ocean/log/sensetive.py,sha256=lVKiZH6b7TkrZAMmhEJRhcl67HNM94e56x12DwFgCQk,2920
 port_ocean/middlewares.py,sha256=9wYCdyzRZGK1vjEJ28FY_DkfwDNENmXp504UKPf5NaQ,2727
-port_ocean/ocean.py,sha256=4KRqRZdeaZ4tGLRglZ3eFKWz-aE_Rqs3-iz5EQvHN2o,10858
+port_ocean/ocean.py,sha256=vymehuoh2ZlMg16y4zl5I4IisgCWG22_-bwlzvJSE9s,11600
 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
@@ -218,8 +218,8 @@ port_ocean/utils/repeat.py,sha256=U2OeCkHPWXmRTVoPV-VcJRlQhcYqPWI5NfmPlb1JIbc,32
 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.29.3.dist-info/LICENSE.md,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-port_ocean-0.29.3.dist-info/METADATA,sha256=ifeuG4g7Bp8E2lXHktm0nju_-RAMW7oOqRvF3JpHcZI,7054
-port_ocean-0.29.3.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-port_ocean-0.29.3.dist-info/entry_points.txt,sha256=F_DNUmGZU2Kme-8NsWM5LLE8piGMafYZygRYhOVtcjA,54
-port_ocean-0.29.3.dist-info/RECORD,,
+port_ocean-0.29.4.dist-info/LICENSE.md,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+port_ocean-0.29.4.dist-info/METADATA,sha256=8i6m2rimeX2fiAW0Hwm7Xnpolo7HCBhwPYMNsrN_uAE,7054
+port_ocean-0.29.4.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+port_ocean-0.29.4.dist-info/entry_points.txt,sha256=F_DNUmGZU2Kme-8NsWM5LLE8piGMafYZygRYhOVtcjA,54
+port_ocean-0.29.4.dist-info/RECORD,,