toml-combine 0.2.0__tar.gz → 0.4.0__tar.gz

{toml_combine-0.2.0 → toml_combine-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: toml-combine
-Version: 0.2.0
+Version: 0.4.0
 Summary: A tool for combining complex configurations in TOML format.
 Author-email: Joachim Jablon <ewjoachim@gmail.com>
 License-Expression: MIT
@@ -131,8 +131,7 @@ list and use that name as a key. Also, yes, you'll loose ordering.
 When you call the tool either with the CLI or the lib (see both below), you will have to
 provide a mapping of the desired dimentions. These values will be compared to overrides
 to apply overrides when relevant. It's ok to omit some dimensions, corresponding
-overrides won't be selected. The mapping you pass is also returned in the output as a
-dict under the `dimensions` key.
+overrides won't be selected.
 
 By default, the output is `toml` though you can switch to `json` with `--format=json`
 
@@ -160,7 +159,6 @@ result = toml_combine.combine(config_file=config_file, environment="staging")
 
 print(result)
 {
-  "dimensions": {"environment": "staging"},
   "fruits": {"apple": {"color": "red"}, "orange": {"color": "orange"}}
 }
 ```
@@ -203,13 +201,10 @@ container.env.ENABLE_EXPENSIVE_MONITORING = false
 This produces the following configs:
 
 ```console
-$ uv run toml-combine example.toml --environment=production --service=frontend
+$ toml-combine example.toml --environment=production --service=frontend
 registry = "gcr.io/my-project/"
 service_account = "my-service-account"
 name = "service-frontend"
-[dimensions]
-environment = "production"
-service = "frontend"
 
 [container]
 image_name = "my-image-frontend"
@@ -220,9 +215,6 @@ $ toml-combine example.toml --environment=production --service=backend
 registry = "gcr.io/my-project/"
 service_account = "my-service-account"
 name = "service-backend"
-[dimensions]
-environment = "production"
-service = "backend"
 
 [container]
 image_name = "my-image-backend"
@@ -234,9 +226,6 @@ $ toml-combine example.toml --environment=staging --service=frontend
 registry = "gcr.io/my-project/"
 service_account = "my-service-account"
 name = "service-frontend"
-[dimensions]
-environment = "staging"
-service = "frontend"
 
 [container]
 image_name = "my-image-frontend"
@@ -247,9 +236,6 @@ $ toml-combine example.toml --environment=staging --service=backend
 registry = "gcr.io/my-project/"
 service_account = "my-service-account"
 name = "service-backend"
-[dimensions]
-environment = "staging"
-service = "backend"
 
 [container]
 image_name = "my-image-backend"
@@ -264,9 +250,6 @@ $ toml-combine example.toml --environment=dev --service=backend
 registry = "gcr.io/my-project/"
 service_account = "my-service-account"
 name = "service-backend"
-[dimensions]
-environment = "dev"
-service = "backend"
 
 [container]
 image_name = "my-image-backend"

{toml_combine-0.2.0 → toml_combine-0.4.0}/README.md

@@ -112,8 +112,7 @@ list and use that name as a key. Also, yes, you'll loose ordering.
 When you call the tool either with the CLI or the lib (see both below), you will have to
 provide a mapping of the desired dimentions. These values will be compared to overrides
 to apply overrides when relevant. It's ok to omit some dimensions, corresponding
-overrides won't be selected. The mapping you pass is also returned in the output as a
-dict under the `dimensions` key.
+overrides won't be selected.
 
 By default, the output is `toml` though you can switch to `json` with `--format=json`
 
@@ -141,7 +140,6 @@ result = toml_combine.combine(config_file=config_file, environment="staging")
 
 print(result)
 {
-  "dimensions": {"environment": "staging"},
   "fruits": {"apple": {"color": "red"}, "orange": {"color": "orange"}}
 }
 ```
@@ -184,13 +182,10 @@ container.env.ENABLE_EXPENSIVE_MONITORING = false
 This produces the following configs:
 
 ```console
-$ uv run toml-combine example.toml --environment=production --service=frontend
+$ toml-combine example.toml --environment=production --service=frontend
 registry = "gcr.io/my-project/"
 service_account = "my-service-account"
 name = "service-frontend"
-[dimensions]
-environment = "production"
-service = "frontend"
 
 [container]
 image_name = "my-image-frontend"
@@ -201,9 +196,6 @@ $ toml-combine example.toml --environment=production --service=backend
 registry = "gcr.io/my-project/"
 service_account = "my-service-account"
 name = "service-backend"
-[dimensions]
-environment = "production"
-service = "backend"
 
 [container]
 image_name = "my-image-backend"
@@ -215,9 +207,6 @@ $ toml-combine example.toml --environment=staging --service=frontend
 registry = "gcr.io/my-project/"
 service_account = "my-service-account"
 name = "service-frontend"
-[dimensions]
-environment = "staging"
-service = "frontend"
 
 [container]
 image_name = "my-image-frontend"
@@ -228,9 +217,6 @@ $ toml-combine example.toml --environment=staging --service=backend
 registry = "gcr.io/my-project/"
 service_account = "my-service-account"
 name = "service-backend"
-[dimensions]
-environment = "staging"
-service = "backend"
 
 [container]
 image_name = "my-image-backend"
@@ -245,9 +231,6 @@ $ toml-combine example.toml --environment=dev --service=backend
 registry = "gcr.io/my-project/"
 service_account = "my-service-account"
 name = "service-backend"
-[dimensions]
-environment = "dev"
-service = "backend"
 
 [container]
 image_name = "my-image-backend"

{toml_combine-0.2.0 → toml_combine-0.4.0}/tests/result.json

@@ -9,11 +9,6 @@
         "name": "frontend",
         "env": { "NEXT_PUBLIC_FOO": "baz" }
       }
