port-ocean 0.5.10__tar.gz → 0.5.13__tar.gz

{port_ocean-0.5.10 → port_ocean-0.5.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: port-ocean
-Version: 0.5.10
+Version: 0.5.13
 Summary: Port Ocean is a CLI tool for managing your Port projects.
 Home-page: https://app.getport.io
 Keywords: ocean,port-ocean,port
@@ -21,11 +21,12 @@ Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Utilities
 Provides-Extra: cli
+Requires-Dist: aiostream (>=0.5.2,<0.6.0)
 Requires-Dist: click (>=8.1.3,<9.0.0) ; extra == "cli"
 Requires-Dist: confluent-kafka (>=2.1.1,<3.0.0)
 Requires-Dist: cookiecutter (>=2.1.1,<3.0.0) ; extra == "cli"
 Requires-Dist: fastapi (>=0.100,<0.110)
-Requires-Dist: httpx (>=0.24.1,<0.25.0)
+Requires-Dist: httpx (>=0.24.1,<0.28.0)
 Requires-Dist: jinja2-time (>=0.2.0,<0.3.0) ; extra == "cli"
 Requires-Dist: loguru (>=0.7.0,<0.8.0)
 Requires-Dist: pydantic (>=1.10.8,<2.0.0)
@@ -37,7 +38,7 @@ Requires-Dist: rich (>=13.4.1,<14.0.0) ; extra == "cli"
 Requires-Dist: six (>=1.16.0,<2.0.0)
 Requires-Dist: tomli (>=2.0.1,<3.0.0)
 Requires-Dist: urllib3 (>=1.26.16,<2.0.0)
-Requires-Dist: uvicorn (>=0.22.0,<0.23.0)
+Requires-Dist: uvicorn (>=0.22,<0.30)
 Requires-Dist: werkzeug (>=2.3.4,<4.0.0)
 Project-URL: Repository, https://github.com/port-labs/Port-Ocean
 Description-Content-Type: text/markdown

{port_ocean-0.5.10 → port_ocean-0.5.13}/port_ocean/clients/port/authentication.py

@@ -49,7 +49,9 @@ class PortAuthentication:
 
         credentials = {"clientId": client_id, "clientSecret": client_secret}
         response = await self.client.post(
-            f"{self.api_url}/auth/access_token", json=credentials
+            f"{self.api_url}/auth/access_token",
+            json=credentials,
+            extensions={"retryable": True},
         )
         handle_status_code(response)
         return TokenResponse(**response.json())

{port_ocean-0.5.10 → port_ocean-0.5.13}/port_ocean/clients/port/mixins/entities.py

@@ -1,4 +1,5 @@
 import asyncio
+from typing import Any
 from urllib.parse import quote_plus
 
 import httpx
@@ -133,23 +134,10 @@ class EntityClientMixin:
             return_exceptions=True,
         )
 
