port-ocean 0.22.7__tar.gz → 0.22.8__tar.gz

{port_ocean-0.22.7 → port_ocean-0.22.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: port-ocean
-Version: 0.22.7
+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.7 → port_ocean-0.22.8}/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-0.22.7 → port_ocean-0.22.8}/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-0.22.7 → port_ocean-0.22.8}/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-0.22.7 → port_ocean-0.22.8}/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-0.22.7 → port_ocean-0.22.8}/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-0.22.7 → port_ocean-0.22.8}/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-0.22.7 → port_ocean-0.22.8}/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-0.22.7 → port_ocean-0.22.8}/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-0.22.7 → port_ocean-0.22.8}/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.7 → port_ocean-0.22.8}/pyproject.toml

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