port-ocean 0.14.0__py3-none-any.whl → 0.14.4__py3-none-any.whl

integrations/_infra/Dockerfile.Deb

@@ -0,0 +1,56 @@
+ARG BASE_BUILDER_PYTHON_IMAGE=ghcr.io/port-labs/port-ocean-base-builder:latest
+ARG BASE_RUNNER_PYTHON_IMAGE=ghcr.io/port-labs/port-ocean-base-runner:latest
+
+FROM ${BASE_BUILDER_PYTHON_IMAGE} AS base
+
+ARG BUILD_CONTEXT
+ARG BUILDPLATFORM
+
+ENV LIBRDKAFKA_VERSION=1.9.2 \
+    PYTHONUNBUFFERED=1 \
+    POETRY_VIRTUALENVS_IN_PROJECT=1 \
+    PIP_ROOT_USER_ACTION=ignore
+
+WORKDIR /app
+
+COPY ./${BUILD_CONTEXT}/pyproject.toml ./${BUILD_CONTEXT}/poetry.lock /app/
+
+RUN poetry install --without dev --no-root --no-interaction --no-ansi --no-cache
+
+FROM ${BASE_RUNNER_PYTHON_IMAGE} AS prod
+
+ARG INTEGRATION_VERSION
+ARG BUILD_CONTEXT
+
+ENV LIBRDKAFKA_VERSION=1.9.2
+
+RUN apt-get update \
+    && apt-get install -y \
+        ca-certificates \
+        openssl \
+        curl \
+    && apt-get clean
+
+LABEL INTEGRATION_VERSION=${INTEGRATION_VERSION}
+# Used to ensure that new integrations will be public, see https://docs.github.com/en/packages/learn-github-packages/configuring-a-packages-access-control-and-visibility
+LABEL org.opencontainers.image.source=https://github.com/port-labs/ocean
+
+ENV PIP_ROOT_USER_ACTION=ignore
+
+WORKDIR /app
+
+# Copy the application code
+COPY ./${BUILD_CONTEXT} /app
+
+# Copy dependencies from the build stage
+COPY --from=base /app/.venv /app/.venv
+
+COPY ./integrations/_infra/init.sh /app/init.sh
+
+# Ensure that ocean is available for all in path
+RUN chmod a+x /app/.venv/bin/ocean
+
+RUN chmod a+x /app/init.sh
+RUN ln -s /app/.venv/bin/ocean /usr/bin/ocean
+# Run the application
+CMD ["bash", "/app/init.sh"]

integrations/_infra/Dockerfile.alpine

@@ -0,0 +1,108 @@
+ARG BASE_PYTHON_IMAGE=alpine:3.20.1
+
+FROM ${BASE_PYTHON_IMAGE} AS base
+
+ARG BUILD_CONTEXT
+ARG BUILDPLATFORM
+
+ENV LIBRDKAFKA_VERSION=1.9.2 \
+    PYTHONUNBUFFERED=1 \
+    PIP_DISABLE_PIP_VERSION_CHECK=on \
+    POETRY_NO_INTERACTION=1 \
+    PIP_NO_CACHE_DIR=on \
+    PIP_DEFAULT_TIMEOUT=100 \
+    GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY=1 \
+    PYTHONDONTWRITEBYTECODE=1
+
+# Install system dependencies and libraries
+RUN \
+    apk add --no-cache \
+        gcc \
+        g++ \
+        musl-dev \
+        build-base \
+        bash \
+        oniguruma-dev \
+        make \
+        autoconf \
+        automake \
+        libtool \
+        curl \
+        openssl-dev \
+        cargo \
+        pkgconfig \
+        linux-headers \
+        libstdc++ \
+        libffi-dev \
+        py3-grpcio \
+        py3-protobuf \
+        python3-dev \
+        # librdkafka-dev \
+    # Install community librdkafka-dev since the default in alpine is older
+    && echo "@edge http://dl-cdn.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories \
+    && echo "@edgecommunity http://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \
+    && apk add --no-cache \
+        alpine-sdk \
+        "librdkafka@edgecommunity>=${LIBRDKAFKA_VERSION}" \
+        "librdkafka-dev@edgecommunity>=${LIBRDKAFKA_VERSION}" \
+    && curl -sSL https://install.python-poetry.org | python3 - \
+    && apk upgrade gcc linux-headers libstdc++ gcc g++ --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main/ \
+    && ln -s /root/.local/bin/poetry /usr/bin/poetry \
+    && poetry config virtualenvs.in-project true
+
+WORKDIR /app
+
+COPY ./${BUILD_CONTEXT}/pyproject.toml ./${BUILD_CONTEXT}/poetry.lock /app/
+
+COPY ./integrations/_infra/grpcio.sh /app/grpcio.sh
+
+RUN chmod a+x /app/grpcio.sh && /app/grpcio.sh "${BUILDPLATFORM}"
+
+RUN export GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY=1 \
+    && poetry install --without dev --no-root --no-interaction --no-ansi --no-cache
+
+FROM ${BASE_PYTHON_IMAGE} AS prod
+
+ARG INTEGRATION_VERSION
+ARG BUILD_CONTEXT
+
+ENV LIBRDKAFKA_VERSION=1.9.2
+
+LABEL INTEGRATION_VERSION=${INTEGRATION_VERSION}
+# Used to ensure that new integrations will be public, see https://docs.github.com/en/packages/learn-github-packages/configuring-a-packages-access-control-and-visibility
+LABEL org.opencontainers.image.source=https://github.com/port-labs/ocean
+
+# Install only runtime dependencies
+RUN \
+    apk add --no-cache \
+        bash \
+        oniguruma-dev \
+        python3 \
+    # Install community librdkafka-dev since the default in alpine is older
+    && echo "@edge http://dl-cdn.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories \
+    && echo "@edgecommunity http://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \
+    && apk update \
+    && apk add --no-cache \
+        alpine-sdk \
+        "librdkafka@edgecommunity>=${LIBRDKAFKA_VERSION}" \
+        "librdkafka-dev@edgecommunity>=${LIBRDKAFKA_VERSION}" \
+    # Fix security issues
+    && apk upgrade busybox libcrypto3 libssl3 --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main/
+
+WORKDIR /app
+
+# Copy the application code
+COPY ./${BUILD_CONTEXT} /app
+
+# Copy dependencies from the build stage
+COPY --from=base /app/.venv /app/.venv
+
+COPY ./integrations/_infra/init.sh /app/init.sh
+
+# Ensure that ocean is available for all in path
+RUN chmod a+x /app/.venv/bin/ocean
+
+RUN chmod a+x /app/init.sh
+RUN ln -s /app/.venv/bin/ocean /usr/bin/ocean
+# Run the application
+CMD ["bash", "/app/init.sh"]

