port-ocean 0.23.1__tar.gz → 0.23.3__tar.gz

{port_ocean-0.23.1 → port_ocean-0.23.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: port-ocean
-Version: 0.23.1
+Version: 0.23.3
 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.23.1 → port_ocean-0.23.3}/integrations/_infra/Dockerfile.Deb

@@ -5,11 +5,15 @@ FROM ${BASE_BUILDER_PYTHON_IMAGE} AS base
 
 ARG BUILD_CONTEXT
 ARG BUILDPLATFORM
+ARG PROMETHEUS_MULTIPROC_DIR=/tmp/ocean/prometheus/metrics
 
 ENV LIBRDKAFKA_VERSION=2.8.2 \
     PYTHONUNBUFFERED=1 \
     POETRY_VIRTUALENVS_IN_PROJECT=1 \
-    PIP_ROOT_USER_ACTION=ignore
+    PIP_ROOT_USER_ACTION=ignore \
+    PROMETHEUS_MULTIPROC_DIR=${PROMETHEUS_MULTIPROC_DIR}
+
+RUN mkdir -p ${PROMETHEUS_MULTIPROC_DIR}
 
 WORKDIR /app
 

{port_ocean-0.23.1 → port_ocean-0.23.3}/integrations/_infra/Dockerfile.base.builder

@@ -1,5 +1,6 @@
-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
@@ -7,7 +8,9 @@ LABEL org.opencontainers.image.source=https://github.com/port-labs/ocean
 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.23.1 → port_ocean-0.23.3}/integrations/_infra/Dockerfile.base.runner

@@ -1,5 +1,6 @@
-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

{port_ocean-0.23.1 → port_ocean-0.23.3}/integrations/_infra/Dockerfile.local

@@ -25,6 +25,11 @@ RUN apt-get update \
     && apt-get clean
 
 ARG BUILD_CONTEXT
+ARG PROMETHEUS_MULTIPROC_DIR=/tmp/ocean/prometheus/metrics
+
+ENV PROMETHEUS_MULTIPROC_DIR=${PROMETHEUS_MULTIPROC_DIR}
+
+RUN mkdir -p ${PROMETHEUS_MULTIPROC_DIR}
 
 WORKDIR /app
 

{port_ocean-0.23.1 → port_ocean-0.23.3}/integrations/_infra/entry_local.sh

@@ -1,6 +1,4 @@
 #!/bin/bash
-mkdir -p /tmp/prometheus_multiproc_dir
-export PROMETHEUS_MULTIPROC_DIR=/tmp/prometheus_multiproc_dir
 if [ -z "$BUILD_CONTEXT" ]; then
     echo "BUILD_CONTEXT is not set"
     exit 1

{port_ocean-0.23.1 → port_ocean-0.23.3}/port_ocean/core/integrations/mixins/sync_raw.py

@@ -16,6 +16,7 @@ from port_ocean.core.handlers.port_app_config.models import ResourceConfig
 from port_ocean.core.integrations.mixins import HandlerMixin, EventsMixin
 from port_ocean.core.integrations.mixins.utils import (
     ProcessWrapper,
+    clear_http_client_context,
     is_resource_supported,
     unsupported_kind_response,
     resync_generator_wrapper,
@@ -594,6 +595,7 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
     ) -> None:
         logger.info(f"process started successfully for {resource.kind} with index {index}")
 
