port-ocean 0.9.8__tar.gz → 0.9.12__tar.gz

{port_ocean-0.9.8 → port_ocean-0.9.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: port-ocean
-Version: 0.9.8
+Version: 0.9.12
 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.9.8 → port_ocean-0.9.12}/port_ocean/cli/cookiecutter/hooks/post_gen_project.py

@@ -2,11 +2,12 @@ import os
 
 
 def handle_private_integration_flags():
+    print("{{ cookiecutter.is_private_integration }}")
     if "{{ cookiecutter.is_private_integration }}" == "True":
+        os.remove("sonar-project.properties")
+    if "{{ cookiecutter.is_private_integration }}" == "False":
         os.remove("Dockerfile")
         os.remove(".dockerignore")
-    if "{{ cookiecutter.is_private_integration }}" == "False":
-        os.remove("sonar-project.properties")
 
 
 if __name__ == "__main__":

{port_ocean-0.9.8 → port_ocean-0.9.12}/port_ocean/cli/cookiecutter/{{cookiecutter.integration_slug}}/pyproject.toml

@@ -19,7 +19,8 @@ towncrier = "^23.6.0"
 [tool.towncrier]
 directory = "changelog"
 filename = "CHANGELOG.md"
-package = "port_ocean"
+title_format = "## {version} ({project_date})"
+underlines = [""]
 
   [[tool.towncrier.type]]
   directory = "breaking"

{port_ocean-0.9.8 → port_ocean-0.9.12}/port_ocean/clients/port/mixins/entities.py

@@ -29,7 +29,7 @@ class EntityClientMixin:
         request_options: RequestOptions,
         user_agent_type: UserAgentType | None = None,
         should_raise: bool = True,
-    ) -> None:
+    ) -> Entity:
         validation_only = request_options["validation_only"]
         async with self.semaphore:
             logger.debug(
@@ -57,6 +57,12 @@ class EntityClientMixin:
                 f"blueprint: {entity.blueprint}"
             )
         handle_status_code(response, should_raise)
+        result = response.json()
+        result_entity = Entity.parse_obj(result)
+        # Set the results of the search relation and identifier to the entity
+        entity.identifier = result_entity.identifier or entity.identifier
+        entity.relations = result_entity.relations or entity.relations
+        return entity
 
     async def batch_upsert_entities(
         self,
@@ -64,8 +70,8 @@ class EntityClientMixin:
         request_options: RequestOptions,
         user_agent_type: UserAgentType | None = None,
         should_raise: bool = True,
-    ) -> None:
-        await asyncio.gather(
+    ) -> list[Entity]:
+        modified_entities_results = await asyncio.gather(
             *(
                 self.upsert_entity(
                     entity,
@@ -75,8 +81,19 @@ class EntityClientMixin:
                 )
                 for entity in entities
             ),
-            return_exceptions=True,
+            return_exceptions=should_raise,
         )