integrations/_infra/Dockerfile.base.builder

@@ -0,0 +1,26 @@
+ARG BASE_PYTHON_IMAGE=debian:trixie-slim
+# debian:trixie-slim - Python 3.12
+FROM ${BASE_PYTHON_IMAGE}
+
+LABEL org.opencontainers.image.source=https://github.com/port-labs/ocean
+
+ENV LIBRDKAFKA_VERSION=1.9.2 \
+    PYTHONUNBUFFERED=1 \
+    POETRY_VIRTUALENVS_IN_PROJECT=1 \
+    PIP_ROOT_USER_ACTION=ignore
+
+RUN apt-get update \
+    && apt-get install -y \
+        --no-install-recommends \
+        wget \
+        g++ \
+        libssl-dev \
+        autoconf \
+        automake \
+        libtool \
+        curl \
+        librdkafka-dev \
+        python3 \
+        python3-pip \
+        python3-poetry \
+    && apt-get clean

integrations/_infra/Dockerfile.base.runner

@@ -0,0 +1,13 @@
+ARG BASE_PYTHON_IMAGE=debian:trixie-slim
+# debian:trixie-slim - Python 3.12
+FROM ${BASE_PYTHON_IMAGE}
+
+LABEL org.opencontainers.image.source=https://github.com/port-labs/ocean
+
+ENV LIBRDKAFKA_VERSION=1.9.2
+
+ENV PIP_ROOT_USER_ACTION=ignore
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends librdkafka-dev python3 \
+    && apt-get clean

integrations/_infra/Dockerfile.dockerignore

@@ -0,0 +1,94 @@
+
+# Git
+**/.git
+**/.gitignore
+**/.gitattributes
+
+
+# CI
+**/.codeclimate.yml
+**/.travis.yml
+**/.taskcluster.yml
+
+# Docker
+**/docker-compose.yml
+**/Dockerfile
+**/.docker
+**/.dockerignore
+
+# Byte-compiled / optimized / DLL files
+**/__pycache__/
+**/*.py[cod]
+
+# C extensions
+**/*.so
+
+# Distribution / packaging
+**/.Python
+**/env/
+**/build/
+**/develop-eggs/
+**/dist/
+**/downloads/
+**/eggs/
+**/lib/
+**/lib64/
+**/parts/
+**/sdist/
+**/var/
+**/*.egg-info/
+**/.installed.cfg
+**/*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+**/*.manifest
+**/*.spec
+
+# Installer logs
+**/pip-log.txt
+**/pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+**/htmlcov/
+**/.tox/
+**/.coverage
+**/.cache
+**/nosetests.xml
+**/coverage.xml
+
+# Translations
+**/*.mo
+**/*.pot
+
+# Django stuff:
+**/*.log
+
+# Sphinx documentation
+**/docs/_build/
+
+# PyBuilder
+**/target/
+
+# Virtual environment
+**/.env
+**/.venv/
+**/venv/
+
+# PyCharm
+**/.idea
+
+# Python mode for VIM
+**/.ropeproject
+
+# Vim swap files
+**/*.swp
+
+# VS Code
+**/.vscode/
+
+**/*.md
+**/.ruff_cache
+**/changelog
+**/tests

integrations/_infra/Makefile

