port-ocean 0.24.10__tar.gz → 0.24.12__tar.gz

{port_ocean-0.24.10 → port_ocean-0.24.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: port-ocean
-Version: 0.24.10
+Version: 0.24.12
 Summary: Port Ocean is a CLI tool for managing your Port projects.
 Home-page: https://app.getport.io
 Keywords: ocean,port-ocean,port
@@ -24,10 +24,10 @@ Classifier: Topic :: Utilities
 Provides-Extra: cli
 Requires-Dist: aiostream (>=0.5.2,<0.7.0)
 Requires-Dist: click (>=8.1.3,<9.0.0) ; extra == "cli"
-Requires-Dist: confluent-kafka (>=2.8.2,<3.0.0)
+Requires-Dist: confluent-kafka (>=2.10.1,<3.0.0)
 Requires-Dist: cookiecutter (>=2.1.1,<3.0.0) ; extra == "cli"
 Requires-Dist: fastapi (>=0.115.3,<0.116.0)
-Requires-Dist: httpx (>=0.24.1,<0.28.0)
+Requires-Dist: httpx (>=0.28.1,<0.29.0)
 Requires-Dist: jinja2-time (>=0.2.0,<0.3.0) ; extra == "cli"
 Requires-Dist: jq (>=1.8.0,<2.0.0)
 Requires-Dist: loguru (>=0.7.0,<0.8.0)
@@ -41,8 +41,8 @@ Requires-Dist: pyyaml (>=6.0,<7.0)
 Requires-Dist: rich (>=13.4.1,<14.0.0) ; extra == "cli"
 Requires-Dist: six (>=1.16.0,<2.0.0)
 Requires-Dist: tomli (>=2.0.1,<3.0.0)
-Requires-Dist: urllib3 (>=1.26.16,<3.0.0)
-Requires-Dist: uvicorn (>=0.22,<0.31)
+Requires-Dist: urllib3 (>=2.5.0,<3.0.0)
+Requires-Dist: uvicorn (>=0.34.3,<0.35.0)
 Requires-Dist: werkzeug (>=2.3.4,<4.0.0)
 Project-URL: Repository, https://github.com/port-labs/Port-Ocean
 Description-Content-Type: text/markdown

{port_ocean-0.24.10 → port_ocean-0.24.12}/port_ocean/core/handlers/webhook/processor_manager.py

@@ -8,6 +8,7 @@ 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
 from port_ocean.core.integrations.mixins.live_events import LiveEventsMixin
+from port_ocean.exceptions.webhook_processor import WebhookEventNotSupportedError
 from .webhook_event import WebhookEvent, WebhookEventRawResults, LiveEventTimestamp
 from port_ocean.context.event import event
 
@@ -53,10 +54,12 @@ class LiveEventsProcessorManager(LiveEventsMixin, EventsMixin):
         """Find and extract the matching processor for an event"""
 
         created_processors: list[tuple[ResourceConfig, AbstractWebhookProcessor]] = []
+        event_processor_names = []
 
         for processor_class in self._processors_classes[path]:
             processor = processor_class(webhook_event.clone())
             if await processor.should_process_event(webhook_event):
+                event_processor_names.append(processor.__class__.__name__)
                 kinds = await processor.get_matching_kinds(webhook_event)
                 for kind in kinds:
                     for resource in event.port_app_config.resources:
@@ -64,7 +67,22 @@ class LiveEventsProcessorManager(LiveEventsMixin, EventsMixin):
                             created_processors.append((resource, processor))
 
         if not created_processors:
-            raise ValueError("No matching processors found")
+            if event_processor_names:
+                logger.info(
+                    "Webhook processors are available to handle this webhook event, but the corresponding kinds are not configured in the integration's mapping",
+                    processors_available=event_processor_names,
+                    webhook_path=path,
+                )
+                return []
+            else:
+                logger.warning(
+                    "Unknown webhook event type received",
+                    webhook_path=path,
+                    message="No processors registered to handle this webhook event type.",
+                )
+                raise WebhookEventNotSupportedError(
+                    "No matching processors found for webhook event"
+                )
 
         logger.info(
             "Found matching processors for webhook event",

port_ocean-0.24.12/port_ocean/exceptions/webhook_processor.py

@@ -0,0 +1,17 @@
+from port_ocean.exceptions.base import BaseOceanException
+
+
+class RetryableError(Exception):
+    """Base exception class for errors that should trigger a retry."""
+
+    pass
+
+
+class WebhookProcessingError(BaseOceanException):
+    """Base exception for webhook processing errors"""
+
+    pass
+
+
+class WebhookEventNotSupportedError(WebhookProcessingError):
+    pass

{port_ocean-0.24.10 → port_ocean-0.24.12}/port_ocean/helpers/async_client.py

@@ -1,4 +1,4 @@
-from typing import Any, Callable, Type
+from typing import Any, Type
 
 import httpx
 from loguru import logger
@@ -26,11 +26,10 @@ class OceanAsyncClient(httpx.AsyncClient):
     def _init_transport(  # type: ignore[override]
         self,
         transport: httpx.AsyncBaseTransport | None = None,
-        app: Callable[..., Any] | None = None,
         **kwargs: Any,
     ) -> httpx.AsyncBaseTransport:
-        if transport is not None or app is not None:
-            return super()._init_transport(transport=transport, app=app, **kwargs)
+        if transport is not None:
+            return super()._init_transport(transport=transport, **kwargs)
 
         return self._transport_class(
             wrapped_transport=httpx.AsyncHTTPTransport(

{port_ocean-0.24.10 → port_ocean-0.24.12}/port_ocean/tests/core/handlers/webhook/test_processor_manager.py

@@ -37,7 +37,10 @@ from port_ocean.core.handlers.port_app_config.models import (
 )
 from port_ocean.core.integrations.mixins.live_events import LiveEventsMixin
 from port_ocean.core.models import Entity
-from port_ocean.exceptions.webhook_processor import RetryableError
+from port_ocean.exceptions.webhook_processor import (
+    RetryableError,
+    WebhookEventNotSupportedError,
+)
 from port_ocean.core.handlers.queue import LocalQueue
 
 
@@ -354,7 +357,9 @@ async def test_extractMatchingProcessors_noMatch(
     test_path = "/test"
     processor_manager.register_processor(test_path, MockProcessorFalse)
 
-    with pytest.raises(ValueError, match="No matching processors found"):
+    with pytest.raises(
+        WebhookEventNotSupportedError, match="No matching processors found"
+    ):
         async with event_context(
             EventType.HTTP_REQUEST, trigger_type="request"
         ) as event:
@@ -409,6 +414,82 @@ async def test_extractMatchingProcessors_onlyOneMatches(
     assert processor.event.payload == webhook_event.payload
 
 
+@pytest.mark.asyncio
+async def test_extractMatchingProcessors_noProcessorsRegistered(
+    processor_manager: LiveEventsProcessorManager,
+    webhook_event: WebhookEvent,
+    mock_port_app_config: PortAppConfig,
+) -> None:
+    """Test that WebhookEventNotSupportedError is raised for unknown events without any registered processors"""
+    test_path = "/unknown_path"
+    # No processors registered for this path
+
+    # Manually add the path to _processors_classes to simulate a path with no processors
+    processor_manager._processors_classes[test_path] = []
+
+    with pytest.raises(
+        WebhookEventNotSupportedError, match="No matching processors found"
+    ):
+        async with event_context(
+            EventType.HTTP_REQUEST, trigger_type="request"
+        ) as event:
+            event.port_app_config = mock_port_app_config
+            await processor_manager._extract_matching_processors(
+                webhook_event, test_path
+            )
+
+
+@pytest.mark.asyncio
+async def test_extractMatchingProcessors_processorsAvailableButKindsNotConfigured(
+    processor_manager: LiveEventsProcessorManager,
+    webhook_event: WebhookEvent,
+) -> None:
+    """Test that processors available but kinds not configured returns empty list"""
+    test_path = "/test"
+
+    from port_ocean.core.handlers.port_app_config.models import (
+        PortAppConfig,
+        ResourceConfig,
+    )
+
+    # Create a mock processor that will match the event but return a kind not in the port app config
+    class MockProcessorWithUnmappedKind(AbstractWebhookProcessor):
+        async def authenticate(
+            self, payload: Dict[str, Any], headers: Dict[str, str]
+        ) -> bool:
+            return True
+
+        async def validate_payload(self, payload: Dict[str, Any]) -> bool:
+            return True
+
+        async def handle_event(
+            self, payload: EventPayload, resource: ResourceConfig
+        ) -> WebhookEventRawResults:
+            return WebhookEventRawResults(
+                updated_raw_results=[], deleted_raw_results=[]
+            )
+
+        async def should_process_event(self, event: WebhookEvent) -> bool:
+            return True  # This processor will match
+
+        async def get_matching_kinds(self, event: WebhookEvent) -> list[str]:
+            return ["unmapped_kind"]  # This kind is not in the mock_port_app_config
+
+    processor_manager.register_processor(test_path, MockProcessorWithUnmappedKind)
+
+    empty_port_app_config = PortAppConfig(
+        resources=[],
+    )
+
+    async with event_context(EventType.HTTP_REQUEST, trigger_type="request") as event:
+        event.port_app_config = empty_port_app_config
+        processors = await processor_manager._extract_matching_processors(
+            webhook_event, test_path
+        )
+
+    assert len(processors) == 0
+
+
 def test_registerProcessor_registrationWorks(
     processor_manager: LiveEventsProcessorManager,
 ) -> None:
@@ -853,7 +934,10 @@ async def test_integrationTest_postRequestSent_noMatchingHandlers_entityNotUpser
     except asyncio.TimeoutError:
         pytest.fail("Event processing timed out")
 
-    assert isinstance(test_state["exception_thrown"], ValueError) is True
+    assert (
+        isinstance(test_state["exception_thrown"], WebhookEventNotSupportedError)
+        is True
+    )
 
     mock_upsert.assert_not_called()
     mock_delete.assert_not_called()

{port_ocean-0.24.10 → port_ocean-0.24.12}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "port-ocean"
-version = "0.24.10"
+version = "0.24.12"
 description = "Port Ocean is a CLI tool for managing your Port projects."
 readme = "README.md"
 homepage = "https://app.getport.io"
@@ -45,11 +45,11 @@ loguru = "^0.7.0"
 pyyaml = "^6.0"
 werkzeug = ">=2.3.4,<4.0.0"
 fastapi = "^0.115.3"
-uvicorn = ">=0.22,<0.31"
-confluent-kafka = "^2.8.2"
-httpx = ">=0.24.1,<0.28.0"
+uvicorn = "^0.34.3"
+confluent-kafka = "^2.10.1"
+httpx = "^0.28.1"
 jq = "^1.8.0"
-urllib3 = ">=1.26.16,<3.0.0"
+urllib3 = "^2.5.0"
 six = "^1.16.0"
 pyhumps = "^3.8.0"
 pydispatcher = "^2.0.7"
@@ -72,7 +72,7 @@ cli = ["click", "rich", "cookiecutter", "jinja2-time"]
 [tool.poetry.group.dev.dependencies]
 black = ">=23.3,<25.0"
 mypy = "^1.3.0"
-pre-commit = "^3.7.1"
+pre-commit = "^4.2.0"
 pylint = ">=2.17.4,<4.0.0"
 pytest = ">=8.2,<9.0"
 pytest-asyncio = ">=0.24.0"

port_ocean-0.24.10/port_ocean/exceptions/webhook_processor.py

@@ -1,4 +0,0 @@
-class RetryableError(Exception):
-    """Base exception class for errors that should trigger a retry."""
-
-    pass