port-ocean 0.4.5__tar.gz → 0.4.7__tar.gz

{port_ocean-0.4.5 → port_ocean-0.4.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: port-ocean
-Version: 0.4.5
+Version: 0.4.7
 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.4.5 → port_ocean-0.4.7}/port_ocean/clients/port/retry_transport.py

@@ -15,6 +15,11 @@ class TokenRetryTransport(RetryTransport):
         super().__init__(*args, **kwargs)
         self.port_client = port_client
 
+    def _is_retryable_method(self, request: httpx.Request) -> bool:
+        return super()._is_retryable_method(request) or request.url.path.endswith(
+            "/auth/access_token"
+        )
+
     async def _handle_unauthorized(self, response: httpx.Response) -> None:
         token = await self.port_client.auth.token
         response.headers["Authorization"] = f"Bearer {token}"

{port_ocean-0.4.5 → port_ocean-0.4.7}/port_ocean/clients/port/utils.py

@@ -12,6 +12,19 @@ if TYPE_CHECKING:
 _http_client: LocalStack[httpx.AsyncClient] = LocalStack()
 
 
+# In case the framework sends more requests to port in parallel then allowed by the limits, a PoolTimeout exception will
+# be raised.
+# Raising defaults for the timeout, in addition to the limits, will allow request to wait for a connection for a longer
+# period of time, before raising an exception.
+# We don't want to set the max_connections too highly, as it will cause the application to run out of memory.
+# We also don't want to set the max_keepalive_connections too highly, as it will cause the application to run out of
+# available connections.
+PORT_HTTP_CLIENT_TIMEOUT = httpx.Timeout(10.0)
+PORT_HTTP_CLIENT_CONNECTIONS_LIMIT = httpx.Limits(
+    max_connections=200, max_keepalive_connections=50
+)
+
+
 def _get_http_client_context(port_client: "PortClient") -> httpx.AsyncClient:
     client = _http_client.top
     if client is None:
@@ -20,7 +33,9 @@ def _get_http_client_context(port_client: "PortClient") -> httpx.AsyncClient:
                 port_client,
                 httpx.AsyncHTTPTransport(),
                 logger=logger,
-            )
+            ),
+            timeout=PORT_HTTP_CLIENT_TIMEOUT,
+            limits=PORT_HTTP_CLIENT_CONNECTIONS_LIMIT,
         )
         _http_client.push(client)
 

{port_ocean-0.4.5 → port_ocean-0.4.7}/port_ocean/config/settings.py

@@ -1,6 +1,6 @@
 from typing import Any, Literal
 
-from pydantic import BaseSettings, BaseModel, Extra, AnyHttpUrl, parse_obj_as
+from pydantic import BaseSettings, BaseModel, Extra, AnyHttpUrl, parse_obj_as, validator
 
 from port_ocean.config.base import BaseOceanSettings
 from port_ocean.core.event_listener import EventListenerSettingsType
@@ -33,6 +33,10 @@ class IntegrationSettings(BaseModel, extra=Extra.allow):
     type: str
     config: dict[str, Any]
 
+    @validator("identifier", "type")
+    def validate_lower(cls, v: str) -> str:
+        return v.lower()
+
 
 class IntegrationConfiguration(BaseOceanSettings, extra=Extra.allow):
     initialize_port_resources: bool = True

{port_ocean-0.4.5 → port_ocean-0.4.7}/port_ocean/core/defaults/initialize.py

@@ -8,13 +8,12 @@ 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.handlers.port_app_config.models import PortAppConfig
 from port_ocean.exceptions.port_defaults import (
     AbortDefaultCreationError,
 )
 
-from port_ocean.core.defaults.common import Defaults, get_port_integration_defaults
-
 
 def deconstruct_blueprints_to_creation_steps(
     raw_blueprints: list[dict[str, Any]]
@@ -111,7 +110,7 @@ async def _create_resources(
             )
         )
 
-        await port_client.initialize_integration(
+        await port_client.create_integration(
             integration_config.integration.type,
             integration_config.event_listener.to_request(),
             port_app_config=defaults.port_app_config,

{port_ocean-0.4.5 → port_ocean-0.4.7}/port_ocean/helpers/retry.py

@@ -151,7 +151,7 @@ class RetryTransport(httpx.AsyncBaseTransport, httpx.BaseTransport):
 
         """
         transport: httpx.AsyncBaseTransport = self._wrapped_transport  # type: ignore
-        if request.method in self._retryable_methods:
+        if self._is_retryable_method(request):
             send_method = partial(transport.handle_async_request)
             response = await self._retry_operation_async(request, send_method)
         else:
@@ -178,6 +178,9 @@ class RetryTransport(httpx.AsyncBaseTransport, httpx.BaseTransport):
         transport: httpx.BaseTransport = self._wrapped_transport  # type: ignore
         transport.close()
 
+    def _is_retryable_method(self, request: httpx.Request) -> bool:
+        return request.method in self._retryable_methods
+
     def _should_retry(self, response: httpx.Response) -> bool:
         return response.status_code in self._retry_status_codes
 

{port_ocean-0.4.5 → port_ocean-0.4.7}/pyproject.toml

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