port-ocean 0.9.2.dev1__tar.gz → 0.9.3__tar.gz

{port_ocean-0.9.2.dev1 → port_ocean-0.9.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: port-ocean
-Version: 0.9.2.dev1
+Version: 0.9.3
 Summary: Port Ocean is a CLI tool for managing your Port projects.
 Home-page: https://app.getport.io
 Keywords: ocean,port-ocean,port
@@ -25,7 +25,7 @@ Requires-Dist: aiostream (>=0.5.2,<0.7.0)
 Requires-Dist: click (>=8.1.3,<9.0.0) ; extra == "cli"
 Requires-Dist: confluent-kafka (>=2.1.1,<3.0.0)
 Requires-Dist: cookiecutter (>=2.1.1,<3.0.0) ; extra == "cli"
-Requires-Dist: fastapi (>=0.100,<0.111)
+Requires-Dist: fastapi (>=0.100,<0.112)
 Requires-Dist: httpx (>=0.24.1,<0.28.0)
 Requires-Dist: jinja2-time (>=0.2.0,<0.3.0) ; extra == "cli"
 Requires-Dist: loguru (>=0.7.0,<0.8.0)
@@ -38,7 +38,7 @@ Requires-Dist: rich (>=13.4.1,<14.0.0) ; extra == "cli"
 Requires-Dist: six (>=1.16.0,<2.0.0)
 Requires-Dist: tomli (>=2.0.1,<3.0.0)
 Requires-Dist: urllib3 (>=1.26.16,<3.0.0)
-Requires-Dist: uvicorn (>=0.22,<0.30)
+Requires-Dist: uvicorn (>=0.22,<0.31)
 Requires-Dist: werkzeug (>=2.3.4,<4.0.0)
 Project-URL: Repository, https://github.com/port-labs/Port-Ocean
 Description-Content-Type: text/markdown

{port_ocean-0.9.2.dev1 → port_ocean-0.9.3}/port_ocean/config/settings.py

@@ -62,6 +62,7 @@ class IntegrationSettings(BaseOceanModel, extra=Extra.allow):
 
 
 class IntegrationConfiguration(BaseOceanSettings, extra=Extra.allow):
+    allow_environment_variables_jq_access: bool = True
     initialize_port_resources: bool = True
     scheduled_resync_interval: int | None = None
     client_timeout: int = 30

{port_ocean-0.9.2.dev1 → port_ocean-0.9.3}/port_ocean/core/handlers/entity_processor/jq_entity_processor.py

@@ -4,7 +4,6 @@ from asyncio import Task
 from dataclasses import dataclass, field
 from functools import lru_cache
 from typing import Any, Optional
-from uuid import uuid4
 
 import pyjq as jq  # type: ignore
 from loguru import logger
@@ -45,56 +44,27 @@ class JQEntityProcessor(BaseEntityProcessor):
 
     @lru_cache
     def _compile(self, pattern: str) -> Any:
+        if not ocean.config.allow_environment_variables_jq_access:
+            pattern = "def env: {}; {} as $ENV | " + pattern
         return jq.compile(pattern)
 
     async def _search(self, data: dict[str, Any], pattern: str) -> Any:
-        identifier = str(uuid4())
         try:
             loop = asyncio.get_event_loop()
-            logger.info(
-                f"__COMPILING__ jq execution with pattern: {pattern}. trace-id: {identifier}"
-            )
             compiled_pattern = self._compile(pattern)
             first_value_callable = functools.partial(compiled_pattern.first, data)
-            logger.info(
-                f"__STARTING__ jq execution with pattern: {pattern} and data: {data}. trace-id: {identifier}"
-            )
-            result = await loop.run_in_executor(None, first_value_callable)
-            logger.info(
-                f"__FINISHED__ jq execution with pattern: {pattern} and data: {data}. trace-id: {identifier} \n"
-                f"Result {result}"
-            )
-            return result
-        except Exception as e:
-            logger.error(
-                f"__FAILED__ jq execution with pattern: {pattern} and data: {data}. trace-id: {identifier} \n"
-                f"Error {e}"
+            return await loop.run_in_executor(None, first_value_callable)
+        except Exception as exc:
+            logger.debug(
+                f"Failed to search for pattern {pattern} in data {data}, {exc}"
             )
             return None
 
     async def _search_as_bool(self, data: dict[str, Any], pattern: str) -> bool:
         loop = asyncio.get_event_loop()
-        identifier = str(uuid4())
-        try:
-            logger.info(
-                f"__COMPILING_BOOL__ jq execution with pattern: {pattern}. trace-id: {identifier}"
-            )
-            compiled_pattern = self._compile(pattern)
-            first_value_callable = functools.partial(compiled_pattern.first, data)
-            logger.info(
-                f"__STARTING_BOOL__ jq execution with pattern: {pattern} and data: {data}. trace-id: {identifier}"
-            )
-            value = await loop.run_in_executor(None, first_value_callable)
-            logger.info(
-                f"__FINISHED_BOOL__ jq execution with pattern: {pattern} and data: {data}. trace-id: {identifier} \n"
-                f"Result {value}"
-            )
-        except Exception as e:
-            logger.error(
-                f"__FAILED_BOOL__ jq execution with pattern: {pattern} and data: {data}. trace-id: {identifier} \n"
-                f"Error {e}"
-            )
-            raise
+        compiled_pattern = self._compile(pattern)
+        first_value_callable = functools.partial(compiled_pattern.first, data)
+        value = await loop.run_in_executor(None, first_value_callable)
 
         if isinstance(value, bool):
             return value
@@ -242,6 +212,15 @@ class JQEntityProcessor(BaseEntityProcessor):
                         examples_to_send.append(result.raw_data)
                 else:
                     failed_entities.append(parsed_entity)
+        if (
+            not calculated_entities_results
+            and raw_results
+            and send_raw_data_examples_amount > 0
+        ):
+            logger.warning(
+                f"No entities were parsed from {len(raw_results)} raw results, sending raw data examples"
+            )
+            examples_to_send = raw_results[:send_raw_data_examples_amount]
 
         await self._send_examples(examples_to_send, mapping.kind)
 

{port_ocean-0.9.2.dev1 → port_ocean-0.9.3}/port_ocean/core/handlers/port_app_config/base.py

@@ -76,6 +76,7 @@ class BasePortAppConfig(BaseHandler):
                 logger.error(
                     "Invalid port app config found. Please check that the integration has been configured correctly."
                 )
+                logger.warning(f"Invalid port app config: {raw_config}")
                 raise
 
         event.port_app_config = self._app_config_cache.port_app_config

{port_ocean-0.9.2.dev1 → port_ocean-0.9.3}/port_ocean/core/integrations/mixins/sync_raw.py

@@ -90,7 +90,6 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
     ) -> tuple[RESYNC_RESULT, list[RAW_RESULT | Exception]]:
         tasks = []
         results = []
-
         for task in fns:
             if inspect.isasyncgenfunction(task):
                 results.append(resync_generator_wrapper(task, resource_config.kind))
@@ -415,7 +414,7 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
             app_config = await self.port_app_config_handler.get_port_app_config(
                 use_cache=False
             )
-
+            logger.info(f"Resync will use the following mappings: {app_config.dict()}")
             try:
                 entities_at_port = await ocean.port_client.search_entities(
                     user_agent_type

{port_ocean-0.9.2.dev1 → port_ocean-0.9.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "port-ocean"
-version = "0.9.2-dev01"
+version = "0.9.3"
 description = "Port Ocean is a CLI tool for managing your Port projects."
 readme = "README.md"
 homepage = "https://app.getport.io"
@@ -40,8 +40,8 @@ pydantic = {version = "^1.10.8", extras = ["dotenv"]}
 loguru = "^0.7.0"
 pyyaml = "^6.0"
 werkzeug = ">=2.3.4,<4.0.0"
-fastapi = ">=0.100,<0.111"
-uvicorn = ">=0.22,<0.30"
+fastapi = ">=0.100,<0.112"
+uvicorn = ">=0.22,<0.31"
 confluent-kafka = "^2.1.1"
 httpx = ">=0.24.1,<0.28.0"
 pyjq = "^2.6.0"
@@ -68,7 +68,7 @@ black = ">=23.3,<25.0"
 mypy = "^1.3.0"
 pylint = ">=2.17.4,<4.0.0"
 types-pyyaml = "^6.0.12.10"
-ruff = ">=0.0.278,<0.4.6"
+ruff = ">=0.0.278,<0.4.11"
 types-toml = "^0.10.8.6"
 towncrier = "^23.6.0"
 yamllint = "^1.32.0"