+        clear_http_client_context()
         async def process_resource_task() -> None:
             result = await self._process_resource(
                 resource, index, user_agent_type
@@ -775,3 +777,5 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
                     return True
             finally:
                 await ocean.app.cache_provider.clear()
+                if ocean.app.process_execution_mode == ProcessExecutionMode.multi_process:
+                    ocean.metrics.cleanup_prometheus_metrics()

{port_ocean-0.23.1 → port_ocean-0.23.3}/port_ocean/core/integrations/mixins/utils.py

@@ -19,6 +19,10 @@ from port_ocean.exceptions.core import (
     KindNotImplementedException,
 )
 
+from port_ocean.utils.async_http import _http_client
+from port_ocean.clients.port.utils import _http_client as _port_http_client
+
+from port_ocean.context.ocean import ocean
 
 @contextmanager
 def resync_error_handling() -> Generator[None, None, None]:
@@ -76,6 +80,7 @@ def unsupported_kind_response(
     logger.error(f"Kind {kind} is not supported in this integration")
     return [], [KindNotImplementedException(kind, available_resync_kinds)]
 
+
 class ProcessWrapper(multiprocessing.Process):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -87,4 +92,18 @@ class ProcessWrapper(multiprocessing.Process):
             logger.error(f"Process {self.pid} failed with exit code {self.exitcode}")
         else:
             logger.info(f"Process {self.pid} finished with exit code {self.exitcode}")
+        ocean.metrics.cleanup_prometheus_metrics(self.pid)
         return super().join()
+
+def clear_http_client_context() -> None:
+    try:
+        while _http_client.top is not None:
+            _http_client.pop()
+    except (RuntimeError, AttributeError):
+        pass
+
+    try:
+        while _port_http_client.top is not None:
+            _port_http_client.pop()
+    except (RuntimeError, AttributeError):
+        pass

{port_ocean-0.23.1 → port_ocean-0.23.3}/port_ocean/helpers/metric/metric.py

@@ -1,9 +1,10 @@
+import os
 from typing import Any, TYPE_CHECKING, Optional, Dict, List, Tuple
 from fastapi import APIRouter
 from port_ocean.exceptions.context import ResourceContextNotFoundError
 import prometheus_client
 from httpx import AsyncClient
-
+from fastapi.responses import PlainTextResponse
 from loguru import logger
 from port_ocean.context import resource
 from prometheus_client import Gauge
@@ -193,7 +194,21 @@ class Metrics:
         """
         self.get_metric(name, labels).set(value)
 
+    @staticmethod
+    def cleanup_prometheus_metrics(pid: int | None = None) -> None:
+        try:
+            prometheus_multiproc_dir = os.environ.get("PROMETHEUS_MULTIPROC_DIR")
+            for file in os.listdir(prometheus_multiproc_dir):
+                if pid:
+                    if file.endswith(".db") and file[0:-3].split("_")[-1] == str(pid):
+                        os.remove(f"{prometheus_multiproc_dir}/{file}")
+                else:
+                    os.remove(f"{prometheus_multiproc_dir}/{file}")
+        except Exception as e:
+            logger.error(f"Failed to cleanup prometheus metrics: {e}")
+
     def initialize_metrics(self, kind_blockes: list[str]) -> None:
+        self.cleanup_prometheus_metrics()
         for kind in kind_blockes:
             self.set_metric(MetricType.SUCCESS_NAME, [kind, MetricPhase.RESYNC], 0)
             self.set_metric(MetricType.DURATION_NAME, [kind, MetricPhase.RESYNC], 0)
@@ -241,7 +256,7 @@ class Metrics:
             return APIRouter()
         router = APIRouter()
 
-        @router.get("/")
+        @router.get("/", response_class=PlainTextResponse)
         async def prom_metrics() -> str:
             return self.generate_latest()
 

{port_ocean-0.23.1 → port_ocean-0.23.3}/port_ocean/ocean.py

@@ -96,7 +96,6 @@ class Ocean:
         self.resync_state_updater = ResyncStateUpdater(
             self.port_client, self.config.scheduled_resync_interval
         )
-
         self.app_initialized = False
 
     def _get_process_execution_mode(self) -> ProcessExecutionMode:

{port_ocean-0.23.1 → port_ocean-0.23.3}/port_ocean/utils/ipc.py

@@ -7,7 +7,7 @@ class FileIPC:
     def __init__(self, process_id: str, name: str, default_return: Any = None):
         self.process_id = process_id
         self.name = name
-        self.dir_path = f"/tmp/p_{self.process_id}"
+        self.dir_path = f"/tmp/ocean/processes/p_{self.process_id}"
         self.file_path = f"{self.dir_path}/{self.name}.pkl"
         self.default_return = default_return
         os.makedirs(self.dir_path, exist_ok=True)

{port_ocean-0.23.1 → port_ocean-0.23.3}/pyproject.toml

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