-    },
-    "dimensions": {
-      "environment": "staging",
-      "stack": "next",
-      "type": "service"
     }
   },
   "staging-service-django-api": {
@@ -27,13 +22,7 @@
         "env": { "APP_FOO": "qux" }
       }
     },
-    "cloudsql_instance": "staging-postgres",
-    "dimensions": {
-      "environment": "staging",
-      "stack": "django",
-      "type": "service",
-      "service": "api"
-    }
+    "cloudsql_instance": "staging-postgres"
   },
   "staging-service-django-admin": {
     "registry": { "region": "us" },
@@ -46,13 +35,7 @@
         "env": { "APP_FOO": "qux", "APP_ID": 5678, "APP_ADMIN_ENABLED": true }
       }
     },
-    "cloudsql_instance": "staging-postgres",
-    "dimensions": {
-      "environment": "staging",
-      "stack": "django",
-      "type": "service",
-      "service": "admin"
-    }
+    "cloudsql_instance": "staging-postgres"
   },
   "staging-job-django-manage": {
     "registry": { "region": "us" },
@@ -65,13 +48,7 @@
         "command": ["./manage.py"]
       }
     },
-    "cloudsql_instance": "staging-postgres",
-    "dimensions": {
-      "environment": "staging",
-      "stack": "django",
-      "type": "job",
-      "job": "manage"
-    }
+    "cloudsql_instance": "staging-postgres"
   },
   "staging-job-django-special-command": {
     "registry": { "region": "us" },
@@ -86,13 +63,7 @@
         "args": ["special-command"]
       }
     },
-    "cloudsql_instance": "staging-postgres",
-    "dimensions": {
-      "environment": "staging",
-      "stack": "django",
-      "type": "job",
-      "job": "special-command"
-    }
+    "cloudsql_instance": "staging-postgres"
   },
   "production-service-next": {
     "registry": { "region": "us" },
@@ -104,11 +75,6 @@
         "service": { "min_scale": 1 }
       },
       "telemetry": { "enabled": true }
-    },
-    "dimensions": {
-      "environment": "production",
-      "stack": "next",
-      "type": "service"
     }
   },
   "production-service-django-api": {
@@ -122,13 +88,7 @@
         "env": { "APP_FOO": "bar" }
       }
     },
