port-ocean 0.5.13__py3-none-any.whl → 0.5.15__py3-none-any.whl

port_ocean/cli/cookiecutter/{{cookiecutter.integration_slug}}/Makefile

@@ -5,7 +5,7 @@ define run_checks
 	cd $1; \
 	poetry check || exit_code=$$?;\
 	mypy . || exit_code=$$?; \
-	ruff . || exit_code=$$?; \
+	ruff check . || exit_code=$$?; \
 	black --check . || exit_code=$$?; \
 	if [ $$exit_code -eq 1 ]; then \
 		echo "\033[0;31mOne or more checks failed with exit code $$exit_code\033[0m"; \

port_ocean/clients/port/mixins/entities.py

@@ -173,27 +173,33 @@ class EntityClientMixin:
         handle_status_code(response)
         return [Entity.parse_obj(result) for result in response.json()["entities"]]
 
-    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(
+    async def search_batch_entities(
+        self, user_agent_type: UserAgentType, entities_to_search: list[Entity]
+    ) -> list[Entity]:
+        search_rules = []
+        for entity in entities_to_search:
+            search_rules.append(
+                {
+                    "combinator": "and",
+                    "rules": [
+                        {
+                            "property": "$identifier",
+                            "operator": "=",
+                            "value": entity.identifier,
+                        },
+                        {
+                            "property": "$blueprint",
+                            "operator": "=",
+                            "value": entity.blueprint,
+                        },
+                    ],
+                }
+            )
+
+        return await self.search_entities(
             user_agent_type,
             {
                 "combinator": "and",
-                "rules": [
-                    {
-                        "property": "$identifier",
-                        "operator": "contains",
-                        "value": entity.identifier,
-                    },
-                    {
-                        "property": "$blueprint",
-                        "operator": "contains",
-                        "value": entity.blueprint,
-                    },
-                ],
+                "rules": [{"combinator": "or", "rules": search_rules}],
             },
         )
-
-        return len(found_entities) > 0

port_ocean/core/handlers/entity_processor/base.py

@@ -7,7 +7,7 @@ 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 (
-    RawEntity,
+    RAW_ITEM,
     EntitySelectorDiff,
 )
 
@@ -38,7 +38,7 @@ class BaseEntityProcessor(BaseHandler):
     async def _parse_items(
         self,
         mapping: ResourceConfig,
-        raw_data: list[RawEntity],
+        raw_data: list[RAW_ITEM],
         parse_all: bool = False,
     ) -> EntitySelectorDiff:
         pass
@@ -46,7 +46,7 @@ class BaseEntityProcessor(BaseHandler):
     async def parse_items(
         self,
         mapping: ResourceConfig,
-        raw_data: list[RawEntity],
+        raw_data: list[RAW_ITEM],
         parse_all: bool = False,
     ) -> EntitySelectorDiff:
         """Public method to parse raw entity data and map it to an EntityDiff.

port_ocean/core/handlers/entity_processor/jq_entity_processor.py

@@ -10,7 +10,7 @@ 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 (
-    RawEntity,
+    RAW_ITEM,
     EntitySelectorDiff,
 )
 from port_ocean.exceptions.core import EntityProcessorException
@@ -122,7 +122,7 @@ class JQEntityProcessor(BaseEntityProcessor):
     async def _parse_items(
         self,
         mapping: ResourceConfig,
-        raw_results: list[RawEntity],
+        raw_results: list[RAW_ITEM],
         parse_all: bool = False,
     ) -> EntitySelectorDiff:
         raw_entity_mappings: dict[str, Any] = mapping.port.entity.mappings.dict(
@@ -153,4 +153,4 @@ class JQEntityProcessor(BaseEntityProcessor):
                     else:
                         failed_entities.append(parsed_entity)
 
-        return {"passed": passed_entities, "failed": failed_entities}
+        return EntitySelectorDiff(passed=passed_entities, failed=failed_entities)

port_ocean/core/integrations/mixins/sync_raw.py

@@ -22,9 +22,8 @@ from port_ocean.core.ocean_types import (
     RAW_RESULT,
     RESYNC_RESULT,
     RawEntityDiff,
-    EntityDiff,
     ASYNC_GENERATOR_RESYNC_TYPE,
-    RawEntity,
+    RAW_ITEM,
     EntitySelectorDiff,
 )
 from port_ocean.core.utils import zip_and_sum
@@ -123,7 +122,7 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
 
     async def _calculate_raw(
         self,
-        raw_diff: list[tuple[ResourceConfig, list[RawEntity]]],
+        raw_diff: list[tuple[ResourceConfig, list[RAW_ITEM]]],
         parse_all: bool = False,
     ) -> list[EntitySelectorDiff]:
         return await asyncio.gather(
@@ -139,40 +138,23 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
         results: list[dict[Any, Any]],
         user_agent_type: UserAgentType,
         parse_all: bool = False,
-    ) -> list[Entity]:
+    ) -> EntitySelectorDiff:
         objects_diff = await self._calculate_raw([(resource, results)], parse_all)
+        await self.entities_state_applier.upsert(
+            objects_diff[0].passed, user_agent_type
+        )
 
-        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
+        return objects_diff[0]
 
     async def _unregister_resource_raw(
         self,
         resource: ResourceConfig,
-        results: list[RawEntity],
+        results: list[RAW_ITEM],
         user_agent_type: UserAgentType,
     ) -> list[Entity]:
         objects_diff = await self._calculate_raw([(resource, results)])
 
-        entities_after: list[Entity] = objects_diff[0]["passed"]
+        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
@@ -189,17 +171,21 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
             else:
                 async_generators.append(result)
 
-        entities = await self._register_resource_raw(
-            resource_config, raw_results, user_agent_type
-        )
+        entities = (
+            await self._register_resource_raw(
+                resource_config, raw_results, user_agent_type
+            )
+        ).passed
 
         for generator in async_generators:
             try:
                 async for items in generator:
                     entities.extend(
-                        await self._register_resource_raw(
-                            resource_config, items, user_agent_type
-                        )
+                        (
+                            await self._register_resource_raw(
+                                resource_config, items, user_agent_type
+                            )
+                        ).passed
                     )
             except* OceanAbortException as error:
                 errors.append(error)
@@ -233,13 +219,47 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
             resource for resource in config.resources if resource.kind == kind
         ]
 
-        return await asyncio.gather(
+        if not resource_mappings:
+            return []
+
+        diffs: list[EntitySelectorDiff] = await asyncio.gather(
             *(
                 self._register_resource_raw(resource, results, user_agent_type, True)
                 for resource in resource_mappings
             )
         )
 
+        registered_entities, entities_to_delete = zip_and_sum(
+            (entities_diff.passed, entities_diff.failed) for entities_diff in diffs
+        )
+
+        registered_entities_attributes = {
+            (entity.identifier, entity.blueprint) for entity in registered_entities
+        }
+
+        filtered_entities_to_delete: list[Entity] = (
+            await ocean.port_client.search_batch_entities(
+                user_agent_type,
+                [
+                    entity
+                    for entity in entities_to_delete
+                    if (entity.identifier, entity.blueprint)
+                    not in registered_entities_attributes
+                ],
+            )
+        )
+
+        if filtered_entities_to_delete:
+            logger.info(
+                f"Deleting {len(filtered_entities_to_delete)} entities that didn't pass any of the selectors"
+            )
+
+            await self.entities_state_applier.delete(
+                filtered_entities_to_delete, user_agent_type
+            )
+
+        return registered_entities
+
     async def unregister_raw(
         self,
         kind: str,
@@ -306,16 +326,13 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
                 [(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
-            ]
+            entities_before_flatten: list[Entity] = sum(
+                (entities_diff.passed for entities_diff in entities_before), []
+            )
+
+            entities_after_flatten: list[Entity] = sum(
+                (entities_diff.passed for entities_diff in entities_after), []
+            )
 
             await self.entities_state_applier.apply_diff(
                 {"before": entities_before_flatten, "after": entities_after_flatten},

port_ocean/core/ocean_types.py

@@ -1,14 +1,21 @@
-from typing import TypedDict, Any, AsyncIterator, Callable, Awaitable
+from typing import TypedDict, Any, AsyncIterator, Callable, Awaitable, NamedTuple
 
 from port_ocean.core.models import Entity
 
 
-RawEntity = dict[Any, Any]
+RAW_ITEM = dict[Any, Any]
+RAW_RESULT = list[RAW_ITEM]
+ASYNC_GENERATOR_RESYNC_TYPE = AsyncIterator[RAW_RESULT]
+RESYNC_RESULT = list[RAW_ITEM | ASYNC_GENERATOR_RESYNC_TYPE]
+
+LISTENER_RESULT = Awaitable[RAW_RESULT] | ASYNC_GENERATOR_RESYNC_TYPE
+RESYNC_EVENT_LISTENER = Callable[[str], LISTENER_RESULT]
+START_EVENT_LISTENER = Callable[[], Awaitable[None]]
 
 
 class RawEntityDiff(TypedDict):
-    before: list[RawEntity]
-    after: list[RawEntity]
+    before: list[RAW_ITEM]
+    after: list[RAW_ITEM]
 
 
 class EntityDiff(TypedDict):
@@ -16,21 +23,11 @@ class EntityDiff(TypedDict):
     after: list[Entity]
 
 
-class EntitySelectorDiff(TypedDict):
+class EntitySelectorDiff(NamedTuple):
     passed: list[Entity]
     failed: list[Entity]
 
 
-RAW_ITEM = dict[Any, Any]
-RAW_RESULT = list[RAW_ITEM]
-ASYNC_GENERATOR_RESYNC_TYPE = AsyncIterator[RAW_RESULT]
-RESYNC_RESULT = list[RAW_ITEM | ASYNC_GENERATOR_RESYNC_TYPE]
-
-LISTENER_RESULT = Awaitable[RAW_RESULT] | ASYNC_GENERATOR_RESYNC_TYPE
-RESYNC_EVENT_LISTENER = Callable[[str], LISTENER_RESULT]
-START_EVENT_LISTENER = Callable[[], Awaitable[None]]
-
-
 class IntegrationEventsCallbacks(TypedDict):
     start: list[START_EVENT_LISTENER]
     resync: dict[str | None, list[RESYNC_EVENT_LISTENER]]

{port_ocean-0.5.13.dist-info → port_ocean-0.5.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: port-ocean
-Version: 0.5.13
+Version: 0.5.15
 Summary: Port Ocean is a CLI tool for managing your Port projects.
 Home-page: https://app.getport.io
 Keywords: ocean,port-ocean,port
@@ -25,7 +25,7 @@ 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: fastapi (>=0.100,<0.111)
 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)
@@ -37,7 +37,7 @@ Requires-Dist: pyyaml (>=6.0,<7.0)
 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: urllib3 (>=1.26.16,<3.0.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

{port_ocean-0.5.13.dist-info → port_ocean-0.5.15.dist-info}/RECORD

@@ -23,7 +23,7 @@ port_ocean/cli/cookiecutter/{{cookiecutter.integration_slug}}/.port/resources/.g
 port_ocean/cli/cookiecutter/{{cookiecutter.integration_slug}}/.port/spec.yaml,sha256=Yq06gYoC6jFWES5mxlvJGFTGXbfD7E9R8j_PDbVIM3M,497
 port_ocean/cli/cookiecutter/{{cookiecutter.integration_slug}}/CHANGELOG.md,sha256=nzAmB0Bjnd2eZo79OjrlyVOdpTBHTmTxvO7c2C8Q-VQ,292
 port_ocean/cli/cookiecutter/{{cookiecutter.integration_slug}}/Dockerfile,sha256=Hh1dBnL959V2n28pmqFpXSrNvSMQjX6fDCUos8ITiu0,326
-port_ocean/cli/cookiecutter/{{cookiecutter.integration_slug}}/Makefile,sha256=HdDAoHiL0unYoMubrfngUA9GrweJny8jdTDqYFcNnTY,1773
+port_ocean/cli/cookiecutter/{{cookiecutter.integration_slug}}/Makefile,sha256=kTa72qEp8pi-joOH6zl8oeIgjEHSCF628p2074yHHNA,1779
 port_ocean/cli/cookiecutter/{{cookiecutter.integration_slug}}/README.md,sha256=5VZmgDRW9gO4d8UuzkujslOIDfIDBiAGL2Hd74HK770,468
 port_ocean/cli/cookiecutter/{{cookiecutter.integration_slug}}/changelog/.gitignore,sha256=kCpRPdl3S_jqYYZaOrc0-xa6-l3KqVjNRXc6jCkd_-Q,12
 port_ocean/cli/cookiecutter/{{cookiecutter.integration_slug}}/config.yaml,sha256=zKaBQNCbWEE3MFxDHaMn9NIeBGVPiZUV6cBjH35f2kw,906
@@ -40,7 +40,7 @@ port_ocean/clients/port/authentication.py,sha256=t3z6h4vld-Tzkpth15sstaMJg0rccX-
 port_ocean/clients/port/client.py,sha256=3GYCM0ZkX3pB6sNoOb-7_6dm0Jr5_vqhflD9iltf_As,2640
 port_ocean/clients/port/mixins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 port_ocean/clients/port/mixins/blueprints.py,sha256=BiqkhvDFdkySWgL1NHI-LAQ9ieZWazZAojPo9E8d7U4,4575
-port_ocean/clients/port/mixins/entities.py,sha256=6AgQocxwaXGYs9IHfaquz5M-4REj5a53-l0lsYJ7N7A,7199
+port_ocean/clients/port/mixins/entities.py,sha256=Lg5Sa6jQuhDTQKLURVavqXlBQt4-XPUUigB9JqQ1X0k,7364
 port_ocean/clients/port/mixins/integrations.py,sha256=GJRweeibfKhukOkWB07pb09G6pp06FOiXPJU-pOV7M8,5155
 port_ocean/clients/port/mixins/migrations.py,sha256=A6896oJF6WbFL2WroyTkMzr12yhVyWqGoq9dtLNSKBY,1457
 port_ocean/clients/port/retry_transport.py,sha256=PtIZOAZ6V-ncpVysRUsPOgt8Sf01QLnTKB5YeKBxkJk,1861
@@ -77,8 +77,8 @@ port_ocean/core/handlers/entities_state_applier/port/applier.py,sha256=G6RyPgBAy
 port_ocean/core/handlers/entities_state_applier/port/get_related_entities.py,sha256=1zncwCbE-Gej0xaWKlzZgoXxOBe9bgs_YxlZ8QW3NdI,1751
 port_ocean/core/handlers/entities_state_applier/port/order_by_entities_dependencies.py,sha256=82BvU8t5w9uhsxX8hbnwuRPuWhW3cMeuT_5sVIkip1I,1550
 port_ocean/core/handlers/entity_processor/__init__.py,sha256=FvFCunFg44wNQoqlybem9MthOs7p1Wawac87uSXz9U8,156
-port_ocean/core/handlers/entity_processor/base.py,sha256=G5pkZX9yUQzU_FhgILu8h86A-OQ3yQzp3Up6n1CC7ew,1955
-port_ocean/core/handlers/entity_processor/jq_entity_processor.py,sha256=hRryLQ21SwJRtR_it7Uryt04MaDeepdUiLv0ssLimzg,5607
+port_ocean/core/handlers/entity_processor/base.py,sha256=4JVCAAohEKtl8FdlnuyIxJ1afSXk3o2-e_m4LSy7vmw,1952
+port_ocean/core/handlers/entity_processor/jq_entity_processor.py,sha256=R5PwTcsJYRVU-lwoYZa1Af8kserp2BXIpyzVtRdEqA8,5617
 port_ocean/core/handlers/port_app_config/__init__.py,sha256=8AAT5OthiVM7KCcM34iEgEeXtn2pRMrT4Dze5r1Ixbk,134
 port_ocean/core/handlers/port_app_config/api.py,sha256=6VbKPwFzsWG0IYsVD81hxSmfqtHUFqrfUuj1DBX5g4w,853
 port_ocean/core/handlers/port_app_config/base.py,sha256=nnMZ4jH6a-4Of9Cn-apMsU0CgNLD9avd5q0gRmc7nZ8,1495
@@ -89,10 +89,10 @@ port_ocean/core/integrations/mixins/__init__.py,sha256=FA1FEKMM6P-L2_m7Q4L20mFa4
 port_ocean/core/integrations/mixins/events.py,sha256=Ddfx2L4FpghV38waF8OfVeOV0bHBxNIgjU-q5ffillI,2341
 port_ocean/core/integrations/mixins/handler.py,sha256=mZ7-0UlG3LcrwJttFbMe-R4xcOU2H_g33tZar7PwTv8,3771
 port_ocean/core/integrations/mixins/sync.py,sha256=TKqRytxXONVhuCo3CB3rDvWNbITnZz33TYTDs3SWWVk,3880
-port_ocean/core/integrations/mixins/sync_raw.py,sha256=ryl4u3MCQo-qYmu2Pt9fHMnLL0RavmjFNKJzEHakQmk,14656
+port_ocean/core/integrations/mixins/sync_raw.py,sha256=kWZ44L2M2G6B0n3oOqF1Ko9Rct06CXnTnWY25Q2eh3c,15049
 port_ocean/core/integrations/mixins/utils.py,sha256=7y1rGETZIjOQadyIjFJXIHKkQFKx_SwiP-TrAIsyyLY,2303
 port_ocean/core/models.py,sha256=bDO_I4Yd33TEZIh2QSV8UwXQIuwE7IgrINkYDHI0dkc,714
-port_ocean/core/ocean_types.py,sha256=df0Yu0Ft2nKmBj-1xbiuJsV3JDGOtGEBBQNJLJE0fuM,897
+port_ocean/core/ocean_types.py,sha256=ltnn22eRuDMFW02kIgmIAu6S06-i9jJV2NJ-MZcwwj0,879
 port_ocean/core/utils.py,sha256=B040Wokk28g9tQj_06qk_uvm85RIXc6XGXysZV6gtQw,1957
 port_ocean/exceptions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 port_ocean/exceptions/api.py,sha256=TLmTMqn4uHGaHgZK8PMIJ0TVJlPB4iP7xl9rx7GtCyY,426
@@ -122,8 +122,8 @@ port_ocean/utils/misc.py,sha256=2XmO8W0SgPjV0rd9HZvrHhoMlHprIwmMFsINxlAmgyw,1723
 port_ocean/utils/repeat.py,sha256=0EFWM9d8lLXAhZmAyczY20LAnijw6UbIECf5lpGbOas,3231
 port_ocean/utils/signal.py,sha256=Fab0049Cjs69TPTQgvEvilaVZKACQr6tGkRdySjNCi8,1515
 port_ocean/version.py,sha256=UsuJdvdQlazzKGD3Hd5-U7N69STh8Dq9ggJzQFnu9fU,177
-port_ocean-0.5.13.dist-info/LICENSE.md,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-port_ocean-0.5.13.dist-info/METADATA,sha256=Jxvee3Xw_3SafxSc98Gq0KB556-BWMBkuh06buCnjuk,6554
-port_ocean-0.5.13.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-port_ocean-0.5.13.dist-info/entry_points.txt,sha256=F_DNUmGZU2Kme-8NsWM5LLE8piGMafYZygRYhOVtcjA,54
-port_ocean-0.5.13.dist-info/RECORD,,
+port_ocean-0.5.15.dist-info/LICENSE.md,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+port_ocean-0.5.15.dist-info/METADATA,sha256=TeyhvegjRCiZJ1nEhYDSRdXdLCuClIslKwLiAr1wbqw,6554
+port_ocean-0.5.15.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+port_ocean-0.5.15.dist-info/entry_points.txt,sha256=F_DNUmGZU2Kme-8NsWM5LLE8piGMafYZygRYhOVtcjA,54
+port_ocean-0.5.15.dist-info/RECORD,,