port-ocean 0.22.6__py3-none-any.whl → 0.22.8__py3-none-any.whl

integrations/_infra/Makefile

@@ -48,7 +48,7 @@ endef
 install:
 	$(call deactivate_virtualenv) && \
 	$(call install_poetry) && \
-	poetry install --with dev
+	poetry install --with dev --no-root
 
 install/local-core: install
 	# NOTE: This is a temporary change that shouldn't be committed

port_ocean/clients/port/authentication.py

@@ -6,7 +6,7 @@ from loguru import logger
 from pydantic import BaseModel, Field, PrivateAttr
 
 from port_ocean.clients.port.types import UserAgentType
-from port_ocean.clients.port.utils import handle_status_code
+from port_ocean.clients.port.utils import handle_port_status_code
 from port_ocean.utils.misc import get_time
 
 
@@ -58,7 +58,7 @@ class PortAuthentication:
             json=credentials,
             extensions={"retryable": True},
         )
-        handle_status_code(response)
+        handle_port_status_code(response)
         return TokenResponse(**response.json())
 
     def user_agent(self, user_agent_type: UserAgentType | None = None) -> str:

port_ocean/clients/port/client.py

@@ -10,7 +10,7 @@ from port_ocean.clients.port.types import (
     KafkaCreds,
 )
 from port_ocean.clients.port.utils import (
-    handle_status_code,
+    handle_port_status_code,
     get_internal_http_client,
 )
 from port_ocean.exceptions.clients import KafkaCredentialsNotFound
@@ -59,7 +59,7 @@ class PortClient(
         )
         if response.is_error:
             logger.error("Error getting kafka credentials")
-        handle_status_code(response)
+        handle_port_status_code(response)
 
         credentials = response.json().get("credentials")
 
@@ -76,7 +76,7 @@ class PortClient(
         )
         if response.is_error:
             logger.error(f"Error getting organization id, error: {response.text}")
-        handle_status_code(response)
+        handle_port_status_code(response)
 
         return response.json()["organization"]["id"]
 
@@ -90,7 +90,7 @@ class PortClient(
             headers=await self.auth.headers(),
             json=state,
         )
-        handle_status_code(response, should_raise, should_log)
+        handle_port_status_code(response, should_raise, should_log)
         if response.is_success and should_log:
             logger.info("Integration resync state updated successfully")
 

port_ocean/clients/port/mixins/blueprints.py

@@ -5,7 +5,7 @@ from loguru import logger
 
 from port_ocean.clients.port.authentication import PortAuthentication
 from port_ocean.clients.port.types import UserAgentType
-from port_ocean.clients.port.utils import handle_status_code
+from port_ocean.clients.port.utils import handle_port_status_code
 from port_ocean.core.models import Blueprint
 
 
@@ -22,7 +22,7 @@ class BlueprintClientMixin:
             f"{self.auth.api_url}/blueprints/{identifier}",
             headers=await self.auth.headers(),
         )
