port-ocean 0.12.2.dev16__tar.gz → 0.12.2.dev18__tar.gz

{port_ocean-0.12.2.dev16 → port_ocean-0.12.2.dev18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: port-ocean
-Version: 0.12.2.dev16
+Version: 0.12.2.dev18
 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.12.2.dev16 → port_ocean-0.12.2.dev18}/port_ocean/ocean.py

@@ -18,8 +18,11 @@ 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 request_handler
 from port_ocean.utils.repeat import repeat_every
 from port_ocean.utils.signal import signal_handler
 from port_ocean.version import __integration_version__
@@ -36,7 +39,7 @@ class Ocean:
     ):
         initialize_port_ocean_context(self)
         self.fast_api_app = app or FastAPI()
-        # self.fast_api_app.middleware("http")(request_handler)
+        self.fast_api_app.middleware("http")(request_handler)
 
         self.config = IntegrationConfiguration(
             # type: ignore
@@ -45,10 +48,10 @@ 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.integration_router = integration_router or APIRouter()
 
         self.port_client = PortClient(
             base_url=self.config.port.base_url,
@@ -62,9 +65,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,7 +112,7 @@ 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")
+        self.fast_api_app.include_router(self.integration_router, prefix="/integration")
 
         @asynccontextmanager
         async def lifecycle(_: FastAPI) -> AsyncIterator[None]:

{port_ocean-0.12.2.dev16 → port_ocean-0.12.2.dev18}/port_ocean/run.py

@@ -1,3 +1,4 @@
+import asyncio
 from inspect import getmembers
 from typing import Dict, Any, Type
 
@@ -6,9 +7,13 @@ 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
+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
 from port_ocean.utils.misc import get_spec_file, load_module
+from port_ocean.utils.signal import init_signal_handler
 
 
 def _get_default_config_factory() -> None | Type[BaseModel]:
@@ -27,13 +32,13 @@ def run(
     initialize_port_resources: bool | None = None,
     config_override: Dict[str, Any] | None = None,
 ) -> None:
-    # application_settings = ApplicationSettings(log_level=log_level, port=port)
+    application_settings = ApplicationSettings(log_level=log_level, port=port)
 
-    # init_signal_handler()
-    # setup_logger(
-    #     application_settings.log_level,
-    #     enable_http_handler=application_settings.enable_http_logging,
-    # )
+    init_signal_handler()
+    setup_logger(
+        application_settings.log_level,
+        enable_http_handler=application_settings.enable_http_logging,
+    )
 
     config_factory = _get_default_config_factory()
     default_app = create_default_app(path, config_factory, config_override)
@@ -45,14 +50,14 @@ def run(
     )
 
     # Validate that the current integration's runtime matches the execution parameters
-    # asyncio.get_event_loop().run_until_complete(
-    #     validate_integration_runtime(app.port_client, app.config.runtime)
-    # )
+    asyncio.get_event_loop().run_until_complete(
+        validate_integration_runtime(app.port_client, app.config.runtime)
+    )
 
     # Override config with arguments
-    # if initialize_port_resources is not None:
-    #     app.config.initialize_port_resources = initialize_port_resources
-    #
-    # initialize_defaults(app.integration.AppConfigHandlerClass.CONFIG_CLASS, app.config)
+    if initialize_port_resources is not None:
+        app.config.initialize_port_resources = initialize_port_resources
+
+    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.dev16 → port_ocean-0.12.2.dev18}/pyproject.toml

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