-    async def validate_entity_exist(self, identifier: str, blueprint: str) -> None:
-        logger.info(f"Validating entity {identifier} of blueprint {blueprint} exists")
-
-        response = await self.client.get(
-            f"{self.auth.api_url}/blueprints/{blueprint}/entities/{identifier}",
-            headers=await self.auth.headers(),
-        )
-        if response.is_error:
-            logger.error(
-                f"Error validating "
-                f"entity: {identifier} of "
-                f"blueprint: {blueprint}"
-            )
-        handle_status_code(response)
-
-    async def search_entities(self, user_agent_type: UserAgentType) -> list[Entity]:
-        query = {
+    async def search_entities(
+        self, user_agent_type: UserAgentType, query: dict[Any, Any] | None = None
+    ) -> list[Entity]:
+        default_query = {
             "combinator": "and",
             "rules": [
                 {
@@ -165,6 +153,11 @@ class EntityClientMixin:
             ],
         }
 
+        if query is None:
+            query = default_query
+        elif query.get("rules"):
+            query["rules"].append(default_query)
+
         logger.info(f"Searching entities with query {query}")
         response = await self.client.post(
             f"{self.auth.api_url}/entities/search",
@@ -174,43 +167,33 @@ class EntityClientMixin:
                 "exclude_calculated_properties": "true",
                 "include": ["blueprint", "identifier"],
             },
+            extensions={"retryable": True},
+            timeout=30,
         )
         handle_status_code(response)
         return [Entity.parse_obj(result) for result in response.json()["entities"]]
 
-    async def search_dependent_entities(self, entity: Entity) -> list[Entity]:
-        body = {
-            "combinator": "and",
-            "rules": [
-                {
-                    "operator": "relatedTo",
-                    "blueprint": entity.blueprint,
-                    "value": entity.identifier,
-                    "direction": "downstream",
-                }
-            ],
-        }
-
-        logger.info(f"Searching dependent entity with body {body}")
-        response = await self.client.post(
-            f"{self.auth.api_url}/entities/search",
-            headers=await self.auth.headers(),
-            json=body,
-        )
-        handle_status_code(response)
-
-        return [Entity.parse_obj(result) for result in response.json()["entities"]]
-
-    async def validate_entity_payload(
-        self, entity: Entity, merge: bool, create_missing_related_entities: bool
-    ) -> None:
-        logger.info(f"Validating entity {entity.identifier}")
-        await self.upsert_entity(
-            entity,
+    async def does_integration_has_ownership_over_entity(
+        self, entity: Entity, user_agent_type: UserAgentType
+    ) -> bool:
+        logger.info(f"Validating ownership on entity {entity.identifier}")
+        found_entities: list[Entity] = await self.search_entities(
+            user_agent_type,
             {
-                "merge": merge,
-                "create_missing_related_entities": create_missing_related_entities,
-                "delete_dependent_entities": False,
-                "validation_only": True,
+                "combinator": "and",
+                "rules": [
+                    {
+                        "property": "$identifier",
+                        "operator": "contains",
+                        "value": entity.identifier,
+                    },
+                    {
+                        "property": "$blueprint",
+                        "operator": "contains",
+                        "value": entity.blueprint,
+                    },
+                ],
             },
         )
+
+        return len(found_entities) > 0

{port_ocean-0.5.10 → port_ocean-0.5.13}/port_ocean/clients/port/retry_transport.py

@@ -15,11 +15,6 @@ class TokenRetryTransport(RetryTransport):
         super().__init__(**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.5.10 → port_ocean-0.5.13}/port_ocean/core/handlers/entities_state_applier/port/applier.py

@@ -1,6 +1,3 @@
-import asyncio
-from itertools import chain
-
 from loguru import logger
 
 from port_ocean.clients.port.types import UserAgentType
@@ -14,14 +11,9 @@ from port_ocean.core.handlers.entities_state_applier.port.get_related_entities i
 from port_ocean.core.handlers.entities_state_applier.port.order_by_entities_dependencies import (
     order_by_entities_dependencies,
 )
-from port_ocean.core.handlers.entities_state_applier.port.validate_entity_relations import (
-    validate_entity_relations,
-)
-from port_ocean.core.handlers.entity_processor.base import EntityPortDiff
 from port_ocean.core.models import Entity
 from port_ocean.core.ocean_types import EntityDiff
-from port_ocean.core.utils import is_same_entity, get_unique, get_port_diff
-from port_ocean.exceptions.core import RelationValidationException
+from port_ocean.core.utils import is_same_entity, get_port_diff
 
 
 class HttpEntitiesStateApplier(BaseEntitiesStateApplier):
@@ -32,63 +24,17 @@ class HttpEntitiesStateApplier(BaseEntitiesStateApplier):
     through HTTP requests.
     """
 
-    async def _validate_delete_dependent_entities(self, entities: list[Entity]) -> None:
-        logger.info("Validated deleted entities")
-        if not event.port_app_config.delete_dependent_entities:
-            dependent_entities = await asyncio.gather(
-                *(
-                    self.context.port_client.search_dependent_entities(entity)
-                    for entity in entities
-                )
-            )
-            new_dependent_entities = get_unique(
-                [
-                    entity
-                    for entity in chain.from_iterable(dependent_entities)
-                    if not any(is_same_entity(item, entity) for item in entities)
-                ]
-            )
-
-            if new_dependent_entities:
-                raise RelationValidationException(
-                    f"Must enable delete_dependent_entities flag or delete all dependent entities: "
-                    f" {[(dep.blueprint, dep.identifier) for dep in new_dependent_entities]}"
-                )
-
-    async def _validate_entity_diff(self, diff: EntityPortDiff) -> None:
-        config = event.port_app_config
-        await self._validate_delete_dependent_entities(diff.deleted)
-        modified_or_created_entities = diff.modified + diff.created
-
-        if modified_or_created_entities and not config.create_missing_related_entities:
-            logger.info("Validating modified or created entities")
-
-            await asyncio.gather(
-                *(
-                    self.context.port_client.validate_entity_payload(
-                        entity,
-                        config.enable_merge_entity,
-                        create_missing_related_entities=config.create_missing_related_entities,
-                    )
-                    for entity in modified_or_created_entities
-                )
-            )
-
-        if not event.port_app_config.delete_dependent_entities:
-            logger.info("Validating no relation blocks the operation")
-            await validate_entity_relations(diff, self.context.port_client)
-
-    async def _delete_diff(
+    async def _safe_delete(
         self,
         entities_to_delete: list[Entity],
-        created_entities: list[Entity],
+        entities_to_protect: list[Entity],
         user_agent_type: UserAgentType,
     ) -> None:
         if not entities_to_delete:
             return
 
         related_entities = await get_related_entities(
-            created_entities, self.context.port_client
+            entities_to_protect, self.context.port_client
         )
 
         allowed_entities_to_delete = []
@@ -98,7 +44,8 @@ class HttpEntitiesStateApplier(BaseEntitiesStateApplier):
                 is_same_entity(entity, entity_to_delete) for entity in related_entities
             )
             is_part_of_created = any(
-                is_same_entity(entity, entity_to_delete) for entity in created_entities
+                is_same_entity(entity, entity_to_delete)
+                for entity in entities_to_protect
             )
             if is_part_of_related:
                 if event.port_app_config.create_missing_related_entities:
@@ -119,21 +66,14 @@ class HttpEntitiesStateApplier(BaseEntitiesStateApplier):
         user_agent_type: UserAgentType,
     ) -> None:
         diff = get_port_diff(entities["before"], entities["after"])
+        kept_entities = diff.created + diff.modified
 
         logger.info(
             f"Updating entity diff (created: {len(diff.created)}, deleted: {len(diff.deleted)}, modified: {len(diff.modified)})"
         )
-        await self._validate_entity_diff(diff)
+        await self.upsert(kept_entities, user_agent_type)
 
-        logger.info("Upserting new entities")
-        await self.upsert(diff.created, user_agent_type)
-        logger.info("Upserting modified entities")
-        await self.upsert(diff.modified, user_agent_type)
-
-        logger.info("Deleting diff entities")
-        await self._delete_diff(
-            diff.deleted, diff.created + diff.modified, user_agent_type
-        )
+        await self._safe_delete(diff.deleted, kept_entities, user_agent_type)
 
     async def delete_diff(
         self,
@@ -145,15 +85,13 @@ class HttpEntitiesStateApplier(BaseEntitiesStateApplier):
         if not diff.deleted:
             return
 
+        kept_entities = diff.created + diff.modified
+
         logger.info(
-            f"Updating entity diff (created: {len(diff.created)}, deleted: {len(diff.deleted)}, modified: {len(diff.modified)})"
+            f"Determining entities to delete ({len(diff.deleted)}/{len(kept_entities)})"
         )
-        await self._validate_entity_diff(diff)
 
-        logger.info("Deleting diff entities")
-        await self._delete_diff(
-            diff.deleted, diff.created + diff.modified, user_agent_type
-        )
+        await self._safe_delete(diff.deleted, kept_entities, user_agent_type)
 
     async def upsert(
         self, entities: list[Entity], user_agent_type: UserAgentType

{port_ocean-0.5.10 → port_ocean-0.5.13}/port_ocean/core/handlers/entity_processor/base.py

@@ -6,7 +6,10 @@ from loguru import logger
 from port_ocean.core.handlers.base import BaseHandler
 from port_ocean.core.handlers.port_app_config.models import ResourceConfig
 from port_ocean.core.models import Entity
-from port_ocean.core.ocean_types import RawEntityDiff, EntityDiff
+from port_ocean.core.ocean_types import (
+    RawEntity,
+    EntitySelectorDiff,
+)
 
 
 @dataclass
@@ -33,21 +36,28 @@ class BaseEntityProcessor(BaseHandler):
 
     @abstractmethod
     async def _parse_items(
-        self, mapping: ResourceConfig, raw_data: RawEntityDiff
-    ) -> EntityDiff:
+        self,
+        mapping: ResourceConfig,
+        raw_data: list[RawEntity],
+        parse_all: bool = False,
+    ) -> EntitySelectorDiff:
         pass
 
     async def parse_items(
-        self, mapping: ResourceConfig, raw_data: RawEntityDiff
-    ) -> EntityDiff:
+        self,
+        mapping: ResourceConfig,
+        raw_data: list[RawEntity],
+        parse_all: bool = False,
+    ) -> EntitySelectorDiff:
         """Public method to parse raw entity data and map it to an EntityDiff.
 
         Args:
             mapping (ResourceConfig): The configuration for entity mapping.
-            raw_data (RawEntityDiff): The raw data to be parsed.
+            raw_data (list[RawEntity]): The raw data to be parsed.
+            parse_all (bool): Whether to parse all data or just data that passed the selector.
 
         Returns:
             EntityDiff: The parsed entity differences.
         """
         with logger.contextualize(kind=mapping.kind):
-            return await self._parse_items(mapping, raw_data)
+            return await self._parse_items(mapping, raw_data, parse_all)

{port_ocean-0.5.10 → port_ocean-0.5.13}/port_ocean/core/handlers/entity_processor/jq_entity_processor.py

@@ -9,7 +9,10 @@ import pyjq as jq  # type: ignore
 from port_ocean.core.handlers.entity_processor.base import BaseEntityProcessor
 from port_ocean.core.handlers.port_app_config.models import ResourceConfig
 from port_ocean.core.models import Entity
-from port_ocean.core.ocean_types import RawEntityDiff, EntityDiff
+from port_ocean.core.ocean_types import (
+    RawEntity,
+    EntitySelectorDiff,
+)
 from port_ocean.exceptions.core import EntityProcessorException
 
 
@@ -68,16 +71,19 @@ class JQEntityProcessor(BaseEntityProcessor):
 
         return result
 
-    async def _get_entity_if_passed_selector(
+    async def _get_mapped_entity(
         self,
         data: dict[str, Any],
         raw_entity_mappings: dict[str, Any],
         selector_query: str,
-    ) -> dict[str, Any]:
+        parse_all: bool = False,
+    ) -> tuple[dict[str, Any], bool]:
         should_run = await self._search_as_bool(data, selector_query)
-        if should_run:
-            return await self._search_as_object(data, raw_entity_mappings)
-        return {}
+        if parse_all or should_run:
+            mapped_entity = await self._search_as_object(data, raw_entity_mappings)
+            return mapped_entity, should_run
+
+        return {}, False
 
     async def _calculate_entity(
         self,
@@ -85,16 +91,18 @@ class JQEntityProcessor(BaseEntityProcessor):
         raw_entity_mappings: dict[str, Any],
         items_to_parse: str | None,
         selector_query: str,
-    ) -> list[dict[str, Any]]:
+        parse_all: bool = False,
+    ) -> list[tuple[dict[str, Any], bool]]:
         if items_to_parse:
             items = await self._search(data, items_to_parse)
             if isinstance(items, list):
                 return await asyncio.gather(
                     *[
-                        self._get_entity_if_passed_selector(
+                        self._get_mapped_entity(
                             {"item": item, **data},
                             raw_entity_mappings,
                             selector_query,
+                            parse_all,
                         )
                         for item in items
                     ]
@@ -105,51 +113,44 @@ class JQEntityProcessor(BaseEntityProcessor):
             )
         else:
             return [
-                await self._get_entity_if_passed_selector(
-                    data, raw_entity_mappings, selector_query
+                await self._get_mapped_entity(
+                    data, raw_entity_mappings, selector_query, parse_all
                 )
             ]
-        return [{}]
+        return [({}, False)]
 
-    async def _calculate_entities(
-        self, mapping: ResourceConfig, raw_data: list[dict[str, Any]]
-    ) -> list[Entity]:
+    async def _parse_items(
+        self,
+        mapping: ResourceConfig,
+        raw_results: list[RawEntity],
+        parse_all: bool = False,
+    ) -> EntitySelectorDiff:
         raw_entity_mappings: dict[str, Any] = mapping.port.entity.mappings.dict(
             exclude_unset=True
         )
-        entities_tasks = [
+        calculate_entities_tasks = [
             asyncio.create_task(
                 self._calculate_entity(
                     data,
                     raw_entity_mappings,
                     mapping.port.items_to_parse,
                     mapping.selector.query,
+                    parse_all,
                 )
             )
-            for data in raw_data
-        ]
-        entities = await asyncio.gather(*entities_tasks)
-
-        return [
-            Entity.parse_obj(entity_data)
-            for flatten in entities
-            for entity_data in filter(
-                lambda entity: entity.get("identifier") and entity.get("blueprint"),
-                flatten,
-            )
+            for data in raw_results
         ]
-
-    async def _parse_items(
-        self, mapping: ResourceConfig, raw_results: RawEntityDiff
-    ) -> EntityDiff:
-        entities_before: list[Entity] = await self._calculate_entities(
-            mapping, raw_results["before"]
-        )
-        entities_after: list[Entity] = await self._calculate_entities(
-            mapping, raw_results["after"]
-        )
-
-        return {
-            "before": entities_before,
-            "after": entities_after,
-        }
+        calculate_entities_results = await asyncio.gather(*calculate_entities_tasks)
+
+        passed_entities = []
+        failed_entities = []
+        for entities_results in calculate_entities_results:
+            for entity, did_entity_pass_selector in entities_results:
+                if entity.get("identifier") and entity.get("blueprint"):
+                    parsed_entity = Entity.parse_obj(entity)
+                    if did_entity_pass_selector:
+                        passed_entities.append(parsed_entity)
+                    else:
+                        failed_entities.append(parsed_entity)
+
+        return {"passed": passed_entities, "failed": failed_entities}

{port_ocean-0.5.10 → port_ocean-0.5.13}/port_ocean/core/integrations/mixins/sync_raw.py

@@ -24,6 +24,8 @@ from port_ocean.core.ocean_types import (
     RawEntityDiff,
     EntityDiff,
     ASYNC_GENERATOR_RESYNC_TYPE,
+    RawEntity,
+    EntitySelectorDiff,
 )
 from port_ocean.core.utils import zip_and_sum
 from port_ocean.exceptions.core import OceanAbortException
@@ -120,12 +122,13 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
         return results, errors
 
     async def _calculate_raw(
-        self, raw_diff: list[tuple[ResourceConfig, RawEntityDiff]]
-    ) -> list[EntityDiff]:
-        logger.info("Calculating diff in entities between states")
+        self,
+        raw_diff: list[tuple[ResourceConfig, list[RawEntity]]],
+        parse_all: bool = False,
+    ) -> list[EntitySelectorDiff]:
         return await asyncio.gather(
             *(
-                self.entity_processor.parse_items(mapping, results)
+                self.entity_processor.parse_items(mapping, results, parse_all)
                 for mapping, results in raw_diff
             )
         )
@@ -135,42 +138,41 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
         resource: ResourceConfig,
         results: list[dict[Any, Any]],
         user_agent_type: UserAgentType,
+        parse_all: bool = False,
     ) -> list[Entity]:
-        objects_diff = await self._calculate_raw(
-            [
-                (
-                    resource,
-                    {
-                        "before": [],
-                        "after": results,
-                    },
-                )
-            ]
-        )
+        objects_diff = await self._calculate_raw([(resource, results)], parse_all)
 
-        entities_after: list[Entity] = objects_diff[0]["after"]
+        entities_after: list[Entity] = objects_diff[0]["passed"]
         await self.entities_state_applier.upsert(entities_after, user_agent_type)
+
+        # If an entity didn't pass the JQ selector, we want to delete it if it exists in Port
+        for entity_to_delete in objects_diff[0]["failed"]:
+            is_owner = (
+                await ocean.port_client.does_integration_has_ownership_over_entity(
+                    entity_to_delete, user_agent_type
+                )
+            )
+            if not is_owner:
+                logger.info(
+                    f"Skipping deletion of entity {entity_to_delete.identifier}, "
+                    f"Couldn't find an entity that's related to the current integration."
+                )
+                continue
+            await self.entities_state_applier.delete(
+                objects_diff[0]["failed"], user_agent_type
+            )
+
         return entities_after
 
     async def _unregister_resource_raw(
         self,
         resource: ResourceConfig,
-        results: list[dict[Any, Any]],
+        results: list[RawEntity],
         user_agent_type: UserAgentType,
     ) -> list[Entity]:
-        objects_diff = await self._calculate_raw(
-            [
-                (
-                    resource,
-                    {
-                        "before": results,
-                        "after": [],
-                    },
-                )
-            ]
-        )
+        objects_diff = await self._calculate_raw([(resource, results)])
 
-        entities_after: list[Entity] = objects_diff[0]["before"]
+        entities_after: list[Entity] = objects_diff[0]["passed"]
         await self.entities_state_applier.delete(entities_after, user_agent_type)
         logger.info("Finished unregistering change")
         return entities_after
@@ -233,7 +235,7 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
 
         return await asyncio.gather(
             *(
-                self._register_resource_raw(resource, results, user_agent_type)
+                self._register_resource_raw(resource, results, user_agent_type, True)
                 for resource in resource_mappings
             )
         )
@@ -293,19 +295,31 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
         with logger.contextualize(kind=kind):
             logger.info(f"Found {len(resource_mappings)} resources for {kind}")
 
-            objects_diff = await self._calculate_raw(
-                [(mapping, raw_desired_state) for mapping in resource_mappings]
+            entities_before = await self._calculate_raw(
+                [
+                    (mapping, raw_desired_state["before"])
+                    for mapping in resource_mappings
+                ]
             )
 
-            entities_before, entities_after = zip_and_sum(
-                (
-                    (entities_change["before"], entities_change["after"])
-                    for entities_change in objects_diff
-                )
+            entities_after = await self._calculate_raw(
+                [(mapping, raw_desired_state["after"]) for mapping in resource_mappings]
             )
 
+            entities_before_flatten = [
+                item
+                for sublist in [d["passed"] for d in entities_before]
+                for item in sublist
+            ]
+            entities_after_flatten = [
+                item
+                for sublist in [d["passed"] for d in entities_after]
+                for item in sublist
+            ]
+
             await self.entities_state_applier.apply_diff(
-                {"before": entities_before, "after": entities_after}, user_agent_type
+                {"before": entities_before_flatten, "after": entities_after_flatten},
+                user_agent_type,
             )
 
     async def sync_raw_all(
@@ -333,8 +347,6 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
         ):
             app_config = await self.port_app_config_handler.get_port_app_config()
 
-            entities_at_port = await ocean.port_client.search_entities(user_agent_type)
-
             creation_results: list[tuple[list[Entity], list[Exception]]] = []
 
             try:
@@ -369,8 +381,11 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
 
                     logger.error(message, exc_info=error_group)
                 else:
+                    entities_at_port = await ocean.port_client.search_entities(
+                        user_agent_type
+                    )
                     logger.info(
-                        f"Running resync diff calculation, number of entities at Port before resync: {len(entities_at_port)}, number of entities created during sync: {len(flat_created_entities)}"
+                        f"Running resync diff calculation, number of entities found at Port: {len(entities_at_port)}, number of entities found during sync: {len(flat_created_entities)}"
                     )
                     await self.entities_state_applier.delete_diff(
                         {"before": entities_at_port, "after": flat_created_entities},