-        handle_status_code(response, should_log=should_log)
+        handle_port_status_code(response, should_log=should_log)
         return Blueprint.parse_obj(response.json()["blueprint"])
 
     async def create_blueprint(
@@ -35,7 +35,7 @@ class BlueprintClientMixin:
         response = await self.client.post(
             f"{self.auth.api_url}/blueprints", headers=headers, json=raw_blueprint
         )
-        handle_status_code(response)
+        handle_port_status_code(response)
         return response.json()["blueprint"]
 
     async def patch_blueprint(
@@ -51,7 +51,7 @@ class BlueprintClientMixin:
             headers=headers,
             json=raw_blueprint,
         )
-        handle_status_code(response)
+        handle_port_status_code(response)
 
     async def delete_blueprint(
         self,
@@ -70,7 +70,7 @@ class BlueprintClientMixin:
                 f"{self.auth.api_url}/blueprints/{identifier}",
                 headers=headers,
             )
-            handle_status_code(response, should_raise)
+            handle_port_status_code(response, should_raise)
             return None
         else:
             response = await self.client.delete(
@@ -78,7 +78,7 @@ class BlueprintClientMixin:
                 headers=await self.auth.headers(),
             )
 
-            handle_status_code(response, should_raise)
+            handle_port_status_code(response, should_raise)
             return response.json().get("migrationId", "")
 
     async def create_action(
@@ -91,7 +91,7 @@ class BlueprintClientMixin:
             headers=await self.auth.headers(),
         )
 
-        handle_status_code(response, should_log=should_log)
+        handle_port_status_code(response, should_log=should_log)
 
     async def create_scorecard(
         self,
@@ -106,7 +106,7 @@ class BlueprintClientMixin:
             headers=await self.auth.headers(),
         )
 
-        handle_status_code(response, should_log=should_log)
+        handle_port_status_code(response, should_log=should_log)
 
     async def create_page(
         self, page: dict[str, Any], should_log: bool = True
@@ -118,7 +118,7 @@ class BlueprintClientMixin:
             headers=await self.auth.headers(),
         )
 
-        handle_status_code(response, should_log=should_log)
+        handle_port_status_code(response, should_log=should_log)
         return page
 
     async def delete_page(
@@ -132,4 +132,4 @@ class BlueprintClientMixin:
             headers=await self.auth.headers(),
         )
 
-        handle_status_code(response, should_raise)
+        handle_port_status_code(response, should_raise)

port_ocean/clients/port/mixins/entities.py

@@ -9,7 +9,7 @@ from loguru import logger
 from port_ocean.clients.port.authentication import PortAuthentication
 from port_ocean.clients.port.types import RequestOptions, UserAgentType
 from port_ocean.clients.port.utils import (
-    handle_status_code,
+    handle_port_status_code,
     PORT_HTTP_MAX_CONNECTIONS_LIMIT,
 )
 from port_ocean.core.models import Entity, PortAPIErrorMessage
@@ -89,7 +89,7 @@ class EntityClientMixin:
             ):
                 # Return false to differentiate from `result_entity.is_using_search_identifier`
                 return False
-        handle_status_code(response, should_raise)
+        handle_port_status_code(response, should_raise)
         result = response.json()
 
         result_entity = (
@@ -192,7 +192,7 @@ class EntityClientMixin:
                     f"blueprint: {entity.blueprint}"
                 )
 
-            handle_status_code(response, should_raise)
+            handle_port_status_code(response, should_raise)
 
     async def batch_delete_entities(
         self,
@@ -252,7 +252,7 @@ class EntityClientMixin:
             },
             extensions={"retryable": True},
         )
-        handle_status_code(response)
+        handle_port_status_code(response)
         return [Entity.parse_obj(result) for result in response.json()["entities"]]
 
     async def search_batch_entities(

port_ocean/clients/port/mixins/integrations.py

@@ -5,7 +5,7 @@ from urllib.parse import quote_plus
 import httpx
 from loguru import logger
 from port_ocean.clients.port.authentication import PortAuthentication
-from port_ocean.clients.port.utils import handle_status_code
+from port_ocean.clients.port.utils import handle_port_status_code
 from port_ocean.exceptions.port_defaults import DefaultsProvisionFailed
 from port_ocean.log.sensetive import sensitive_log_filter
 
@@ -56,7 +56,7 @@ class IntegrationClientMixin:
             headers=await self.auth.headers(),
         )
 
-        handle_status_code(response, should_raise, should_log)
+        handle_port_status_code(response, should_raise, should_log)
 
         return response.json().get("integrations", [])
 
@@ -75,7 +75,7 @@ class IntegrationClientMixin:
         has_provision_feature_flag: bool = False,
     ) -> dict[str, Any]:
         response = await self._get_current_integration()
-        handle_status_code(response, should_raise, should_log)
+        handle_port_status_code(response, should_raise, should_log)
         integration = response.json().get("integration", {})
         if integration.get("config", None) or not integration:
             return integration
@@ -164,7 +164,7 @@ class IntegrationClientMixin:
             json=json,
             params=query_params,
         )