-    "cloudsql_instance": "production-postgres",
-    "dimensions": {
-      "environment": "production",
-      "stack": "django",
-      "type": "service",
-      "service": "api"
-    }
+    "cloudsql_instance": "production-postgres"
   },
   "production-service-django-admin": {
     "registry": { "region": "us" },
@@ -141,13 +101,7 @@
         "env": { "APP_FOO": "bar", "APP_ADMIN_ENABLED": true, "APP_ID": 1234 }
       }
     },
-    "cloudsql_instance": "production-postgres",
-    "dimensions": {
-      "environment": "production",
-      "stack": "django",
-      "type": "service",
-      "service": "admin"
-    }
+    "cloudsql_instance": "production-postgres"
   },
   "production-job-django-manage": {
     "registry": { "region": "us" },
@@ -160,13 +114,7 @@
         "command": ["./manage.py"]
       }
     },
-    "cloudsql_instance": "production-postgres",
-    "dimensions": {
-      "environment": "production",
-      "stack": "django",
-      "type": "job",
-      "job": "manage"
-    }
+    "cloudsql_instance": "production-postgres"
   },
   "production-job-django-special-command": {
     "registry": { "region": "us" },
@@ -181,12 +129,6 @@
         "args": ["special-command"]
       }
     },
-    "cloudsql_instance": "production-postgres",
-    "dimensions": {
-      "environment": "production",
-      "stack": "django",
-      "type": "job",
-      "job": "special-command"
-    }
+    "cloudsql_instance": "production-postgres"
   }
 }

{toml_combine-0.2.0 → toml_combine-0.4.0}/tests/test_combiner.py

@@ -75,7 +75,6 @@ def test_merge_configs__dicts_error():
                 "c": 3,
                 "d": {"e": {"h": {"i": {"j": 4}}}},
                 "g": 6,
-                "dimensions": {"env": "dev"},
             },
             id="no_matches",
         ),
@@ -87,7 +86,6 @@ def test_merge_configs__dicts_error():
                 "c": 30,
                 "d": {"e": {"h": {"i": {"j": 40}}}},
                 "g": 60,
-                "dimensions": {"env": "prod"},
             },
             id="single_match",
         ),
@@ -100,7 +98,6 @@ def test_merge_configs__dicts_error():
                 "d": {"e": {"h": {"i": {"j": 400}}}},
                 "f": 500,
                 "g": 6,
-                "dimensions": {"env": "staging"},
             },
             id="dont_override_if_match_is_more_specific",
         ),

{toml_combine-0.2.0 → toml_combine-0.4.0}/toml_combine/combiner.py

@@ -4,7 +4,7 @@ import copy
 import dataclasses
 from collections.abc import Mapping, Sequence
 from functools import partial
-from typing import Any
+from typing import Any, TypeVar
 
 from . import exceptions
 
@@ -89,7 +89,10 @@ def override_sort_key(
     return tuple(result)
 
 
-def merge_configs(a: Any, b: Any, /) -> Any:
+T = TypeVar("T", dict, list, str, int, float, bool)
+
+
+def merge_configs(a: T, b: T, /) -> T:
     """
     Recursively merge two configuration dictionaries, with b taking precedence.
     """
@@ -100,7 +103,7 @@ def merge_configs(a: Any, b: Any, /) -> Any:
         return b
 
     result = a.copy()
-    for key, b_value in b.items():
+    for key, b_value in b.items():  # type: ignore
         if a_value := a.get(key):
             result[key] = merge_configs(a_value, b_value)
         else:
@@ -183,4 +186,4 @@ def generate_for_mapping(
         if mapping_matches_override(mapping=mapping, override=override):
             result = merge_configs(result, override.config)
 
-    return {"dimensions": mapping, **result}
+    return result

{toml_combine-0.2.0 → toml_combine-0.4.0}/toml_combine/toml.py

@@ -22,6 +22,6 @@ def dumps(config: dict) -> str:
     # features. The easiest way to turn tomlkit objects into plain dicts and strings
     # is through a json round-trip.
     try:
-        return tomlkit.dumps(json.loads(json.dumps(config)))
+        return tomlkit.dumps(json.loads(json.dumps(config)), sort_keys=False)
     except tomlkit.exceptions.TOMLKitError as e:
         raise exceptions.TomlEncodeError from e