port-ocean 0.10.1__py3-none-any.whl → 0.10.5__py3-none-any.whl

port_ocean/clients/port/mixins/entities.py

@@ -58,11 +58,24 @@ class EntityClientMixin:
             )
         handle_status_code(response, should_raise)
         result = response.json()
-        result_entity = Entity.parse_obj(result["entity"])
-        # Set the results of the search relation and identifier to the entity
-        entity.identifier = result_entity.identifier or entity.identifier
-        entity.relations = result_entity.relations or entity.relations
-        return entity
+        result_entity = (
+            Entity.parse_obj(result["entity"]) if result.get("entity") else entity
+        )
+        # 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
 
     async def batch_upsert_entities(
         self,

port_ocean/ocean.py

@@ -89,6 +89,7 @@ class Ocean:
                 raise e
 
         interval = self.config.scheduled_resync_interval
+        loop = asyncio.get_event_loop()
         if interval is not None:
             logger.info(
                 f"Setting up scheduled resync, the integration will automatically perform a full resync every {interval} minutes)"
@@ -99,7 +100,9 @@ class Ocean:
                 wait_first=True,
             )(
                 lambda: threading.Thread(
-                    target=lambda: asyncio.run(execute_resync_all())
+                    target=lambda: asyncio.run_coroutine_threadsafe(
+                        execute_resync_all(), loop
+                    )
                 ).start()
             )
             await repeated_function()

port_ocean/tests/helpers/__init__.py

@@ -0,0 +1,75 @@
+import sys
+from inspect import getmembers
+from typing import Dict, List, Set, Tuple, Union
+
+from yaml import safe_load
+
+from port_ocean.bootstrap import create_default_app
+from port_ocean.core.handlers.port_app_config.models import ResourceConfig
+from port_ocean.core.ocean_types import RESYNC_RESULT
+from port_ocean.ocean import Ocean
+from port_ocean.utils.misc import load_module
+
+
+def get_integration_ocean_app(integration_path: str) -> Ocean:
+    default_app = create_default_app(
+        integration_path,
+        None,
+        {
+            "port": {
+                "client_id": "bla",
+                "client_secret": "bla",
+            },
+        },
+    )
+    main_path = f"{integration_path}/main.py"
+    sys.path.append(integration_path)
+    app_module = load_module(main_path)
+    app: Ocean = {name: item for name, item in getmembers(app_module)}.get(
+        "app", default_app
+    )
+
+    return app
+
+
+def get_integation_resource_configs(integration_path: str) -> List[ResourceConfig]:
+    with open(
+        f"{integration_path}/.port/resources/port-app-config.yml"
+    ) as port_app_config_file:
+        resource_configs = safe_load(port_app_config_file)
+
+    return [ResourceConfig(**item) for item in resource_configs["resources"]]
+
+
+def get_integation_resource_config_by_name(
+    integration_path: str, kind: str
+) -> Union[ResourceConfig, None]:
+    resource_configs = get_integation_resource_configs(integration_path)
+
+    relevant_configs = [x for x in resource_configs if x.kind == kind]
+
+    return relevant_configs[0] if len(relevant_configs) else None
+
+
+async def get_raw_result_on_integration_sync_kinds(
+    integration_path: str, override_kinds: Union[Set[str], None] = None
+) -> Dict[str, List[Tuple[RESYNC_RESULT, List[Exception]]]]:
+    app = get_integration_ocean_app(integration_path)
+
+    resource_configs = get_integation_resource_configs(integration_path)
+
+    if override_kinds:
+        resource_configs = [x for x in resource_configs if x.kind in override_kinds]
+
+    results: Dict[str, List[Tuple[RESYNC_RESULT, List[Exception]]]] = {}
+
+    for resource_config in resource_configs:
+        resource_result = await app.integration._get_resource_raw_results(
+            resource_config
+        )
+
+        results[resource_config.kind] = results.get(resource_config.kind, []) + [
+            resource_result
+        ]
+
+    return results

{port_ocean-0.10.1.dist-info → port_ocean-0.10.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: port-ocean
-Version: 0.10.1
+Version: 0.10.5
 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.1.dist-info → port_ocean-0.10.5.dist-info}/RECORD

@@ -44,7 +44,7 @@ port_ocean/clients/port/authentication.py,sha256=t3z6h4vld-Tzkpth15sstaMJg0rccX-
 port_ocean/clients/port/client.py,sha256=Xd8Jk25Uh4WXY_WW-z1Qbv6F3ZTBFPoOolsxHMfozKw,3366
 port_ocean/clients/port/mixins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 port_ocean/clients/port/mixins/blueprints.py,sha256=8ZVC5i8K1WKQMJJiPqZmgcOlF3OyxWz1aAQ_WA5UW3c,4500
-port_ocean/clients/port/mixins/entities.py,sha256=zAyw5FL0rahggdWw-jslTWqQ0ZQgqYitj3CMca8TJPw,8114
+port_ocean/clients/port/mixins/entities.py,sha256=oyd1mVlaoRnQLMpN9oOuYOC2PqLTMfJ51Z7cNyuVNNc,8647
 port_ocean/clients/port/mixins/integrations.py,sha256=Ro6h9BwLxglQWniCVmfC---4oyGuUxk_Qejswl2t-J8,4841
 port_ocean/clients/port/mixins/migrations.py,sha256=A6896oJF6WbFL2WroyTkMzr12yhVyWqGoq9dtLNSKBY,1457
 port_ocean/clients/port/retry_transport.py,sha256=PtIZOAZ6V-ncpVysRUsPOgt8Sf01QLnTKB5YeKBxkJk,1861
@@ -116,11 +116,12 @@ port_ocean/log/handlers.py,sha256=k9G_Mb4ga2-Jke9irpdlYqj6EYiwv0gEsh4TgyqqOmI,28
 port_ocean/log/logger_setup.py,sha256=BaXt-mh9CVXhneh37H46d04lqOdIBixG1pFyGfotuZs,2328
 port_ocean/log/sensetive.py,sha256=wkyvkKMbyLTjZDSbvvLHL9bv4RvD0DPAyL3uWSttUOA,2916
 port_ocean/middlewares.py,sha256=6GrhldYAazxSwK2TbS-J28XdZ-9wO3PgCcyIMhnnJvI,2480
-port_ocean/ocean.py,sha256=0L8sj5TaIJSeYydO7jyANNinB1k0WwN-Q-ChWNnhJOs,4729
+port_ocean/ocean.py,sha256=0dtaiRxKgY3kYNm1ZI3uFCJRhnNoTMwVv-PkWlLJQrQ,4842
 port_ocean/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 port_ocean/run.py,sha256=rTxBlrQd4yyrtgErCFJCHCEHs7d1OXrRiJehUYmIbN0,2212
 port_ocean/sonar-project.properties,sha256=X_wLzDOkEVmpGLRMb2fg9Rb0DxWwUFSvESId8qpvrPI,73
 port_ocean/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+port_ocean/tests/helpers/__init__.py,sha256=XQBdAi54t9VavF11dGVLeS1jSoEKRjqRemKskLh-nSo,2377
 port_ocean/tests/test_sample.py,sha256=Ew5LA_G1k6DC5a2ygU2FoyjZQa0fRmPy73N0bio0d14,46
 port_ocean/utils/__init__.py,sha256=KMGnCPXZJbNwtgxtyMycapkDz8tpSyw23MSYT3iVeHs,91
 port_ocean/utils/async_http.py,sha256=arnH458TExn2Dju_Sy6pHas_vF5RMWnOp-jBz5WAAcE,1226
@@ -132,8 +133,8 @@ port_ocean/utils/repeat.py,sha256=0EFWM9d8lLXAhZmAyczY20LAnijw6UbIECf5lpGbOas,32
 port_ocean/utils/signal.py,sha256=K-6kKFQTltcmKDhtyZAcn0IMa3sUpOHGOAUdWKgx0_E,1369
 port_ocean/utils/time.py,sha256=pufAOH5ZQI7gXvOvJoQXZXZJV-Dqktoj9Qp9eiRwmJ4,1939
 port_ocean/version.py,sha256=UsuJdvdQlazzKGD3Hd5-U7N69STh8Dq9ggJzQFnu9fU,177
-port_ocean-0.10.1.dist-info/LICENSE.md,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-port_ocean-0.10.1.dist-info/METADATA,sha256=tNiC4yGVwLDcHumtUn6Xr87FHhYntjVdKvIEvyGLsi8,6616
-port_ocean-0.10.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-port_ocean-0.10.1.dist-info/entry_points.txt,sha256=F_DNUmGZU2Kme-8NsWM5LLE8piGMafYZygRYhOVtcjA,54
-port_ocean-0.10.1.dist-info/RECORD,,
+port_ocean-0.10.5.dist-info/LICENSE.md,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+port_ocean-0.10.5.dist-info/METADATA,sha256=0ml7R1dYtI2YzfgwkkkhECc1P_-oV5FjYIBeiMXdF9Y,6616
+port_ocean-0.10.5.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+port_ocean-0.10.5.dist-info/entry_points.txt,sha256=F_DNUmGZU2Kme-8NsWM5LLE8piGMafYZygRYhOVtcjA,54
+port_ocean-0.10.5.dist-info/RECORD,,