port-ocean 0.14.0__tar.gz → 0.14.4__tar.gz

{port_ocean-0.14.0 → port_ocean-0.14.4}/PKG-INFO

@@ -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.4/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"]

port_ocean-0.14.4/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"]

port_ocean-0.14.4/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

port_ocean-0.14.4/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

port_ocean-0.14.4/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

port_ocean-0.14.4/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/

port_ocean-0.14.4/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

port_ocean-0.14.4/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-0.14.4/port_ocean/cli/cookiecutter/hooks/post_gen_project.py

@@ -0,0 +1,30 @@
+import os
+import shutil
+
+
+def handle_private_integration_flags():
+    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)
+
+
+if __name__ == "__main__":
+    handle_private_integration_flags()

{port_ocean-0.14.0 → port_ocean-0.14.4}/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-0.14.0 → port_ocean-0.14.4}/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)