port-ocean 0.10.5__tar.gz → 0.10.8__tar.gz

{port_ocean-0.10.5 → port_ocean-0.10.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: port-ocean
-Version: 0.10.5
+Version: 0.10.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.10.5 → port_ocean-0.10.8}/port_ocean/bootstrap.py

@@ -16,7 +16,7 @@ def _get_base_integration_class_from_module(
     for name, obj in getmembers(module):
         if (
             isclass(obj)
-            and type(obj) == type
+            and type(obj) is type
             and issubclass(obj, BaseIntegration)
             and obj != BaseIntegration
         ):

{port_ocean-0.10.5 → port_ocean-0.10.8}/port_ocean/cli/cookiecutter/{{cookiecutter.integration_slug}}/pyproject.toml

@@ -11,14 +11,14 @@ port_ocean = { version = "^{% version %}", extras = ["cli"] }
 [tool.poetry.group.dev.dependencies]
 # Uncomment this if you want to debug the ocean core together with your integration
 # port_ocean = { path = '../../', develop = true, extras = ['all'] }
-pytest = "^7.2"
-pytest-xdist = "^3.6.1"
-pre-commit = "^3.7.1"
-requests = "^2.32.3"
-black = "^23.3.0"
+black = "^24.4.2"
 mypy = "^1.3.0"
-ruff = "^0.0.278"
-pylint = "^2.17.4"
+pylint = ">=2.17.4,<4.0.0"
+pytest = ">=8.2,<9.0"
+pytest-asyncio = ">=0.24.0"
+pytest-httpx = ">=0.30.0"
+pytest-xdist = "^3.6.1"
+ruff = "^0.6.3"
 towncrier = "^23.6.0"
 
 [tool.towncrier]
@@ -106,3 +106,8 @@ exclude = '''
   |\.venv
 )/
 '''
+
+[tool.pytest.ini_options]
+asyncio_mode = "auto"
+asyncio_default_fixture_loop_scope = "function"
+addopts = "-vv -n auto ./tests"

{port_ocean-0.10.5 → port_ocean-0.10.8}/port_ocean/clients/port/mixins/entities.py

@@ -29,7 +29,7 @@ class EntityClientMixin:
         request_options: RequestOptions,
         user_agent_type: UserAgentType | None = None,
         should_raise: bool = True,
-    ) -> Entity:
+    ) -> Entity | None:
         validation_only = request_options["validation_only"]
         async with self.semaphore:
             logger.debug(
@@ -58,9 +58,16 @@ class EntityClientMixin:
             )
         handle_status_code(response, should_raise)
         result = response.json()
+
         result_entity = (
             Entity.parse_obj(result["entity"]) if result.get("entity") else entity
         )
+
+        # Happens when upsert fails and search identifier is defined.
+        # We return None to ignore the entity later in the delete process
+        if result_entity.is_using_search_identifier:
+            return None
+
         # In order to save memory we'll keep only the identifier, blueprint and relations of the
         # upserted entity result for later calculations
         reduced_entity = Entity(
@@ -94,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.5 → port_ocean-0.10.8}/port_ocean/clients/port/mixins/integrations.py

@@ -110,7 +110,7 @@ class IntegrationClientMixin:
                 "logs": logs,
             },
         )
-        handle_status_code(response)
+        handle_status_code(response, should_log=False)
         logger.debug("Logs successfully ingested")
 
     async def ingest_integration_kind_examples(

{port_ocean-0.10.5 → port_ocean-0.10.8}/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.5 → port_ocean-0.10.8}/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.5 → port_ocean-0.10.8}/port_ocean/core/defaults/initialize.py

@@ -64,7 +64,7 @@ async def _initialize_required_integration_settings(
         )
         if not integration:
             logger.info(
-                "Integration does not exist, Creating new integration with default default mapping"
+                "Integration does not exist, Creating new integration with default mapping"
             )
             integration = await port_client.create_integration(
                 integration_config.integration.type,

{port_ocean-0.10.5 → port_ocean-0.10.8}/port_ocean/core/handlers/entities_state_applier/port/applier.py

@@ -106,18 +106,27 @@ class HttpEntitiesStateApplier(BaseEntitiesStateApplier):
                 should_raise=False,
             )
         else:
+            entities_with_search_identifier: list[Entity] = []
+            entities_without_search_identifier: list[Entity] = []
+            for entity in entities:
+                if entity.is_using_search_identifier:
+                    entities_with_search_identifier.append(entity)
+                else:
+                    entities_without_search_identifier.append(entity)
+
             ordered_created_entities = reversed(
-                order_by_entities_dependencies(entities)
+                entities_with_search_identifier
+                + order_by_entities_dependencies(entities_without_search_identifier)
             )
             for entity in ordered_created_entities:
-                modified_entities.append(
-                    await self.context.port_client.upsert_entity(
-                        entity,
-                        event.port_app_config.get_port_request_options(),
-                        user_agent_type,
-                        should_raise=False,
-                    )
+                upsertedEntity = await self.context.port_client.upsert_entity(
+                    entity,
+                    event.port_app_config.get_port_request_options(),
+                    user_agent_type,
+                    should_raise=False,
                 )
+                if upsertedEntity:
+                    modified_entities.append(upsertedEntity)
         return modified_entities
 
     async def delete(

{port_ocean-0.10.5 → port_ocean-0.10.8}/port_ocean/core/handlers/port_app_config/models.py

@@ -13,18 +13,22 @@ class Rule(BaseModel):
     value: str
 
 
-class SearchRelation(BaseModel):
+class IngestSearchQuery(BaseModel):
     combinator: str
-    rules: list[Rule | SearchRelation]
+    rules: list[Rule | IngestSearchQuery]
 
 
 class EntityMapping(BaseModel):
-    identifier: str
+    identifier: str | IngestSearchQuery
     title: str | None
     blueprint: str
     team: str | None
     properties: dict[str, str] = Field(default_factory=dict)
-    relations: dict[str, str | SearchRelation] = Field(default_factory=dict)
+    relations: dict[str, str | IngestSearchQuery] = Field(default_factory=dict)
+
+    @property
+    def is_using_search_identifier(self) -> bool:
+        return isinstance(self.identifier, dict)
 
 
 class MappingsConfig(BaseModel):

{port_ocean-0.10.5 → port_ocean-0.10.8}/port_ocean/core/integrations/mixins/sync_raw.py

@@ -154,6 +154,12 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
         results: list[RAW_ITEM],
         user_agent_type: UserAgentType,
     ) -> tuple[list[Entity], list[Exception]]:
+        if resource.port.entity.mappings.is_using_search_identifier:
+            logger.info(
+                f"Skip unregistering resource of kind {resource.kind}, as mapping defined with search identifier"
+            )
+            return [], []
+
         objects_diff = await self._calculate_raw([(resource, results)])
         entities_selector_diff, errors = objects_diff[0]
 
@@ -272,7 +278,8 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
                 [
                     entity
                     for entity in entities_to_delete
-                    if (entity.identifier, entity.blueprint)
+                    if not entity.is_using_search_identifier
+                    and (entity.identifier, entity.blueprint)
                     not in registered_entities_attributes
                 ],
             )

{port_ocean-0.10.5 → port_ocean-0.10.8}/port_ocean/core/models.py

@@ -19,6 +19,10 @@ class Entity(BaseModel):
     properties: dict[str, Any] = {}
     relations: dict[str, Any] = {}
 
+    @property
+    def is_using_search_identifier(self) -> bool:
+        return isinstance(self.identifier, dict)
+
 
 class BlueprintRelation(BaseModel):
     many: bool

{port_ocean-0.10.5 → port_ocean-0.10.8}/port_ocean/core/utils.py

@@ -39,7 +39,9 @@ async def validate_integration_runtime(
     requested_runtime: Runtime,
 ) -> None:
     logger.debug("Validating integration runtime")
-    current_integration = await port_client.get_current_integration(should_raise=False)
+    current_integration = await port_client.get_current_integration(
+        should_raise=False, should_log=False
+    )
     current_runtime = current_integration.get("installationType", "OnPrem")
     if current_integration and current_runtime != requested_runtime.value:
         raise IntegrationRuntimeException(

{port_ocean-0.10.5 → port_ocean-0.10.8}/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.5 → port_ocean-0.10.8}/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.8/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.5 → port_ocean-0.10.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "port-ocean"
-version = "0.10.5"
+version = "0.10.8"
 description = "Port Ocean is a CLI tool for managing your Port projects."
 readme = "README.md"
 homepage = "https://app.getport.io"
@@ -72,7 +72,7 @@ pytest = ">=8.2,<9.0"
 pytest-asyncio = ">=0.24.0"
 pytest-httpx = ">=0.30.0"
 pytest-xdist = "^3.6.1"
-ruff = ">=0.0.278,<0.4.11"
+ruff = "^0.6.3"
 towncrier = "^23.6.0"
 types-python-dateutil = "^2.9.0.20240316"
 types-pyyaml = "^6.0.12.10"