port-ocean 0.12.2.dev6__py3-none-any.whl → 0.12.2.dev8__py3-none-any.whl

port_ocean/core/event_listener/base.py

@@ -1,14 +1,12 @@
-import asyncio
 from abc import abstractmethod
-from concurrent.futures import ProcessPoolExecutor
 from typing import TypedDict, Callable, Any, Awaitable
 
 from pydantic import Extra
 
 from port_ocean.config.base import BaseOceanModel
+from port_ocean.utils.signal import signal_handler
 from port_ocean.context.ocean import ocean
 from port_ocean.utils.misc import IntegrationStateStatus
-from port_ocean.utils.signal import signal_handler
 
 
 class EventListenerEvents(TypedDict):
@@ -69,14 +67,7 @@ class BaseEventListener:
         """
         await self._before_resync()
         try:
-            loop = asyncio.get_event_loop()
-            with ProcessPoolExecutor() as executor:
-                e = executor.submit(
-                    lambda: asyncio.run_coroutine_threadsafe(
-                        self.events["on_resync"](resync_args), loop
-                    )
-                )
-                signal_handler.register(e.cancel)
+            await self.events["on_resync"](resync_args)
             await self._after_resync()
         except Exception as e:
             await self._on_resync_failure(e)

port_ocean/core/integrations/mixins/sync_raw.py

@@ -3,7 +3,6 @@ import inspect
 import typing
 from typing import Callable, Awaitable, Any
 
-import httpx
 from loguru import logger
 
 from port_ocean.clients.port.types import UserAgentType
@@ -140,9 +139,9 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
         objects_diff = await self._calculate_raw(
             [(resource, results)], parse_all, send_raw_data_examples_amount
         )
-        await self.entities_state_applier.upsert(
-            objects_diff[0].entity_selector_diff.passed, user_agent_type
-        )
+        # modified_objects = await self.entities_state_applier.upsert(
+        #     objects_diff[0].entity_selector_diff.passed, user_agent_type
+        # )
         return CalculationResult(
             objects_diff[0].entity_selector_diff._replace(passed=objects_diff[0].entity_selector_diff.passed),
             errors=objects_diff[0].errors,
@@ -426,20 +425,20 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
                 use_cache=False
             )
             logger.info(f"Resync will use the following mappings: {app_config.dict()}")
-            try:
-                did_fetched_current_state = True
-                entities_at_port = await ocean.port_client.search_entities(
-                    user_agent_type
-                )
-            except httpx.HTTPError as e:
-                logger.warning(
-                    "Failed to fetch the current state of entities at Port. "
-                    "Skipping delete phase due to unknown initial state. "
-                    f"Error: {e}\n"
-                    f"Response status code: {e.response.status_code if isinstance(e, httpx.HTTPStatusError) else None}\n"
-                    f"Response content: {e.response.text if isinstance(e, httpx.HTTPStatusError) else None}\n"
-                )
-                did_fetched_current_state = False
+            # try:
+            #     did_fetched_current_state = True
+            #     entities_at_port = await ocean.port_client.search_entities(
+            #         user_agent_type
+            #     )
+            # except httpx.HTTPError as e:
+            #     logger.warning(
+            #         "Failed to fetch the current state of entities at Port. "
+            #         "Skipping delete phase due to unknown initial state. "
+            #         f"Error: {e}\n"
+            #         f"Response status code: {e.response.status_code if isinstance(e, httpx.HTTPStatusError) else None}\n"
+            #         f"Response content: {e.response.text if isinstance(e, httpx.HTTPStatusError) else None}\n"
+            #     )
+            #     did_fetched_current_state = False
 
             creation_results: list[tuple[list[Entity], list[Exception]]] = []
 
@@ -458,36 +457,36 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
             except asyncio.CancelledError as e:
                 logger.warning("Resync aborted successfully, skipping delete phase. This leads to an incomplete state")
                 raise
-            else:
-                if not did_fetched_current_state:
-                    logger.warning(
-                        "Due to an error before the resync, the previous state of entities at Port is unknown."
-                        " Skipping delete phase due to unknown initial state."
-                    )
-                    return
-
-                logger.info("Starting resync diff calculation")
-                flat_created_entities, errors = zip_and_sum(creation_results) or [
-                    [],
-                    [],
-                ]
-
-                if errors:
-                    message = f"Resync failed with {len(errors)}. Skipping delete phase due to incomplete state"
-                    error_group = ExceptionGroup(
-                        f"Resync failed with {len(errors)}. Skipping delete phase due to incomplete state",
-                        errors,
-                    )
-                    if not silent:
-                        raise error_group
-
-                    logger.error(message, exc_info=error_group)
-                else:
-                    logger.info(
-                        f"Running resync diff calculation, number of entities at Port before resync: {len(entities_at_port)}, number of entities created during sync: {len(flat_created_entities)}"
-                    )
-                    await self.entities_state_applier.delete_diff(
-                        {"before": entities_at_port, "after": flat_created_entities},
-                        user_agent_type,
-                    )
-                    logger.info("Resync finished successfully")
+            # else:
+            #     if not did_fetched_current_state:
+            #         logger.warning(
+            #             "Due to an error before the resync, the previous state of entities at Port is unknown."
+            #             " Skipping delete phase due to unknown initial state."
+            #         )
+            #         return
+            #
+            #     logger.info("Starting resync diff calculation")
+            #     flat_created_entities, errors = zip_and_sum(creation_results) or [
+            #         [],
+            #         [],
+            #     ]
+            #
+            #     if errors:
+            #         message = f"Resync failed with {len(errors)}. Skipping delete phase due to incomplete state"
+            #         error_group = ExceptionGroup(
+            #             f"Resync failed with {len(errors)}. Skipping delete phase due to incomplete state",
+            #             errors,
+            #         )
+            #         if not silent:
+            #             raise error_group
+            #
+            #         logger.error(message, exc_info=error_group)
+            #     else:
+            #         logger.info(
+            #             f"Running resync diff calculation, number of entities at Port before resync: {len(entities_at_port)}, number of entities created during sync: {len(flat_created_entities)}"
+            #         )
+            #         await self.entities_state_applier.delete_diff(
+            #             {"before": entities_at_port, "after": flat_created_entities},
+            #             user_agent_type,
+            #         )
+            #         logger.info("Resync finished successfully")

port_ocean/log/handlers.py

@@ -1,8 +1,8 @@
 import asyncio
 import logging
 import sys
+import threading
 import time
-from concurrent.futures import ProcessPoolExecutor
 from datetime import datetime
 from logging.handlers import MemoryHandler
 from typing import Any
@@ -65,19 +65,18 @@ class HTTPMemoryHandler(MemoryHandler):
         if self.ocean is None or not self.buffer:
             return
 
+        def _wrap_event_loop(_ocean: Ocean, logs_to_send: list[dict[str, Any]]) -> None:
+            loop = asyncio.new_event_loop()
+            loop.run_until_complete(self.send_logs(_ocean, logs_to_send))
+            loop.close()
+
         self.acquire()
         logs = list(self._serialized_buffer)
         if logs:
             self.buffer.clear()
             self._serialized_buffer.clear()
             self.last_flush_time = time.time()
-            loop = asyncio.new_event_loop()
-            with ProcessPoolExecutor() as executor:
-                executor.submit(
-                    lambda: asyncio.run_coroutine_threadsafe(
-                        self.send_logs(self.ocean, logs), loop
-                    )
-                )
+            threading.Thread(target=_wrap_event_loop, args=(self.ocean, logs)).start()
         self.release()
 
     async def send_logs(

port_ocean/ocean.py

@@ -1,6 +1,6 @@
 import asyncio
 import sys
-from concurrent.futures import ProcessPoolExecutor
+import threading
 from contextlib import asynccontextmanager
 from typing import Callable, Any, Dict, AsyncIterator, Type
 
@@ -9,6 +9,8 @@ from loguru import logger
 from pydantic import BaseModel
 from starlette.types import Scope, Receive, Send
 
+from port_ocean.core.handlers.resync_state_updater import ResyncStateUpdater
+from port_ocean.core.models import Runtime
 from port_ocean.clients.port.client import PortClient
 from port_ocean.config.settings import (
     IntegrationConfiguration,
@@ -18,15 +20,13 @@ from port_ocean.context.ocean import (
     ocean,
     initialize_port_ocean_context,
 )
-from port_ocean.core.handlers.resync_state_updater import ResyncStateUpdater
 from port_ocean.core.integrations.base import BaseIntegration
-from port_ocean.core.models import Runtime
 from port_ocean.log.sensetive import sensitive_log_filter
 from port_ocean.middlewares import request_handler
-from port_ocean.utils.misc import IntegrationStateStatus
 from port_ocean.utils.repeat import repeat_every
 from port_ocean.utils.signal import signal_handler
 from port_ocean.version import __integration_version__
+from port_ocean.utils.misc import IntegrationStateStatus
 
 
 class Ocean:
@@ -92,13 +92,6 @@ class Ocean:
                 )
                 raise e
 
-        def pool_executor_wrapper(event_loop) -> None:
-            with ProcessPoolExecutor() as executor:
-                e = executor.submit(lambda: asyncio.run_coroutine_threadsafe(
-                    execute_resync_all(), event_loop
-                ))
-                signal_handler.register(e.cancel)
-
         interval = self.config.scheduled_resync_interval
         loop = asyncio.get_event_loop()
         if interval is not None:
@@ -110,7 +103,13 @@ class Ocean:
                 seconds=interval * 60,
                 # Not running the resync immediately because the event listener should run resync on startup
                 wait_first=True,
-            )(lambda _: pool_executor_wrapper(loop))
+            )(
+                lambda: threading.Thread(
+                    target=lambda: asyncio.run_coroutine_threadsafe(
+                        execute_resync_all(), loop
+                    )
+                ).start()
+            )
             await repeated_function()
 
     async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None:

{port_ocean-0.12.2.dev6.dist-info → port_ocean-0.12.2.dev8.dist-info}/METADATA

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

@@ -65,7 +65,7 @@ port_ocean/core/defaults/clean.py,sha256=S3UAfca-oU89WJKIB4OgGjGjPr0vxBQ2aRZsLTZ
 port_ocean/core/defaults/common.py,sha256=uVUg6VEn4RqtXQwLwMNGfkmT5zYRN_h5USfKw3poVyo,3561
 port_ocean/core/defaults/initialize.py,sha256=qg4JLIWjp0c5-9w09X99muHRYX4k1cGZ_77vYo-tnpU,8422
 port_ocean/core/event_listener/__init__.py,sha256=mzJ33wRq0kh60fpVdOHVmvMTUQIvz3vxmifyBgwDn0E,889
-port_ocean/core/event_listener/base.py,sha256=tc7NHg-Vvt8M4iVIBrJvkecVTmTDGE1r-bjMQZpK_ME,2719
+port_ocean/core/event_listener/base.py,sha256=1Nmpg00OfT2AD2L8eFm4VQEcdG2TClpSWJMhWhAjkEE,2356
 port_ocean/core/event_listener/factory.py,sha256=AYYfSHPAF7P5H-uQECXT0JVJjKDHrYkWJJBSL4mGkg8,3697
 port_ocean/core/event_listener/http.py,sha256=N8HrfFqR3KGKz96pWdp_pP-m30jGtcz_1CkijovkBN8,2565
 port_ocean/core/event_listener/kafka.py,sha256=ulidnp4sz-chXwHsbH9JayVjcxy_mG6ts_Im3YKmLpI,6983
@@ -94,7 +94,7 @@ port_ocean/core/integrations/mixins/__init__.py,sha256=FA1FEKMM6P-L2_m7Q4L20mFa4
 port_ocean/core/integrations/mixins/events.py,sha256=Ddfx2L4FpghV38waF8OfVeOV0bHBxNIgjU-q5ffillI,2341
 port_ocean/core/integrations/mixins/handler.py,sha256=mZ7-0UlG3LcrwJttFbMe-R4xcOU2H_g33tZar7PwTv8,3771
 port_ocean/core/integrations/mixins/sync.py,sha256=B9fEs8faaYLLikH9GBjE_E61vo0bQDjIGQsQ1SRXOlA,3931
-port_ocean/core/integrations/mixins/sync_raw.py,sha256=hWaO1XbW7m2pUTGXlPJE30gOfbVhYhPXz0uNKEuDaNs,18849
+port_ocean/core/integrations/mixins/sync_raw.py,sha256=VVAReztpakDil4DSuXWdBnVSyKSBs-Dv7GCdm6toJp4,18988
 port_ocean/core/integrations/mixins/utils.py,sha256=7y1rGETZIjOQadyIjFJXIHKkQFKx_SwiP-TrAIsyyLY,2303
 port_ocean/core/models.py,sha256=dJ2_olTdbjUpObQJNmg7e7EENU_zZiX6XOaknNp54B0,1342
 port_ocean/core/ocean_types.py,sha256=3_d8-n626f1kWLQ_Jxw194LEyrOVupz05qs_Y1pvB-A,990
@@ -111,11 +111,11 @@ port_ocean/helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 port_ocean/helpers/async_client.py,sha256=SRlP6o7_FCSY3UHnRlZdezppePVxxOzZ0z861vE3K40,1783
 port_ocean/helpers/retry.py,sha256=IQ0RfQ2T5o6uoZh2WW2nrFH5TT6K_k3y2Im0HDp5j9Y,15059
 port_ocean/log/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-port_ocean/log/handlers.py,sha256=Br_1aujTmMkT15DbZj1E-mg0sHauvtKQB4E9-SDypmE,2861
+port_ocean/log/handlers.py,sha256=k9G_Mb4ga2-Jke9irpdlYqj6EYiwv0gEsh4TgyqqOmI,2853
 port_ocean/log/logger_setup.py,sha256=BaXt-mh9CVXhneh37H46d04lqOdIBixG1pFyGfotuZs,2328
 port_ocean/log/sensetive.py,sha256=lVKiZH6b7TkrZAMmhEJRhcl67HNM94e56x12DwFgCQk,2920
 port_ocean/middlewares.py,sha256=9wYCdyzRZGK1vjEJ28FY_DkfwDNENmXp504UKPf5NaQ,2727
-port_ocean/ocean.py,sha256=ZPIRXqBF2WB3-tLsOwRnbFioGzGh2iRadK7YgYP1rpM,5227
+port_ocean/ocean.py,sha256=Oe4H3kKtkj52uNO4Rd_47iY3MBdrTtshXZ_16q7A8bM,5071
 port_ocean/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 port_ocean/run.py,sha256=rTxBlrQd4yyrtgErCFJCHCEHs7d1OXrRiJehUYmIbN0,2212
 port_ocean/sonar-project.properties,sha256=X_wLzDOkEVmpGLRMb2fg9Rb0DxWwUFSvESId8qpvrPI,73
@@ -140,8 +140,8 @@ port_ocean/utils/repeat.py,sha256=0EFWM9d8lLXAhZmAyczY20LAnijw6UbIECf5lpGbOas,32
 port_ocean/utils/signal.py,sha256=K-6kKFQTltcmKDhtyZAcn0IMa3sUpOHGOAUdWKgx0_E,1369
 port_ocean/utils/time.py,sha256=pufAOH5ZQI7gXvOvJoQXZXZJV-Dqktoj9Qp9eiRwmJ4,1939
 port_ocean/version.py,sha256=UsuJdvdQlazzKGD3Hd5-U7N69STh8Dq9ggJzQFnu9fU,177
-port_ocean-0.12.2.dev6.dist-info/LICENSE.md,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-port_ocean-0.12.2.dev6.dist-info/METADATA,sha256=2jHYgbU6PsEbwOZIXbqyF9PfomB4mCoGmsBcdsr0XZU,6619
-port_ocean-0.12.2.dev6.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-port_ocean-0.12.2.dev6.dist-info/entry_points.txt,sha256=F_DNUmGZU2Kme-8NsWM5LLE8piGMafYZygRYhOVtcjA,54
-port_ocean-0.12.2.dev6.dist-info/RECORD,,
+port_ocean-0.12.2.dev8.dist-info/LICENSE.md,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+port_ocean-0.12.2.dev8.dist-info/METADATA,sha256=vakquKZunnwpNx8anyEnp8R8Fx6t235fknBMWSvRuxQ,6619
+port_ocean-0.12.2.dev8.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+port_ocean-0.12.2.dev8.dist-info/entry_points.txt,sha256=F_DNUmGZU2Kme-8NsWM5LLE8piGMafYZygRYhOVtcjA,54
+port_ocean-0.12.2.dev8.dist-info/RECORD,,