WID-100. Fix after rebase.

Author: popaula937

xircuits/handlers/component_parser.py

@@ -21,18 +21,18 @@
 # A good point in time to do that, would be when the python compilation step
 # gets refactored
 DEFAULT_COMPONENTS = {
-    1: { "name": "Get Hyper-parameter String Name", "returnType": "string"},
-    2: { "name": "Get Hyper-parameter Int Name", "returnType": "int"},
-    3: { "name": "Get Hyper-parameter Float Name", "returnType": "float"},
-    4: { "name": "Get Hyper-parameter Boolean Name", "returnType": "boolean"},
-    5: { "name": "Literal String", "returnType": "string"},
-    6:{ "name": "Literal Integer", "returnType": "int"},
-    7:{ "name": "Literal Float", "returnType": "float"},
-    8:{ "name": "Literal True", "returnType": "boolean"},
-    9:{ "name": "Literal False", "returnType": "boolean"},
-    10:{ "name": "Literal List", "returnType": "list"},
-    11:{ "name": "Literal Tuple", "returnType": "tuple"},
-    12:{ "name": "Literal Dict", "returnType": "dict"},
+    1: { "name": "Get Argument String Name", "returnType": "string","color":"lightpink"},
+    2: { "name": "Get Argument Integer Name", "returnType": "int","color":"blue"},
+    3: { "name": "Get Argument Float Name", "returnType": "float","color":"green"},
+    4: { "name": "Get Argument Boolean Name", "returnType": "boolean","color":"red"},
+    5: { "name": "Literal String", "returnType": "string","color":"lightpink"},
+    6:{ "name": "Literal Integer", "returnType": "int","color":"blue"},
+    7:{ "name": "Literal Float", "returnType": "float","color":"green"},
+    8:{ "name": "Literal True", "returnType": "boolean","color":"red"},
+    9:{ "name": "Literal False", "returnType": "boolean","color":"red"},
+    10:{ "name": "Literal List", "returnType": "list","color":"yellow"},
+    11:{ "name": "Literal Tuple", "returnType": "tuple","color":"purple"},
+    12:{ "name": "Literal Dict", "returnType": "dict","color":"orange"},
     # Comment this first since we don't use it
     # 1: { "name": "Math Operation", "returnType": "math"},
     # 2: { "name": "Convert to Aurora", "returnType": "convert"},
@@ -99,7 +99,8 @@ def get_components(self):
                 "header": GROUP_GENERAL,
                 "category": GROUP_GENERAL,
                 "variables": [],
-                "type": c["returnType"]
+                "type": c["returnType"],
+                "color": c.get('color') or None
             })
 
         default_paths = set(pathlib.Path(p).expanduser().resolve() for p in sys.path)
@@ -127,7 +128,6 @@ def get_components(self):
                     finally:
                         components.extend(chain.from_iterable(self.extract_components(f, directory, python_path) for f in python_files))
 
-
         components = list({(c["header"], c["task"]): c for c in components}.values())
         return components
 
@@ -176,28 +176,29 @@ def extract_component(self, node: ast.ClassDef, file_path, file_lines, python_pa
 
         is_arg = lambda n: isinstance(n, ast.AnnAssign) and \
                                            isinstance(n.annotation, ast.Subscript) and \
-                                           n.annotation.value.id in ('InArg', 'InCompArg', 'OutArg')
+                                           n.annotation.value.id in ['InArg', 'InCompArg', 'OutArg']
+
+        is_flow_arg = lambda n: isinstance(n, ast.AnnAssign) and \
+                                            isinstance(n.annotation, ast.Name) and \
+                                            n.annotation.id in ['BaseComponent']
 
         python_version = platform.python_version_tuple()
-        if int(python_version[1]) == 8:
-            variables = [
-                {
+
+        variables = []
+        for v in (node.body):
+            if is_flow_arg(v):
+                variables.append({
                     "name": v.target.id,
-                    "kind": v.annotation.value.id,
-                    "type": read_orig_code(v.annotation.slice.value, file_lines)
-                }
-                for v in node.body if is_arg(v)
-            ]
-        else:
-            variables = [
-                {
+                    "kind": v.annotation.id,
+                })
+                continue
+            elif is_arg(v):
+                variables.append({
                     "name": v.target.id,
                     "kind": v.annotation.value.id,
-                    # "type": ast.unparse(v.annotation.slice)
-                    "type": read_orig_code(v.annotation.slice, file_lines)
-                }
-                for v in node.body if is_arg(v)
-            ]
+                    "type": read_orig_code(v.annotation.slice.value if int(python_version[1]) == 8 else v.annotation.slice, file_lines)
+                })
+                continue
 
         docstring = ast.get_docstring(node)
         lineno = [

xircuits/handlers/components.py

@@ -1,4 +1,3 @@
-import json
 import tornado
 from jupyter_server.base.handlers import APIHandler
 from .component_parser import ComponentsParser