port-ocean 0.12.2.dev2__tar.gz → 0.12.2.dev4__tar.gz

{port_ocean-0.12.2.dev2 → port_ocean-0.12.2.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: port-ocean
-Version: 0.12.2.dev2
+Version: 0.12.2.dev4
 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.dev2 → port_ocean-0.12.2.dev4}/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(
-            objects_diff[0].entity_selector_diff.passed, user_agent_type
-        )
+        # modified_objects = 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,
         )
 
@@ -426,20 +425,20 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
                 use_cache=False
             )
             logger.info(f"Resync will use the following mappings: {app_config.dict()}")
-            try:
-                did_fetched_current_state = True
-                entities_at_port = await ocean.port_client.search_entities(
-                    user_agent_type
-                )
-            except httpx.HTTPError as e:
-                logger.warning(
-                    "Failed to fetch the current state of entities at Port. "
-                    "Skipping delete phase due to unknown initial state. "
-                    f"Error: {e}\n"
-                    f"Response status code: {e.response.status_code if isinstance(e, httpx.HTTPStatusError) else None}\n"
-                    f"Response content: {e.response.text if isinstance(e, httpx.HTTPStatusError) else None}\n"
-                )
-                did_fetched_current_state = False
+            # try:
+            #     did_fetched_current_state = True
+            #     entities_at_port = await ocean.port_client.search_entities(
+            #         user_agent_type
+            #     )
+            # except httpx.HTTPError as e:
+            #     logger.warning(
+            #         "Failed to fetch the current state of entities at Port. "
+            #         "Skipping delete phase due to unknown initial state. "
+            #         f"Error: {e}\n"
+            #         f"Response status code: {e.response.status_code if isinstance(e, httpx.HTTPStatusError) else None}\n"
+            #         f"Response content: {e.response.text if isinstance(e, httpx.HTTPStatusError) else None}\n"
+            #     )
+            #     did_fetched_current_state = False
 
             creation_results: list[tuple[list[Entity], list[Exception]]] = []
 
@@ -458,36 +457,36 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
             except asyncio.CancelledError as e:
                 logger.warning("Resync aborted successfully, skipping delete phase. This leads to an incomplete state")
                 raise
-            else:
-                if not did_fetched_current_state:
-                    logger.warning(
-                        "Due to an error before the resync, the previous state of entities at Port is unknown."
-                        " Skipping delete phase due to unknown initial state."
-                    )
-                    return
-
-                logger.info("Starting resync diff calculation")
-                flat_created_entities, errors = zip_and_sum(creation_results) or [
-                    [],
-                    [],
-                ]
-
-                if errors:
-                    message = f"Resync failed with {len(errors)}. Skipping delete phase due to incomplete state"
-                    error_group = ExceptionGroup(
-                        f"Resync failed with {len(errors)}. Skipping delete phase due to incomplete state",
-                        errors,
-                    )
-                    if not silent:
-                        raise error_group
-
-                    logger.error(message, exc_info=error_group)
-                else:
-                    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)}"
-                    )
-                    await self.entities_state_applier.delete_diff(
-                        {"before": entities_at_port, "after": flat_created_entities},
-                        user_agent_type,
-                    )
-                    logger.info("Resync finished successfully")
+            # else:
+            #     if not did_fetched_current_state:
+            #         logger.warning(
+            #             "Due to an error before the resync, the previous state of entities at Port is unknown."
+            #             " Skipping delete phase due to unknown initial state."
+            #         )
+            #         return
+            #
+            #     logger.info("Starting resync diff calculation")
+            #     flat_created_entities, errors = zip_and_sum(creation_results) or [
+            #         [],
+            #         [],
+            #     ]
+            #
+            #     if errors:
+            #         message = f"Resync failed with {len(errors)}. Skipping delete phase due to incomplete state"
+            #         error_group = ExceptionGroup(
+            #             f"Resync failed with {len(errors)}. Skipping delete phase due to incomplete state",
+            #             errors,
+            #         )
+            #         if not silent:
+            #             raise error_group
+            #
+            #         logger.error(message, exc_info=error_group)
+            #     else:
+            #         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)}"
+            #         )
+            #         await self.entities_state_applier.delete_diff(
+            #             {"before": entities_at_port, "after": flat_created_entities},
+            #             user_agent_type,
+            #         )
+            #         logger.info("Resync finished successfully")

{port_ocean-0.12.2.dev2 → port_ocean-0.12.2.dev4}/pyproject.toml

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