port-ocean 0.21.4__tar.gz → 0.21.5__tar.gz

{port_ocean-0.21.4 → port_ocean-0.21.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: port-ocean
-Version: 0.21.4
+Version: 0.21.5
 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.21.4 → port_ocean-0.21.5}/port_ocean/core/handlers/webhook/processor_manager.py

@@ -1,9 +1,9 @@
-from copy import deepcopy
 from typing import Dict, Type, Set
 from fastapi import APIRouter, Request
 from loguru import logger
 import asyncio
 
+from port_ocean.context.ocean import ocean
 from port_ocean.context.event import EventType, event_context
 from port_ocean.core.handlers.port_app_config.models import ResourceConfig
 from port_ocean.core.integrations.mixins.events import EventsMixin
@@ -89,8 +89,11 @@ class LiveEventsProcessorManager(LiveEventsMixin, EventsMixin):
                     async with event_context(
                         EventType.HTTP_REQUEST,
                         trigger_type="machine",
-                        parent_override=webhook_event.event_context,
                     ):
+                        # This forces the Processor manager to fetch the latest port app config for each event
+                        await ocean.integration.port_app_config_handler.get_port_app_config(
+                            use_cache=False
+                        )
                         matching_processors_with_resource = (
                             await self._extract_matching_processors(webhook_event, path)
                         )
@@ -246,7 +249,6 @@ class LiveEventsProcessorManager(LiveEventsMixin, EventsMixin):
             try:
                 webhook_event = await WebhookEvent.from_request(request)
                 webhook_event.set_timestamp(LiveEventTimestamp.AddedToQueue)
-                webhook_event.set_event_context(deepcopy(event))
                 await self._event_queues[path].put(webhook_event)
                 return {"status": "ok"}
             except Exception as e:

{port_ocean-0.21.4 → port_ocean-0.21.5}/port_ocean/core/handlers/webhook/webhook_event.py

@@ -5,7 +5,6 @@ from uuid import uuid4
 from fastapi import Request
 from loguru import logger
 
-from port_ocean.context.event import EventContext
 from port_ocean.core.handlers.port_app_config.models import ResourceConfig
 from port_ocean.core.ocean_types import RAW_ITEM
 
@@ -57,7 +56,6 @@ class WebhookEvent(LiveEvent):
         self.payload = payload
         self.headers = headers
         self._original_request = original_request
-        self.event_context: EventContext | None = None
 
     @classmethod
     async def from_request(
@@ -103,9 +101,6 @@ class WebhookEvent(LiveEvent):
             },
         )
 
