port-ocean 0.10.1__tar.gz → 0.10.5__tar.gz

{port_ocean-0.10.1 → port_ocean-0.10.5}/PKG-INFO

@@ -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 → port_ocean-0.10.5}/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-0.10.1 → port_ocean-0.10.5}/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-0.10.5/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 → port_ocean-0.10.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "port-ocean"
-version = "0.10.1"
+version = "0.10.5"
 description = "Port Ocean is a CLI tool for managing your Port projects."
 readme = "README.md"
 homepage = "https://app.getport.io"
@@ -64,18 +64,20 @@ cli = ["click", "rich", "cookiecutter", "jinja2-time"]
 
 
 [tool.poetry.group.dev.dependencies]
-pytest = ">=7.2,<9.0"
 black = ">=23.3,<25.0"
 mypy = "^1.3.0"
+pre-commit = "^3.7.1"
 pylint = ">=2.17.4,<4.0.0"
-types-pyyaml = "^6.0.12.10"
+pytest = ">=8.2,<9.0"
+pytest-asyncio = ">=0.24.0"
+pytest-httpx = ">=0.30.0"
+pytest-xdist = "^3.6.1"
 ruff = ">=0.0.278,<0.4.11"
-types-toml = "^0.10.8.6"
 towncrier = "^23.6.0"
-yamllint = "^1.32.0"
 types-python-dateutil = "^2.9.0.20240316"
-pytest-xdist = "^3.6.1"
-pre-commit = "^3.7.1"
+types-pyyaml = "^6.0.12.10"
+types-toml = "^0.10.8.6"
+yamllint = "^1.32.0"
 
 [tool.towncrier]
 directory = "changelog"
@@ -168,3 +170,8 @@ exclude = '''
   |node_modules
 )/
 '''
+
+[tool.pytest.ini_options]
+asyncio_mode = "auto"
+asyncio_default_fixture_loop_scope = "function"
+addopts = "-vv -n auto --ignore-glob='./integrations/*' ./port_ocean/tests"