port-ocean 0.12.2.dev17__py3-none-any.whl → 0.12.2.dev20__py3-none-any.whl

port_ocean/context/ocean.py

@@ -1,6 +1,5 @@
 from typing import Callable, TYPE_CHECKING, Any, Literal, Union
 
-from fastapi import APIRouter
 from pydantic.main import BaseModel
 from werkzeug.local import LocalProxy
 
@@ -44,10 +43,6 @@ class PortOceanContext:
     def config(self) -> "IntegrationConfiguration":
         return self.app.config
 
-    @property
-    def router(self) -> APIRouter:
-        return self.app.integration_router
-
     @property
     def integration(self) -> "BaseIntegration":
         return self.app.integration

port_ocean/exceptions/api.py

@@ -1,7 +1,7 @@
 import abc
 
-from fastapi.responses import Response, PlainTextResponse
 from port_ocean.exceptions.base import BaseOceanException
+from starlette.responses import Response, PlainTextResponse
 
 
 class BaseAPIException(BaseOceanException, abc.ABC):

port_ocean/middlewares.py

@@ -1,73 +1,70 @@
-from typing import Callable, Awaitable
-
-from fastapi import Request, Response
 from loguru import logger
+from starlette.requests import Request
+from starlette.responses import Response
 
 from port_ocean.exceptions.api import BaseAPIException, InternalServerException
 from .context.event import event_context, EventType
 from .context.ocean import ocean
 from .utils.misc import get_time, generate_uuid
+from starlette.middleware.base import (
+    BaseHTTPMiddleware,
+    RequestResponseEndpoint,
+)
 
 
-async def _handle_silently(
-    call_next: Callable[[Request], Awaitable[Response]], request: Request
-) -> Response:
-    response: Response
-    try:
-        if request.url.path.startswith("/integration"):
-            async with event_context(EventType.HTTP_REQUEST, trigger_type="request"):
-                await ocean.integration.port_app_config_handler.get_port_app_config()
-                response = await call_next(request)
-        else:
-            response = await call_next(request)
+class RequestHandlerMiddleware(BaseHTTPMiddleware):
+    async def dispatch(self, request: Request, call_next: RequestResponseEndpoint):
+        start_time = get_time(seconds_precision=False)
+        request_id = generate_uuid()
 
