port-ocean 0.2.0.dev2__py3-none-any.whl → 0.2.2.dev1__py3-none-any.whl

port_ocean/config/base.py

@@ -1,12 +1,14 @@
 import os
 import re
 from pathlib import Path
+from types import GenericAlias
 from typing import Any
 
 import yaml
 from humps import decamelize
 from pydantic import BaseSettings
 from pydantic.env_settings import EnvSettingsSource, InitSettingsSource
+from pydantic.main import ModelMetaclass, BaseModel
 
 PROVIDER_WRAPPER_PATTERN = r"{{ from (.*) }}"
 PROVIDER_CONFIG_PATTERN = r"^[a-zA-Z0-9]+ .*$"
@@ -60,17 +62,30 @@ def decamelize_object(obj: Any) -> Any:
 
 
 def parse_config(
-    config: dict[str, Any], existing_data: dict[str, Any]
+    settings_model: BaseModel | ModelMetaclass,
+    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):
+        if isinstance(value, dict) and settings_model is not None:
+            # If the value is ModelMetaClass typed then its a nested model, and we need to parse it
+            # If the value is a primitive dict then we need to decamelize the keys and not recurse into the values because its no longer part of the model
+            _type = settings_model.__annotations__[decamelize_key]
+            is_primitive_dict_type = _type is dict or (
+                isinstance(_type, GenericAlias) and _type.__origin__ is dict
+            )
+
+            if is_primitive_dict_type:
+                _type = None
+
             existing_data[decamelize_key] = parse_config(
-                value, existing_data.get(decamelize_key, {})
+                _type, 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):
@@ -95,7 +110,7 @@ def load_providers(
 ) -> dict[str, Any]:
     yaml_content = read_yaml_config_settings_source(settings, base_path)
     data = yaml.safe_load(yaml_content)
-    return parse_config(data, existing_values)
+    return parse_config(settings, data, existing_values)
 
 
 class BaseOceanSettings(BaseSettings):

{port_ocean-0.2.0.dev2.dist-info → port_ocean-0.2.2.dev1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: port-ocean
-Version: 0.2.0.dev2
+Version: 0.2.2.dev1
 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.2.0.dev2.dist-info → port_ocean-0.2.2.dev1.dist-info}/RECORD

@@ -36,7 +36,7 @@ port_ocean/clients/port/mixins/integrations.py,sha256=lKsZHIrfDpAFlPy1X1sXj7eQ6U
 port_ocean/clients/port/types.py,sha256=NnT1W2H_tZ_9cyEFoDhb90q3apf8p9emkHYspbPoZJQ,593
 port_ocean/clients/port/utils.py,sha256=T2poQv_8sCs59pIIeynJWe9NZi6pAO0SHhS7KLErnIs,789
 port_ocean/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-port_ocean/config/base.py,sha256=nqHIZJZK3IyR48cOQGKQaQv4kz5IG_oUhrP9dJScC-U,4011
+port_ocean/config/base.py,sha256=BHx7bsqoD3zK2g9ARuZxe0FPx-VcLkpdI_MKavLkPUM,4735
 port_ocean/config/dynamic.py,sha256=CIRDnqFUPSnNMLZ-emRCMVAjEQNBlIujhZ7OGwi_aKs,1816
 port_ocean/config/settings.py,sha256=2QmMrKpAZ3dHVbo-nCoo-GiHFXWwUV1FddKcDWSrjW8,1230
 port_ocean/consumers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -93,8 +93,8 @@ port_ocean/port_defaults.py,sha256=slubEiM4SJKCzD4bHzf8Rwj3RgsHZXZuYZ0ouhcIQOA,7
 port_ocean/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 port_ocean/run.py,sha256=Bd6c6qYqQZlZqTLyRWRIkf579NQNqrr-o4mVAnBIISA,2834
 port_ocean/utils.py,sha256=2a30qmGMSPgsTxfpz2RiI3xDsM0-TkaKAbvJBaYqvCc,1007
-port_ocean-0.2.0.dev2.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-port_ocean-0.2.0.dev2.dist-info/METADATA,sha256=JI46-sPH25MozELzcP7aMgPUeSpPwh38qHfusoUulFQ,6361
-port_ocean-0.2.0.dev2.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-port_ocean-0.2.0.dev2.dist-info/entry_points.txt,sha256=F_DNUmGZU2Kme-8NsWM5LLE8piGMafYZygRYhOVtcjA,54
-port_ocean-0.2.0.dev2.dist-info/RECORD,,
+port_ocean-0.2.2.dev1.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+port_ocean-0.2.2.dev1.dist-info/METADATA,sha256=-WGpPZQK05oxsgS4F17uTK5Zeq0NkW0spwPaTFj01OQ,6361
+port_ocean-0.2.2.dev1.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+port_ocean-0.2.2.dev1.dist-info/entry_points.txt,sha256=F_DNUmGZU2Kme-8NsWM5LLE8piGMafYZygRYhOVtcjA,54
+port_ocean-0.2.2.dev1.dist-info/RECORD,,