port-ocean 0.5.27__py3-none-any.whl → 0.6.0__py3-none-any.whl

port_ocean/clients/port/mixins/integrations.py

@@ -3,7 +3,6 @@ from urllib.parse import quote_plus
 
 import httpx
 from loguru import logger
-from starlette import status
 
 from port_ocean.clients.port.authentication import PortAuthentication
 from port_ocean.clients.port.utils import handle_status_code
@@ -44,7 +43,7 @@ class IntegrationClientMixin:
     ) -> dict[str, Any]:
         response = await self._get_current_integration()
         handle_status_code(response, should_raise, should_log)
-        return response.json()["integration"]
+        return response.json().get("integration", {})
 
     async def get_log_attributes(self) -> LogAttributes:
         if self._log_attributes is None:
@@ -57,7 +56,7 @@ class IntegrationClientMixin:
         _type: str,
         changelog_destination: dict[str, Any],
         port_app_config: Optional["PortAppConfig"] = None,
-    ) -> None:
+    ) -> dict:
         logger.info(f"Creating integration with id: {self.integration_identifier}")
         headers = await self.auth.headers()
         json = {
@@ -73,13 +72,14 @@ class IntegrationClientMixin:
             f"{self.auth.api_url}/integration", headers=headers, json=json
         )
         handle_status_code(response)
+        return response.json()["integration"]
 
     async def patch_integration(
         self,
         _type: str | None = None,
         changelog_destination: dict[str, Any] | None = None,
         port_app_config: Optional["PortAppConfig"] = None,
-    ) -> None:
+    ) -> dict:
         logger.info(f"Updating integration with id: {self.integration_identifier}")
         headers = await self.auth.headers()
         json: dict[str, Any] = {}
@@ -97,34 +97,7 @@ class IntegrationClientMixin:
             json=json,
         )
         handle_status_code(response)
-
-    async def initialize_integration(
-        self,
-        _type: str,
-        changelog_destination: dict[str, Any],
-        port_app_config: Optional["PortAppConfig"] = None,
-    ) -> None:
-        logger.info(f"Initiating integration with id: {self.integration_identifier}")
-        response = await self._get_current_integration()
-        if response.status_code == status.HTTP_404_NOT_FOUND:
-            await self.create_integration(_type, changelog_destination, port_app_config)
-        else:
-            handle_status_code(response)
-
-            integration = response.json()["integration"]
-            logger.info("Checking for diff in integration configuration")
-            if (
-                integration["changelogDestination"] != changelog_destination
-                or integration["installationAppType"] != _type
-                or integration.get("version") != self.integration_version
-            ):
-                await self.patch_integration(
-                    _type, changelog_destination, port_app_config
-                )
-
-        logger.info(
-            f"Integration with id: {self.integration_identifier} successfully registered"
-        )
+        return response.json()["integration"]
 
     async def ingest_integration_logs(self, logs: list[dict[str, Any]]) -> None:
         logger.debug("Ingesting logs")

port_ocean/core/defaults/initialize.py

@@ -3,13 +3,15 @@ from typing import Type, Any
 
 import httpx
 from loguru import logger
-from starlette import status
 
 from port_ocean.clients.port.client import PortClient
 from port_ocean.clients.port.types import UserAgentType
 from port_ocean.config.settings import IntegrationConfiguration
 from port_ocean.context.ocean import ocean
-from port_ocean.core.defaults.common import Defaults, get_port_integration_defaults
+from port_ocean.core.defaults.common import (
+    Defaults,
+    get_port_integration_defaults,
+)
 from port_ocean.core.handlers.port_app_config.models import PortAppConfig
 from port_ocean.core.models import Blueprint
 from port_ocean.core.utils import gather_and_split_errors_from_results
@@ -50,18 +52,56 @@ def deconstruct_blueprints_to_creation_steps(
     )
 
 
