port-ocean 0.7.0__py3-none-any.whl → 0.8.0__py3-none-any.whl

port_ocean/core/handlers/entity_processor/jq_entity_processor.py

@@ -1,5 +1,6 @@
 import asyncio
 import functools
+from asyncio import Task
 from dataclasses import dataclass, field
 from functools import lru_cache
 from typing import Any, Optional
@@ -70,9 +71,13 @@ class JQEntityProcessor(BaseEntityProcessor):
     async def _search_as_object(
         self, data: dict[str, Any], obj: dict[str, Any]
     ) -> dict[str, Any | None]:
-        search_tasks = {}
+        search_tasks: dict[str,Task[dict[str,Any | None]] | list[Task[dict[str,Any | None]]]] = {}
         for key, value in obj.items():
-            if isinstance(value, dict):
+
+            if isinstance(value,list):
+                search_tasks[key] = [asyncio.create_task(self._search_as_object(data,obj)) for obj in value]
+
+            elif isinstance(value, dict):
                 search_tasks[key] = asyncio.create_task(
                     self._search_as_object(data, value)
                 )
@@ -82,7 +87,10 @@ class JQEntityProcessor(BaseEntityProcessor):
         result: dict[str, Any | None] = {}
         for key, task in search_tasks.items():
             try:
-                result[key] = await task
+                if isinstance(task,list):
+                    result[key] = [await task for task in task]
+                else:
+                    result[key] = await task
             except Exception:
                 result[key] = None
 

port_ocean/core/handlers/port_app_config/models.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from typing import Any
 
 from pydantic import BaseModel, Field
@@ -5,19 +7,31 @@ from pydantic import BaseModel, Field
 from port_ocean.clients.port.types import RequestOptions
 
 
+class Rule(BaseModel):
+    property: str
+    operator: str
+    value: str
+
+
+class SearchRelation(BaseModel):
+    combinator: str
+    rules: list[Rule | SearchRelation]
+
+
 class EntityMapping(BaseModel):
     identifier: str
     title: str | None
     blueprint: str
     team: str | None
     properties: dict[str, str] = Field(default_factory=dict)
-    relations: dict[str, str] = Field(default_factory=dict)
+    relations: dict[str, str | SearchRelation] = Field(default_factory=dict)
 
 
-class PortResourceConfig(BaseModel):
-    class MappingsConfig(BaseModel):
-        mappings: EntityMapping
+class MappingsConfig(BaseModel):
+    mappings: EntityMapping
 
+
+class PortResourceConfig(BaseModel):
     entity: MappingsConfig
     items_to_parse: str | None = Field(alias="itemsToParse")
 

port_ocean/core/integrations/mixins/sync_raw.py

