port-ocean 0.21.2__tar.gz → 0.29.5__tar.gz

{port_ocean-0.21.2 → port_ocean-0.29.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: port-ocean
-Version: 0.21.2
+Version: 0.29.5
 Summary: Port Ocean is a CLI tool for managing your Port projects.
 Home-page: https://app.getport.io
 Keywords: ocean,port-ocean,port
@@ -22,25 +22,32 @@ Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Utilities
 Provides-Extra: cli
+Requires-Dist: aiofiles (>=24.1.0,<25.0.0)
 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: confluent-kafka (>=2.10.1,<3.0.0)
 Requires-Dist: cookiecutter (>=2.1.1,<3.0.0) ; extra == "cli"
-Requires-Dist: fastapi (>=0.115.3,<0.116.0)
-Requires-Dist: httpx (>=0.24.1,<0.28.0)
+Requires-Dist: cryptography (>=44.0.1,<45.0.0)
+Requires-Dist: fastapi (>=0.121.0,<0.122.0)
+Requires-Dist: httpx (>=0.28.1,<0.29.0)
+Requires-Dist: ijson (>=3.4.0,<4.0.0)
+Requires-Dist: jinja2 (>=3.1.6)
 Requires-Dist: jinja2-time (>=0.2.0,<0.3.0) ; extra == "cli"
 Requires-Dist: jq (>=1.8.0,<2.0.0)
 Requires-Dist: loguru (>=0.7.0,<0.8.0)
+Requires-Dist: prometheus-client (>=0.21.1,<0.22.0)
 Requires-Dist: pydantic[dotenv] (>=1.10.8,<2.0.0)
 Requires-Dist: pydispatcher (>=2.0.7,<3.0.0)
 Requires-Dist: pyhumps (>=3.8.0,<4.0.0)
+Requires-Dist: pyjwt (>=2.10.1,<3.0.0)
+Requires-Dist: pytest-cov (>=6.0.0,<7.0.0)
 Requires-Dist: python-dateutil (>=2.9.0.post0,<3.0.0)
 Requires-Dist: pyyaml (>=6.0,<7.0)
 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.31)
+Requires-Dist: urllib3 (>=2.5.0,<3.0.0)
+Requires-Dist: uvicorn (>=0.34.3,<0.35.0)
 Requires-Dist: werkzeug (>=2.3.4,<4.0.0)
 Project-URL: Repository, https://github.com/port-labs/Port-Ocean
 Description-Content-Type: text/markdown