-    except BaseAPIException as ex:
-        response = ex.response()
-        if response.status_code < 500:
-            logger.bind(exception=str(ex)).info(
-                "Request did not succeed due to client-side error"
+        with logger.contextualize(request_id=request_id):
+            log_level = (
+                "DEBUG"
+                if request.url.path == "/docs" or request.url.path == "/openapi.json"
+                else "INFO"
             )
-        else:
-            logger.opt(exception=True).warning(
-                "Request did not succeed due to server-side error"
+            logger.bind(url=str(request.url), method=request.method).log(
+                log_level, f"Request to {request.url.path} started"
             )
+            response = await self._handle_silently(request, call_next)
 
-    except Exception:
-        logger.opt(exception=True).error("Request failed due to unexpected error")
-        response = InternalServerException().response()
-
-    return response
+            end_time = get_time(seconds_precision=False)
+            time_elapsed = round(end_time - start_time, 5)
+            response.headers["X-Request-ID"] = request_id
+            response.headers["X-Process-Time"] = str(time_elapsed)
+            logger.bind(
+                time_elapsed=time_elapsed, response_status=response.status_code
+            ).log(log_level, f"Request to {request.url.path} ended")
 
+            return response
 
-async def request_handler(
-    request: Request, call_next: Callable[[Request], Awaitable[Response]]
-) -> Response:
-    """Middleware used by FastAPI to process each request, featuring:
-
-    - Contextualize request logs with a unique Request ID (UUID4) for each unique request.
-    - Catch exceptions during the request handling. Translate custom API exceptions into responses,
-      or treat (and log) unexpected exceptions.
-    """
-    start_time = get_time(seconds_precision=False)
-    request_id = generate_uuid()
+    async def _handle_silently(
+        self, request: Request, call_next: RequestResponseEndpoint
+    ) -> Response:
+        response: Response
+        try:
+            if request.url.path.startswith("/integration"):
+                async with event_context(
+                    EventType.HTTP_REQUEST, trigger_type="request"
+                ):
+                    await ocean.integration.port_app_config_handler.get_port_app_config()
+                    response = await call_next(request)
+            else:
+                response = await call_next(request)
 
-    with logger.contextualize(request_id=request_id):
-        log_level = (
-            "DEBUG"
-            if request.url.path == "/docs" or request.url.path == "/openapi.json"
-            else "INFO"
-        )
-        logger.bind(url=str(request.url), method=request.method).log(
-            log_level, f"Request to {request.url.path} started"
-        )
-        response = await _handle_silently(call_next, request)
+        except BaseAPIException as ex:
+            response = ex.response()
+            if response.status_code < 500:
+                logger.bind(exception=str(ex)).info(
+                    "Request did not succeed due to client-side error"
+                )
+            else:
+                logger.opt(exception=True).warning(
+                    "Request did not succeed due to server-side error"
+                )
 
-        end_time = get_time(seconds_precision=False)
-        time_elapsed = round(end_time - start_time, 5)
-        response.headers["X-Request-ID"] = request_id
-        response.headers["X-Process-Time"] = str(time_elapsed)
-        logger.bind(
-            time_elapsed=time_elapsed, response_status=response.status_code
-        ).log(log_level, f"Request to {request.url.path} ended")
+        except Exception:
+            logger.opt(exception=True).error("Request failed due to unexpected error")
+            response = InternalServerException().response()
 
         return response

port_ocean/ocean.py

@@ -1,12 +1,13 @@
 import asyncio
 import sys
 import threading
-from contextlib import asynccontextmanager
-from typing import Callable, Any, Dict, AsyncIterator, Type
+from typing import Callable, Any, Dict, Type
 
-from fastapi import FastAPI, APIRouter
 from loguru import logger
 from pydantic import BaseModel
+from starlette.middleware import Middleware
+from starlette.responses import JSONResponse
+from starlette.routing import Route
 from starlette.types import Scope, Receive, Send
 
 from port_ocean.clients.port.client import PortClient
@@ -18,25 +19,50 @@ from port_ocean.context.ocean import (
     ocean,
     initialize_port_ocean_context,
 )
+from port_ocean.core.handlers.resync_state_updater import ResyncStateUpdater
 from port_ocean.core.integrations.base import BaseIntegration
 from port_ocean.core.models import Runtime
+from port_ocean.log.sensetive import sensitive_log_filter
+from port_ocean.middlewares import RequestHandlerMiddleware
 from port_ocean.utils.repeat import repeat_every
 from port_ocean.utils.signal import signal_handler
 from port_ocean.version import __integration_version__
+import contextlib
+
+from starlette.applications import Starlette
 
 
 class Ocean:
     def __init__(
         self,
-        app: FastAPI | None = None,
+        app: Starlette | None = None,
         integration_class: Callable[[PortOceanContext], BaseIntegration] | None = None,
-        integration_router: APIRouter | None = None,
+        integration_router: None = None,
         config_factory: Type[BaseModel] | None = None,
         config_override: Dict[str, Any] | None = None,
     ):
         initialize_port_ocean_context(self)
-        self.fast_api_app = app or FastAPI()
-        # self.fast_api_app.middleware("http")(request_handler)
+
+        @contextlib.asynccontextmanager
+        async def lifespan(app):
+            try:
+                await self.integration.start()
+                await self._setup_scheduled_resync()
+                yield None
+            except Exception:
+                logger.exception("Integration had a fatal error. Shutting down.")
+                sys.exit("Server stopped")
+            finally:
+                signal_handler.exit()
+
+        async def handle_webhook_request(data: dict[str, Any]) -> dict[str, Any]:
+            return JSONResponse({"ok": True})
+
+        self.starlette_app = Starlette(
+            routes=[Route("/integration/webhook", endpoint=handle_webhook_request)],
+            middleware=[Middleware(RequestHandlerMiddleware)],
+            lifespan=lifespan,
+        )
 
         self.config = IntegrationConfiguration(
             # type: ignore
@@ -45,10 +71,9 @@ class Ocean:
         )
 
         # add the integration sensitive configuration to the sensitive patterns to mask out
-        # sensitive_log_filter.hide_sensitive_strings(
-        #     *self.config.get_sensitive_fields_data()
-        # )
-        # self.integration_router = integration_router or APIRouter()
+        sensitive_log_filter.hide_sensitive_strings(
+            *self.config.get_sensitive_fields_data()
+        )
 
         self.port_client = PortClient(
             base_url=self.config.port.base_url,
@@ -62,9 +87,9 @@ class Ocean:
             integration_class(ocean) if integration_class else BaseIntegration(ocean)
         )
 
-        # self.resync_state_updater = ResyncStateUpdater(
-        #     self.port_client, self.config.scheduled_resync_interval
-        # )
+        self.resync_state_updater = ResyncStateUpdater(
+            self.port_client, self.config.scheduled_resync_interval
+        )
 
     def is_saas(self) -> bool:
         return self.config.runtime == Runtime.Saas
@@ -109,19 +134,4 @@ class Ocean:
             await repeated_function()
 
     async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None:
-        # self.fast_api_app.include_router(self.integration_router, prefix="/integration")
-
-        @asynccontextmanager
-        async def lifecycle(_: FastAPI) -> AsyncIterator[None]:
-            try:
-                await self.integration.start()
-                await self._setup_scheduled_resync()
-                yield None
-            except Exception:
-                logger.exception("Integration had a fatal error. Shutting down.")
-                sys.exit("Server stopped")
-            finally:
-                signal_handler.exit()
-
-        self.fast_api_app.router.lifespan_context = lifecycle
-        await self.fast_api_app(scope, receive, send)
+        await self.starlette_app(scope, receive, send)

port_ocean/run.py

@@ -7,8 +7,8 @@ from pydantic import BaseModel
 
 from port_ocean.bootstrap import create_default_app
 from port_ocean.config.dynamic import default_config_factory
-from port_ocean.config.settings import LogLevelType, ApplicationSettings
-from port_ocean.core.defaults import initialize_defaults
+from port_ocean.config.settings import ApplicationSettings, LogLevelType
+from port_ocean.core.defaults.initialize import initialize_defaults
 from port_ocean.core.utils import validate_integration_runtime
 from port_ocean.log.logger_setup import setup_logger
 from port_ocean.ocean import Ocean
@@ -60,4 +60,4 @@ def run(
 
     initialize_defaults(app.integration.AppConfigHandlerClass.CONFIG_CLASS, app.config)
 
-    uvicorn.run(app, host="0.0.0.0", port=8000, loop="none")
+    uvicorn.run(app, host="0.0.0.0", port=application_settings.port)

{port_ocean-0.12.2.dev17.dist-info → port_ocean-0.12.2.dev20.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: port-ocean
-Version: 0.12.2.dev17
+Version: 0.12.2.dev20
 Summary: Port Ocean is a CLI tool for managing your Port projects.
 Home-page: https://app.getport.io
 Keywords: ocean,port-ocean,port
@@ -26,7 +26,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.112)
+Requires-Dist: fastapi (>=0.100,<0.116)
 Requires-Dist: httpx (>=0.24.1,<0.28.0)
 Requires-Dist: jinja2-time (>=0.2.0,<0.3.0) ; extra == "cli"
 Requires-Dist: jq (>=1.8.0,<2.0.0)
@@ -40,7 +40,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.31)
+Requires-Dist: uvicorn (>=0.22,<0.33)
 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.12.2.dev17.dist-info → port_ocean-0.12.2.dev20.dist-info}/RECORD

@@ -57,7 +57,7 @@ port_ocean/consumers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 port_ocean/consumers/kafka_consumer.py,sha256=N8KocjBi9aR0BOPG8hgKovg-ns_ggpEjrSxqSqF_BSo,4710
 port_ocean/context/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 port_ocean/context/event.py,sha256=WduGbCPgm2J2a63EY4J3XWwFGSt3ja1acBVpyI_ciMo,5430
-port_ocean/context/ocean.py,sha256=2EreWOj-N2H7QUjEt5wGiv5KHP4pTZc70tn_wHcpF4w,4657
+port_ocean/context/ocean.py,sha256=0NQj6nPCAYAKvYgb00zRDz88_7BDUR04-dFsA2XBXQE,4534
 port_ocean/context/resource.py,sha256=yDj63URzQelj8zJPh4BAzTtPhpKr9Gw9DRn7I_0mJ1s,1692
 port_ocean/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 port_ocean/core/defaults/__init__.py,sha256=8qCZg8n06WAdMu9s_FiRtDYLGPGHbOuS60vapeUoAks,142
@@ -100,7 +100,7 @@ port_ocean/core/models.py,sha256=dJ2_olTdbjUpObQJNmg7e7EENU_zZiX6XOaknNp54B0,134
 port_ocean/core/ocean_types.py,sha256=3_d8-n626f1kWLQ_Jxw194LEyrOVupz05qs_Y1pvB-A,990
 port_ocean/core/utils.py,sha256=40UjRauRJO47WDSNn9bkCRD2bfhfB3e-dnOLULnuVzE,3631
 port_ocean/exceptions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-port_ocean/exceptions/api.py,sha256=TLmTMqn4uHGaHgZK8PMIJ0TVJlPB4iP7xl9rx7GtCyY,426
+port_ocean/exceptions/api.py,sha256=gb2jqBfRv21-Y5BQ8-1DmYMT7uv7QEhhNDvpZCvqdKU,428
 port_ocean/exceptions/base.py,sha256=uY4DX7fIITDFfemCJDWpaZi3bD51lcANc5swpoNvMJA,46
 port_ocean/exceptions/clients.py,sha256=LKLLs-Zy3caNG85rwxfOw2rMr8qqVV6SHUq4fRCZ99U,180
 port_ocean/exceptions/context.py,sha256=mA8HII6Rl4QxKUz98ppy1zX3kaziaen21h1ZWuU3ADc,372
@@ -114,10 +114,10 @@ port_ocean/log/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 port_ocean/log/handlers.py,sha256=k9G_Mb4ga2-Jke9irpdlYqj6EYiwv0gEsh4TgyqqOmI,2853
 port_ocean/log/logger_setup.py,sha256=qSeVwnivV4WoLx_4SfBwn2PtmUpNdkSEgfm0C8B3yUw,2332
 port_ocean/log/sensetive.py,sha256=lVKiZH6b7TkrZAMmhEJRhcl67HNM94e56x12DwFgCQk,2920
-port_ocean/middlewares.py,sha256=9wYCdyzRZGK1vjEJ28FY_DkfwDNENmXp504UKPf5NaQ,2727
-port_ocean/ocean.py,sha256=7NV-QVP-NivyZNoJXp2Mz6NGjkR0ngqml2zfdV5Qulc,4861
+port_ocean/middlewares.py,sha256=K_FGt39YgiC0397W3ON1Z0n0bRIke95sZkw7a0xOiII,2737
+port_ocean/ocean.py,sha256=MKz9K83a9zUrazBkV4jVJDxJnIynomLfwZ0L39IR-hc,5133
 port_ocean/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-port_ocean/run.py,sha256=6FHXSLkb7Lkyf15iQH7tifo-z2Z1RolkNaNju9rWFoM,2193
+port_ocean/run.py,sha256=rTxBlrQd4yyrtgErCFJCHCEHs7d1OXrRiJehUYmIbN0,2212
 port_ocean/sonar-project.properties,sha256=X_wLzDOkEVmpGLRMb2fg9Rb0DxWwUFSvESId8qpvrPI,73
 port_ocean/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 port_ocean/tests/clients/port/mixins/test_entities.py,sha256=A9myrnkLhKSQrnOLv1Zz2wiOVSxW65Q9RIUIRbn_V7w,1586
@@ -140,8 +140,8 @@ port_ocean/utils/repeat.py,sha256=0EFWM9d8lLXAhZmAyczY20LAnijw6UbIECf5lpGbOas,32
 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.12.2.dev17.dist-info/LICENSE.md,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-port_ocean-0.12.2.dev17.dist-info/METADATA,sha256=r6PD39j-z-I0Fb1a_bEg6t7cueWWA1hs8As9lACIufk,6671
-port_ocean-0.12.2.dev17.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-port_ocean-0.12.2.dev17.dist-info/entry_points.txt,sha256=F_DNUmGZU2Kme-8NsWM5LLE8piGMafYZygRYhOVtcjA,54
-port_ocean-0.12.2.dev17.dist-info/RECORD,,
+port_ocean-0.12.2.dev20.dist-info/LICENSE.md,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+port_ocean-0.12.2.dev20.dist-info/METADATA,sha256=3mb_wnpmLv0NDDR_QREkEu6ZRpKP6nuW3dk0ciH1LyE,6671
+port_ocean-0.12.2.dev20.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+port_ocean-0.12.2.dev20.dist-info/entry_points.txt,sha256=F_DNUmGZU2Kme-8NsWM5LLE8piGMafYZygRYhOVtcjA,54
+port_ocean-0.12.2.dev20.dist-info/RECORD,,