-        handle_status_code(response)
+        handle_port_status_code(response)
         if create_port_resources_origin_in_port:
             result = (
                 await self._poll_integration_until_default_provisioning_is_complete()
@@ -194,7 +194,7 @@ class IntegrationClientMixin:
             headers=headers,
             json=json,
         )
-        handle_status_code(response)
+        handle_port_status_code(response)
         return response.json()["integration"]
 
     async def ingest_integration_logs(self, logs: list[dict[str, Any]]) -> None:
@@ -208,7 +208,7 @@ class IntegrationClientMixin:
                 "logs": logs,
             },
         )
-        handle_status_code(response, should_log=False)
+        handle_port_status_code(response, should_log=False)
         logger.debug("Logs successfully ingested")
 
     async def ingest_integration_kind_examples(
@@ -223,7 +223,7 @@ class IntegrationClientMixin:
                 "examples": sensitive_log_filter.mask_object(data, full_hide=True),
             },
         )
-        handle_status_code(response, should_log=should_log)
+        handle_port_status_code(response, should_log=should_log)
         logger.debug(f"Examples for kind {kind} successfully ingested")
 
     async def _delete_current_integration(self) -> httpx.Response:
@@ -238,5 +238,5 @@ class IntegrationClientMixin:
         self, should_raise: bool = True, should_log: bool = True
     ) -> dict[str, Any]:
         response = await self._delete_current_integration()
-        handle_status_code(response, should_raise, should_log)
+        handle_port_status_code(response, should_raise, should_log)
         return response.json()

port_ocean/clients/port/mixins/migrations.py

@@ -4,7 +4,7 @@ import httpx
 from loguru import logger
 
 from port_ocean.clients.port.authentication import PortAuthentication
-from port_ocean.clients.port.utils import handle_status_code
+from port_ocean.clients.port.utils import handle_port_status_code
 from port_ocean.core.models import Migration
 
 
@@ -28,7 +28,7 @@ class MigrationClientMixin:
             headers=headers,
         )
 
-        handle_status_code(response, should_raise=True)
+        handle_port_status_code(response, should_raise=True)
 
         migration_status = response.json().get("migration", {}).get("status", None)
         if (

port_ocean/clients/port/mixins/organization.py

@@ -2,7 +2,7 @@ from typing import List
 import httpx
 from loguru import logger
 from port_ocean.clients.port.authentication import PortAuthentication
-from port_ocean.clients.port.utils import handle_status_code
+from port_ocean.clients.port.utils import handle_port_status_code
 
 
 class OrganizationClientMixin:
@@ -27,5 +27,5 @@ class OrganizationClientMixin:
         self, should_raise: bool = True, should_log: bool = True
     ) -> List[str]:
         response = await self._get_organization_feature_flags()
-        handle_status_code(response, should_raise, should_log)
+        handle_port_status_code(response, should_raise, should_log)
         return response.json().get("organization", {}).get("featureFlags", [])

port_ocean/clients/port/utils.py

@@ -62,12 +62,17 @@ def get_internal_http_client(port_client: "PortClient") -> httpx.AsyncClient:
     return _port_internal_async_client
 
 