@@ -0,0 +1,89 @@
+ACTIVATE := . .venv/bin/activate
+
+define run_checks
+	exit_code=0; \
+	cd $1; \
+	echo "Running poetry check"; \
+	poetry check || exit_code=$$?;\
+	echo "Running mypy"; \
+	mypy . --exclude '/\.venv/' || exit_code=$$?; \
+	echo "Running ruff"; \
+	ruff check . || exit_code=$$?; \
+	echo "Running black"; \
+	black --check . || exit_code=$$?; \
+	echo "Running yamllint"; \
+	yamllint . || exit_code=$$?; \
+	if [ $$exit_code -eq 1 ]; then \
+		echo "\033[0;31mOne or more checks failed with exit code $$exit_code\033[0m"; \
+	else \
+		echo "\033[0;32mAll checks executed successfully.\033[0m"; \
+	fi; \
+	exit $$exit_code
+endef
+
+define install_poetry
+	if ! command -v poetry &> /dev/null; then \
+    	pip install --upgrade pip; \
+		pip install poetry; \
+	else \
+    	echo "Poetry is already installed."; \
+	fi
+endef
+
+define deactivate_virtualenv
+    if [ -n "$$VIRTUAL_ENV" ]; then \
+        unset VIRTUAL_ENV; \
+        unset PYTHONHOME; \
+        unset -f pydoc >/dev/null 2>&1; \
+        OLD_PATH="$$PATH"; \
+        PATH=$$(echo -n "$$PATH" | awk -v RS=: -v ORS=: '/\/virtualenv\/bin$$/ {next} {print}'); \
+        export PATH; \
+        hash -r; \
+        echo "Deactivated the virtual environment."; \
+    fi
+endef
+
+.SILENT: install install/prod install/local-core lint lint/fix run test clean
+
+install:
+	$(call deactivate_virtualenv) && \
+	$(call install_poetry) && \
+	poetry install --with dev
+
+install/local-core: install
+	# NOTE: This is a temporary change that shouldn't be committed
+	$(ACTIVATE) && pip install -e ../../
+
+install/prod:
+	poetry install --without dev --no-root --no-interaction --no-ansi --no-cache
+	$(call install_poetry) && \
+
+lint:
+	$(ACTIVATE) && \
+	$(call run_checks,.)
+
+lint/fix:
+	$(ACTIVATE) && \
+	black .
+	ruff check --fix .
+
+run:
+	$(ACTIVATE) && ocean sail
+
+test:
+	$(ACTIVATE) && poetry run pytest -n auto
+
+clean:
+	@find . -name '.venv' -type d -exec rm -rf {} \;
+	@find . -name '*.pyc' -exec rm -rf {} \;
+	@find . -name '__pycache__' -exec rm -rf {} \;
+	@find . -name 'Thumbs.db' -exec rm -rf {} \;
+	@find . -name '*~' -exec rm -rf {} \;
+	rm -rf .cache
+	rm -rf build
+	rm -rf dist
+	rm -rf *.egg-info
+	rm -rf htmlcov
+	rm -rf .tox/
+	rm -rf docs/_build
+	rm -rf dist/

integrations/_infra/grpcio.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+PLATFORM=${1}
+
+if [[ ! $(grep -q 'grpcio' ./poetry.lock) ]]; then
+    echo 'grpcio not present, skipping explicit build'
+else
+    echo 'found grpcio, checking platform'
+fi
+
+if [[ "${PLATFORM}" == "linux/arm64" ]]; then
+    echo "On arm, need to explicitly install grpcio"
+    poetry env use "$(which python)"
+    echo "${VIRTUAL_ENV}"
+    poetry run pip install --upgrade pip
+    GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1 GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1 GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY=1 poetry run pip install 'grpcio==1.66.2'
+else
+    echo "Not on arm, no need to explicitly install grpcio"
+fi

integrations/_infra/init.sh

@@ -0,0 +1,5 @@
+if test -e /usr/local/share/ca-certificates/cert.crt; then
+  update-ca-certificates
+fi
+
+ocean sail

port_ocean/cli/cookiecutter/hooks/post_gen_project.py

@@ -3,17 +3,27 @@ import shutil
 
 
 def handle_private_integration_flags():
-    infra_make_file = "../_infra/Makefile"
-    target_link_make_file = os.path.join("./Makefile")
+    target_dir = os.path.join(
+        "{{cookiecutter._output_dir}}", "{{cookiecutter.integration_slug}}"
+    )
+    root_dir = os.path.join("{{ cookiecutter._repo_dir }}", "../../../")
+    infra_make_file = os.path.join(root_dir, "integrations/_infra/Makefile")
+    infra_dockerfile = os.path.join(root_dir, "integrations/_infra/Dockerfile.deb")
+    infra_dockerignore = os.path.join(
+        root_dir, "integrations/_infra/Dockerfile.dockerignore"
+    )
+    target_link_make_file = os.path.join(target_dir, "./Makefile")
+    target_link_dockerfile = os.path.join(target_dir, "./Dockerfile")
+    target_link_dockerignore = os.path.join(target_dir, "./.dockerignore")
 
     if "{{ cookiecutter.is_private_integration }}" == "True":
         shutil.copyfile(infra_make_file, target_link_make_file)
+        shutil.copyfile(infra_dockerfile, target_link_dockerfile)
+        shutil.copyfile(infra_dockerignore, target_link_dockerignore)
         os.remove("sonar-project.properties")
         return
 
     os.symlink(infra_make_file, target_link_make_file)
-    os.remove("Dockerfile")
-    os.remove(".dockerignore")
 
 
 if __name__ == "__main__":

port_ocean/clients/port/utils.py

@@ -16,7 +16,7 @@ if TYPE_CHECKING:
 # period of time, before raising an exception.
 # The max_connections value can't be too high, as it will cause the application to run out of memory.
 # The max_keepalive_connections can't be too high, as it will cause the application to run out of available connections.
