python: fix JGF writer properties

Problem: the Python JGF writer outputs properties as a list by
default, but the reader expects a mapping.

Change the default to a dictionary.

Author: jameshcorbett

src/python/fluxion/resourcegraph/V1.py

@@ -50,7 +50,7 @@ def __init__(
         exclusive -- Exclusivity
         unit -- Unit of this resource
         size -- Amount of individual resources in this resource pool in unit
-        properties -- Comma-separated list of property strings
+        properties -- mapping from property name to value
         paths -- Fully qualified paths dictionary
         status -- Resource status (0 for 'up', 1 for 'down'), defaults to 0
         """
@@ -127,31 +127,18 @@ def _extract_id_from_hn(self, hostName):
             rc = int(postfix[0])
         return rc
 
-    def _add_to_rankdict(self, key, gLabel, rankdict):
-        if key in rankdict:
-            rankdict[key].append(gLabel)
-        else:
-            rankdict[key] = [gLabel]
-
     def _contains_any(self, prop_str, charset):
         for c in charset:
             if c in prop_str:
                 return True
         return False
 
-    def _per_rank_property_dict(self, properties, rankdict):
-        for p in properties:
-            # This can be extended later to support scheduler specific
-            # string (@suffix)
-            if self._contains_any(p, "!&'\"^`|()"):
-                raise ValueError(f"invalid character used in property={p}")
-            self._add_to_rankdict("node", p, rankdict)
-
-    def _encode_child(self, ppid, hPath, rank, resType, i, rpd):
+    def _encode_child(self, ppid, hPath, rank, resType, i, properties):
         path = f"{hPath}/{resType}{i}"
-        properties = []
+        properties = {}
         # This can be extended later to support fine grained property
-        # attachment using rpd
+        # attachment using properties passed in from parent;
+        # for now, set empty properties
         vtx = FluxionResourcePoolV1(
             self._uniqId,
             resType,
@@ -169,14 +156,11 @@ def _encode_child(self, ppid, hPath, rank, resType, i, rpd):
         edg = FluxionResourceRelationshipV1(ppid, vtx.get_id())
         self._add_and_tick_uniq_id(vtx, edg)
 
-    def _encode_rank(self, ppid, rank, children, hList, rdict, rpd):
+    def _encode_rank(self, ppid, rank, children, hList, rdict, properties):
         if rdict[rank] >= len(hList):
             raise ValueError(f"nodelist doesn't include node for rank={rank}")
         hPath = f"/cluster0/{hList[rdict[rank]]}"
         iden = self._extract_id_from_hn(hList[rdict[rank]])
-        properties = []
-        if "node" in rpd:
-            properties = rpd["node"]
         vtx = FluxionResourcePoolV1(
             self._uniqId,
             "node",
@@ -195,14 +179,13 @@ def _encode_rank(self, ppid, rank, children, hList, rdict, rpd):
         self._add_and_tick_uniq_id(vtx, edg)
         for key, val in children.items():
             for i in IDset(val):
-                self._encode_child(vtx.get_id(), hPath, rank, str(key), i, rpd)
+                self._encode_child(vtx.get_id(), hPath, rank, str(key), i, properties)
 
     def _encode_rlite(self, ppid, entry, hList, rdict, pdict):
         for rank in list(IDset(entry["rank"])):
-            rpd = {}
-            if rank in pdict:
-                self._per_rank_property_dict(pdict[rank], rpd)
-            self._encode_rank(ppid, rank, entry["children"], hList, rdict, rpd)
+            self._encode_rank(
+                ppid, rank, entry["children"], hList, rdict, pdict.get(rank, {})
+            )
 
     def _encode(self):
         hList = Hostlist(self._rv1NoSched["execution"]["nodelist"])
@@ -217,7 +200,7 @@ def _encode(self):
             True,
             "",
             1,
-            [],
+            {},
             "/cluster0",
         )
         self._add_and_tick_uniq_id(vtx, None)
@@ -234,11 +217,13 @@ def _encode(self):
             props = self._rv1NoSched["execution"]["properties"]
         pdict = {}
         for p in props:
+            if self._contains_any(p, "!&'\"^`|()"):
+                raise ValueError(f"invalid character used in property={p}")
             for rank in list(IDset(props[p])):
                 if rank in pdict:
-                    pdict[rank].append(p)
+                    pdict[rank][p] = ""
                 else:
-                    pdict[rank] = [p]
+                    pdict[rank] = {p: ""}
 
         for entry in self._rv1NoSched["execution"]["R_lite"]:
             self._encode_rlite(vtx.get_id(), entry, hList, rdict, pdict)