-def handle_status_code(
+def handle_port_status_code(
     response: httpx.Response, should_raise: bool = True, should_log: bool = True
 ) -> None:
     if should_log and response.is_error:
-        logger.error(
-            f"Request failed with status code: {response.status_code}, Error: {response.text}"
-        )
+        error_message = f"Request failed with status code: {response.status_code}, Error: {response.text}"
+        if response.status_code >= 500 and response.headers.get("x-trace-id"):
+            logger.error(
+                error_message,
+                trace_id=response.headers.get("x-trace-id"),
+            )
+        else:
+            logger.error(error_message)
     if should_raise:
         response.raise_for_status()

port_ocean/tests/clients/port/mixins/test_organization_mixin.py

@@ -16,6 +16,7 @@ async def mocked_org_mixin() -> OrganizationClientMixin:
     client.get.return_value.json.return_value = {
         "organization": {"featureFlags": ["aa", "bb"]}
     }
+    client.get.return_value.status_code = 200
     return OrganizationClientMixin(auth=auth, client=client)
 
 

{port_ocean-0.22.6.dist-info → port_ocean-0.22.8.dist-info}/METADATA

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

@@ -3,7 +3,7 @@ integrations/_infra/Dockerfile.alpine,sha256=7E4Sb-8supsCcseerHwTkuzjHZoYcaHIyxi
 integrations/_infra/Dockerfile.base.builder,sha256=Ogp_fodUE-lD-HgcfcFJd7pr520LPoEU9GCNk6HQBxk,619
 integrations/_infra/Dockerfile.base.runner,sha256=T7Tis9EjmcOl2jUXPMSENbRXMqwoHnnFPhgRmfEMO5Y,357
 integrations/_infra/Dockerfile.dockerignore,sha256=CM1Fxt3I2AvSvObuUZRmy5BNLSGC7ylnbpWzFgD4cso,1163
-integrations/_infra/Makefile,sha256=Pzfac3IA1eRxSNDkdOx1spQFxmyRZwqswTI8WGsFYnU,2420
+integrations/_infra/Makefile,sha256=YgLKvuF_Dw4IA7X98Nus6zIW_3cJ60M1QFGs3imj5c4,2430
 integrations/_infra/grpcio.sh,sha256=m924poYznoRZ6Tt7Ct8Cs5AV_cmmOx598yIZ3z4DvZE,616
 integrations/_infra/init.sh,sha256=nN8lTrOhB286UfFvD6sJ9YJ-9asT9zVSddQB-RAb7Z4,99
 port_ocean/__init__.py,sha256=J3Mqp7d-CkEe9eMigGG8gSEiVKICY2bf7csNEwVOXk0,294
@@ -48,17 +48,17 @@ port_ocean/clients/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 port_ocean/clients/auth/auth_client.py,sha256=scxx7AYqvXoRAd8_K-Ww26oErzi5l8ZCGPc0sVKgIfA,192
 port_ocean/clients/auth/oauth_client.py,sha256=RGMigXP8XOQECvEccXjF-EYPBXaxFDpA2aniN_vM3d0,794
 port_ocean/clients/port/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-port_ocean/clients/port/authentication.py,sha256=6-uDMWsJ0xLe1-9IoYXHWmwtufj8rJR4BCRXJlSkCSQ,3447
-port_ocean/clients/port/client.py,sha256=OaNeN3U7Hw0tK4jYE6ESJEPKbTf9nGp2jcJVq00gnf8,3546
+port_ocean/clients/port/authentication.py,sha256=r7r8Ag9WuwXy-CmgeOoj-PHbmJAQxhb2NMx8wrNzF3g,3457
+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=POBl4uDocrgJBw4rvCAzwRcD4jk-uBL6pDAuKMTajdg,4633
-port_ocean/clients/port/mixins/entities.py,sha256=se1RudWS2R1WXyZvvkFgSiLejra91gl79zPY8QsRHeQ,10881
-port_ocean/clients/port/mixins/integrations.py,sha256=nqz1gvQnR6Nzv62ZfbXEyli7FTKW5DCFpI1x1KoJJ_E,9341
-port_ocean/clients/port/mixins/migrations.py,sha256=A6896oJF6WbFL2WroyTkMzr12yhVyWqGoq9dtLNSKBY,1457
-port_ocean/clients/port/mixins/organization.py,sha256=fCo_ZS8UlQXsyIx-odTuWkbnfcYmVnQfIsSyJuPOPjM,1031
+port_ocean/clients/port/mixins/blueprints.py,sha256=aMCG4zePsMSMjMLiGrU37h5z5_ElfMzTcTvqvOI5wXY,4683
+port_ocean/clients/port/mixins/entities.py,sha256=MaJjkp16wxc2fkd2BwgVIhHU05fi-7pM9OgX_cV3VmA,10901
+port_ocean/clients/port/mixins/integrations.py,sha256=tvuP8jxgbDyTwGfp8hd0-NXfnsMjZFJXDEDzXroctnY,9381
+port_ocean/clients/port/mixins/migrations.py,sha256=vdL_A_NNUogvzujyaRLIoZEu5vmKDY2BxTjoGP94YzI,1467
+port_ocean/clients/port/mixins/organization.py,sha256=A2cP5V49KnjoAXxjmnm_XGth4ftPSU0qURNfnyUyS_Y,1041
 port_ocean/clients/port/retry_transport.py,sha256=PtIZOAZ6V-ncpVysRUsPOgt8Sf01QLnTKB5YeKBxkJk,1861
 port_ocean/clients/port/types.py,sha256=nvlgiAq4WH5_F7wQbz_GAWl-faob84LVgIjZ2Ww5mTk,451
-port_ocean/clients/port/utils.py,sha256=SjhgmJXAqH2JqXfGy8GoGwzUYiJvUhWDrJyxQcenxZc,2512
+port_ocean/clients/port/utils.py,sha256=osFyAjw7Y5Qf2uVSqC7_RTCQfijiL1zS74JJM0goxh0,2762
 port_ocean/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 port_ocean/config/base.py,sha256=x1gFbzujrxn7EJudRT81C6eN9WsYAb3vOHwcpcpX8Tc,6370
 port_ocean/config/dynamic.py,sha256=qOFkRoJsn_BW7581omi_AoMxoHqasf_foxDQ_G11_SI,2030
@@ -148,7 +148,7 @@ port_ocean/tests/clients/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZ
 port_ocean/tests/clients/oauth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 port_ocean/tests/clients/oauth/test_oauth_client.py,sha256=2XVMQUalDpiD539Z7_dk5BK_ngXQzsTmb2lNBsfEm9c,3266
 port_ocean/tests/clients/port/mixins/test_entities.py,sha256=Zq_wKTymxJ0R8lHKztvEV6lN__3FZk8uTSIVpKCE6NA,1815
-port_ocean/tests/clients/port/mixins/test_organization_mixin.py,sha256=-8iHM33Oe8PuyEfj3O_6Yob8POp4fSmB0hnIT0Gv-8Y,868
+port_ocean/tests/clients/port/mixins/test_organization_mixin.py,sha256=zzKYz3h8dl4Z5A2QG_924m0y9U6XTth1XYOfwNrd_24,914
 port_ocean/tests/conftest.py,sha256=JXASSS0IY0nnR6bxBflhzxS25kf4iNaABmThyZ0mZt8,101
 port_ocean/tests/core/conftest.py,sha256=BHfi7egDVNRpg61lHZlWj81_ohUG7DEVMdFe9yX-vkc,5517
 port_ocean/tests/core/defaults/test_common.py,sha256=sR7RqB3ZYV6Xn6NIg-c8k5K6JcGsYZ2SCe_PYX5vLYM,5560
@@ -188,8 +188,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.22.6.dist-info/LICENSE.md,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-port_ocean-0.22.6.dist-info/METADATA,sha256=UJyRnEhac_CupMFcjVqYAVcakRljWFseBOaCs9ky-cM,6764
-port_ocean-0.22.6.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-port_ocean-0.22.6.dist-info/entry_points.txt,sha256=F_DNUmGZU2Kme-8NsWM5LLE8piGMafYZygRYhOVtcjA,54
-port_ocean-0.22.6.dist-info/RECORD,,
+port_ocean-0.22.8.dist-info/LICENSE.md,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+port_ocean-0.22.8.dist-info/METADATA,sha256=o8OYwTwdxk24xZt7KB8kXJLN_ukZNrnu3lMZOPTlbW8,6764
+port_ocean-0.22.8.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+port_ocean-0.22.8.dist-info/entry_points.txt,sha256=F_DNUmGZU2Kme-8NsWM5LLE8piGMafYZygRYhOVtcjA,54
+port_ocean-0.22.8.dist-info/RECORD,,