Matrix bridge working and effectively pushing messages

core/runtime/logs.py

@@ -15,6 +15,7 @@ def buildLog (action, outputs, response):
         print(f"{action.name} successful")
 
     elif action.showstatus is True and response.status_code != 200:
-        print(f"{action.name} failed")
+        print(f"{action.name} failed with status code {response.status_code}")
+        print(f"Response: {response.json()["error"]}")
 
     return

core/runtime/outputs.py

@@ -1,4 +1,4 @@
-def buildOutput(response, action, outputs):#, select_data):
+def buildOutput(response, action, outputs):
     #if select_data != "not applied":
         #response_data = select_data
     #else:

core/runtime/recursiveactions.py

@@ -8,26 +8,8 @@ def recursiveAction(definition, outputs):
 
         for job in recursiveset:
             outputs, response = buildAction(job, outputs)
-        #outputs[action.recursive["target"]] = item
 
         print(outputs["profile"])
         print(outputs["messages"])
     return outputs
 
-def recursiveActionStale(action, outputs):
-    #if hasattr(action, "recursive"):
-    #outputs[action.recursive["target"]] = {}
-    for item in outputs[action.recursive["source"]]:
-        #resolved = resolveItem(action, item)#, outputs)#, resolved)
-        #print("DEBUG Resolved value:", resolved)
-        #outputs[action.recursive["target"]] = outputs[action.recursive["source"]][][action.recursive["target"]]
-        #print(outputs[action.recursive["target"]])
-
-        #Target may be phased out here. its not quite necessary after resolve
-        outputs[action.recursive["target"]] = item
-
-        #print(outputs[action.recursive["target"]])
-        #target = outputs[action.recursive["source"]["target"]
-        outputs, response = buildAction(action, outputs)#, resolved)
-        #print(outputs)
-    return outputs

core/runtime/resolver.py

@@ -1,75 +1,11 @@
 def resolveItem(action, item):
     resolved = {}
     if hasattr(action, "resolve"):
-    #label = action.resolve["label"]
-    #targetkeys = action.resolve["targetkeys"]
-    #print(item)
-    #target = item
-    
-    #for key in targetkeys:
-    #    target = target[key]
-
-    #resolved[label] = target
-
         for label, keys in action.resolve.items():
             target = item
-            #print(item)
-        #print(target)
+
             for key in keys:
                 target = target[key]
 
             resolved[label] = target
-            #print(resolved[label])
-
-    return resolved
-    
-def resolveItem2(action, item, outputs):
-    #resolved = {}
-    label = action.resolve["label"]
-    targetkeys = action.resolve["targetkeys"]
-    #print(item)
-    target = item
-    
-    for key in targetkeys:
-        target = target[key]
-
-    #resolved[label] = target
-
-    #for label, keys in action.resolve.items():
-        #target = item
-
-        #print(target)
-        #for key in keys:
-            #target = target[key]
-
-        #resolved[label] = target
-        #print(resolved[label])
-
-    outputs[label] = target
-    #print("Resolver DEBUG", target, outputs[label])
-    return outputs
-
-def resolveItemBackup(action, item):
-    resolved = {}
-    if hasattr(action, "resolve"):
-    #label = action.resolve["label"]
-    #targetkeys = action.resolve["targetkeys"]
-    #print(item)
-    #target = item
-    
-    #for key in targetkeys:
-    #    target = target[key]
-
-    #resolved[label] = target
-
-        for label, keys in action.resolve.items():
-            target = item
-            #print(item)
-        #print(target)
-            for key in keys:
-                target = target[key]
-
-            resolved[label] = target
-            print(resolved[label])
-
     return resolved

core/runtime/select.py

@@ -28,7 +28,7 @@ def buildSelect(action, outputs):
             #print(select_data)            
 
             return select_data, action, outputs
-        except (KeyError, TypeError):
-            select_data = ["no selection"]
+        except: (KeyError, TypeError)
+            #select_data = ["no selection"]
     return select_data, action, outputs