port-ocean 0.5.6__py3-none-any.whl → 0.5.7__py3-none-any.whl

port_ocean/core/handlers/entity_processor/jq_entity_processor.py

@@ -2,6 +2,7 @@ import asyncio
 import functools
 from functools import lru_cache
 from typing import Any
+from loguru import logger
 
 import pyjq as jq  # type: ignore
 
@@ -67,25 +68,74 @@ class JQEntityProcessor(BaseEntityProcessor):
 
         return result
 
+    async def _get_entity_if_passed_selector(
+        self,
+        data: dict[str, Any],
+        raw_entity_mappings: dict[str, Any],
+        selector_query: str,
+    ) -> dict[str, Any]:
+        should_run = await self._search_as_bool(data, selector_query)
+        if should_run:
+            return await self._search_as_object(data, raw_entity_mappings)
+        return {}
+
+    async def _calculate_entity(
+        self,
+        data: dict[str, Any],
+        raw_entity_mappings: dict[str, Any],
+        items_to_parse: str | None,
+        selector_query: str,
+    ) -> list[dict[str, Any]]:
+        if items_to_parse:
+            items = await self._search(data, items_to_parse)
+            if isinstance(items, list):
+                return await asyncio.gather(
+                    *[
+                        self._get_entity_if_passed_selector(
+                            {"item": item, **data},
+                            raw_entity_mappings,
+                            selector_query,
+                        )
+                        for item in items
+                    ]
+                )
+            logger.warning(
+                f"Failed to parse items for JQ expression {items_to_parse}, Expected list but got {type(items)}."
+                f" Skipping..."
+            )
+        else:
+            return [
+                await self._get_entity_if_passed_selector(
+                    data, raw_entity_mappings, selector_query
+                )
+            ]
+        return [{}]
+
     async def _calculate_entities(
         self, mapping: ResourceConfig, raw_data: list[dict[str, Any]]
     ) -> list[Entity]:
-        async def calculate_raw(data: dict[str, Any]) -> dict[str, Any]:
-            should_run = await self._search_as_bool(data, mapping.selector.query)
-            if should_run and mapping.port.entity:
-                return await self._search_as_object(
-                    data, mapping.port.entity.mappings.dict(exclude_unset=True)
+        raw_entity_mappings: dict[str, Any] = mapping.port.entity.mappings.dict(
+            exclude_unset=True
+        )
+        entities_tasks = [
+            asyncio.create_task(
+                self._calculate_entity(
+                    data,
+                    raw_entity_mappings,
+                    mapping.port.items_to_parse,
+                    mapping.selector.query,
                 )
-            return {}
-
-        entities_tasks = [asyncio.create_task(calculate_raw(data)) for data in raw_data]
+            )
+            for data in raw_data
+        ]
         entities = await asyncio.gather(*entities_tasks)
 
         return [
             Entity.parse_obj(entity_data)
+            for flatten in entities
             for entity_data in filter(
                 lambda entity: entity.get("identifier") and entity.get("blueprint"),
-                entities,
+                flatten,
             )
         ]
 

port_ocean/core/handlers/port_app_config/models.py

@@ -19,6 +19,7 @@ class PortResourceConfig(BaseModel):
         mappings: EntityMapping
 
     entity: MappingsConfig
+    items_to_parse: str | None = Field(alias="itemsToParse")
 
 
 class Selector(BaseModel):

{port_ocean-0.5.6.dist-info → port_ocean-0.5.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: port-ocean
-Version: 0.5.6
+Version: 0.5.7
 Summary: Port Ocean is a CLI tool for managing your Port projects.
 Home-page: https://app.getport.io
 Keywords: ocean,port-ocean,port
@@ -42,8 +42,7 @@ Requires-Dist: werkzeug (>=2.3.4,<4.0.0)
 Project-URL: Repository, https://github.com/port-labs/Port-Ocean
 Description-Content-Type: text/markdown
 
-<img src="./assets/Thumbnail.jpg" alt="Ocean">
-
+<img src="./assets/Thumbnail.png" alt="Ocean">
 
 # Ocean <img src="./assets/OceanSymbol.svg" alt="Ocean" width="100" height="100" align="right">
 
@@ -56,9 +55,8 @@ empowering engineers to effortlessly prioritize key features and streamline the
 
 - Python 3.11
 
-
-
 ## Installation
+
 In order to install the Ocean Framework, run the following command:
 
 ```bash
@@ -73,7 +71,7 @@ poetry add port-ocean[cli]
 
 ## Run Integration
 
-1. source the integration venv 
+1. source the integration venv
 
    ```bash
    . .venv/bin/activate
@@ -91,14 +89,15 @@ poetry add port-ocean[cli]
 ![image](./assets/ExportArchitecture.svg)
 
 ## Real-Time updates Architecture
+
 ![image](./assets/RealTimeUpdatesArchitecture.svg)
 
 ## Integration Lifecycle
 
 ![image](./assets/LifecycleOfIntegration.svg)
 
-
 ## Folder Structure
+
 The Ocean Integration Framework follows a specific folder structure within this mono repository. This structure ensures proper organization and easy identification of integration modules. The suggested folder structure is as follows:
 
 ```
@@ -122,9 +121,11 @@ port-ocean/
 - The `pyproject.toml` file inside each integration folder lists the required dependencies for that integration.
 
 ## Configuration
+
 The Integration Framework utilizes a `config.yaml` file for its configuration. This file defines both the framework configuration and the integration configuration within it. Each integration is identified by its type and unique identifier, which are utilized during initialization to appropriately update Port.
 
 Example `config.yaml`:
+
 ```yaml
 # This is an example configuration file for the integration service.
 # Please copy this file to config.yaml file in the integration folder and edit it to your needs.
@@ -153,6 +154,7 @@ The reason Ocean is open source is that we aim for the Port integration library
 In order to learn how you can contribute to Ocean, read our [contributing guide](./CONTRIBUTING.md)
 
 ### Local Development (Framework)
+
 1. Clone the repository
 
 2. Install dependencies:
@@ -174,6 +176,7 @@ In order to learn how you can contribute to Ocean, read our [contributing guide]
    ```
 
 ### Local Development (Integration)
+
 1. Clone the repository
 
 2. For new integration run
@@ -209,7 +212,10 @@ In order to learn how you can contribute to Ocean, read our [contributing guide]
    ```
 
 ## License
+
 The Ocean Framework is open-source software licensed under the [Apache 2.0 License](https://www.apache.org/licenses/LICENSE-2.0). See the [LICENSE](./LICENSE) file for more information.
 
 ## Contact
+
 For any questions or inquiries, please reach out to our team at support@getport.io
+

{port_ocean-0.5.6.dist-info → port_ocean-0.5.7.dist-info}/RECORD

@@ -79,11 +79,11 @@ port_ocean/core/handlers/entities_state_applier/port/order_by_entities_dependenc
 port_ocean/core/handlers/entities_state_applier/port/validate_entity_relations.py,sha256=nKuQ-RlalGG07olxm6l5NHeOuQT9dEZLoMpD-AN5nq0,1392
 port_ocean/core/handlers/entity_processor/__init__.py,sha256=FvFCunFg44wNQoqlybem9MthOs7p1Wawac87uSXz9U8,156
 port_ocean/core/handlers/entity_processor/base.py,sha256=3ucPc-esMI5M6gFl_l2j_ncEqOIe7m1bCH4rAXtGDzg,1710
-port_ocean/core/handlers/entity_processor/jq_entity_processor.py,sha256=R1oejEASXT9LWtJZ-HNKmd-vpPdyWt2HAq_GJTymO2o,3875
+port_ocean/core/handlers/entity_processor/jq_entity_processor.py,sha256=Xn_BfsddY_NR2Ssbiw6TT6xAm_7gKlZSFVlhlmb2TyA,5425
 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
-port_ocean/core/handlers/port_app_config/models.py,sha256=E-1J4ccfKD74S86hierzRAX0gRaq571nYcD2aBR8ir0,1924
+port_ocean/core/handlers/port_app_config/models.py,sha256=WtF2uW4KPUPfDpy6E2tl9qXh5GUcDucVvKt0DCTYv6w,1985
 port_ocean/core/integrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 port_ocean/core/integrations/base.py,sha256=3jU0skK_gMLB8a_fN8whsRKva-Dz058TFoI0vXTbryU,3193
 port_ocean/core/integrations/mixins/__init__.py,sha256=FA1FEKMM6P-L2_m7Q4L20mFa4_RgZnwSRmTCreKcBVM,220
@@ -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.6.dist-info/LICENSE.md,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-port_ocean-0.5.6.dist-info/METADATA,sha256=mVyVE17g71s_j21aiLJjfVtpiWsh6_NKnNLLHtAemh4,6510
-port_ocean-0.5.6.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-port_ocean-0.5.6.dist-info/entry_points.txt,sha256=F_DNUmGZU2Kme-8NsWM5LLE8piGMafYZygRYhOVtcjA,54
-port_ocean-0.5.6.dist-info/RECORD,,
+port_ocean-0.5.7.dist-info/LICENSE.md,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+port_ocean-0.5.7.dist-info/METADATA,sha256=rsoY88yea-y1ZcgFKGtIglzy5UgJUOYNPwaSq-M5ZSQ,6515
+port_ocean-0.5.7.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+port_ocean-0.5.7.dist-info/entry_points.txt,sha256=F_DNUmGZU2Kme-8NsWM5LLE8piGMafYZygRYhOVtcjA,54
+port_ocean-0.5.7.dist-info/RECORD,,