port-ocean 0.5.24.dev1__py3-none-any.whl → 0.5.27__py3-none-any.whl

port_ocean/config/settings.py

@@ -1,15 +1,14 @@
 from typing import Any, Literal
 
+from port_ocean.config.base import BaseOceanSettings, BaseOceanModel
+from port_ocean.core.event_listener import EventListenerSettingsType
+from port_ocean.utils.misc import get_integration_name
 from pydantic import Extra, AnyHttpUrl, parse_obj_as
 from pydantic.class_validators import root_validator
 from pydantic.env_settings import InitSettingsSource, EnvSettingsSource, BaseSettings
 from pydantic.fields import Field
 from pydantic.main import BaseModel
 
-from port_ocean.config.base import BaseOceanSettings, BaseOceanModel
-from port_ocean.core.event_listener import EventListenerSettingsType
-from port_ocean.utils.misc import get_integration_name
-
 LogLevelType = Literal["ERROR", "WARNING", "INFO", "DEBUG", "CRITICAL"]
 
 
@@ -42,12 +41,12 @@ class PortSettings(BaseOceanModel, extra=Extra.allow):
 
 
 class IntegrationSettings(BaseOceanModel, extra=Extra.allow):
-    identifier: str = Field(..., min_length=1)
-    type: str = Field(..., min_length=1)
-    config: dict[str, Any] | BaseModel
+    identifier: str
+    type: str
+    config: dict[str, Any] | BaseModel = Field(default_factory=dict)
 
     @root_validator(pre=True)
-    def a(cls, values: dict[str, Any]) -> dict[str, Any]:
+    def root_validator(cls, values: dict[str, Any]) -> dict[str, Any]:
         integ_type = values.get("type")
 
         if not integ_type:
@@ -68,4 +67,5 @@ class IntegrationConfiguration(BaseOceanSettings, extra=Extra.allow):
     send_raw_data_examples: bool = True
     port: PortSettings
     event_listener: EventListenerSettingsType
-    integration: IntegrationSettings
+    # If an identifier or type is not provided, it will be generated based on the integration name
+    integration: IntegrationSettings = IntegrationSettings(type="", identifier="")

port_ocean/core/defaults/initialize.py

@@ -159,7 +159,7 @@ async def _create_resources(
             f"Failed to create resources: {err.response.text}. Rolling back changes..."
         )
         raise AbortDefaultCreationError(
-            created_blueprints_identifiers, [err], created_pages
+            created_blueprints_identifiers, [err], created_pages_identifiers
         )
 
 

port_ocean/core/integrations/mixins/sync_raw.py

@@ -372,7 +372,10 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
             )
 
             if after_errors:
-                message = f"Failed to calculate diff for entities with {len(after_errors)} errors. Skipping delete phase due to incomplete state"
+                message = (
+                    f"Failed to calculate diff for entities with {len(after_errors)} errors. "
+                    f"Skipping delete phase due to incomplete state"
+                )
                 logger.error(message, exc_info=after_errors)
                 entities_before_flatten = []
 
@@ -416,7 +419,11 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
                 )
             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"
+                    "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"
                 )
                 entities_at_port = []
 

port_ocean/core/utils.py

@@ -34,13 +34,19 @@ Q = TypeVar("Q")
 
 async def gather_and_split_errors_from_results(
     task: Iterable[Awaitable[Q]],
-    result_threshold_validation: Callable[[Q | BaseException], bool] | None = None,
-) -> tuple[list[Q], list[BaseException]]:
-    valid_items = []
-    errors = []
+    result_threshold_validation: Callable[[Q | Exception], bool] | None = None,
+) -> tuple[list[Q], list[Exception]]:
+    valid_items: list[Q] = []
+    errors: list[Exception] = []
     results = await asyncio.gather(*task, return_exceptions=True)
     for item in results:
-        if isinstance(item, Exception):
+        # return_exceptions will also catch Python BaseException which also includes KeyboardInterrupt, SystemExit, GeneratorExit
+        # https://docs.python.org/3/library/asyncio-task.html#asyncio.gather
+        # These exceptions should be raised and not caught for the application to exit properly.
+        # https://stackoverflow.com/a/17802352
+        if isinstance(item, BaseException) and not isinstance(item, Exception):
+            raise item
+        elif isinstance(item, Exception):
             errors.append(item)
         elif not result_threshold_validation or result_threshold_validation(item):
             valid_items.append(item)

port_ocean/exceptions/port_defaults.py

@@ -5,7 +5,7 @@ class AbortDefaultCreationError(BaseOceanException):
     def __init__(
         self,
         blueprints_to_rollback: list[str],
-        errors: list[BaseException],
+        errors: list[Exception],
         pages_to_rollback: list[str] | None = None,
     ):
         self.blueprints_to_rollback = blueprints_to_rollback

{port_ocean-0.5.24.dev1.dist-info → port_ocean-0.5.27.dist-info}/METADATA

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

@@ -48,7 +48,7 @@ port_ocean/clients/port/utils.py,sha256=O9mBu6zp4TfpS4SQ3qCPpn9ZVyYF8GKnji4UnYhM
 port_ocean/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 port_ocean/config/base.py,sha256=J_FUvlo0D4FbEbr4mgJsbGB5JjW9I7zMwfekj6T30KY,6389
 port_ocean/config/dynamic.py,sha256=qOFkRoJsn_BW7581omi_AoMxoHqasf_foxDQ_G11_SI,2030
-port_ocean/config/settings.py,sha256=ILWgh9358QI9TSbUtZo_reEtF33687_kW0nTniXEFJQ,2308
+port_ocean/config/settings.py,sha256=f6BXxFyu92WYhfPw4wlRaZ6jhkEsxhjw_BiWN9RERZg,2441
 port_ocean/consumers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 port_ocean/consumers/kafka_consumer.py,sha256=N8KocjBi9aR0BOPG8hgKovg-ns_ggpEjrSxqSqF_BSo,4710
 port_ocean/context/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -59,7 +59,7 @@ port_ocean/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 port_ocean/core/defaults/__init__.py,sha256=8qCZg8n06WAdMu9s_FiRtDYLGPGHbOuS60vapeUoAks,142
 port_ocean/core/defaults/clean.py,sha256=S3UAfca-oU89WJKIB4OgGjGjPr0vxBQ2aRZsLTZhQ04,2185
 port_ocean/core/defaults/common.py,sha256=QnLFTkT3yIWIRtLQb7fUvvfe5AfInYJy0q5LjlzHkOw,3553
-port_ocean/core/defaults/initialize.py,sha256=MLzxpQ7B9OlXyIIxUkTgMJTMk_GjF6vjQoqfKzUAebc,7420
+port_ocean/core/defaults/initialize.py,sha256=Cm1QFO7CLoPDdbJVYycbkWlfJfq7hlGbdRj49clBNUM,7432
 port_ocean/core/event_listener/__init__.py,sha256=mzJ33wRq0kh60fpVdOHVmvMTUQIvz3vxmifyBgwDn0E,889
 port_ocean/core/event_listener/base.py,sha256=4RujgPz4VfDFlviu4qLGJFnJougSCL-Ewf0rfTQfwgc,1133
 port_ocean/core/event_listener/factory.py,sha256=AYYfSHPAF7P5H-uQECXT0JVJjKDHrYkWJJBSL4mGkg8,3697
@@ -88,18 +88,18 @@ 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=TKqRytxXONVhuCo3CB3rDvWNbITnZz33TYTDs3SWWVk,3880
-port_ocean/core/integrations/mixins/sync_raw.py,sha256=32pmbZuv-g508Qv6v9I1kLMmkzERKxTrs9nXZncfx5w,17596
+port_ocean/core/integrations/mixins/sync_raw.py,sha256=GmH5YPVnYO6mKEhoRer9F-vYy8mxPspaSWw2y9JJhgc,17954
 port_ocean/core/integrations/mixins/utils.py,sha256=7y1rGETZIjOQadyIjFJXIHKkQFKx_SwiP-TrAIsyyLY,2303
 port_ocean/core/models.py,sha256=YPIU7V3GKeDXIVkNzZn0w17YN2Akl-D8nFs-l4bEKcU,1143
 port_ocean/core/ocean_types.py,sha256=3_d8-n626f1kWLQ_Jxw194LEyrOVupz05qs_Y1pvB-A,990