@@ -50,6 +57,7 @@ Description-Content-Type: text/markdown
 # Ocean <img src="./assets/OceanSymbol.svg" alt="Ocean" width="100" height="100" align="right">
 
 [![Lint](https://github.com/port-labs/Port-Ocean/actions/workflows/lint.yml/badge.svg)](https://github.com/port-labs/port-ocean/actions/workflows/lint.yml)
+[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/port-labs/ocean)
 
 Ocean is an innovative solution developed by Port to seamlessly integrate various third-party systems with our developer portal product,
 empowering engineers to effortlessly prioritize key features and streamline the integration process.

{port_ocean-0.21.2 → port_ocean-0.29.5}/README.md

@@ -3,6 +3,7 @@
 # Ocean <img src="./assets/OceanSymbol.svg" alt="Ocean" width="100" height="100" align="right">
 
 [![Lint](https://github.com/port-labs/Port-Ocean/actions/workflows/lint.yml/badge.svg)](https://github.com/port-labs/port-ocean/actions/workflows/lint.yml)
+[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/port-labs/ocean)
 
 Ocean is an innovative solution developed by Port to seamlessly integrate various third-party systems with our developer portal product,
 empowering engineers to effortlessly prioritize key features and streamline the integration process.

{port_ocean-0.21.2 → port_ocean-0.29.5}/integrations/_infra/Dockerfile.Deb

@@ -6,7 +6,7 @@ FROM ${BASE_BUILDER_PYTHON_IMAGE} AS base
 ARG BUILD_CONTEXT
 ARG BUILDPLATFORM
 
-ENV LIBRDKAFKA_VERSION=1.9.2 \
+ENV LIBRDKAFKA_VERSION=2.8.2 \
     PYTHONUNBUFFERED=1 \
     POETRY_VIRTUALENVS_IN_PROJECT=1 \
     PIP_ROOT_USER_ACTION=ignore
@@ -18,17 +18,37 @@ 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 OCEAN_USER_ID=999
+
+RUN groupadd -r appgroup && useradd -r -g appgroup -m -u ${OCEAN_USER_ID} ocean
+
+RUN mkdir -p /tmp/ocean
 
 ARG INTEGRATION_VERSION
 ARG BUILD_CONTEXT
+ARG PROMETHEUS_MULTIPROC_DIR=/tmp/ocean/prometheus/metrics
+ARG OAUTH_CONFIG_DIR=/app/.config
+ARG STREAMING_LOCATION=/tmp/ocean/streaming
+
+ENV LIBRDKAFKA_VERSION=2.8.2 \
+    PROMETHEUS_MULTIPROC_DIR=${PROMETHEUS_MULTIPROC_DIR} \
+    STREAMING_LOCATION=${STREAMING_LOCATION}
 
-ENV LIBRDKAFKA_VERSION=1.9.2
+RUN mkdir -p ${PROMETHEUS_MULTIPROC_DIR}
+RUN mkdir -p ${STREAMING_LOCATION}
+RUN chown -R ocean:appgroup /tmp/ocean && chmod -R 755 /tmp/ocean
+
+RUN mkdir -p ${OAUTH_CONFIG_DIR}
+RUN chown -R ocean:appgroup ${OAUTH_CONFIG_DIR}
 
 RUN apt-get update \
     && apt-get install -y \
         ca-certificates \
         openssl \
         curl \
+        acl \
+        sudo \
+        jq \
     && apt-get clean
 
 LABEL INTEGRATION_VERSION=${INTEGRATION_VERSION}
@@ -39,6 +59,8 @@ ENV PIP_ROOT_USER_ACTION=ignore
 
 WORKDIR /app
 
+USER ocean
+
 # Copy the application code
 COPY ./${BUILD_CONTEXT} /app
 
@@ -47,10 +69,23 @@ COPY --from=base /app/.venv /app/.venv
 
 COPY ./integrations/_infra/init.sh /app/init.sh
 
+USER root
+
 # 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
+
+# Add ocean user to ssl certs group
+RUN setfacl -R -m u:ocean:rwX /etc/ssl/certs \
+    && setfacl -d -m u:ocean:rwX /etc/ssl/certs
+
+# Allow ocean user to run update-ca-certificates without password (secure, limited sudo)
+RUN echo "ocean ALL=(root) NOPASSWD: /usr/sbin/update-ca-certificates" >> /etc/sudoers.d/ocean-certs \
+    && chmod 440 /etc/sudoers.d/ocean-certs
+
+USER ocean
+
 # Run the application
 CMD ["bash", "/app/init.sh"]

{port_ocean-0.21.2 → port_ocean-0.29.5}/integrations/_infra/Dockerfile.alpine

@@ -5,7 +5,7 @@ FROM ${BASE_PYTHON_IMAGE} AS base
 ARG BUILD_CONTEXT
 ARG BUILDPLATFORM
 
-ENV LIBRDKAFKA_VERSION=1.9.2 \
+ENV LIBRDKAFKA_VERSION=2.8.2 \
     PYTHONUNBUFFERED=1 \
     PIP_DISABLE_PIP_VERSION_CHECK=on \
     POETRY_NO_INTERACTION=1 \
@@ -66,7 +66,7 @@ FROM ${BASE_PYTHON_IMAGE} AS prod
 ARG INTEGRATION_VERSION
 ARG BUILD_CONTEXT
 
-ENV LIBRDKAFKA_VERSION=1.9.2
+ENV LIBRDKAFKA_VERSION=2.8.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

{port_ocean-0.21.2 → port_ocean-0.29.5}/integrations/_infra/Dockerfile.base.builder

@@ -1,13 +1,16 @@
-ARG BASE_PYTHON_IMAGE=debian:trixie-slim
-# debian:trixie-slim - Python 3.12
+ARG ACCOUNT_ID=1
+ARG BASE_PYTHON_IMAGE=${ACCOUNT_ID}.dkr.ecr.eu-west-1.amazonaws.com/echo/python:3.13
+
 FROM ${BASE_PYTHON_IMAGE}
 
 LABEL org.opencontainers.image.source=https://github.com/port-labs/ocean
 
-ENV LIBRDKAFKA_VERSION=1.9.2 \
+ENV LIBRDKAFKA_VERSION=2.8.2 \
     PYTHONUNBUFFERED=1 \
     POETRY_VIRTUALENVS_IN_PROJECT=1 \
-    PIP_ROOT_USER_ACTION=ignore
+    PIP_ROOT_USER_ACTION=ignore \
+    POETRY_VIRTUALENVS_PREFER_ACTIVE_PYTHON=true \
+    POETRY_PYTHON=/usr/local/bin/python3.13
 
 RUN apt-get update \
     && apt-get install -y \

{port_ocean-0.21.2 → port_ocean-0.29.5}/integrations/_infra/Dockerfile.base.runner

@@ -1,10 +1,11 @@
-ARG BASE_PYTHON_IMAGE=debian:trixie-slim
-# debian:trixie-slim - Python 3.12
+ARG ACCOUNT_ID=1
+ARG BASE_PYTHON_IMAGE=${ACCOUNT_ID}.dkr.ecr.eu-west-1.amazonaws.com/echo/python:3.13
+
 FROM ${BASE_PYTHON_IMAGE}
 
 LABEL org.opencontainers.image.source=https://github.com/port-labs/ocean
 
-ENV LIBRDKAFKA_VERSION=1.9.2
+ENV LIBRDKAFKA_VERSION=2.8.2
 
 ENV PIP_ROOT_USER_ACTION=ignore
 

port_ocean-0.29.5/integrations/_infra/Dockerfile.local

@@ -0,0 +1,65 @@
+ARG BASE_PYTHON_IMAGE=debian:trixie-slim
+# debian:trixie-slim - Python 3.12
+FROM ${BASE_PYTHON_IMAGE}
+
+ARG OCEAN_USER_ID=999
+RUN groupadd -r appgroup && useradd -r -g appgroup -m -u ${OCEAN_USER_ID} ocean
+
+RUN mkdir -p /tmp/ocean
+
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends librdkafka-dev python3 \
+    && apt-get clean
+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 \
+        build-essential\
+        jq \
+        git \
+        python3-venv \
+        acl \
+    && apt-get clean
+
+ARG BUILD_CONTEXT
+ARG PROMETHEUS_MULTIPROC_DIR=/tmp/ocean/prometheus/metrics
+ARG STREAMING_LOCATION=/tmp/ocean/streaming
+
+ENV PROMETHEUS_MULTIPROC_DIR=${PROMETHEUS_MULTIPROC_DIR}
+ENV STREAMING_LOCATION=${STREAMING_LOCATION}
+# Create /tmp/ocean directory and set permissions
+
+
+RUN mkdir -p ${PROMETHEUS_MULTIPROC_DIR}
+RUN mkdir -p ${STREAMING_LOCATION}
+
+WORKDIR /app
+
+COPY . .
+RUN rm -rf .venv-docker ${BUILD_CONTEXT}/.venv-docker
+RUN python3 -m venv .venv-docker
+RUN python3 -m venv ${BUILD_CONTEXT}/.venv-docker
+
+
+WORKDIR /app/${BUILD_CONTEXT}
+
+WORKDIR /app
+RUN chown -R ocean:appgroup /app && chmod -R 755 /app
+RUN chown -R ocean:appgroup /app/${BUILD_CONTEXT} && chmod -R 755 /app/${BUILD_CONTEXT}
+RUN chown -R ocean:appgroup /tmp/ocean && chmod -R 755 /tmp/ocean
+# Add ocean user to ssl certs group
+RUN setfacl -m u:ocean:rwX /etc/ssl/certs
+USER ocean
+
+ENTRYPOINT ["./integrations/_infra/entry_local.sh"]

{port_ocean-0.21.2 → port_ocean-0.29.5}/integrations/_infra/Makefile

@@ -11,6 +11,8 @@ define run_checks
 	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 \
@@ -46,7 +48,7 @@ endef
 install:
 	$(call deactivate_virtualenv) && \
 	$(call install_poetry) && \
-	poetry install --with dev
+	poetry install --with dev --no-root
 
 install/local-core: install
 	# NOTE: This is a temporary change that shouldn't be committed

port_ocean-0.29.5/integrations/_infra/README.md

@@ -0,0 +1,30 @@
+# Running the Ocean image locally using vscode / Cursor
+
+In order to run the local image of Ocean you need to follow these steps:
+
+1. Build the image:
+
+    ```bash
+    docker build -f integrations/_infra/Dockerfile.local --build-arg BUILD_CONTEXT=integrations/<integration_type> --platform linux/arm64 -t <my-local-image>:<local> .
+    ```
+
+2. Run the image
+   1. `5678` is the debugpy port mentioned in the `entry_local.sh` file
+   2. `8000` is the port of the Ocean FastAPI server
+   3. the `-v` option mounts your local Ocean directory to the pod, allowing you not to constantly build the image.
+      1. Make sure to run the command from the root directory of the Ocean repository.
+
+    ```bash
+    docker run --rm -it \
+    -v $(pwd):/app \
+    -p 5678:5678 \
+    -p 8000:8000 \
+    -e BUILD_CONTEXT=integrations/<integration_type> \
+    -e OCEAN__PORT__CLIENT_ID=<MY_CLIENT_ID> \
+    -e OCEAN__PORT__CLIENT_SECRET=<MY_CLIENT_SECRET> \
+    -e OCEAN__PORT__MY_OTHER_CONFIGURATION=<MY_OTHER_CONFIGURATION> \
+    <my-local-image>:<local>
+    ```
+
+3. In vscode/Cursor, run the `Attach to docker fake-integration integration` Running configuration from the `launch.json`.
+4. Have fun debugging!

port_ocean-0.29.5/integrations/_infra/entry_local.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+if [ -z "$BUILD_CONTEXT" ]; then
+    echo "BUILD_CONTEXT is not set"
+    exit 1
+fi
+
+if [ ! -d ".venv-docker" ]; then
+    /usr/bin/python3 -m venv .venv-docker
+    source .venv-docker/bin/activate
+    python -m pip install poetry
+    python -m poetry install
+fi
+
+cd $BUILD_CONTEXT
+
+if [ ! -d ".venv-docker" ]; then
+    /usr/bin/python3 -m venv .venv-docker
+    source .venv-docker/bin/activate
+    python -m pip install poetry
+    python -m poetry install
+fi
+source .venv-docker/bin/activate
+python -m pip install -e ../../
+
+python -m pip install debugpy
+python -m debugpy --listen 0.0.0.0:5678 --wait-for-client debug.py

{port_ocean-0.21.2 → port_ocean-0.29.5}/integrations/_infra/init.sh

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

{port_ocean-0.21.2 → port_ocean-0.29.5}/port_ocean/__init__.py

@@ -8,4 +8,9 @@ from .run import run  # noqa: E402
 from .version import __integration_version__, __version__  # noqa: E402
 
 
-__all__ = ["Ocean", "run", "__version__", "__integration_version__"]
+__all__ = [
+    "Ocean",
+    "run",
+    "__version__",
+    "__integration_version__",
+]

port_ocean-0.29.5/port_ocean/cache/base.py

@@ -0,0 +1,25 @@
+from abc import ABC, abstractmethod
+from typing import Any, Optional
+
+from port_ocean.core.models import CachingStorageMode
+
+
+class CacheProvider(ABC):
+    """Base class for cache providers that defines the contract for all cache implementations."""
+
+    STORAGE_TYPE: CachingStorageMode
+
+    @abstractmethod
+    async def get(self, key: str) -> Optional[Any]:
+        """Get a value from the cache."""
+        pass
+
+    @abstractmethod
+    async def set(self, key: str, value: Any) -> None:
+        """Set a value in the cache."""
+        pass
+
+    @abstractmethod
+    async def clear(self) -> None:
+        """Clear all values from the cache."""
+        pass

port_ocean-0.29.5/port_ocean/cache/disk.py

@@ -0,0 +1,61 @@
+import pickle
+from pathlib import Path
+from typing import Any, Optional
+
+from port_ocean.cache.base import CacheProvider
+from port_ocean.cache.errors import FailedToReadCacheError, FailedToWriteCacheError
+from port_ocean.core.models import CachingStorageMode
+
+
+class FailedToReadCacheFileError(FailedToReadCacheError):
+    pass
+
+
+class FailedToWriteCacheFileError(FailedToWriteCacheError):
+    pass
+
+
+class DiskCacheProvider(CacheProvider):
+    STORAGE_TYPE = CachingStorageMode.disk
+
+    def __init__(self, cache_dir: str | None = None) -> None:
+        if cache_dir is None:
+            cache_dir = "/tmp/ocean/.ocean_cache"
+        self._cache_dir = Path(cache_dir)
+        self._cache_dir.mkdir(parents=True, exist_ok=True)
+
+    def _get_cache_path(self, key: str) -> Path:
+        return self._cache_dir / f"{key}.pkl"
+
+    async def get(self, key: str) -> Optional[Any]:
+        cache_path = self._get_cache_path(key)
+        if not cache_path.exists():
+            return None
+
+        try:
+            with open(cache_path, "rb") as f:
+                return pickle.load(f)
+        except (pickle.PickleError, EOFError) as e:
+            raise FailedToReadCacheFileError(
+                f"Failed to read cache file: {cache_path}: {str(e)}"
+            )
+
+    async def set(self, key: str, value: Any) -> None:
+        cache_path = self._get_cache_path(key)
+        try:
+            with open(cache_path, "wb") as f:
+                pickle.dump(value, f)
+        except (pickle.PickleError, IOError) as e:
+            raise FailedToWriteCacheFileError(
+                f"Failed to write cache file: {cache_path}: {str(e)}"
+            )
+
+    async def clear(self) -> None:
+        try:
+            for cache_file in self._cache_dir.glob("*.pkl"):
+                try:
+                    cache_file.unlink()
+                except OSError:
+                    pass
+        except OSError:
+            pass

port_ocean-0.29.5/port_ocean/cache/errors.py

@@ -0,0 +1,10 @@
+class CacheError(Exception):
+    pass
+
+
+class FailedToReadCacheError(CacheError):
+    pass
+
+
+class FailedToWriteCacheError(CacheError):
+    pass

port_ocean-0.29.5/port_ocean/cache/memory.py

@@ -0,0 +1,36 @@
+from typing import Any, Optional
+from port_ocean.cache.base import CacheProvider
+from port_ocean.cache.errors import FailedToReadCacheError, FailedToWriteCacheError
+from port_ocean.core.models import CachingStorageMode
+
+
+class FailedToReadCacheMemoryError(FailedToReadCacheError):
+    pass
+
+
+class FailedToWriteCacheMemoryError(FailedToWriteCacheError):
+    pass
+
+
+class InMemoryCacheProvider(CacheProvider):
+    CACHE_KEY = "cache"
+    STORAGE_TYPE = CachingStorageMode.memory
+
+    def __init__(self, caching_storage: dict[str, Any] | None = None) -> None:
+        self._storage = caching_storage or {}
+        self._storage[self.CACHE_KEY] = self._storage.get(self.CACHE_KEY, {})
+
+    async def get(self, key: str) -> Optional[Any]:
+        try:
+            return self._storage.get(self.CACHE_KEY, {}).get(key)
+        except KeyError as e:
+            raise FailedToReadCacheMemoryError(f"Failed to read cache: {str(e)}")
+
+    async def set(self, key: str, value: Any) -> None:
+        try:
+            self._storage[self.CACHE_KEY][key] = value
+        except KeyError as e:
+            raise FailedToWriteCacheMemoryError(f"Failed to write cache: {str(e)}")
+
+    async def clear(self) -> None:
+        self._storage[self.CACHE_KEY].clear()

{port_ocean-0.21.2 → port_ocean-0.29.5}/port_ocean/cli/cookiecutter/cookiecutter.json

@@ -6,8 +6,8 @@
     "email": "Your address email <you@example.com>",
     "release_date": "{% now 'local' %}",
     "is_private_integration": true,
-    "port_client_id": "you can find it using: https://docs.getport.io/build-your-software-catalog/custom-integration/api/#find-your-port-credentials",
-    "port_client_secret": "you can find it using: https://docs.getport.io/build-your-software-catalog/custom-integration/api/#find-your-port-credentials",
+    "port_client_id": "you can find it using: https://docs.port.io/build-your-software-catalog/custom-integration/api/#find-your-port-credentials",
+    "port_client_secret": "you can find it using: https://docs.port.io/build-your-software-catalog/custom-integration/api/#find-your-port-credentials",
     "is_us_region": false,
     "_extensions": [
         "jinja2_time.TimeExtension",

{port_ocean-0.21.2 → port_ocean-0.29.5}/port_ocean/cli/cookiecutter/{{cookiecutter.integration_slug}}/README.md

@@ -2,6 +2,6 @@
 
 An integration used to import {{cookiecutter.integration_name}} resources into Port.
 
-#### Install & use the integration - [Integration documentation](https://docs.getport.io/build-your-software-catalog/sync-data-to-catalog/) *Replace this link with a link to this integration's documentation*
+#### Install & use the integration - [Integration documentation](https://docs.port.io/build-your-software-catalog/sync-data-to-catalog/) *Replace this link with a link to this integration's documentation*
 
 #### Develop & improve the integration - [Ocean integration development documentation](https://ocean.getport.io/develop-an-integration/)

{port_ocean-0.21.2 → port_ocean-0.29.5}/port_ocean/clients/auth/oauth_client.py

@@ -12,7 +12,7 @@ class OAuthClient(AuthClient):
             register_on_retry_callback(self.refresh_request_auth_creds)
 
     def is_oauth_enabled(self) -> bool:
-        return ocean.app.load_external_oauth_access_token() is not None
+        return ocean.app.config.oauth_access_token_file_path is not None
 
     @property
     def external_access_token(self) -> str:

{port_ocean-0.21.2 → port_ocean-0.29.5}/port_ocean/clients/port/authentication.py

@@ -1,4 +1,5 @@
 import re
+import jwt
 from typing import Any
 
 import httpx
@@ -6,7 +7,7 @@ from loguru import logger
 from pydantic import BaseModel, Field, PrivateAttr
 
 from port_ocean.clients.port.types import UserAgentType
-from port_ocean.clients.port.utils import handle_status_code
+from port_ocean.clients.port.utils import handle_port_status_code
 from port_ocean.utils.misc import get_time
 
 
@@ -35,6 +36,7 @@ class PortAuthentication:
         integration_identifier: str,
         integration_type: str,
         integration_version: str,
+        ingest_url: str,
     ):
         self.client = client
         self.api_url = api_url
@@ -43,6 +45,7 @@ class PortAuthentication:
         self.integration_identifier = integration_identifier
         self.integration_type = integration_type
         self.integration_version = integration_version
+        self.ingest_url = ingest_url
         self.last_token_object: TokenResponse | None = None
 
     async def _get_token(self, client_id: str, client_secret: str) -> TokenResponse:
@@ -58,7 +61,7 @@ class PortAuthentication:
             json=credentials,
             extensions={"retryable": True},
         )
-        handle_status_code(response)
+        handle_port_status_code(response)
         return TokenResponse(**response.json())
 
     def user_agent(self, user_agent_type: UserAgentType | None = None) -> str:
@@ -88,6 +91,24 @@ class PortAuthentication:
             )
         return self.last_token_object.full_token
 
+    async def is_machine_user(self) -> bool:
+        # Ensure self.last_token_object is populated
+        await self.token
+        if not self.last_token_object:
+            raise ValueError("No token found")
+
+        payload: dict[str, Any] = jwt.decode(
+            self.last_token_object.access_token, options={"verify_signature": False}
+        )
+        is_machine_user = payload.get("isMachine")
+        if is_machine_user is None:
+            logger.warning(
+                "Can not determine if the user is a machine user directly, checking for personal token usage instead"
+            )
+            return not payload.get("personalToken", True)
+
+        return is_machine_user
+
     @staticmethod
     def _is_personal_token(client_id: str) -> bool:
         email_regex = r"^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$"