port-ocean 0.10.7__tar.gz → 0.10.9__tar.gz

{port_ocean-0.10.7 → port_ocean-0.10.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: port-ocean
-Version: 0.10.7
+Version: 0.10.9
 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.10.7 → port_ocean-0.10.9}/port_ocean/clients/port/mixins/entities.py

@@ -101,7 +101,7 @@ class EntityClientMixin:
                 )
                 for entity in entities
             ),
-            return_exceptions=should_raise,
+            return_exceptions=True,
         )
         entity_results = [
             entity for entity in modified_entities_results if isinstance(entity, Entity)

{port_ocean-0.10.7 → port_ocean-0.10.9}/port_ocean/clients/port/utils.py

@@ -18,7 +18,7 @@ if TYPE_CHECKING:
 # The max_keepalive_connections can't be too high, as it will cause the application to run out of available connections.
 PORT_HTTP_MAX_CONNECTIONS_LIMIT = 200
 PORT_HTTP_MAX_KEEP_ALIVE_CONNECTIONS = 50
-PORT_HTTP_TIMEOUT = 10.0
+PORT_HTTP_TIMEOUT = 60.0
 
 PORT_HTTPX_TIMEOUT = httpx.Timeout(PORT_HTTP_TIMEOUT)
 PORT_HTTPX_LIMITS = httpx.Limits(

{port_ocean-0.10.7 → port_ocean-0.10.9}/port_ocean/config/settings.py

@@ -67,7 +67,7 @@ class IntegrationConfiguration(BaseOceanSettings, extra=Extra.allow):
     allow_environment_variables_jq_access: bool = True
     initialize_port_resources: bool = True
     scheduled_resync_interval: int | None = None
-    client_timeout: int = 30
+    client_timeout: int = 60
     send_raw_data_examples: bool = True
     port: PortSettings
     event_listener: EventListenerSettingsType = Field(

{port_ocean-0.10.7 → port_ocean-0.10.9}/port_ocean/helpers/retry.py

@@ -290,6 +290,11 @@ class RetryTransport(httpx.AsyncBaseTransport, httpx.BaseTransport):
                 if remaining_attempts < 1:
                     self._log_error(request, error)
                     raise
+            except httpx.ReadTimeout as e:
+                error = e
+                if remaining_attempts < 1:
+                    self._log_error(request, error)
+                    raise
             except httpx.TimeoutException as e:
                 error = e
                 if remaining_attempts < 1:

{port_ocean-0.10.7 → port_ocean-0.10.9}/port_ocean/middlewares.py

@@ -52,7 +52,14 @@ async def request_handler(
     request_id = generate_uuid()
 
     with logger.contextualize(request_id=request_id):
-        logger.bind(url=str(request.url), method=request.method).info("Request started")
+        log_level = (
+            "DEBUG"
+            if request.url.path == "/docs" or request.url.path == "/openapi.json"
+            else "INFO"
+        )
+        logger.bind(url=str(request.url), method=request.method).log(
+            log_level, f"Request to {request.url.path} started"
+        )
         response = await _handle_silently(call_next, request)
 
         end_time = get_time(seconds_precision=False)
@@ -61,5 +68,6 @@ async def request_handler(
         response.headers["X-Process-Time"] = str(time_elapsed)
         logger.bind(
             time_elapsed=time_elapsed, response_status=response.status_code
-        ).info("Request ended")
+        ).log(log_level, f"Request to {request.url.path} ended")
+
         return response

port_ocean-0.10.9/port_ocean/tests/clients/port/mixins/test_entities.py

@@ -0,0 +1,53 @@
+from typing import Any
+from unittest.mock import MagicMock
+
+import pytest
+
+from port_ocean.clients.port.mixins.entities import EntityClientMixin
+from port_ocean.core.models import Entity
+from httpx import ReadTimeout
+
+
+errored_entity_identifier: str = "a"
+expected_result_entities = [
+    Entity(identifier="b", blueprint="b"),
+    Entity(identifier="c", blueprint="c"),
+]
+all_entities = [
+    Entity(identifier=errored_entity_identifier, blueprint="a")
+] + expected_result_entities
+
+
+async def mock_upsert_entity(entity: Entity, *args: Any, **kwargs: Any) -> Entity:
+    if entity.identifier == errored_entity_identifier:
+        raise ReadTimeout("")
+    else:
+        return entity
+
+
+@pytest.fixture
+async def entity_client(monkeypatch: Any) -> EntityClientMixin:
+    # Arrange
+    entity_client = EntityClientMixin(auth=MagicMock(), client=MagicMock())
+    monkeypatch.setattr(entity_client, "upsert_entity", mock_upsert_entity)
+
+    return entity_client
+
+
+async def test_batch_upsert_entities_read_timeout_should_raise_false(
+    entity_client: EntityClientMixin,
+) -> None:
+    result_entities = await entity_client.batch_upsert_entities(
+        entities=all_entities, request_options=MagicMock(), should_raise=False
+    )
+
+    assert result_entities == expected_result_entities
+
+
+async def test_batch_upsert_entities_read_timeout_should_raise_true(
+    entity_client: EntityClientMixin,
+) -> None:
+    with pytest.raises(ReadTimeout):
+        await entity_client.batch_upsert_entities(
+            entities=all_entities, request_options=MagicMock(), should_raise=True
+        )

{port_ocean-0.10.7 → port_ocean-0.10.9}/port_ocean/utils/async_iterators.py

@@ -36,7 +36,7 @@ async def stream_async_iterators_tasks(
     :return: A stream of results
     """
     if not tasks:
-        raise StopAsyncIteration("No tasks provided")
+        return
 
     if len(tasks) == 1:
         async for batch_items in tasks[0]:

{port_ocean-0.10.7 → port_ocean-0.10.9}/pyproject.toml

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