port-ocean 0.7.1__tar.gz → 0.8.0__tar.gz

{port_ocean-0.7.1 → port_ocean-0.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: port-ocean
-Version: 0.7.1
+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.1 → port_ocean-0.8.0}/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-0.7.1 → port_ocean-0.8.0}/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-0.7.1 → port_ocean-0.8.0}/pyproject.toml

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