-PORT_HTTP_MAX_CONNECTIONS_LIMIT = 200
+PORT_HTTP_MAX_CONNECTIONS_LIMIT = 100
 PORT_HTTP_MAX_KEEP_ALIVE_CONNECTIONS = 50
 PORT_HTTP_TIMEOUT = 60.0
 
@@ -28,13 +28,19 @@ PORT_HTTPX_LIMITS = httpx.Limits(
 
 _http_client: LocalStack[httpx.AsyncClient] = LocalStack()
 
+FIVE_MINUETS = 60 * 5
+
 
 def _get_http_client_context(port_client: "PortClient") -> httpx.AsyncClient:
     client = _http_client.top
     if client is None:
         client = OceanAsyncClient(
             TokenRetryTransport,
-            transport_kwargs={"port_client": port_client},
+            transport_kwargs={
+                "port_client": port_client,
+                "max_backoff_wait": FIVE_MINUETS,
+                "base_delay": 0.3,
+            },
             timeout=PORT_HTTPX_TIMEOUT,
             limits=PORT_HTTPX_LIMITS,
         )

port_ocean/helpers/retry.py

@@ -55,14 +55,14 @@ class RetryTransport(httpx.AsyncBaseTransport, httpx.BaseTransport):
             HTTPStatus.GATEWAY_TIMEOUT,
         ]
     )
-    MAX_BACKOFF_WAIT = 60
+    MAX_BACKOFF_WAIT_IN_SECONDS = 60
 
     def __init__(
         self,
         wrapped_transport: Union[httpx.BaseTransport, httpx.AsyncBaseTransport],
         max_attempts: int = 10,
-        max_backoff_wait: float = MAX_BACKOFF_WAIT,
-        backoff_factor: float = 0.1,
+        max_backoff_wait: float = MAX_BACKOFF_WAIT_IN_SECONDS,
+        base_delay: float = 0.1,
         jitter_ratio: float = 0.1,
         respect_retry_after_header: bool = True,
         retryable_methods: Iterable[str] | None = None,
@@ -81,7 +81,7 @@ class RetryTransport(httpx.AsyncBaseTransport, httpx.BaseTransport):
             max_backoff_wait (float, optional):
                 The maximum amount of time (in seconds) to wait before retrying a request.
                 Defaults to 60.
-            backoff_factor (float, optional):
+            base_delay (float, optional):
                 The factor by which the waiting time will be multiplied in each retry attempt.
                 Defaults to 0.1.
             jitter_ratio (float, optional):
@@ -105,7 +105,7 @@ class RetryTransport(httpx.AsyncBaseTransport, httpx.BaseTransport):
             )
 
         self._max_attempts = max_attempts