-port_ocean/core/utils.py,sha256=4TAxSIuJ1fIO84Ttx-TSKw3SJW4Iat50I1JD4PlAwBA,2417
+port_ocean/core/utils.py,sha256=5ISNJ90xxK4Nf_suGEZ2ZPBKsoOqL7khU0MuA0q5zmE,2891
 port_ocean/exceptions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 port_ocean/exceptions/api.py,sha256=TLmTMqn4uHGaHgZK8PMIJ0TVJlPB4iP7xl9rx7GtCyY,426
 port_ocean/exceptions/base.py,sha256=uY4DX7fIITDFfemCJDWpaZi3bD51lcANc5swpoNvMJA,46
 port_ocean/exceptions/clients.py,sha256=LKLLs-Zy3caNG85rwxfOw2rMr8qqVV6SHUq4fRCZ99U,180
 port_ocean/exceptions/context.py,sha256=mA8HII6Rl4QxKUz98ppy1zX3kaziaen21h1ZWuU3ADc,372
 port_ocean/exceptions/core.py,sha256=ygxtPQ9IG8NzIrzZok5OqkefVrqcC4bjZ-2Vf9IPZuA,790
-port_ocean/exceptions/port_defaults.py,sha256=PUzxOyeKeuur_xbBmCNFl_fcSsJBdeSx6GG9TcdoJr4,545
+port_ocean/exceptions/port_defaults.py,sha256=pJ5im06ziDX2IVstSlYIjVHhs4JW-N0Vr0PqlDNhAb4,541
 port_ocean/exceptions/utils.py,sha256=gjOqpi-HpY1l4WlMFsGA9yzhxDhajhoGGdDDyGbLnqI,197
 port_ocean/helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 port_ocean/helpers/async_client.py,sha256=SRlP6o7_FCSY3UHnRlZdezppePVxxOzZ0z861vE3K40,1783
@@ -122,8 +122,8 @@ port_ocean/utils/queue_utils.py,sha256=KWWl8YVnG-glcfIHhM6nefY-2sou_C6DVP1VynQwz
 port_ocean/utils/repeat.py,sha256=0EFWM9d8lLXAhZmAyczY20LAnijw6UbIECf5lpGbOas,3231
 port_ocean/utils/signal.py,sha256=K-6kKFQTltcmKDhtyZAcn0IMa3sUpOHGOAUdWKgx0_E,1369
 port_ocean/version.py,sha256=UsuJdvdQlazzKGD3Hd5-U7N69STh8Dq9ggJzQFnu9fU,177
-port_ocean-0.5.24.dev1.dist-info/LICENSE.md,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-port_ocean-0.5.24.dev1.dist-info/METADATA,sha256=qnUn24YkOxfk4BZd616CeA7XJZ2b_jQS43lSg3o3Zzo,6559
-port_ocean-0.5.24.dev1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-port_ocean-0.5.24.dev1.dist-info/entry_points.txt,sha256=F_DNUmGZU2Kme-8NsWM5LLE8piGMafYZygRYhOVtcjA,54
-port_ocean-0.5.24.dev1.dist-info/RECORD,,
+port_ocean-0.5.27.dist-info/LICENSE.md,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+port_ocean-0.5.27.dist-info/METADATA,sha256=FoY4jR5sOhpMQ9I42YySx6xk1ejb_Fk8OiByuTcNP6k,6554
+port_ocean-0.5.27.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+port_ocean-0.5.27.dist-info/entry_points.txt,sha256=F_DNUmGZU2Kme-8NsWM5LLE8piGMafYZygRYhOVtcjA,54
+port_ocean-0.5.27.dist-info/RECORD,,