@@ -238,7 +238,7 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
             return []
 
         diffs, errors = zip(
-            await asyncio.gather(
+            *await asyncio.gather(
                 *(
                     self._register_resource_raw(
                         resource, results, user_agent_type, True
@@ -248,6 +248,9 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
             )
         )
 
+        diffs = list(diffs)
+        errors = sum(errors, [])
+
         if errors:
             message = f"Failed to register {len(errors)} entities. Skipping delete phase due to incomplete state"
             logger.error(message, exc_info=errors)

{port_ocean-0.7.0.dist-info → port_ocean-0.8.0.dist-info}/METADATA

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

@@ -77,18 +77,18 @@ port_ocean/core/handlers/entities_state_applier/port/get_related_entities.py,sha
 port_ocean/core/handlers/entities_state_applier/port/order_by_entities_dependencies.py,sha256=82BvU8t5w9uhsxX8hbnwuRPuWhW3cMeuT_5sVIkip1I,1550
 port_ocean/core/handlers/entity_processor/__init__.py,sha256=FvFCunFg44wNQoqlybem9MthOs7p1Wawac87uSXz9U8,156
 port_ocean/core/handlers/entity_processor/base.py,sha256=udR0w5TstTOS5xOfTjAZIEdldn4xr6Oyb3DylatYX3Q,1869
-port_ocean/core/handlers/entity_processor/jq_entity_processor.py,sha256=CLg3FxHDs-GIXmRFC0r_BlJd9VGIi9ySjbWkYfB73i8,7330
+port_ocean/core/handlers/entity_processor/jq_entity_processor.py,sha256=BU-kRUDnTVJNpa-B_Z6LQFuHanh9J9-2NluHavniYDM,7712
 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=oufdNLzUmEgJY5PgIz75zDlowWrjA-y8WR4UnM58E58,2897
-port_ocean/core/handlers/port_app_config/models.py,sha256=WtF2uW4KPUPfDpy6E2tl9qXh5GUcDucVvKt0DCTYv6w,1985
+port_ocean/core/handlers/port_app_config/models.py,sha256=4dw6HbgjMG3advpN3x6XF35xsgScnWm0KKTERG4CYZ8,2201
 port_ocean/core/integrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 port_ocean/core/integrations/base.py,sha256=KHsRYFZ38ff3AkkqIQu45883ovgKOJn_fZfnTNy7HWY,2952
 port_ocean/core/integrations/mixins/__init__.py,sha256=FA1FEKMM6P-L2_m7Q4L20mFa4_RgZnwSRmTCreKcBVM,220
 port_ocean/core/integrations/mixins/events.py,sha256=Ddfx2L4FpghV38waF8OfVeOV0bHBxNIgjU-q5ffillI,2341
 port_ocean/core/integrations/mixins/handler.py,sha256=mZ7-0UlG3LcrwJttFbMe-R4xcOU2H_g33tZar7PwTv8,3771
 port_ocean/core/integrations/mixins/sync.py,sha256=TKqRytxXONVhuCo3CB3rDvWNbITnZz33TYTDs3SWWVk,3880
-port_ocean/core/integrations/mixins/sync_raw.py,sha256=GmH5YPVnYO6mKEhoRer9F-vYy8mxPspaSWw2y9JJhgc,17954
+port_ocean/core/integrations/mixins/sync_raw.py,sha256=yFORznT6TXX7SXP1sSoHAjLxmjDzXIr3Vu-plbhLBoA,18017
 port_ocean/core/integrations/mixins/utils.py,sha256=7y1rGETZIjOQadyIjFJXIHKkQFKx_SwiP-TrAIsyyLY,2303
 port_ocean/core/models.py,sha256=YPIU7V3GKeDXIVkNzZn0w17YN2Akl-D8nFs-l4bEKcU,1143
 port_ocean/core/ocean_types.py,sha256=3_d8-n626f1kWLQ_Jxw194LEyrOVupz05qs_Y1pvB-A,990
@@ -122,8 +122,8 @@ port_ocean/utils/queue_utils.py,sha256=KWWl8YVnG-glcfIHhM6nefY-2sou_C6DVP1VynQwz
 port_ocean/utils/repeat.py,sha256=0EFWM9d8lLXAhZmAyczY20LAnijw6UbIECf5lpGbOas,3231
 port_ocean/utils/signal.py,sha256=K-6kKFQTltcmKDhtyZAcn0IMa3sUpOHGOAUdWKgx0_E,1369
 port_ocean/version.py,sha256=UsuJdvdQlazzKGD3Hd5-U7N69STh8Dq9ggJzQFnu9fU,177
-port_ocean-0.7.0.dist-info/LICENSE.md,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-port_ocean-0.7.0.dist-info/METADATA,sha256=1sWlQlLRUkwNe2abMNyMgOnZ6FZNAbgMvb2Z3ECmKAc,6561
-port_ocean-0.7.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-port_ocean-0.7.0.dist-info/entry_points.txt,sha256=F_DNUmGZU2Kme-8NsWM5LLE8piGMafYZygRYhOVtcjA,54
-port_ocean-0.7.0.dist-info/RECORD,,
+port_ocean-0.8.0.dist-info/LICENSE.md,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+port_ocean-0.8.0.dist-info/METADATA,sha256=b12SkmpuVSjxM8ASdLd4VBJS1h1igcll5UInwEggHNY,6561
+port_ocean-0.8.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+port_ocean-0.8.0.dist-info/entry_points.txt,sha256=F_DNUmGZU2Kme-8NsWM5LLE8piGMafYZygRYhOVtcjA,54
+port_ocean-0.8.0.dist-info/RECORD,,