port-ocean 0.12.2.dev7__tar.gz → 0.12.2.dev9__tar.gz

{port_ocean-0.12.2.dev7 → port_ocean-0.12.2.dev9}/PKG-INFO

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

@@ -56,33 +56,33 @@ class EntityClientMixin:
                 f"entity: {entity.identifier} of "
                 f"blueprint: {entity.blueprint}"
             )
-        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(
-            identifier=result_entity.identifier, blueprint=result_entity.blueprint
-        )
-
-        # Turning dict typed relations (raw search relations) is required
-        # for us to be able to successfully calculate the participation related entities
-        # and ignore the ones that don't as they weren't upserted
-        reduced_entity.relations = {
-            key: None if isinstance(relation, dict) else relation
-            for key, relation in result_entity.relations.items()
-        }
-
-        return reduced_entity
+        # 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(
+        #     identifier=result_entity.identifier, blueprint=result_entity.blueprint
+        # )
+        #
+        # # Turning dict typed relations (raw search relations) is required
+        # # for us to be able to successfully calculate the participation related entities
+        # # and ignore the ones that don't as they weren't upserted
+        # reduced_entity.relations = {
+        #     key: None if isinstance(relation, dict) else relation
+        #     for key, relation in result_entity.relations.items()
+        # }
+
+        return None
 
     async def batch_upsert_entities(
         self,
@@ -91,7 +91,7 @@ class EntityClientMixin:
         user_agent_type: UserAgentType | None = None,
         should_raise: bool = True,
     ) -> list[Entity]:
-        modified_entities_results = await asyncio.gather(
+        await asyncio.gather(
             *(
                 self.upsert_entity(
                     entity,
@@ -103,17 +103,18 @@ class EntityClientMixin:
             ),
             return_exceptions=True,
         )
-        entity_results = [
-            entity for entity in modified_entities_results if isinstance(entity, Entity)
-        ]
-        if not should_raise:
-            return entity_results
-
-        for entity_result in modified_entities_results:
-            if isinstance(entity_result, Exception):
-                raise entity_result
-
-        return entity_results
+        return []
+        # entity_results = [
+        #     entity for entity in modified_entities_results if isinstance(entity, Entity)
+        # ]
+        # if not should_raise:
+        #     return entity_results
+        #
+        # for entity_result in modified_entities_results:
+        #     if isinstance(entity_result, Exception):
+        #         raise entity_result
+        #
+        # return entity_results
 
     async def delete_entity(
         self,

{port_ocean-0.12.2.dev7 → port_ocean-0.12.2.dev9}/port_ocean/core/handlers/entities_state_applier/port/applier.py

@@ -97,37 +97,38 @@ class HttpEntitiesStateApplier(BaseEntitiesStateApplier):
         self, entities: list[Entity], user_agent_type: UserAgentType
     ) -> list[Entity]:
         logger.info(f"Upserting {len(entities)} entities")
-        modified_entities: list[Entity] = []
-        if event.port_app_config.create_missing_related_entities:
-            modified_entities = await self.context.port_client.batch_upsert_entities(
-                entities,
-                event.port_app_config.get_port_request_options(),
-                user_agent_type,
-                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(
-                entities_with_search_identifier
-                + order_by_entities_dependencies(entities_without_search_identifier)
-            )
-            for entity in ordered_created_entities:
-                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
+        # modified_entities: list[Entity] = []
+        # if event.port_app_config.create_missing_related_entities:
+        await self.context.port_client.batch_upsert_entities(
+            entities,
+            event.port_app_config.get_port_request_options(),
+            user_agent_type,
+            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(
+        #         entities_with_search_identifier
+        #         + order_by_entities_dependencies(entities_without_search_identifier)
+        #     )
+        #     for entity in ordered_created_entities:
+        #         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
+        return []
 
     async def delete(
         self, entities: list[Entity], user_agent_type: UserAgentType

{port_ocean-0.12.2.dev7 → port_ocean-0.12.2.dev9}/port_ocean/core/integrations/mixins/sync_raw.py

@@ -3,7 +3,6 @@ import inspect
 import typing
 from typing import Callable, Awaitable, Any
 
-import httpx
 from loguru import logger
 
 from port_ocean.clients.port.types import UserAgentType
@@ -140,11 +139,11 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
         objects_diff = await self._calculate_raw(
             [(resource, results)], parse_all, send_raw_data_examples_amount
         )
-        modified_objects = await self.entities_state_applier.upsert(
+        await self.entities_state_applier.upsert(
             objects_diff[0].entity_selector_diff.passed, user_agent_type
         )
         return CalculationResult(
-            objects_diff[0].entity_selector_diff._replace(passed=modified_objects),
+            objects_diff[0].entity_selector_diff._replace(passed=objects_diff[0].entity_selector_diff.passed),
             errors=objects_diff[0].errors,
         )
 
@@ -173,49 +172,48 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
         self, resource_config: ResourceConfig, user_agent_type: UserAgentType
     ) -> tuple[list[Entity], list[Exception]]:
         results, errors = await self._get_resource_raw_results(resource_config)
-        passed_entities = []
-        # async_generators: list[ASYNC_GENERATOR_RESYNC_TYPE] = []
-        # raw_results: RAW_RESULT = []
-        # for result in results:
-        #     if isinstance(result, dict):
-        #         raw_results.append(result)
-        #     else:
-        #         async_generators.append(result)
-        #
-        # send_raw_data_examples_amount = (
-        #     SEND_RAW_DATA_EXAMPLES_AMOUNT if ocean.config.send_raw_data_examples else 0
-        # )
-        # all_entities, register_errors = await self._register_resource_raw(
-        #     resource_config,
-        #     raw_results,
-        #     user_agent_type,
-        #     send_raw_data_examples_amount=send_raw_data_examples_amount,
-        # )
-        # errors.extend(register_errors)
-        # passed_entities = list(all_entities.passed)
-        #
-        # for generator in async_generators:
-        #     try:
-        #         async for items in generator:
-        #             if send_raw_data_examples_amount > 0:
-        #                 send_raw_data_examples_amount = max(
-        #                     0, send_raw_data_examples_amount - len(passed_entities)
-        #                 )
-        #
-        #             entities, register_errors = await self._register_resource_raw(
-        #                 resource_config,
-        #                 items,
-        #                 user_agent_type,
-        #                 send_raw_data_examples_amount=send_raw_data_examples_amount,
-        #             )
-        #             errors.extend(register_errors)
-        #             passed_entities.extend(entities.passed)
-        #     except* OceanAbortException as error:
-        #         errors.append(error)
-        #
-        # logger.info(
-        #     f"Finished registering change for {len(results)} raw results for kind: {resource_config.kind}. {len(passed_entities)} entities were affected"
-        # )
+        async_generators: list[ASYNC_GENERATOR_RESYNC_TYPE] = []
+        raw_results: RAW_RESULT = []
+        for result in results:
+            if isinstance(result, dict):
+                raw_results.append(result)
+            else:
+                async_generators.append(result)
+
+        send_raw_data_examples_amount = (
+            SEND_RAW_DATA_EXAMPLES_AMOUNT if ocean.config.send_raw_data_examples else 0
+        )
+        all_entities, register_errors = await self._register_resource_raw(
+            resource_config,
+            raw_results,
+            user_agent_type,
+            send_raw_data_examples_amount=send_raw_data_examples_amount,
+        )
+        errors.extend(register_errors)
+        passed_entities = list(all_entities.passed)
+
+        for generator in async_generators:
+            try:
+                async for items in generator:
+                    if send_raw_data_examples_amount > 0:
+                        send_raw_data_examples_amount = max(
+                            0, send_raw_data_examples_amount - len(passed_entities)
+                        )
+
+                    entities, register_errors = await self._register_resource_raw(
+                        resource_config,
+                        items,
+                        user_agent_type,
+                        send_raw_data_examples_amount=send_raw_data_examples_amount,
+                    )
+                    errors.extend(register_errors)
+                    passed_entities.extend(entities.passed)
+            except* OceanAbortException as error:
+                errors.append(error)
+
+        logger.info(
+            f"Finished registering change for {len(results)} raw results for kind: {resource_config.kind}. {len(passed_entities)} entities were affected"
+        )
         return passed_entities, errors
 
     async def register_raw(

{port_ocean-0.12.2.dev7 → port_ocean-0.12.2.dev9}/pyproject.toml

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