TOML experiments for #28

nickzoic · nickzoic · commit 10974e822cdc · 2026-03-23T13:55:40.000+11:00
diff --git a/countess/core/config.py b/countess/core/config.py
@@ -5,13 +5,16 @@
 import re
 from configparser import ConfigParser
 
+from tomllib import load as toml_load
+from tomli_w import dump as toml_dump
+
 from countess.core.pipeline import PipelineGraph, PipelineNode
 from countess.core.plugins import load_plugin
 
 logger = logging.getLogger(__name__)
 
 
-def read_config_dict(name: str, base_dir: str, config_dict: dict) -> PipelineNode:
+def read_config_meta(name: str, config_dict: dict) -> PipelineNode:
     if "_module" in config_dict:
         module_name = config_dict["_module"]
         class_name = config_dict["_class"]
@@ -37,7 +40,7 @@ def read_config_dict(name: str, base_dir: str, config_dict: dict) -> PipelineNod
 
     # XXX check version and hash_digest and emit warnings.
 
-    node = PipelineNode(
+    return PipelineNode(
         name=name,
         uuid=config_dict.get("_uuid"),
         plugin=plugin,
@@ -46,11 +49,33 @@ def read_config_dict(name: str, base_dir: str, config_dict: dict) -> PipelineNod
         sort_column=int(sort[0]),
         sort_descending=bool(int(sort[1])),
     )
+
+
+def read_config_toml(filename: str) -> PipelineGraph:
+    base_dir = os.path.dirname(filename)
+    pipeline_graph  = PipelineGraph()
+    nodes_by_name : dict[str, PipelineNode] = {}
+    with open(filename, "rb") as fh:
+        doc = toml_load(fh)
+    for name, config_dict in doc.items():
+        node = read_config_meta(name, config_dict)
+        node.plugin.set_config({
+            k: v
+            for k, v in config_dict.items()
+            if not k.startswith("_")
+        }, base_dir)
+        for key, val in config_dict.items():
+            if key.startswith("_parent."):
+                node.add_parent(nodes_by_name[val])
+        pipeline_graph.nodes.append(node)
+        nodes_by_name[name] = node
+
+def read_config_dict(name: str, base_dir: str, config_dict: dict) -> PipelineNode:
+    node = read_config_meta(name, config_dict)
     for key, val in config_dict.items():
         if not key.startswith("_"):
             node.set_config(key, ast.literal_eval(val), base_dir)
-    return node
-
+        return node
 
 def read_config(
     filenames: list[str],
@@ -110,31 +135,53 @@ def write_config_node_string(node: PipelineNode, base_dir: str = ""):
     return buf.getvalue()
 
 
-def write_config_node(node: PipelineNode, cp: ConfigParser, base_dir: str):
-    cp.add_section(node.name)
+def get_config_meta(node: PipelineNode) -> dict[str, str]:
+    meta = { "_uuid": node.uuid }
+    if node.sort_column:
+        desc = 1 if node.sort_descending else 0
+        meta["_sort"] = "%d %d" % (node.sort_column, desc)
     if node.plugin:
-        cp[node.name].update(
-            {
-                "_uuid": node.uuid,
-                "_module": node.plugin.__module__,
-                "_class": node.plugin.__class__.__name__,
-                "_version": node.plugin.version,
-                "_hash": node.plugin.hash(),
-                "_sort": "%d %d" % (node.sort_column, 1 if node.sort_descending else 0),
-            }
-        )
+        meta.update({
+            "_module": node.plugin.__module__,
+            "_class": node.plugin.__class__.__name__,
+            "_version": node.plugin.version,
+            "_hash": node.plugin.hash(),
+        })
     if node.position:
         xx, yy = node.position
-        cp[node.name]["_position"] = "%d %d" % (xx * 1000, yy * 1000)
+        meta["_position"] = "%d %d" % (xx * 1000, yy * 1000)
     if node.notes:
-        cp[node.name]["_notes"] = node.notes
+        meta["_notes"] = node.notes
     for n, parent in enumerate(node.parent_nodes):
-        cp[node.name][f"_parent.{n}"] = parent.name
+        meta[f"_parent.{n}"] = parent.name
+    return meta
+
+
+def write_config_node(node: PipelineNode, cp: ConfigParser, base_dir: str):
+    cp.add_section(node.name)
+    if node.plugin:
+        cp[node.name].update(get_config_meta(node))
     if node.plugin:
         node.load_config()
         for k, v in node.plugin.get_parameters("", base_dir):
             cp[node.name][k] = repr(v)
 
+def make_config_toml_node(node: PipelineNode, base_dir: str = ""):
+    tab = get_config_meta(node)
+    node.load_config()
+    tab.update(node.plugin.get_config(base_dir))
+    return tab
+
+def make_config_toml(pipeline_graph: PipelineGraph, base_dir: str = ""):
+    return {
+        node.name: make_config_toml_node(node, base_dir)
+        for node in pipeline_graph.traverse_nodes()
+    }
+
+def write_config_toml(pipeline_graph: PipelineGraph, filename: str):
+    base_dir = os.path.dirname(filename)
+    with open(filename, "wb") as fh:
+        toml_dump(make_config_toml(pipeline_graph, base_dir), fh)
 
 def export_config_graphviz(pipeline_graph: PipelineGraph, filename: str):
     with open(filename, "w", encoding="utf-8") as fh:
diff --git a/countess/core/parameters.py b/countess/core/parameters.py
@@ -45,6 +45,17 @@ def copy_and_set_value(self, value):
         new.value = value
         return new
 
+    def copy_and_set_config(self, config, base_dir="."):
+        new = self.copy()
+        new.set_config(config, base_dir)
+        return new
+
+    def get_config(self, base_dir="."):
+        raise NotImplementedError(f"Implement {self.__class__.__name__}.get_config()")
+
+    def set_config(self, value, base_dir="."):
+        raise NotImplementedError(f"Implement {self.__class__.__name__}.set_config()")
+
     def get_parameters(self, key, base_dir="."):
         raise NotImplementedError(f"Implement {self.__class__.__name__}.get_parameters()")
 
@@ -82,6 +93,12 @@ def reset_value(self):
     def copy(self):
         return self.__class__(self.label, self._value)
 
+    def get_config(self, base_dir="."):
+        return self._value
+
+    def set_config(self, value, base_dir="."):
+        self._value = value
+
     def get_parameters(self, key, base_dir="."):
         return ((key, self.value),)
 
@@ -113,6 +130,12 @@ def reset_value(self, value: Any):
     def copy(self):
         return self.__class__(self.label, self._values)
 
+    def get_config(self, base_dir="."):
+        return self._values
+
+    def set_config(self, value, base_dir="."):
+        self._values = set(value)
+
     def get_parameters(self, key, base_dir="."):
         yield from ((f"{key}.{n}", v) for n, v in enumerate(self._values))
 
@@ -345,20 +368,24 @@ def set_base_dir(self, base_dir):
                 self.value = self.get_file_path()
         self.base_dir = base_dir
 
-    def get_parameters(self, key, base_dir="."):
-        if self.value:
-            try:
-                if base_dir:
-                    path = os.path.relpath(self.get_file_path(), base_dir)
-                else:
-                    path = os.path.abspath(self.get_file_path())
-            except ValueError:
-                # relpath can fail on Windows
-                path = self.get_file_path()
-        else:
-            path = None
+    def get_config(self, base_dir="."):
+        if not self.value:
+            return None
+        try:
+            if base_dir:
+                return os.path.relpath(self.get_file_path(), base_dir)
+            else:
+                return os.path.abspath(self.get_file_path())
+        except ValueError:
+            # relpath can fail on Windows
+            return self.get_file_path()
+
+    def set_config(self, value, base_dir="."):
+        self.value = value
+        self.set_base_dir(base_dir)
 
-        return [(key, path)]
+    def get_parameters(self, key, base_dir="."):
+        return [(key, self.get_config(base_dir))]
 
     def copy(self) -> "FileBaseParam":
         return self.__class__(self.label, self.value, file_types=self.file_types, base_dir=self.base_dir)
@@ -836,6 +863,16 @@ def __setattr__(self, name: str, value: None) -> None:
         else:
             super().__setattr__(name, value)
 
+    def get_config(self, base_dir="."):
+        return { k: v.get_config(base_dir) for k, v in self.params.items() }
+
+    def set_config(self, value, base_dir="."):
+        for k, v in value:
+            if k in self.params:
+                self.params[k].set_config(v, base_dir)
+            else:
+                logger.error("Unmatched Parameter Key %s", k)
+
     def get_parameters(self, key, base_dir=".") -> Iterable[Tuple[str, str]]:
         for subkey, param in self.params.items():
             yield from param.get_parameters(f"{key}.{subkey}" if key else subkey, base_dir)
@@ -951,6 +988,16 @@ def __contains__(self, item):
     def __iter__(self):
         return self.params.__iter__()
 
+    def get_config(self, base_dir="."):
+        return [ p.get_config(base_dir) for p in self.params ]
+
+    def set_config(self, value, base_dir="."):
+        self.params = [
+            self.copy_and_set_config(v, base_dir)
+            for v in value
+        ]
+        self.relabel()
+
     def get_parameters(self, key, base_dir="."):
         for n, p in enumerate(self.params):
             yield from p.get_parameters(f"{key}.{n}", base_dir)
diff --git a/countess/gui/main.py b/countess/gui/main.py
@@ -15,7 +15,7 @@
 from duckdb import DuckDBPyRelation
 
 from countess import VERSION
-from countess.core.config import config_to_graph, export_config_graphviz, graph_to_config, read_config, write_config
+from countess.core.config import config_to_graph, export_config_graphviz, graph_to_config, read_config, write_config, write_config_toml
 from countess.core.pipeline import PipelineGraph
 from countess.core.plugins import get_plugin_classes
 from countess.gui.config import PluginConfigurator
@@ -568,9 +568,12 @@ def config_save(self, filename=None):
             )
         if not filename:
             return
-        if not filename.endswith(".ini"):
-            filename = filename + ".ini"
-        write_config(self.graph, filename)
+        if filename.endswith(".toml"):
+            write_config_toml(self.graph, filename)
+        else:
+            if not filename.endswith(".ini"):
+                filename = filename + ".ini"
+            write_config(self.graph, filename)
         self.config_filename = filename
         self.config_changed = False
         self.update_title()
diff --git a/pyproject.toml b/pyproject.toml
@@ -29,6 +29,7 @@ dependencies = [
     'rapidfuzz~=3.13.0',
     'scipy~=1.15.3',
     'tkinterweb~=3.23.5',
+    'tomli-w~=1.2.0',
     'ttkthemes~=3.2.2',
     'typing_extensions~=4.14.0',
 ]

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ dependencies = [`
`29`	`29`	`'rapidfuzz~=3.13.0',`
`30`	`30`	`'scipy~=1.15.3',`
`31`	`31`	`'tkinterweb~=3.23.5',`
	`32`	`+ 'tomli-w~=1.2.0',`
`32`	`33`	`'ttkthemes~=3.2.2',`
`33`	`34`	`'typing_extensions~=4.14.0',`
`34`	`35`	`]`