From 0a822870528c29768149df32ca9c29b25c4fa2ac Mon Sep 17 00:00:00 2001
From: Maxim Gonchar <maxim.mg.gonchar@gmail.com>
Date: Tue, 25 Apr 2023 11:12:37 +0300
Subject: [PATCH] Squashed 'subtrees/dagflow/' changes from
a3693e304..e22b9679d
e22b9679d chore: clean labels usage in load_parameters
git-subtree-dir: subtrees/dagflow
git-subtree-split: e22b9679de467c9152a482ddd02bfcdc0aab687b
---
dagflow/bundles/load_parameters.py | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/dagflow/bundles/load_parameters.py b/dagflow/bundles/load_parameters.py
index f5e2bf3..b8fc01f 100644
--- a/dagflow/bundles/load_parameters.py
+++ b/dagflow/bundles/load_parameters.py
@@ -146,6 +146,9 @@ def get_label(key: tuple, labelscfg: dict) -> dict:
except KeyError:
continue
+ if not subkey and not 'text' in lcfg:
+ break
+
sidx = '.'.join(key[n-1:])
return {k: v.format(sidx) for k, v in lcfg.items()}
@@ -207,13 +210,15 @@ def load_parameters(acfg):
key_general_str = '.'.join(key_general)
varcfg.setdefault(state, True)
+ label_general = varcfg['label']
+
normpars_i = normpars.setdefault(key_general[0], [])
for subkey in subkeys:
key = key_general + subkey
key_str = '.'.join(key)
subkey_str = '.'.join(subkey)
- label = varcfg['label'].copy()
+ varcfg['label'] = (label := label_general.copy())
label['key'] = key_str
label.setdefault('text', key_str)
--
GitLab