port-ocean 0.1.3rc2__tar.gz → 0.1.3rc4__tar.gz

{port_ocean-0.1.3rc2 → port_ocean-0.1.3rc4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: port-ocean
-Version: 0.1.3rc2
+Version: 0.1.3rc4
 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.1.3rc2 → port_ocean-0.1.3rc4}/port_ocean/config/base.py

@@ -62,6 +62,9 @@ def decamelize_object(obj: Any) -> Any:
 def parse_config(
     config: dict[str, Any], existing_data: dict[str, Any]
 ) -> dict[str, Any]:
+    """
+    Normalizing the config yaml file to work with snake_case and getting only the data that is missing for the settings
+    """
     for key, value in config.items():
         decamelize_key = decamelize(key)
         if isinstance(value, dict):
@@ -69,7 +72,10 @@ def parse_config(
                 value, existing_data.get(decamelize_key, {})
             )
         elif isinstance(value, str):
+            # If the value is a provider, we try to load it from the provider
             if provider_match := re.match(PROVIDER_WRAPPER_PATTERN, value):
+                # If the there is already value for that field, we ignore it
+                # If the provider failed to load, we ignore it
                 if decamelize_key not in existing_data:
                     try:
                         existing_data[decamelize_key] = load_from_config_provider(

{port_ocean-0.1.3rc2 → port_ocean-0.1.3rc4}/port_ocean/config/dynamic.py

@@ -1,7 +1,9 @@
+import json
 from typing import Type, Any, Optional
 
 from humps import decamelize
-from pydantic import BaseModel, AnyUrl, create_model, Extra, parse_obj_as
+from pydantic import BaseModel, AnyUrl, create_model, Extra, parse_obj_as, validator
+from pydantic.fields import ModelField
 
 
 class Configuration(BaseModel, extra=Extra.allow):
@@ -11,6 +13,18 @@ class Configuration(BaseModel, extra=Extra.allow):
     default: Optional[Any]
 
 
+def dynamic_parse(value: Any, field: ModelField) -> Any:
+    should_json_load = issubclass(field.annotation, dict) or issubclass(
+        field.annotation, list
+    )
+    if isinstance(value, str) and should_json_load:
+        try:
+            return json.loads(value)
+        except json.JSONDecodeError:
+            pass
+    return value
+
+
 def default_config_factory(configurations: Any) -> Type[BaseModel]:
     configurations = parse_obj_as(list[Configuration], configurations)
     fields: dict[str, tuple[Any, Any]] = {}
@@ -40,4 +54,9 @@ def default_config_factory(configurations: Any) -> Type[BaseModel]:
             default,
         )
 
-    return create_model("Config", **fields)  # type: ignore
+    dynamic_model = create_model(  # type: ignore
+        __model_name="Config",
+        **fields,
+        __validators__={"dynamic_parse": validator("*", pre=True)(dynamic_parse)},
+    )
+    return dynamic_model

{port_ocean-0.1.3rc2 → port_ocean-0.1.3rc4}/pyproject.toml

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