port-ocean 0.4.5__py3-none-any.whl → 0.4.7__py3-none-any.whl

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/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/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/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/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.dist-info → port_ocean-0.4.7.dist-info}/METADATA

@@ -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.dist-info → port_ocean-0.4.7.dist-info}/RECORD

@@ -41,13 +41,13 @@ port_ocean/clients/port/mixins/blueprints.py,sha256=vp7kVzr704fCcp6Cvuwv4LR1GeM_
 port_ocean/clients/port/mixins/entities.py,sha256=YIu4saILm3-3ArvQTm_vJJa6oTTDCMVFwXAi5qcmpYc,5576
 port_ocean/clients/port/mixins/integrations.py,sha256=FuDoQfQnfJvhK-nKpftQ8k7VsB9odNRlkMkGCmxwaWY,4280
 port_ocean/clients/port/mixins/migrations.py,sha256=M93i_aryfDazRHjkpTS3-sV3UshLCxmsv6yAIOziFl8,1463
-port_ocean/clients/port/retry_transport.py,sha256=zLJFZpjTr663-ttRxRM4WQ0KTGbFqwOccYZnmxc8Kww,1880
+port_ocean/clients/port/retry_transport.py,sha256=6p64Ek8vpe0hHVcrNIXij8KQ9K2zwPuMUnJp2R8ZYUI,2075
 port_ocean/clients/port/types.py,sha256=nvlgiAq4WH5_F7wQbz_GAWl-faob84LVgIjZ2Ww5mTk,451
-port_ocean/clients/port/utils.py,sha256=KMQqaWnvRgtbuEdT2oI9h4ZBIo02BmI-dVNo8x_INTk,1462
+port_ocean/clients/port/utils.py,sha256=x20rtGgnYodklU8AcndF93fI4R58ggExxc9gvpiVeq0,2273
 port_ocean/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 port_ocean/config/base.py,sha256=e1oW66ynjo7Sp2PcLBp9aCzj59JpTaiKUXVJK8VB8TA,5540
 port_ocean/config/dynamic.py,sha256=CIRDnqFUPSnNMLZ-emRCMVAjEQNBlIujhZ7OGwi_aKs,1816
-port_ocean/config/settings.py,sha256=IPfS7oy0so_2R19athWMHOa6-MfOeLowqYmOGWkgdoA,1248
+port_ocean/config/settings.py,sha256=gKcc7q2HTu62JT-RyNXEZQ6TO7cafU6hXEN4Wd8DbBU,1366
 port_ocean/consumers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 port_ocean/consumers/base_consumer.py,sha256=L0gW0DvUpeGVdb1RH83-wgbI37V6fsUKfd9Yox42-Gs,125
 port_ocean/consumers/kafka_consumer.py,sha256=jFgL3Vnnqf0g6I843yLvo5vGBSdMKmmC7Q3WklCUFqY,3467
@@ -60,7 +60,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=qyrrPQ53JuH7SnbFrnsvvGvpBZgj8CA2fYpwJKkYRIg,2187
 port_ocean/core/defaults/common.py,sha256=6o-14cglafhv4Kw7zihat154sgKyhPEXAQq4IQSNlhs,3470
-port_ocean/core/defaults/initialize.py,sha256=ySPZzxarvI-dVoF07FlzUBm0NWarWJMEJ1PcPhceh_M,5253
+port_ocean/core/defaults/initialize.py,sha256=fvVFaYJWyGGlEbRz46Y48D3rRRLthJkstiQxYVam7WM,5248
 port_ocean/core/event_listener/__init__.py,sha256=mzJ33wRq0kh60fpVdOHVmvMTUQIvz3vxmifyBgwDn0E,889
 port_ocean/core/event_listener/base.py,sha256=cn-NJiw6x41h-I1DBpGDQr2NYmUwZKCUGeecwWL4stk,787
 port_ocean/core/event_listener/factory.py,sha256=AYYfSHPAF7P5H-uQECXT0JVJjKDHrYkWJJBSL4mGkg8,3697
@@ -103,7 +103,7 @@ port_ocean/exceptions/context.py,sha256=qC1OLppiv6XZuXSHRO2P_VPFSzrc_uUQNvfSYLeA
 port_ocean/exceptions/core.py,sha256=ygxtPQ9IG8NzIrzZok5OqkefVrqcC4bjZ-2Vf9IPZuA,790
 port_ocean/exceptions/port_defaults.py,sha256=R3ufJcfllb7NZSwHOpBs8kbjsIZVQLM6vKO6dz4w-EE,407
 port_ocean/helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-port_ocean/helpers/retry.py,sha256=Hac1XkL13V1zcgenS0gYvR_NtCSv6AnNGWSNFvAh_sU,13052
+port_ocean/helpers/retry.py,sha256=xrkXeVBHk1yIM6yVse5DpDZJMUj310ZpXqHFZFzCFRM,13171
 port_ocean/logger_setup.py,sha256=dOA58ZBAfe9dcAoBybXFWgDfsJG-uIX1ABI0r2CyUG8,1160
 port_ocean/middlewares.py,sha256=8rGu9XSKvbNCQGzWvfaijDrp-0ATJrWAQfBji2CnSck,2475
 port_ocean/ocean.py,sha256=9dFBf46N6fht6ibQUjnDDizY-p0qa0Uw-415JTDQmus,3626
@@ -111,8 +111,8 @@ port_ocean/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 port_ocean/run.py,sha256=xvYZlfi-J-IcqsAg8tNVnvl1mEUr6wPSya_-Bbf6jAU,1811
 port_ocean/utils.py,sha256=ZQCdOk1DzAA3hwUxFAzmbxQurnNYGpl1bDsPocJSkko,6129
 port_ocean/version.py,sha256=2ugCk8TXPsRIuFviZ8j3RPaszSw2HE-KuaW8vhgWJVM,172
-port_ocean-0.4.5.dist-info/LICENSE.md,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-port_ocean-0.4.5.dist-info/METADATA,sha256=8MVv1FT_aDHYJYbJ8X5qK5zMY50LlZzc_Oh9_FxpOYo,6490
-port_ocean-0.4.5.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-port_ocean-0.4.5.dist-info/entry_points.txt,sha256=F_DNUmGZU2Kme-8NsWM5LLE8piGMafYZygRYhOVtcjA,54
-port_ocean-0.4.5.dist-info/RECORD,,
+port_ocean-0.4.7.dist-info/LICENSE.md,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+port_ocean-0.4.7.dist-info/METADATA,sha256=p4Ch4rizkk1-mBpAXRsyBSRaQAdQ6CNhfDt7ohkggdQ,6490
+port_ocean-0.4.7.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+port_ocean-0.4.7.dist-info/entry_points.txt,sha256=F_DNUmGZU2Kme-8NsWM5LLE8piGMafYZygRYhOVtcjA,54
+port_ocean-0.4.7.dist-info/RECORD,,