-    def set_event_context(self, event_context: EventContext) -> None:
-        self.event_context = event_context
-
 
 class WebhookEventRawResults:
     """

{port_ocean-0.21.4 → port_ocean-0.21.5}/port_ocean/tests/core/handlers/webhook/test_processor_manager.py

@@ -12,6 +12,7 @@ from port_ocean.core.handlers.webhook.webhook_event import (
     EventPayload,
 )
 from fastapi import APIRouter
+from port_ocean.core.integrations.mixins.handler import HandlerMixin
 from port_ocean.utils.signal import SignalHandler
 from typing import Dict, Any
 import asyncio
@@ -19,7 +20,7 @@ from fastapi.testclient import TestClient
 from fastapi import FastAPI
 from port_ocean.context.ocean import PortOceanContext
 from unittest.mock import AsyncMock
-from port_ocean.context.event import event_context, EventType
+from port_ocean.context.event import EventContext, event_context, EventType
 from port_ocean.context.ocean import ocean
 from unittest.mock import MagicMock, patch
 from httpx import Response
@@ -571,6 +572,16 @@ async def test_integrationTest_postRequestSent_webhookEventRawResultProcessed_en
         "sync_raw_results",
         patched_export_single_resource,
     )
+    monkeypatch.setattr(
+        HandlerMixin,
+        "port_app_config_handler",
+        AsyncMock(return_value=mock_port_app_config),
+    )
+    monkeypatch.setattr(
+        EventContext,
+        "port_app_config",
+        mock_port_app_config,
+    )
     test_path = "/webhook-test"
     mock_context.app.integration = BaseIntegration(ocean)
     mock_context.app.webhook_manager = LiveEventsProcessorManager(
@@ -589,12 +600,7 @@ async def test_integrationTest_postRequestSent_webhookEventRawResultProcessed_en
 
     test_payload = {"test": "data"}
 
-    async with event_context(EventType.HTTP_REQUEST, trigger_type="request") as event:
-        mock_context.app.webhook_manager.port_app_config_handler.get_port_app_config = AsyncMock(return_value=mock_port_app_config)  # type: ignore
-        event.port_app_config = (
-            await mock_context.app.webhook_manager.port_app_config_handler.get_port_app_config()
-        )
-
+    async with event_context(EventType.HTTP_REQUEST, trigger_type="request"):
         response = client.post(
             test_path, json=test_payload, headers={"Content-Type": "application/json"}
         )
@@ -685,6 +691,16 @@ async def test_integrationTest_postRequestSent_reachedTimeout_entityNotUpserted(
         "_process_single_event",
         patched_process_single_event,
     )
+    monkeypatch.setattr(
+        HandlerMixin,
+        "port_app_config_handler",
+        AsyncMock(return_value=mock_port_app_config),
+    )
+    monkeypatch.setattr(
+        EventContext,
+        "port_app_config",
+        mock_port_app_config,
+    )
     test_path = "/webhook-test"
     mock_context.app.integration = BaseIntegration(ocean)
     mock_context.app.webhook_manager = LiveEventsProcessorManager(
@@ -703,12 +719,7 @@ async def test_integrationTest_postRequestSent_reachedTimeout_entityNotUpserted(
 
     test_payload = {"test": "data"}
 
-    async with event_context(EventType.HTTP_REQUEST, trigger_type="request") as event:
-        mock_context.app.webhook_manager.port_app_config_handler.get_port_app_config = AsyncMock(return_value=mock_port_app_config)  # type: ignore
-        event.port_app_config = (
-            await mock_context.app.webhook_manager.port_app_config_handler.get_port_app_config()
-        )
-
+    async with event_context(EventType.HTTP_REQUEST, trigger_type="request"):
         response = client.post(
             test_path, json=test_payload, headers={"Content-Type": "application/json"}
         )
@@ -802,6 +813,16 @@ async def test_integrationTest_postRequestSent_noMatchingHandlers_entityNotUpser
         "_extract_matching_processors",
         patched_extract_matching_processors,
     )
+    monkeypatch.setattr(
+        HandlerMixin,
+        "port_app_config_handler",
+        AsyncMock(return_value=mock_port_app_config),
+    )
+    monkeypatch.setattr(
+        EventContext,
+        "port_app_config",
+        mock_port_app_config,
+    )
     test_path = "/webhook-test"
     mock_context.app.integration = BaseIntegration(ocean)
     mock_context.app.webhook_manager = LiveEventsProcessorManager(
@@ -819,13 +840,7 @@ async def test_integrationTest_postRequestSent_noMatchingHandlers_entityNotUpser
     client = TestClient(mock_context.app.fast_api_app)
 
     test_payload = {"test": "data"}
-
-    async with event_context(EventType.HTTP_REQUEST, trigger_type="request") as event:
-        mock_context.app.webhook_manager.port_app_config_handler.get_port_app_config = AsyncMock(return_value=mock_port_app_config)  # type: ignore
-        event.port_app_config = (
-            await mock_context.app.webhook_manager.port_app_config_handler.get_port_app_config()
-        )
-
+    async with event_context(EventType.HTTP_REQUEST, trigger_type="request"):
         response = client.post(
             test_path, json=test_payload, headers={"Content-Type": "application/json"}
         )
@@ -982,6 +997,16 @@ async def test_integrationTest_postRequestSent_webhookEventRawResultProcessedFor
         "sync_raw_results",
         patched_export_single_resource,
     )
+    monkeypatch.setattr(
+        HandlerMixin,
+        "port_app_config_handler",
+        AsyncMock(return_value=mock_port_app_config),
+    )
+    monkeypatch.setattr(
+        EventContext,
+        "port_app_config",
+        mock_port_app_config,
+    )
     test_path = "/webhook-test"
     mock_context.app.integration = BaseIntegration(ocean)
     mock_context.app.webhook_manager = LiveEventsProcessorManager(
@@ -1004,12 +1029,7 @@ async def test_integrationTest_postRequestSent_webhookEventRawResultProcessedFor
 
     test_payload = {"test": "data"}
 
-    async with event_context(EventType.HTTP_REQUEST, trigger_type="request") as event:
-        mock_context.app.webhook_manager.port_app_config_handler.get_port_app_config = AsyncMock(return_value=mock_port_app_config)  # type: ignore
-        event.port_app_config = (
-            await mock_context.app.webhook_manager.port_app_config_handler.get_port_app_config()
-        )
-
+    async with event_context(EventType.HTTP_REQUEST, trigger_type="request"):
         response = client.post(
             test_path, json=test_payload, headers={"Content-Type": "application/json"}
         )
@@ -1112,6 +1132,16 @@ async def test_integrationTest_postRequestSent_webhookEventRawResultProcessedwit
         "sync_raw_results",
         patched_export_single_resource,
     )
+    monkeypatch.setattr(
+        HandlerMixin,
+        "port_app_config_handler",
+        AsyncMock(return_value=mock_port_app_config),
+    )
+    monkeypatch.setattr(
+        EventContext,
+        "port_app_config",
+        mock_port_app_config,
+    )
     test_path = "/webhook-test"
     mock_context.app.integration = BaseIntegration(ocean)
     mock_context.app.webhook_manager = LiveEventsProcessorManager(
@@ -1130,12 +1160,7 @@ async def test_integrationTest_postRequestSent_webhookEventRawResultProcessedwit
 
     test_payload = {"test": "data"}
 
-    async with event_context(EventType.HTTP_REQUEST, trigger_type="request") as event:
-        mock_context.app.webhook_manager.port_app_config_handler.get_port_app_config = AsyncMock(return_value=mock_port_app_config)  # type: ignore
-        event.port_app_config = (
-            await mock_context.app.webhook_manager.port_app_config_handler.get_port_app_config()
-        )
-
+    async with event_context(EventType.HTTP_REQUEST, trigger_type="request"):
         response = client.post(
             test_path, json=test_payload, headers={"Content-Type": "application/json"}
         )
@@ -1242,6 +1267,16 @@ async def test_integrationTest_postRequestSent_webhookEventRawResultProcessedwit
         "_process_webhook_request",
         patched_process_webhook_request,
     )
+    monkeypatch.setattr(
+        HandlerMixin,
+        "port_app_config_handler",
+        AsyncMock(return_value=mock_port_app_config),
+    )
+    monkeypatch.setattr(
+        EventContext,
+        "port_app_config",
+        mock_port_app_config,
+    )
     test_path = "/webhook-test"
     mock_context.app.integration = BaseIntegration(ocean)
     mock_context.app.webhook_manager = LiveEventsProcessorManager(
@@ -1260,12 +1295,7 @@ async def test_integrationTest_postRequestSent_webhookEventRawResultProcessedwit
 
     test_payload = {"test": "data"}
 
-    async with event_context(EventType.HTTP_REQUEST, trigger_type="request") as event:
-        mock_context.app.webhook_manager.port_app_config_handler.get_port_app_config = AsyncMock(return_value=mock_port_app_config)  # type: ignore
-        event.port_app_config = (
-            await mock_context.app.webhook_manager.port_app_config_handler.get_port_app_config()
-        )
-
+    async with event_context(EventType.HTTP_REQUEST, trigger_type="request"):
         response = client.post(
             test_path, json=test_payload, headers={"Content-Type": "application/json"}
         )
@@ -1381,6 +1411,16 @@ async def test_integrationTest_postRequestSent_oneProcessorThrowsException_onlyS
         "sync_raw_results",
         patched_export_single_resource,
     )
+    monkeypatch.setattr(
+        HandlerMixin,
+        "port_app_config_handler",
+        AsyncMock(return_value=mock_port_app_config),
+    )
+    monkeypatch.setattr(
+        EventContext,
+        "port_app_config",
+        mock_port_app_config,
+    )
     test_path = "/webhook-test"
     mock_context.app.integration = BaseIntegration(ocean)
     mock_context.app.webhook_manager = LiveEventsProcessorManager(
@@ -1401,12 +1441,7 @@ async def test_integrationTest_postRequestSent_oneProcessorThrowsException_onlyS
 
     test_payload = {"test": "data"}
 
-    async with event_context(EventType.HTTP_REQUEST, trigger_type="request") as event:
-        mock_context.app.webhook_manager.port_app_config_handler.get_port_app_config = AsyncMock(return_value=mock_port_app_config)  # type: ignore
-        event.port_app_config = (
-            await mock_context.app.webhook_manager.port_app_config_handler.get_port_app_config()
-        )
-
+    async with event_context(EventType.HTTP_REQUEST, trigger_type="request"):
         response = client.post(
             test_path, json=test_payload, headers={"Content-Type": "application/json"}
         )

{port_ocean-0.21.4 → port_ocean-0.21.5}/pyproject.toml

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