-        self._backoff_factor = backoff_factor
+        self._base_delay = base_delay
         self._respect_retry_after_header = respect_retry_after_header
         self._retryable_methods = (
             frozenset(retryable_methods)
@@ -132,13 +132,18 @@ class RetryTransport(httpx.AsyncBaseTransport, httpx.BaseTransport):
             httpx.Response: The response received.
 
         """
-        transport: httpx.BaseTransport = self._wrapped_transport  # type: ignore
-        if request.method in self._retryable_methods:
-            send_method = partial(transport.handle_request)
-            response = self._retry_operation(request, send_method)
-        else:
-            response = transport.handle_request(request)
-        return response
+        try:
+            transport: httpx.BaseTransport = self._wrapped_transport  # type: ignore
+            if request.method in self._retryable_methods:
+                send_method = partial(transport.handle_request)
+                response = self._retry_operation(request, send_method)
+            else:
+                response = transport.handle_request(request)
+            return response
+        except Exception as e:
+            if not self._is_retryable_method(request) and self._logger is not None:
+                self._logger.exception(f"{repr(e)} - {request.url}", exc_info=e)
+            raise e
 
     async def handle_async_request(self, request: httpx.Request) -> httpx.Response:
         """Sends an HTTP request, possibly with retries.
@@ -150,13 +155,19 @@ class RetryTransport(httpx.AsyncBaseTransport, httpx.BaseTransport):
             The response.
 
         """
-        transport: httpx.AsyncBaseTransport = self._wrapped_transport  # type: ignore
-        if self._is_retryable_method(request):
-            send_method = partial(transport.handle_async_request)
-            response = await self._retry_operation_async(request, send_method)
-        else:
-            response = await transport.handle_async_request(request)
-        return response
+        try:
+            transport: httpx.AsyncBaseTransport = self._wrapped_transport  # type: ignore
+            if self._is_retryable_method(request):
+                send_method = partial(transport.handle_async_request)
+                response = await self._retry_operation_async(request, send_method)
+            else:
+                response = await transport.handle_async_request(request)
+            return response
+        except Exception as e:
+            # Retyable methods are logged via _log_error
+            if not self._is_retryable_method(request) and self._logger is not None:
+                self._logger.exception(f"{repr(e)} - {request.url}", exc_info=e)
+            raise e
 
     async def aclose(self) -> None:
         """
@@ -255,7 +266,7 @@ class RetryTransport(httpx.AsyncBaseTransport, httpx.BaseTransport):
             except ValueError:
                 pass
 
-        backoff = self._backoff_factor * (2 ** (attempts_made - 1))
+        backoff = self._base_delay * (2 ** (attempts_made - 1))
         jitter = (backoff * self._jitter_ratio) * random.choice([1, -1])
         total_backoff = backoff + jitter
         return min(total_backoff, self._max_backoff_wait)

port_ocean/tests/utils/test_cache.py

@@ -0,0 +1,189 @@
+from typing import Any
+import asyncio
+from port_ocean.utils import cache  # Import the module where 'event' is used
+import pytest
+from dataclasses import dataclass, field
+from typing import AsyncGenerator, AsyncIterator, List, TypeVar
+
+
+@dataclass
+class EventContext:
+    attributes: dict[str, Any] = field(default_factory=dict)
+
+
+@pytest.fixture
+def event() -> EventContext:
+    return EventContext()
+
+
+T = TypeVar("T")
+
+
+async def collect_iterator_results(iterator: AsyncIterator[List[T]]) -> List[T]:
+    results = []
+    async for item in iterator:
+        results.extend(item)
+    return results
+
+
+@pytest.mark.asyncio
+async def test_cache_iterator_result(event: EventContext, monkeypatch: Any) -> None:
+    monkeypatch.setattr(cache, "event", event)
+
+    call_count = 0
+
+    @cache.cache_iterator_result()
+    async def sample_iterator(x: int) -> AsyncGenerator[List[int], None]:
+        nonlocal call_count
+        call_count += 1
+        for i in range(x):
+            await asyncio.sleep(0.1)
+            yield [i]
+
+    result1 = await collect_iterator_results(sample_iterator(3))
+    assert result1 == [0, 1, 2]
+    assert call_count == 1
+
+    result2 = await collect_iterator_results(sample_iterator(3))
+    assert result2 == [0, 1, 2]
+    assert call_count == 1
+
+    result3 = await collect_iterator_results(sample_iterator(4))
+    assert result3 == [0, 1, 2, 3]
+    assert call_count == 2
+
+
+@pytest.mark.asyncio
+async def test_cache_iterator_result_with_kwargs(
+    event: EventContext, monkeypatch: Any
+) -> None:
+    monkeypatch.setattr(cache, "event", event)
+
+    call_count = 0
+
+    @cache.cache_iterator_result()
+    async def sample_iterator(x: int, y: int = 1) -> AsyncGenerator[List[int], None]:
+        nonlocal call_count
+        call_count += 1
+        for i in range(x * y):
+            await asyncio.sleep(0.1)
+            yield [i]
+
+    result1 = await collect_iterator_results(sample_iterator(2, y=2))
+    assert result1 == [0, 1, 2, 3]
+    assert call_count == 1
+
+    result2 = await collect_iterator_results(sample_iterator(2, y=2))
+    assert result2 == [0, 1, 2, 3]
+    assert call_count == 1
+
+    result3 = await collect_iterator_results(sample_iterator(2, y=3))
+    assert result3 == [0, 1, 2, 3, 4, 5]
+    assert call_count == 2
+
+
+@pytest.mark.asyncio
+async def test_cache_iterator_result_no_cache(
+    event: EventContext, monkeypatch: Any
+) -> None:
+    monkeypatch.setattr(cache, "event", event)
+
+    call_count = 0
+
+    @cache.cache_iterator_result()
+    async def sample_iterator(x: int) -> AsyncGenerator[List[int], None]:
+        nonlocal call_count
+        call_count += 1
+        for i in range(x):
+            await asyncio.sleep(0.1)
+            yield [i]
+
+    result1 = await collect_iterator_results(sample_iterator(3))
+    assert result1 == [0, 1, 2]
+    assert call_count == 1
+
+    event.attributes.clear()
+
+    result2 = await collect_iterator_results(sample_iterator(3))
+    assert result2 == [0, 1, 2]
+    assert call_count == 2
+
+
+@pytest.mark.asyncio
+async def test_cache_coroutine_result(event: EventContext, monkeypatch: Any) -> None:
+    monkeypatch.setattr(cache, "event", event)
+
+    call_count = 0
+
+    @cache.cache_coroutine_result()
+    async def sample_coroutine(x: int) -> int:
+        nonlocal call_count
+        call_count += 1
+        await asyncio.sleep(0.1)
+        return x * 2
+
+    result1 = await sample_coroutine(2)
+    assert result1 == 4
+    assert call_count == 1
+
+    result2 = await sample_coroutine(2)
+    assert result2 == 4
+    assert call_count == 1
+
+    result3 = await sample_coroutine(3)
+    assert result3 == 6
+    assert call_count == 2
+
+
+@pytest.mark.asyncio
+async def test_cache_coroutine_result_with_kwargs(
+    event: EventContext, monkeypatch: Any
+) -> None:
+    monkeypatch.setattr(cache, "event", event)
+
+    call_count = 0
+
+    @cache.cache_coroutine_result()
+    async def sample_coroutine(x: int, y: int = 1) -> int:
+        nonlocal call_count
+        call_count += 1
+        await asyncio.sleep(0.1)
+        return x * y
+
+    result1 = await sample_coroutine(2, y=3)
+    assert result1 == 6
+    assert call_count == 1
+
+    result2 = await sample_coroutine(2, y=3)
+    assert result2 == 6
+    assert call_count == 1
+
+    result3 = await sample_coroutine(2, y=4)
+    assert result3 == 8
+    assert call_count == 2
+
+
+@pytest.mark.asyncio
+async def test_cache_coroutine_result_no_cache(
+    event: EventContext, monkeypatch: Any
+) -> None:
+    monkeypatch.setattr(cache, "event", event)
+
+    call_count = 0
+
+    @cache.cache_coroutine_result()
+    async def sample_coroutine(x: int) -> int:
+        nonlocal call_count
+        call_count += 1
+        await asyncio.sleep(0.1)
+        return x * 2
+
+    result1 = await sample_coroutine(2)
+    assert result1 == 4
+    assert call_count == 1
+
+    event.attributes.clear()
+
+    result2 = await sample_coroutine(2)
+    assert result2 == 4
+    assert call_count == 2

port_ocean/utils/cache.py

@@ -1,9 +1,10 @@
 import functools
 import hashlib
-from typing import Callable, AsyncIterator, Any
+from typing import Callable, AsyncIterator, Awaitable, Any
 from port_ocean.context.event import event
 
 AsyncIteratorCallable = Callable[..., AsyncIterator[list[Any]]]
+AsyncCallable = Callable[..., Awaitable[Any]]
 
 
 def hash_func(function_name: str, *args: Any, **kwargs: Any) -> str:
@@ -59,3 +60,38 @@ def cache_iterator_result() -> Callable[[AsyncIteratorCallable], AsyncIteratorCa
         return wrapper
 
     return decorator
+
+
+def cache_coroutine_result() -> Callable[[AsyncCallable], AsyncCallable]:
+    """Coroutine version of `cache_iterator_result` from port_ocean.utils.cache
+
+    Decorator that caches the result of a coroutine function.
+    It checks if the result is already in the cache, and if not,
+    fetches the result, caches it, and returns the cached value.
+
+    The cache is stored in the scope of the running event and is
+    removed when the event is finished.
+
+    Usage:
+    ```python
+    @cache_coroutine_result()
+    async def my_coroutine_function():
+        # Your code here
+    ```
+    """
+
+    def decorator(func: AsyncCallable) -> AsyncCallable:
+        @functools.wraps(func)
+        async def wrapper(*args: Any, **kwargs: Any) -> Any:
+            cache_key = hash_func(func.__name__, *args, **kwargs)
+
+            if cache := event.attributes.get(cache_key):
+                return cache
+
+            result = await func(*args, **kwargs)
+            event.attributes[cache_key] = result
+            return result
+
+        return wrapper
+
+    return decorator

{port_ocean-0.14.0.dist-info → port_ocean-0.14.4.dist-info}/METADATA

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

@@ -1,3 +1,11 @@
+integrations/_infra/Dockerfile.Deb,sha256=iEyen_5YTa0syesJWS7NKuE-Oo4rM34Wwgjq9JzEjdA,1519
+integrations/_infra/Dockerfile.alpine,sha256=iauglyEzz5uEPBxsN-9SLFr6qca3Tf4b0DPXKFFeKq4,3482
+integrations/_infra/Dockerfile.base.builder,sha256=LwKLfJvQfKksMqacAT_aDQxFMC2Ty5fFKIa0Eu4QcCc,619
+integrations/_infra/Dockerfile.base.runner,sha256=dsjTWgLQFm4x5gcm-IPhwkDv-M6VRKwdf-qct457h2c,357
+integrations/_infra/Dockerfile.dockerignore,sha256=CM1Fxt3I2AvSvObuUZRmy5BNLSGC7ylnbpWzFgD4cso,1163
+integrations/_infra/Makefile,sha256=vnuFuDau8AYiNgif3gfx0I17X1HqiPxcIS6uUqE9q1Y,2186
+integrations/_infra/grpcio.sh,sha256=m924poYznoRZ6Tt7Ct8Cs5AV_cmmOx598yIZ3z4DvZE,616
+integrations/_infra/init.sh,sha256=nN8lTrOhB286UfFvD6sJ9YJ-9asT9zVSddQB-RAb7Z4,99
 port_ocean/__init__.py,sha256=J3Mqp7d-CkEe9eMigGG8gSEiVKICY2bf7csNEwVOXk0,294
 port_ocean/bootstrap.py,sha256=CN1M5pVecZ7z_Vfu86Dk2HjFMiuiwt6E_SSOLFCYRMk,1321
 port_ocean/cli/__init__.py,sha256=ZjTGS305llhbjC2BH2KkVj34gCASBGwqc5HZEO_0T_Q,328
@@ -16,8 +24,7 @@ port_ocean/cli/commands/version.py,sha256=hEuIEIcm6Zkamz41Z9nxeSM_4g3oNlAgWwQyDG
 port_ocean/cli/cookiecutter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 port_ocean/cli/cookiecutter/cookiecutter.json,sha256=N5UrAP2e5JbgEDz_WTQFIZlzSveME6x32sHeA7idjh0,481
 port_ocean/cli/cookiecutter/extensions.py,sha256=eQNjZvy2enDkJpvMbBGil77Xk9-38f862wfnmCjdoBc,446
-port_ocean/cli/cookiecutter/hooks/post_gen_project.py,sha256=xZbDPSmfP-ZXNlPaqQDsYLuNfdhFpLX9fIshiAd94Qg,535
-port_ocean/cli/cookiecutter/{{cookiecutter.integration_slug}}/.dockerignore,sha256=9Mz_WI7XBpKzlJ7ILb4vlcuzYkh98Ql3bP_5GHN1sRY,1034
+port_ocean/cli/cookiecutter/hooks/post_gen_project.py,sha256=tFqtsjSbu7HMN32WIiFO37S1a_dfHezvdPwmM6MmNJk,1182
 port_ocean/cli/cookiecutter/{{cookiecutter.integration_slug}}/.env.example,sha256=LnNPRe3RnzjWPL4tNLYEQiMvFEZHSy3ceqwQEapcpwE,92
 port_ocean/cli/cookiecutter/{{cookiecutter.integration_slug}}/.gitignore,sha256=32p1lDW_g5hyBz486GWfDeR9m7ikFlASVri5a8vmNoo,2698
 port_ocean/cli/cookiecutter/{{cookiecutter.integration_slug}}/.port/resources/.gitignore,sha256=kCpRPdl3S_jqYYZaOrc0-xa6-l3KqVjNRXc6jCkd_-Q,12
@@ -26,7 +33,6 @@ port_ocean/cli/cookiecutter/{{cookiecutter.integration_slug}}/.port/resources/po
 port_ocean/cli/cookiecutter/{{cookiecutter.integration_slug}}/.port/spec.yaml,sha256=ie8bI_QOZnJJVG-N1e4KlMebdYts4LUNO_kKw8nGdhA,531
 port_ocean/cli/cookiecutter/{{cookiecutter.integration_slug}}/CHANGELOG.md,sha256=XVSgyxfXJZoZmtwaGbQ8XmCapIthe4E7flfuJub-m_s,338
 port_ocean/cli/cookiecutter/{{cookiecutter.integration_slug}}/CONTRIBUTING.md,sha256=ZQwD3K35q0wugHZmb1z5wnynmn0uuzwGFSpjm7GieZU,259
-port_ocean/cli/cookiecutter/{{cookiecutter.integration_slug}}/Dockerfile,sha256=LsH3vZqqEJkzeQG44cE7JkvPAuh_WPSqYam4YoMvG3M,328
 port_ocean/cli/cookiecutter/{{cookiecutter.integration_slug}}/README.md,sha256=5VZmgDRW9gO4d8UuzkujslOIDfIDBiAGL2Hd74HK770,468
 port_ocean/cli/cookiecutter/{{cookiecutter.integration_slug}}/changelog/.gitignore,sha256=JAo-DTfS6GthQGP1NH6wLU-ZymwlTea4KHH_jZVTKn0,14
 port_ocean/cli/cookiecutter/{{cookiecutter.integration_slug}}/debug.py,sha256=_TRsA2s6GV2E3CTI8CHcsH-ZuH4_Eh5-juDXWaET0ho,65
@@ -48,7 +54,7 @@ port_ocean/clients/port/mixins/integrations.py,sha256=t8OSa7Iopnpp8IOEcp3a7WgwOc
 port_ocean/clients/port/mixins/migrations.py,sha256=A6896oJF6WbFL2WroyTkMzr12yhVyWqGoq9dtLNSKBY,1457
 port_ocean/clients/port/retry_transport.py,sha256=PtIZOAZ6V-ncpVysRUsPOgt8Sf01QLnTKB5YeKBxkJk,1861
 port_ocean/clients/port/types.py,sha256=nvlgiAq4WH5_F7wQbz_GAWl-faob84LVgIjZ2Ww5mTk,451
-port_ocean/clients/port/utils.py,sha256=5B6rHgiVrtiL4YWh7Eq7_ncIeDwrDsB7jIvRik5xH8c,2373
+port_ocean/clients/port/utils.py,sha256=SjhgmJXAqH2JqXfGy8GoGwzUYiJvUhWDrJyxQcenxZc,2512
 port_ocean/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 port_ocean/config/base.py,sha256=x1gFbzujrxn7EJudRT81C6eN9WsYAb3vOHwcpcpX8Tc,6370
 port_ocean/config/dynamic.py,sha256=qOFkRoJsn_BW7581omi_AoMxoHqasf_foxDQ_G11_SI,2030
@@ -109,7 +115,7 @@ port_ocean/exceptions/port_defaults.py,sha256=45Bno5JEB-GXztvKsy8mw7TrydQmw13-4J
 port_ocean/exceptions/utils.py,sha256=gjOqpi-HpY1l4WlMFsGA9yzhxDhajhoGGdDDyGbLnqI,197
 port_ocean/helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 port_ocean/helpers/async_client.py,sha256=SRlP6o7_FCSY3UHnRlZdezppePVxxOzZ0z861vE3K40,1783
-port_ocean/helpers/retry.py,sha256=IQ0RfQ2T5o6uoZh2WW2nrFH5TT6K_k3y2Im0HDp5j9Y,15059
+port_ocean/helpers/retry.py,sha256=WO4yDFUd9NexZ0kESqxeTxBxNabU7_utKzgTj2-kMaM,15632
 port_ocean/log/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 port_ocean/log/handlers.py,sha256=ncVjgqrZRh6BhyRrA6DQG86Wsbxph1yWYuEC0cWfe-Q,3631
 port_ocean/log/logger_setup.py,sha256=CoEDowe5OwNOL_5clU6Z4faktfh0VWaOTS0VLmyhHjw,2404
@@ -133,18 +139,19 @@ port_ocean/tests/helpers/smoke_test.py,sha256=_9aJJFRfuGJEg2D2YQJVJRmpreS6gEPHHQ
 port_ocean/tests/log/test_handlers.py,sha256=bTOGnuj8fMIEXepwYblRvcg0FKqApCdyCBtAQZ2BlXM,2115
 port_ocean/tests/test_smoke.py,sha256=uix2uIg_yOm8BHDgHw2hTFPy1fiIyxBGW3ENU_KoFlo,2557
 port_ocean/tests/utils/test_async_iterators.py,sha256=3PLk1emEXekb8LcC5GgVh3OicaX15i5WyaJT_eFnu_4,1336
+port_ocean/tests/utils/test_cache.py,sha256=GzoS8xGCBDbBcPwSDbdimsMMkRvJATrBC7UmFhdW3fw,4906
 port_ocean/utils/__init__.py,sha256=KMGnCPXZJbNwtgxtyMycapkDz8tpSyw23MSYT3iVeHs,91
 port_ocean/utils/async_http.py,sha256=arnH458TExn2Dju_Sy6pHas_vF5RMWnOp-jBz5WAAcE,1226
 port_ocean/utils/async_iterators.py,sha256=CPXskYWkhkZtAG-ducEwM8537t3z5usPEqXR9vcivzw,3715
-port_ocean/utils/cache.py,sha256=3KItZDE2yVrbVDr-hoM8lNna8s2dlpxhP4ICdLjH4LQ,2231
+port_ocean/utils/cache.py,sha256=RgfN4SjjHrEkbqUChyboeD1mrXomolUUjsJtvbkmr3U,3353
 port_ocean/utils/misc.py,sha256=0q2cJ5psqxn_5u_56pT7vOVQ3shDM02iC1lzyWQ_zl0,2098
 port_ocean/utils/queue_utils.py,sha256=KWWl8YVnG-glcfIHhM6nefY-2sou_C6DVP1VynQwzB4,2762
 port_ocean/utils/repeat.py,sha256=0EFWM9d8lLXAhZmAyczY20LAnijw6UbIECf5lpGbOas,3231
 port_ocean/utils/signal.py,sha256=K-6kKFQTltcmKDhtyZAcn0IMa3sUpOHGOAUdWKgx0_E,1369
 port_ocean/utils/time.py,sha256=pufAOH5ZQI7gXvOvJoQXZXZJV-Dqktoj9Qp9eiRwmJ4,1939
 port_ocean/version.py,sha256=UsuJdvdQlazzKGD3Hd5-U7N69STh8Dq9ggJzQFnu9fU,177
-port_ocean-0.14.0.dist-info/LICENSE.md,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-port_ocean-0.14.0.dist-info/METADATA,sha256=A_jE7vo5o-cE6dE8fLzRZGFh7wOJFNquJN5LyZ_ygCA,6673
-port_ocean-0.14.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-port_ocean-0.14.0.dist-info/entry_points.txt,sha256=F_DNUmGZU2Kme-8NsWM5LLE8piGMafYZygRYhOVtcjA,54
-port_ocean-0.14.0.dist-info/RECORD,,
+port_ocean-0.14.4.dist-info/LICENSE.md,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+port_ocean-0.14.4.dist-info/METADATA,sha256=I8hKNbKejXTSk8cm5WKrjCZb1ElaKrNtuvETQoRVh9k,6673
+port_ocean-0.14.4.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+port_ocean-0.14.4.dist-info/entry_points.txt,sha256=F_DNUmGZU2Kme-8NsWM5LLE8piGMafYZygRYhOVtcjA,54
+port_ocean-0.14.4.dist-info/RECORD,,

port_ocean/cli/cookiecutter/{{cookiecutter.integration_slug}}/.dockerignore

@@ -1,94 +0,0 @@
-# Git
-.git
-.gitignore
-.gitattributes
-
-
-# CI
-.codeclimate.yml
-.travis.yml
-.taskcluster.yml
-
-# Docker
-docker-compose.yml
-Dockerfile
-.docker
-.dockerignore
-
-# Byte-compiled / optimized / DLL files
-**/__pycache__/
-**/*.py[cod]
-
-# C extensions
-*.so
-
-# Distribution / packaging
-.Python
-env/
-build/
-develop-eggs/
-dist/
-downloads/
-eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-*.egg-info/
-.installed.cfg
-*.egg
-
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.coverage
-.cache
-nosetests.xml
-coverage.xml
-
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
-*.log
-
-# Sphinx documentation
-docs/_build/
-
-# PyBuilder
-target/
-
-# Virtual environment
-.env
-.venv/
-venv/
-
-# PyCharm
-.idea
-
-# Python mode for VIM
-.ropeproject
-**/.ropeproject
-
-# Vim swap files
-**/*.swp
-
-# VS Code
-.vscode/
-
-*.md
-**/.ruff_cache
-**/cahangelog
-**/tests

port_ocean/cli/cookiecutter/{{cookiecutter.integration_slug}}/Dockerfile

@@ -1,15 +0,0 @@
-FROM python:3.11-slim-bookworm
-
-ENV LIBRDKAFKA_VERSION 1.9.2
-
-WORKDIR /app
-
-RUN apt update && \
-    apt install -y wget make g++ libssl-dev autoconf automake libtool curl librdkafka-dev && \
-    apt-get clean
-
-COPY . /app
-
-RUN export POETRY_VIRTUALENVS_CREATE=false && make install/prod && pip cache purge
-
-ENTRYPOINT ocean sail