port-ocean 0.5.24.dev1__tar.gz → 0.5.27__tar.gz

{port_ocean-0.5.24.dev1 → port_ocean-0.5.27}/PKG-INFO

@@ -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 → port_ocean-0.5.27}/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-0.5.24.dev1 → port_ocean-0.5.27}/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-0.5.24.dev1 → port_ocean-0.5.27}/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-0.5.24.dev1 → port_ocean-0.5.27}/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-0.5.24.dev1 → port_ocean-0.5.27}/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 → port_ocean-0.5.27}/pyproject.toml

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