port-ocean 0.24.8__py3-none-any.whl → 0.24.11__py3-none-any.whl

port_ocean/clients/port/mixins/entities.py

@@ -397,6 +397,15 @@ class EntityClientMixin:
                             self._reduce_entity(entity),
                         )
                         entities_results.append(failed_result)
+                        ocean.metrics.inc_metric(
+                            name=MetricType.OBJECT_COUNT_NAME,
+                            labels=[
+                                ocean.metrics.current_resource_kind(),
+                                MetricPhase.LOAD,
+                                MetricPhase.LoadResult.FAILED,
+                            ],
+                            value=1,
+                        )
             elif isinstance(bulk_result, list):
                 for status, entity in bulk_result:
                     if (

port_ocean/core/handlers/port_app_config/models.py

@@ -21,6 +21,7 @@ class IngestSearchQuery(BaseModel):
 class EntityMapping(BaseModel):
     identifier: str | IngestSearchQuery
     title: str | None
+    icon: str | None
     blueprint: str
     team: str | IngestSearchQuery | None
     properties: dict[str, str] = Field(default_factory=dict)

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/core/integrations/mixins/sync_raw.py

@@ -257,16 +257,10 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
                             labels=[ocean.metrics.current_resource_kind(), MetricPhase.LOAD, MetricPhase.LoadResult.SKIPPED],
                             value=len(objects_diff[0].entity_selector_diff.passed) - len(changed_entities)
                         )
