fixed bug with integer keys

Author: shadowy-pycoder

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pyya"
-version = "0.1.13"
+version = "0.1.14"
 description = "Convert YAML/TOML configuration files to Python objects"
 readme = "README.md"
 requires-python = ">=3.8"

pyya.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyya
-Version: 0.1.13
+Version: 0.1.14
 Summary: Convert YAML/TOML configuration files to Python objects
 Author-email: shadowy-pycoder <shadowy-pycoder@example.com>
 Project-URL: Homepage, https://github.com/shadowy-pycoder/pyya

pyya/__init__.py

@@ -82,7 +82,9 @@ def _merge_configs(
                 logger.debug(f'section `{".".join(sections)}` already exists in {config}, skipping')
             sections.pop()
 
-    def _sanitize_section(section: str) -> str:
+    def _sanitize_section(section: Any) -> Any:
+        if not isinstance(section, str):
+            return section
         if convert_keys_to_snake_case:
             logger.debug(f'converting section `{section}` to snake case')
             section = _to_snake(section)
@@ -135,6 +137,7 @@ class ExtraBase(BaseModel):
         @model_validator(mode='before')
         @classmethod
         def validator(cls, values: Any) -> Any:
+            values = {str(k): v for k, v in values.items()}
             if cls.model_config.get('extra') == 'allow':
                 extra, valid = {}, {}
                 for key, value in values.items():
@@ -155,6 +158,11 @@ def extra_flat(self) -> Any:
                     extra_flat.update(data)
             return extra_flat
 
+    def is_identifier(data: Any) -> bool:
+        if not isinstance(data, str):
+            return False
+        return not keyword.iskeyword(data) and data.isidentifier()
+
     def _model_and_stub_from_dict(
         name: str, data: Dict[str, Any], path: Optional[List[str]] = None
     ) -> Tuple[Type[ExtraBase], str]:
@@ -168,38 +176,35 @@ def _model_and_stub_from_dict(
         nested_stubs = []
         py_type: Any
         for section, entry in data.items():
+            if not is_identifier(section):
+                continue
             if isinstance(entry, Dict):
                 nested_model, nested_stub = _model_and_stub_from_dict(section, entry, path + [name])
-                if not keyword.iskeyword(section) and section.isidentifier():
-                    stub_lines.append(f'    {section}: {class_name + section.capitalize()}')
-                    nested_stubs.append(nested_stub)
+                stub_lines.append(f'    {section}: {class_name + section.capitalize()}')
+                nested_stubs.append(nested_stub)
                 fields[section] = (nested_model, entry)
             elif isinstance(entry, list) and entry:
                 first_item = entry[0]
                 if isinstance(first_item, Dict):
                     nested_model, nested_stub = _model_and_stub_from_dict(
                         f'{section.capitalize()}_item', first_item, path + [name]
                     )
-                    if not keyword.iskeyword(section) and section.isidentifier():
-                        stub_lines.append(f'    {section}: list[{class_name + section.capitalize()}_item]')
-                        nested_stubs.append(nested_stub)
+                    stub_lines.append(f'    {section}: list[{class_name + section.capitalize()}_item]')
+                    nested_stubs.append(nested_stub)
                     fields[section] = (List[nested_model], entry)  # type: ignore
                 else:
                     py_type = type(first_item)
-                    if not keyword.iskeyword(section) and section.isidentifier():
-                        stub_lines.append(f'    {section}: list[{py_type.__name__}]')
+                    stub_lines.append(f'    {section}: list[{py_type.__name__}]')
                     fields[section] = (List[py_type], entry)
             elif isinstance(entry, list):
-                if not keyword.iskeyword(section) and section.isidentifier():
-                    stub_lines.append(f'    {section}: list[Any]')
+                stub_lines.append(f'    {section}: list[Any]')
                 fields[section] = (List[Any], entry)
             else:
                 py_type = type(entry)
-                if not keyword.iskeyword(section) and section.isidentifier():
-                    stub_lines.append(f'    {section}: {py_type.__name__}')
+                stub_lines.append(f'    {section}: {py_type.__name__}')
                 fields[section] = (py_type, entry)
         if len(stub_lines) == 1:
-            stub_lines[0] += ' ...'
+            stub_lines = [f'class {class_name}(dict[Any, Any]): ...']
         stub_code = '\n\n'.join(nested_stubs + ['\n'.join(stub_lines)])
         return create_model(name, **fields, __base__=ExtraBase), stub_code
 

tests/test_common.py

@@ -54,17 +54,6 @@ def test_raise_err_default_corrupted() -> None:
         )
 
 
-def test_raise_err_sections_ignored_on_merge() -> None:
-    with pytest.raises(pyya.PyyaError, match=r'Failed parsing `sections_ignored_on_merge`'):
-        _ = pyya.init_config(
-            config=config_path,
-            default_config=default_config_path,
-            sections_ignored_on_merge=[0],  # type: ignore
-            validate_data_types=False,
-            replace_dashes_with_underscores=True,
-        )
-
-
 def test_no_error_config_not_found() -> None:
     _ = pyya.init_config(config='missing.yaml', default_config=default_config_path)
 

tests/test_yaml.py

@@ -20,6 +20,8 @@ def test_default_setup() -> None:
     assert len(config.cache.servers) == 1
     assert len(config.admins) == 1
     assert config.cache.ttlSeconds == 500
+    assert config.errors[1] == 'error 1'
+    assert config.environments['prod-env'][1] == 'test'
 
 
 def test_convert_snake_case() -> None:

tests/testdata/default.config.yaml

@@ -57,5 +57,12 @@ environments:
       level: warn
     cache:
       ttl_seconds: 600
+    1: "test"
 
 flags: []
+
+errors:
+  1: "error 1"
+  2: "error 2"
+  3: "error 3"
+  4: "error 4"

tests/testdata/extra.yaml

@@ -19,3 +19,4 @@ database:
 
 extra:
   garbage: false
+  1: true