kpops 3.2.1__tar.gz → 3.2.2__tar.gz

{kpops-3.2.1 → kpops-3.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kpops
-Version: 3.2.1
+Version: 3.2.2
 Summary: KPOps is a tool to deploy Kafka pipelines to Kubernetes
 Home-page: https://github.com/bakdata/kpops
 License: MIT

{kpops-3.2.1 → kpops-3.2.2}/kpops/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "3.2.1"
+__version__ = "3.2.2"
 
 # export public API functions
 from kpops.cli.main import clean, deploy, destroy, generate, manifest, reset

{kpops-3.2.1 → kpops-3.2.2}/kpops/components/base_components/base_defaults_component.py

@@ -88,8 +88,6 @@ class BaseDefaultsComponent(DescConfigModel, ABC):
             tmp_self = cls(**values, enrich=False)
             values = tmp_self.model_dump(mode="json", by_alias=True)
             values = cls.substitute_in_component(tmp_self.config, **values)
-            # HACK: why is double substitution necessary for test_substitute_in_component
-            values = cls.substitute_in_component(tmp_self.config, **values)
             self.__init__(
                 enrich=False,
                 validate=True,

{kpops-3.2.1 → kpops-3.2.2}/kpops/utils/yaml.py

@@ -1,3 +1,4 @@
+import json
 from collections.abc import Mapping
 from pathlib import Path
 from typing import Any
@@ -44,14 +45,22 @@ def substitute(input: str, substitution: Mapping[str, Any] | None = None) -> str
     return ImprovedTemplate(input).safe_substitute(**prepare_substitution(substitution))
 
 
+def _diff_substituted_str(s1: str, s2: str):
+    """Compare 2 strings, raise exception if not equal.
+
+    :param s1: String to compare
+    :param s2: String to compare
+    :raises ValueError: An infinite loop condition detected. Check substitution variables.
+    """
+    if s1 != s2:
+        msg = "An infinite loop condition detected. Check substitution variables."
+        raise ValueError(msg)
+
+
 def substitute_nested(input: str, **kwargs) -> str:
     """Allow for multiple substitutions to be passed.
 
     Will make as many passes as needed to substitute all possible placeholders.
-    A ceiling is set to avoid infinite loops.
-
-    HINT: If :param input: is a ``Mapping`` that you converted into ``str``,
-    You can pass it as a string, and as a ``Mapping`` to enable self-reference.
 
     :Example:
 
@@ -63,26 +72,43 @@ def substitute_nested(input: str, **kwargs) -> str:
         }
     >>> input = "${a}, ${b}, ${c}, ${d}"
     >>> print("Substituted string: " + substitute_nested(input, **substitution))
-    0, 0, 0, 0
+    "0, 0, 0, 0"
 
     :param input: The raw input containing $-placeholders
     :param **kwargs: Substitutions
-    :raises Exception: An infinite loop condition detected. Check substitution variables.
+    :raises ValueError: An infinite loop condition detected. Check substitution variables.
     :return: Substituted input string
     """
     if not kwargs:
         return input
+    kwargs = substitute_in_self(kwargs)
     old_str, new_str = "", substitute(input, kwargs)
     steps = set()
     while new_str not in steps:
         steps.add(new_str)
         old_str, new_str = new_str, substitute(new_str, kwargs)
-    if new_str != old_str:
-        msg = "An infinite loop condition detected. Check substitution variables."
-        raise ValueError(msg)
+    _diff_substituted_str(new_str, old_str)
     return old_str
 
 
+def substitute_in_self(input: dict[str, Any]) -> dict[str, Any]:
+    """Substitute all self-references in mapping.
+
+    Will make as many passes as needed to substitute all possible placeholders.
+
+    :param input: Mapping containing $-placeholders
+    :raises ValueError: An infinite loop condition detected. Check substitution variables.
+    :return: Substituted input mapping as dict
+    """
+    old_str, new_str = "", substitute(json.dumps(input), input)
+    steps = set()
+    while new_str not in steps:
+        steps.add(new_str)
+        old_str, new_str = new_str, substitute(new_str, json.loads(new_str))
+    _diff_substituted_str(new_str, old_str)
+    return json.loads(old_str)
+
+
 def print_yaml(data: Mapping | str, *, substitution: dict | None = None) -> None:
     """Print YAML object with syntax highlighting.
 

{kpops-3.2.1 → kpops-3.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "kpops"
-version = "3.2.1"
+version = "3.2.2"
 description = "KPOps is a tool to deploy Kafka pipelines to Kubernetes"
 authors = ["bakdata <opensource@bakdata.com>"]
 license = "MIT"