-                    upserted_entities = await self.entities_state_applier.upsert(
+                    await self.entities_state_applier.upsert(
                         changed_entities, user_agent_type
                     )
 
-                    ocean.metrics.set_metric(
-                        name=MetricType.OBJECT_COUNT_NAME,
-                        labels=[ocean.metrics.current_resource_kind(), MetricPhase.LOAD, MetricPhase.LoadResult.LOADED],
-                        value=len(upserted_entities)
-                    )
-
                 else:
                     logger.info("Entities in batch didn't changed since last sync, skipping", total_entities=len(objects_diff[0].entity_selector_diff.passed))
                     ocean.metrics.inc_metric(
@@ -280,11 +274,6 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
                 modified_objects = await self.entities_state_applier.upsert(
                     objects_diff[0].entity_selector_diff.passed, user_agent_type
                     )
-                ocean.metrics.set_metric(
-                        name=MetricType.OBJECT_COUNT_NAME,
-                        labels=[ocean.metrics.current_resource_kind(), MetricPhase.LOAD, MetricPhase.LoadResult.LOADED],
-                        value=len(upserted_entities)
-                    )
         else:
            modified_objects = await self.entities_state_applier.upsert(
                     objects_diff[0].entity_selector_diff.passed, user_agent_type

port_ocean/core/models.py

@@ -48,6 +48,7 @@ class PortAPIErrorMessage(Enum):
 
 class Entity(BaseModel):
     identifier: Any
+    icon: str | None
     blueprint: Any
     title: Any
     team: str | None | list[Any] | dict[str, Any] = []

port_ocean/exceptions/webhook_processor.py

@@ -1,4 +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/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.8.dist-info → port_ocean-0.24.11.dist-info}/METADATA

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

@@ -59,7 +59,7 @@ port_ocean/clients/port/authentication.py,sha256=r7r8Ag9WuwXy-CmgeOoj-PHbmJAQxhb
 port_ocean/clients/port/client.py,sha256=dv0mxIOde6J-wFi1FXXZkoNPVHrZzY7RSMhNkDD9xgA,3566
 port_ocean/clients/port/mixins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 port_ocean/clients/port/mixins/blueprints.py,sha256=aMCG4zePsMSMjMLiGrU37h5z5_ElfMzTcTvqvOI5wXY,4683
-port_ocean/clients/port/mixins/entities.py,sha256=hg4xJCcYml2JLkqEwg7lJUhB5YLm_sadNfiKdf3rP6Q,22811
+port_ocean/clients/port/mixins/entities.py,sha256=NSZCV-IAg5_gQ7LxCMzxKJu_LkFkz809CQ2y8dFhHqE,23239
 port_ocean/clients/port/mixins/integrations.py,sha256=s6paomK9bYWW-Tu3y2OIaEGSxsXCHyhapVi4JIhhO64,11162
 port_ocean/clients/port/mixins/migrations.py,sha256=vdL_A_NNUogvzujyaRLIoZEu5vmKDY2BxTjoGP94YzI,1467
 port_ocean/clients/port/mixins/organization.py,sha256=A2cP5V49KnjoAXxjmnm_XGth4ftPSU0qURNfnyUyS_Y,1041
@@ -104,7 +104,7 @@ port_ocean/core/handlers/entity_processor/jq_entity_processor.py,sha256=C6zJbS3m
 port_ocean/core/handlers/port_app_config/__init__.py,sha256=8AAT5OthiVM7KCcM34iEgEeXtn2pRMrT4Dze5r1Ixbk,134
 port_ocean/core/handlers/port_app_config/api.py,sha256=r_Th66NEw38IpRdnXZcRvI8ACfvxW_A6V62WLwjWXlQ,1044
 port_ocean/core/handlers/port_app_config/base.py,sha256=Sup4-X_a7JGa27rMy_OgqGIjFHMlKBpKevicaK3AeHU,2919
-port_ocean/core/handlers/port_app_config/models.py,sha256=Rf01rQpQZRse2qfr5PwgOz4pKwb53y0LuW9yp7v_ZoI,2912
+port_ocean/core/handlers/port_app_config/models.py,sha256=pO7oI7GIYZ9c2ZxLu8EQ97U2IPqzsbJf3gRQxlizEjE,2933
 port_ocean/core/handlers/queue/__init__.py,sha256=1fICM0ZLATmmj6f7cdq_eV2kmw0_jy7y2INuLQIpzIE,121
 port_ocean/core/handlers/queue/abstract_queue.py,sha256=q_gpaWFFZHxM3XovEbgsDn8jEOLM45iAZWVC81Paxto,620
 port_ocean/core/handlers/queue/local_queue.py,sha256=EzqsGIX43xbVAcePwTcCg5QDrXATQpy-VzWxxN_OyAM,574
@@ -112,7 +112,7 @@ port_ocean/core/handlers/resync_state_updater/__init__.py,sha256=kG6y-JQGpPfuTHh
 port_ocean/core/handlers/resync_state_updater/updater.py,sha256=TRYq6QnTtPlJg6MvgZPtQdZPvkAhkvpcmWjtkxCnkg4,3764
 port_ocean/core/handlers/webhook/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 port_ocean/core/handlers/webhook/abstract_webhook_processor.py,sha256=5KwZkdkDd5HdVkXPzKiqabodZKl-hOtMypkTKd8Hq3M,3891
-port_ocean/core/handlers/webhook/processor_manager.py,sha256=ipyAXoFtF84EGczyzRcZCzQG4Ippjo4eMsnVxMVz12A,12072
+port_ocean/core/handlers/webhook/processor_manager.py,sha256=4u9Q_djZAzxgwGHlHBmVBG26svEigeSka6GajcETd20,12976
 port_ocean/core/handlers/webhook/webhook_event.py,sha256=9wHXLY6IGgjuqrwXXvZm_RbYEd-a9qIFNxWnGbfPv6o,3877
 port_ocean/core/integrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 port_ocean/core/integrations/base.py,sha256=dUhytVM9uUbcDRzG1QWyvBvEJOWZY0dPVV3hXuukOfg,3587
@@ -121,9 +121,9 @@ 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=mY9z6wexl1bC8c3LzOafOzC3RxjRv7NjCmVpQZUypvI,34289
+port_ocean/core/integrations/mixins/sync_raw.py,sha256=AtS0Qr4mIY3vZZxSmnFOLMskiQ_kJUg0_f2ZT8O_Ejw,33670
 port_ocean/core/integrations/mixins/utils.py,sha256=N76dNu1Y6UEg0_pcSdF4RO6dQIZ8EBfX3xMelgWdMxM,3779
-port_ocean/core/models.py,sha256=NYsOBtAqRgmRTb2XYGDW31IxTHSXGRQLOF64apwUZ2Q,2872
+port_ocean/core/models.py,sha256=DNbKpStMINI2lIekKprTqBevqkw_wFuFayN19w1aDfQ,2893
 port_ocean/core/ocean_types.py,sha256=4VipWFOHEh_d9LmWewQccwx1p2dtrRYW0YURVgNsAjo,1398
 port_ocean/core/utils/entity_topological_sorter.py,sha256=MDUjM6OuDy4Xj68o-7InNN0w1jqjxeDfeY8U02vySNI,3081
 port_ocean/core/utils/utils.py,sha256=XJ6ZZBR5hols19TcX4Bh49ygSNhPt3MLncLR-g41GTA,6858
@@ -136,7 +136,7 @@ port_ocean/exceptions/context.py,sha256=mA8HII6Rl4QxKUz98ppy1zX3kaziaen21h1ZWuU3
 port_ocean/exceptions/core.py,sha256=3LpQrOWdZ-xZ8zm90DmTnFnk0Nms2OgrVIzZBK0Xw5M,931
 port_ocean/exceptions/port_defaults.py,sha256=2a7Koy541KxMan33mU-gbauUxsumG3NT4itVxSpQqfw,666
 port_ocean/exceptions/utils.py,sha256=gjOqpi-HpY1l4WlMFsGA9yzhxDhajhoGGdDDyGbLnqI,197
-port_ocean/exceptions/webhook_processor.py,sha256=yQYazg53Y-ohb7HfViwq1opH_ZUuUdhHSRxcUNveFpI,114
+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=SRlP6o7_FCSY3UHnRlZdezppePVxxOzZ0z861vE3K40,1783
 port_ocean/helpers/metric/metric.py,sha256=Aacz7bOd8ZCwEPpXAdwLbKRXf28Z4wiViG_GXiV_xWg,14529
@@ -171,7 +171,7 @@ port_ocean/tests/core/handlers/port_app_config/test_api.py,sha256=eJZ6SuFBLz71y4
 port_ocean/tests/core/handlers/port_app_config/test_base.py,sha256=hSh556bJM9zuELwhwnyKSfd9z06WqWXIfe-6hCl5iKI,9799
 port_ocean/tests/core/handlers/queue/test_local_queue.py,sha256=9Ly0HzZXbs6Rbl_bstsIdInC3h2bgABU3roP9S_PnJM,2582
 port_ocean/tests/core/handlers/webhook/test_abstract_webhook_processor.py,sha256=zKwHhPAYEZoZ5Z2UETp1t--mbkS8uyvlXThB0obZTTc,3340
-port_ocean/tests/core/handlers/webhook/test_processor_manager.py,sha256=6Zap3rKBd8Td7-a9af6_FWOGNDN4oZhNdWeeaICsLD0,49386
+port_ocean/tests/core/handlers/webhook/test_processor_manager.py,sha256=rqNFc-S_ZnPyDTSFTdiGcRFKbeDGfWQCH_f2UPbfcAA,52310
 port_ocean/tests/core/handlers/webhook/test_webhook_event.py,sha256=oR4dEHLO65mp6rkfNfszZcfFoRZlB8ZWee4XetmsuIk,3181
 port_ocean/tests/core/test_utils.py,sha256=Z3kdhb5V7Svhcyy3EansdTpgHL36TL6erNtU-OPwAcI,2647
 port_ocean/tests/core/utils/test_entity_topological_sorter.py,sha256=zuq5WSPy_88PemG3mOUIHTxWMR_js1R7tOzUYlgBd68,3447
@@ -200,8 +200,8 @@ port_ocean/utils/repeat.py,sha256=U2OeCkHPWXmRTVoPV-VcJRlQhcYqPWI5NfmPlb1JIbc,32
 port_ocean/utils/signal.py,sha256=mMVq-1Ab5YpNiqN4PkiyTGlV_G0wkUDMMjTZp5z3pb0,1514
 port_ocean/utils/time.py,sha256=pufAOH5ZQI7gXvOvJoQXZXZJV-Dqktoj9Qp9eiRwmJ4,1939
 port_ocean/version.py,sha256=UsuJdvdQlazzKGD3Hd5-U7N69STh8Dq9ggJzQFnu9fU,177
-port_ocean-0.24.8.dist-info/LICENSE.md,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-port_ocean-0.24.8.dist-info/METADATA,sha256=cu0CSxuGdnkD2bsnwo9sK6K2FrZP5sojiDhmFqfpE9Q,6852
-port_ocean-0.24.8.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-port_ocean-0.24.8.dist-info/entry_points.txt,sha256=F_DNUmGZU2Kme-8NsWM5LLE8piGMafYZygRYhOVtcjA,54
-port_ocean-0.24.8.dist-info/RECORD,,
+port_ocean-0.24.11.dist-info/LICENSE.md,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+port_ocean-0.24.11.dist-info/METADATA,sha256=5SPsmnSpVV2tiRRGdbP0SeRJZ3SJ2EUiPR_t-4oGupI,6853
+port_ocean-0.24.11.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+port_ocean-0.24.11.dist-info/entry_points.txt,sha256=F_DNUmGZU2Kme-8NsWM5LLE8piGMafYZygRYhOVtcjA,54
+port_ocean-0.24.11.dist-info/RECORD,,