-async def _create_resources(
+async def _initialize_required_integration_settings(
     port_client: PortClient,
-    defaults: Defaults,
+    default_mapping: PortAppConfig,
     integration_config: IntegrationConfiguration,
 ) -> None:
-    response = await port_client._get_current_integration()
-    if response.status_code == status.HTTP_404_NOT_FOUND:
-        logger.info("Integration doesn't exist, creating new integration")
-    else:
-        logger.info("Integration already exists, skipping integration creation...")
-        return
+    try:
+        logger.info("Initializing integration at port")
+        integration = await port_client.get_current_integration(
+            should_log=False, should_raise=False
+        )
+        if not integration:
+            logger.info(
+                "Integration does not exist, Creating new integration with default default mapping"
+            )
+            integration = await port_client.create_integration(
+                integration_config.integration.type,
+                integration_config.event_listener.to_request(),
+                port_app_config=default_mapping,
+            )
+        elif not integration["config"]:
+            logger.info(
+                "Encountered that the integration's mapping is empty, Initializing to default mapping"
+            )
+            integration = await port_client.patch_integration(
+                integration_config.integration.type,
+                integration_config.event_listener.to_request(),
+                port_app_config=default_mapping,
+            )
+    except httpx.HTTPStatusError as err:
+        logger.error(f"Failed to apply default mapping: {err.response.text}.")
+        raise err
+
+    logger.info("Checking for diff in integration configuration")
+    changelog_destination = integration_config.event_listener.to_request().get(
+        "changelog_destination"
+    )
+    if (
+        integration["changelogDestination"] != changelog_destination
+        or integration["installationAppType"] != integration_config.integration.type
+        or integration.get("version") != port_client.integration_version
+    ):
+        await port_client.patch_integration(
+            integration_config.integration.type, changelog_destination
+        )
 
+
+async def _create_resources(
+    port_client: PortClient,
+    defaults: Defaults,
+) -> None:
     creation_stage, *blueprint_patches = deconstruct_blueprints_to_creation_steps(
         defaults.blueprints
     )
@@ -148,12 +188,6 @@ async def _create_resources(
                 pages_errors,
                 created_pages_identifiers,
             )
-
-        await port_client.create_integration(
-            integration_config.integration.type,
-            integration_config.event_listener.to_request(),
-            port_app_config=defaults.port_app_config,
-        )
     except httpx.HTTPStatusError as err:
         logger.error(
             f"Failed to create resources: {err.response.text}. Rolling back changes..."
@@ -169,12 +203,20 @@ async def _initialize_defaults(
     port_client = ocean.port_client
     defaults = get_port_integration_defaults(config_class)
     if not defaults:
-        logger.warning("No defaults found. Skipping...")
+        logger.warning("No defaults found. Skipping initialization...")
         return None
 
+    if defaults.port_app_config:
+        await _initialize_required_integration_settings(
+            port_client, defaults.port_app_config, integration_config
+        )
+
+    if not integration_config.initialize_port_resources:
+        return
+
     try:
         logger.info("Found default resources, starting creation process")
-        await _create_resources(port_client, defaults, integration_config)
+        await _create_resources(port_client, defaults)
     except AbortDefaultCreationError as e:
         logger.warning(
             f"Failed to create resources. Rolling back blueprints : {e.blueprints_to_rollback}"
@@ -208,9 +250,6 @@ async def _initialize_defaults(
 def initialize_defaults(
     config_class: Type[PortAppConfig], integration_config: IntegrationConfiguration
 ) -> None:
-    try:
-        asyncio.new_event_loop().run_until_complete(
-            _initialize_defaults(config_class, integration_config)
-        )
-    except Exception as e:
-        logger.debug(f"Failed to initialize defaults, skipping... Error: {e}")
+    asyncio.new_event_loop().run_until_complete(
+        _initialize_defaults(config_class, integration_config)
+    )

port_ocean/core/integrations/base.py

@@ -66,12 +66,6 @@ class BaseIntegration(SyncRawMixin, SyncMixin):
 
         await self.initialize_handlers()
 
-        logger.info("Initializing integration at port")
-        await self.context.port_client.initialize_integration(
-            self.context.config.integration.type,
-            self.context.config.event_listener.to_request(),
-        )
-
         self.started = True
 
         async with event_context(

port_ocean/run.py

@@ -49,9 +49,6 @@ def run(
     if initialize_port_resources is not None:
         app.config.initialize_port_resources = initialize_port_resources
 
-    if app.config.initialize_port_resources:
-        initialize_defaults(
-            app.integration.AppConfigHandlerClass.CONFIG_CLASS, app.config
-        )
+    initialize_defaults(app.integration.AppConfigHandlerClass.CONFIG_CLASS, app.config)
 
     uvicorn.run(app, host="0.0.0.0", port=application_settings.port)

{port_ocean-0.5.27.dist-info → port_ocean-0.6.0.dist-info}/METADATA

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

@@ -40,7 +40,7 @@ port_ocean/clients/port/client.py,sha256=3GYCM0ZkX3pB6sNoOb-7_6dm0Jr5_vqhflD9ilt
 port_ocean/clients/port/mixins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 port_ocean/clients/port/mixins/blueprints.py,sha256=BiqkhvDFdkySWgL1NHI-LAQ9ieZWazZAojPo9E8d7U4,4575
 port_ocean/clients/port/mixins/entities.py,sha256=pMERHqy1keb5w2k2xQsNuyZaKSAZ5ijVA4pzxEbAatY,7365
-port_ocean/clients/port/mixins/integrations.py,sha256=ypRYi7_VlnP2YEPgE8zS-_6WgPzUmsRi95K_pwVIpKE,5943
+port_ocean/clients/port/mixins/integrations.py,sha256=Ro6h9BwLxglQWniCVmfC---4oyGuUxk_Qejswl2t-J8,4841
 port_ocean/clients/port/mixins/migrations.py,sha256=A6896oJF6WbFL2WroyTkMzr12yhVyWqGoq9dtLNSKBY,1457
 port_ocean/clients/port/retry_transport.py,sha256=PtIZOAZ6V-ncpVysRUsPOgt8Sf01QLnTKB5YeKBxkJk,1861
 port_ocean/clients/port/types.py,sha256=nvlgiAq4WH5_F7wQbz_GAWl-faob84LVgIjZ2Ww5mTk,451
@@ -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=Cm1QFO7CLoPDdbJVYycbkWlfJfq7hlGbdRj49clBNUM,7432
+port_ocean/core/defaults/initialize.py,sha256=uq7gnsx2uHpWRuyYbQWGrPY6jbjXfmSWGc6myOQ8CVQ,8853
 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
@@ -83,7 +83,7 @@ port_ocean/core/handlers/port_app_config/api.py,sha256=6VbKPwFzsWG0IYsVD81hxSmfq
 port_ocean/core/handlers/port_app_config/base.py,sha256=oufdNLzUmEgJY5PgIz75zDlowWrjA-y8WR4UnM58E58,2897
 port_ocean/core/handlers/port_app_config/models.py,sha256=WtF2uW4KPUPfDpy6E2tl9qXh5GUcDucVvKt0DCTYv6w,1985
 port_ocean/core/integrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-port_ocean/core/integrations/base.py,sha256=3jU0skK_gMLB8a_fN8whsRKva-Dz058TFoI0vXTbryU,3193
+port_ocean/core/integrations/base.py,sha256=KHsRYFZ38ff3AkkqIQu45883ovgKOJn_fZfnTNy7HWY,2952
 port_ocean/core/integrations/mixins/__init__.py,sha256=FA1FEKMM6P-L2_m7Q4L20mFa4_RgZnwSRmTCreKcBVM,220
 port_ocean/core/integrations/mixins/events.py,sha256=Ddfx2L4FpghV38waF8OfVeOV0bHBxNIgjU-q5ffillI,2341
 port_ocean/core/integrations/mixins/handler.py,sha256=mZ7-0UlG3LcrwJttFbMe-R4xcOU2H_g33tZar7PwTv8,3771
@@ -111,7 +111,7 @@ port_ocean/log/sensetive.py,sha256=wkyvkKMbyLTjZDSbvvLHL9bv4RvD0DPAyL3uWSttUOA,2
 port_ocean/middlewares.py,sha256=6GrhldYAazxSwK2TbS-J28XdZ-9wO3PgCcyIMhnnJvI,2480
 port_ocean/ocean.py,sha256=nRTTh6faPrt77ozvKBFk6eCNxwzKcTDzJ4KPgpO4VRk,4304
 port_ocean/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-port_ocean/run.py,sha256=vyShtqg_jEiE6M4SJpci6c4oRD9k2ztesAXEx_6Sc9M,1906
+port_ocean/run.py,sha256=IYo3R0DChb0-Uqs_WU8f5sk_ZBrv1Xjb-PHyE5IRAYw,1835
 port_ocean/sonar-project.properties,sha256=X_wLzDOkEVmpGLRMb2fg9Rb0DxWwUFSvESId8qpvrPI,73
 port_ocean/utils/__init__.py,sha256=KMGnCPXZJbNwtgxtyMycapkDz8tpSyw23MSYT3iVeHs,91
 port_ocean/utils/async_http.py,sha256=arnH458TExn2Dju_Sy6pHas_vF5RMWnOp-jBz5WAAcE,1226
@@ -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.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,,
+port_ocean-0.6.0.dist-info/LICENSE.md,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+port_ocean-0.6.0.dist-info/METADATA,sha256=1qQJtxP7GAgYR5HaAhatoIKdkLF7Cq75wSGi11fbrUw,6553
+port_ocean-0.6.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+port_ocean-0.6.0.dist-info/entry_points.txt,sha256=F_DNUmGZU2Kme-8NsWM5LLE8piGMafYZygRYhOVtcjA,54
+port_ocean-0.6.0.dist-info/RECORD,,