+        entity_results = [
+            entity for entity in modified_entities_results if isinstance(entity, Entity)
+        ]
+        if not should_raise:
+            return entity_results
+
+        for entity_result in modified_entities_results:
+            if isinstance(entity_result, Exception):
+                raise entity_result
+
+        return entity_results
 
     async def delete_entity(
         self,

{port_ocean-0.9.8 → port_ocean-0.9.12}/port_ocean/config/base.py

@@ -1,11 +1,11 @@
 import os
 import re
-from pathlib import Path
 from types import GenericAlias
 from typing import Any
 
 import yaml
 from humps import decamelize
+from pathlib import Path
 from pydantic import BaseSettings
 from pydantic.env_settings import EnvSettingsSource, InitSettingsSource
 from pydantic.main import ModelMetaclass, BaseModel
@@ -14,13 +14,17 @@ PROVIDER_WRAPPER_PATTERN = r"{{ from (.*) }}"
 PROVIDER_CONFIG_PATTERN = r"^[a-zA-Z0-9]+ .*$"
 
 
-def read_yaml_config_settings_source(
-    settings: "BaseOceanSettings", base_path: str
-) -> dict[str, Any]:
-    yaml_file = getattr(settings.__config__, "yaml_file", "")
+def read_yaml_config_settings_source(settings: "BaseOceanSettings") -> dict[str, Any]:
+    yaml_file = getattr(settings.Config, "yaml_file", "")
 
     assert yaml_file, "Settings.yaml_file not properly configured"
-    path = Path(base_path, yaml_file)
+    path = Path(
+        getattr(
+            settings,
+            "_base_path",
+        ),
+        yaml_file,
+    )
 
     if not path.exists():
         return {}
@@ -119,15 +123,15 @@ def decamelize_config(
 
 
 def load_providers(
-    settings: "BaseOceanSettings", existing_values: dict[str, Any], base_path: str
+    settings: "BaseOceanSettings", existing_values: dict[str, Any]
 ) -> dict[str, Any]:
-    data = read_yaml_config_settings_source(settings, base_path)
+    data = read_yaml_config_settings_source(settings)
     snake_case_config = decamelize_config(settings, data)
     return parse_providers(settings, snake_case_config, existing_values)
 
 
 class BaseOceanSettings(BaseSettings):
-    base_path: str
+    _base_path: str = "./"
 
     def get_sensitive_fields_data(self) -> set[str]:
         return _get_sensitive_information(self)
@@ -150,9 +154,7 @@ class BaseOceanSettings(BaseSettings):
             return (
                 init_settings,
                 env_settings,
-                lambda s: load_providers(
-                    s, env_settings(s), init_settings.init_kwargs["base_path"]
-                ),
+                lambda s: load_providers(s, {**env_settings(s), **init_settings(s)}),
             )
 
 

{port_ocean-0.9.8 → port_ocean-0.9.12}/port_ocean/config/settings.py

@@ -1,15 +1,16 @@
-from typing import Any, Literal
+from typing import Any, Literal, Type
 
-from port_ocean.config.base import BaseOceanSettings, BaseOceanModel
-from port_ocean.core.event_listener import EventListenerSettingsType
-from port_ocean.core.models import Runtime
-from port_ocean.utils.misc import get_integration_name, get_spec_file
-from pydantic import Extra, AnyHttpUrl, parse_obj_as
+from pydantic import Extra, AnyHttpUrl, parse_obj_as, parse_raw_as
 from pydantic.class_validators import root_validator, validator
 from pydantic.env_settings import InitSettingsSource, EnvSettingsSource, BaseSettings
 from pydantic.fields import Field
 from pydantic.main import BaseModel
 
+from port_ocean.config.base import BaseOceanSettings, BaseOceanModel
+from port_ocean.core.event_listener import EventListenerSettingsType
+from port_ocean.core.models import Runtime
+from port_ocean.utils.misc import get_integration_name, get_spec_file
+
 LogLevelType = Literal["ERROR", "WARNING", "INFO", "DEBUG", "CRITICAL"]
 
 
@@ -44,7 +45,7 @@ class PortSettings(BaseOceanModel, extra=Extra.allow):
 class IntegrationSettings(BaseOceanModel, extra=Extra.allow):
     identifier: str
     type: str
-    config: dict[str, Any] | BaseModel = Field(default_factory=dict)
+    config: Any = Field(default_factory=dict)
 
     @root_validator(pre=True)
     def root_validator(cls, values: dict[str, Any]) -> dict[str, Any]:
@@ -62,6 +63,8 @@ class IntegrationSettings(BaseOceanModel, extra=Extra.allow):
 
 
 class IntegrationConfiguration(BaseOceanSettings, extra=Extra.allow):
+    _integration_config_model: BaseModel | None = None
+
     allow_environment_variables_jq_access: bool = True
     initialize_port_resources: bool = True
     scheduled_resync_interval: int | None = None
@@ -73,6 +76,27 @@ class IntegrationConfiguration(BaseOceanSettings, extra=Extra.allow):
     integration: IntegrationSettings = IntegrationSettings(type="", identifier="")
     runtime: Runtime = "OnPrem"
 
+    @root_validator()
+    def validate_integration_config(cls, values: dict[str, Any]) -> dict[str, Any]:
+        if not (config_model := values.get("_integration_config_model")):
+            return values
+
+        # Using the integration dynamic config model to parse the config
+        def parse_config(model: Type[BaseModel], config: Any) -> BaseModel:
+            # In some cases, the config is parsed as a string so we need to handle it
+            # Example: when the config is loaded from the environment variables and there is an object inside the config
+            if isinstance(config, str):
+                return parse_raw_as(model, config)
+            else:
+                return parse_obj_as(model, config)
+
+        integration_config = values["integration"]
+        integration_config.config = parse_config(
+            config_model, integration_config.config
+        )
+
+        return values
+
     @validator("runtime")
     def validate_runtime(cls, runtime: Literal["OnPrem", "Saas"]) -> Runtime:
         if runtime == "Saas":

{port_ocean-0.9.8 → port_ocean-0.9.12}/port_ocean/core/handlers/entities_state_applier/base.py

@@ -47,12 +47,15 @@ class BaseEntitiesStateApplier(BaseHandler):
     @abstractmethod
     async def upsert(
         self, entities: list[Entity], user_agent_type: UserAgentType
-    ) -> None:
+    ) -> list[Entity]:
         """Upsert (insert or update) the given entities into the state.
 
         Args:
             entities (list[Entity]): The entities to be upserted.
             user_agent_type (UserAgentType): The user agent responsible for the upsert.
+
+        Returns:
+            list[Entity]: The upserted entities.
         """
         pass
 

{port_ocean-0.9.8 → port_ocean-0.9.12}/port_ocean/core/handlers/entities_state_applier/port/applier.py

@@ -71,9 +71,9 @@ class HttpEntitiesStateApplier(BaseEntitiesStateApplier):
         logger.info(
             f"Updating entity diff (created: {len(diff.created)}, deleted: {len(diff.deleted)}, modified: {len(diff.modified)})"
         )
-        await self.upsert(kept_entities, user_agent_type)
+        modified_entities = await self.upsert(kept_entities, user_agent_type)
 
-        await self._safe_delete(diff.deleted, kept_entities, user_agent_type)
+        await self._safe_delete(diff.deleted, modified_entities, user_agent_type)
 
     async def delete_diff(
         self,
@@ -95,10 +95,11 @@ class HttpEntitiesStateApplier(BaseEntitiesStateApplier):
 
     async def upsert(
         self, entities: list[Entity], user_agent_type: UserAgentType
-    ) -> None:
+    ) -> list[Entity]:
         logger.info(f"Upserting {len(entities)} entities")
+        modified_entities: list[Entity] = []
         if event.port_app_config.create_missing_related_entities:
-            await self.context.port_client.batch_upsert_entities(
+            modified_entities = await self.context.port_client.batch_upsert_entities(
                 entities,
                 event.port_app_config.get_port_request_options(),
                 user_agent_type,
@@ -108,14 +109,16 @@ class HttpEntitiesStateApplier(BaseEntitiesStateApplier):
             ordered_created_entities = reversed(
                 order_by_entities_dependencies(entities)
             )
-
             for entity in ordered_created_entities:
-                await self.context.port_client.upsert_entity(
-                    entity,
-                    event.port_app_config.get_port_request_options(),
-                    user_agent_type,
-                    should_raise=False,
+                modified_entities.append(
+                    await self.context.port_client.upsert_entity(
+                        entity,
+                        event.port_app_config.get_port_request_options(),
+                        user_agent_type,
+                        should_raise=False,
+                    )
                 )
+        return modified_entities
 
     async def delete(
         self, entities: list[Entity], user_agent_type: UserAgentType

{port_ocean-0.9.8 → port_ocean-0.9.12}/port_ocean/core/integrations/mixins/sync.py

@@ -97,9 +97,11 @@ class SyncMixin(HandlerMixin):
         """
         entities_at_port = await ocean.port_client.search_entities(user_agent_type)
 
-        await self.entities_state_applier.upsert(entities, user_agent_type)
+        modified_entities = await self.entities_state_applier.upsert(
+            entities, user_agent_type
+        )
         await self.entities_state_applier.delete_diff(
-            {"before": entities_at_port, "after": entities}, user_agent_type
+            {"before": entities_at_port, "after": modified_entities}, user_agent_type
         )
 
         logger.info("Finished syncing change")

{port_ocean-0.9.8 → port_ocean-0.9.12}/port_ocean/core/integrations/mixins/sync_raw.py

@@ -140,11 +140,13 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
         objects_diff = await self._calculate_raw(
             [(resource, results)], parse_all, send_raw_data_examples_amount
         )
-        await self.entities_state_applier.upsert(
+        modified_objects = await self.entities_state_applier.upsert(
             objects_diff[0].entity_selector_diff.passed, user_agent_type
         )
-
-        return objects_diff[0]
+        return CalculationResult(
+            objects_diff[0].entity_selector_diff._replace(passed=modified_objects),
+            errors=objects_diff[0].errors,
+        )
 
     async def _unregister_resource_raw(
         self,
@@ -418,6 +420,7 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
             )
             logger.info(f"Resync will use the following mappings: {app_config.dict()}")
             try:
+                did_fetched_current_state = True
                 entities_at_port = await ocean.port_client.search_entities(
                     user_agent_type
                 )
@@ -429,7 +432,7 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
                     f"Response status code: {e.response.status_code if isinstance(e, httpx.HTTPStatusError) else None}\n"
                     f"Response content: {e.response.text if isinstance(e, httpx.HTTPStatusError) else None}\n"
                 )
-                entities_at_port = []
+                did_fetched_current_state = False
 
             creation_results: list[tuple[list[Entity], list[Exception]]] = []
 
@@ -448,7 +451,7 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
             except asyncio.CancelledError as e:
                 logger.warning("Resync aborted successfully")
             else:
-                if not entities_at_port:
+                if not did_fetched_current_state:
                     logger.warning(
                         "Due to an error before the resync, the previous state of entities at Port is unknown."
                         " Skipping delete phase due to unknown initial state."

{port_ocean-0.9.8 → port_ocean-0.9.12}/port_ocean/ocean.py

@@ -2,7 +2,7 @@ import asyncio
 import sys
 import threading
 from contextlib import asynccontextmanager
-from typing import Callable, Any, Dict, AsyncIterator
+from typing import Callable, Any, Dict, AsyncIterator, Type
 
 from fastapi import FastAPI, APIRouter
 from loguru import logger
@@ -32,7 +32,7 @@ class Ocean:
         app: FastAPI | None = None,
         integration_class: Callable[[PortOceanContext], BaseIntegration] | None = None,
         integration_router: APIRouter | None = None,
-        config_factory: Callable[..., BaseModel] | None = None,
+        config_factory: Type[BaseModel] | None = None,
         config_override: Dict[str, Any] | None = None,
     ):
         initialize_port_ocean_context(self)
@@ -40,16 +40,11 @@ class Ocean:
         self.fast_api_app.middleware("http")(request_handler)
 
         self.config = IntegrationConfiguration(
-            base_path="./", **(config_override or {})
+            # type: ignore
+            _integration_config_model=config_factory,
+            **(config_override or {}),
         )
 
-        if config_factory:
-            raw_config = (
-                self.config.integration.config
-                if isinstance(self.config.integration.config, dict)
-                else self.config.integration.config.dict()
-            )
-            self.config.integration.config = config_factory(**raw_config)
         # add the integration sensitive configuration to the sensitive patterns to mask out
         sensitive_log_filter.hide_sensitive_strings(
             *self.config.get_sensitive_fields_data()

{port_ocean-0.9.8 → port_ocean-0.9.12}/pyproject.toml

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