From dc33aca6a027458bd6e3330a14e10e627bb06e8e Mon Sep 17 00:00:00 2001
From: Nicole Rappe <nicole.rappe@bunny-lab.io>
Date: Mon, 24 Feb 2025 18:33:04 -0700
Subject: [PATCH] Dynamically create context menu sub-folders based on folder
 structure of nodes.

---
 .../data_collector.cpython-312.pyc            | Bin 9878 -> 9878 bytes
 .../__pycache__/data_manager.cpython-312.pyc  | Bin 2415 -> 3596 bytes
 Modules/data_collector.py                     |   6 +-
 Modules/data_manager.py                       |  39 +++++-
 Nodes/{ => Experimental}/blueprint_node.py    |   0
 ...lyff_character_status_node.cpython-312.pyc | Bin 5132 -> 5132 bytes
 ...ff_leveling_predictor_node.cpython-312.pyc | Bin 6684 -> 6684 bytes
 .../{ => General Purpose}/comparison_node.py  |   0
 Nodes/{ => General Purpose}/data_node.py      |   0
 .../math_operation_node.py                    |   0
 borealis.py                                   | 116 +++++++-----------
 11 files changed, 82 insertions(+), 79 deletions(-)
 rename Nodes/{ => Experimental}/blueprint_node.py (100%)
 rename Nodes/{ => General Purpose}/comparison_node.py (100%)
 rename Nodes/{ => General Purpose}/data_node.py (100%)
 rename Nodes/{ => General Purpose}/math_operation_node.py (100%)

diff --git a/Modules/__pycache__/data_collector.cpython-312.pyc b/Modules/__pycache__/data_collector.cpython-312.pyc
index d93ef5815407ab047c4b5afb35e2ce319a191d31..9d4d97e2cc1247359324e28f0abc58b01a666bc3 100644
GIT binary patch
delta 189
zcmbQ{JI$B(G%qg~0}vEk+LXR?BX64sD^m(n4Z~zcNtwx8L^g2;0_BRBfW%AI$%Ue)
zxRqxVFL1mptah1CeX^UFCpYtg;1!COC3UWF=x&}RX3fZ0w)vX)ejqh@nxqP6IZ)#*
z#>}Fs&4(rbu`!l!KBRDsNwOX&s>xK812Q@r!p;M+%O`JCo+w%kVwQo3HV`opL`>cs
Uu42r{SUb5}HI{M7<d>>z0nj@)umAu6

delta 189
zcmbQ{JI$B(G%qg~0}vD+-;|!bk+)5Rl`(~}hG8<Jq|D?kBAd9GfO18FAi{5Qq39`Y
z#TkJMm@f;fT;@}q>?Y>P&A7mDLGooutt%Ybn`enxGcuNLz9zmONKKw5slr(X)Od?A
zv#4_OVab1NjAfe-DO_WctOJT_G8N^3OwER{^FZvf$s3g?idKP`r68geL`(n?lQxH|
T7&9`~Ozu{VWn4V@rRrJ$M0hs9

diff --git a/Modules/__pycache__/data_manager.cpython-312.pyc b/Modules/__pycache__/data_manager.cpython-312.pyc
index 16fcb0f8bb21fb29c085e1b10015d5bb308615f7..22b6786ef3efab878aac3ede8c3173df7d97de2f 100644
GIT binary patch
delta 1578
zcmcIk&rcIU6yDkG?vAvy-EDy)6$^=p1#Crx5aSOtA__4YF+qt*Q`uFjB4l=Jv@rn_
z4VoC0tcfOa=uzZI{0BUE@dBy8(r`51)IvRZ^1ba3TjgS+)6Cbm^Sw9yzV4g(rrr;_
z-_+LDa4`D%UtT;<=iC8aBXipy&pl{p*tAHH;W(}4Hn&&^xluP#&NAhypgc&`mMM1y
z<prwCQ>MHXl%grOxlvV90ezYe(69Lc>u!*6-Q33?WWmai6VpBr&;-*^0A{%FHJr=$
zxYyc~aW*eIni;O998vxH)EGqNAwnd;%<lqt!kI-!;E9;HZjX{TjWoh@f|O(qb74NU
zwI&4P)U<9U*;ONCj_aZRGbck@+>A$Tin*YOxe>ewsD!BiSsB#C;!_D$2T!dq4Kz^H
z{-}Sx_t~DbzS7jO?AwuXMwT6sf(s!!{-+7ab}?vOCN0wiog3)qQNJe4^A!#pspf)%
z3Ij*0^h;30WPmWw%JGJVq;d2!nqUo>4Kv>cP&Bk!-)vn<2UqGNtNx%h_%yZRZ(9=u
zzm(?$mz?7SQ7-wL_|xCNw0FG99tDYP6AI>8Io{ab1lrq~V4ESk3(Eosc54aI3;$R2
zkt)%6CYcieM3>`@MPESCN`eI;dmok+L@yoUorKCeBlgD{5klVT_GGQrtkAk;2uciW
z*BNe=Iv>jS<VR=Ir|-(|Xd6?k*Fw(-c5arK1`pq%P@%QGh8brjHh0X>*)^RpY=;4u
z2Byz&>y(J?pQ!SI23BYwEj&N`mUhk@{OAy82W}1AImVQwVTVdQ_{+>wf|Hghb`!;V
zA-?jq<6;NG4uq(6Q)=|v=ZYG-8N&m}b^~+PT97)R=DqZJsJbRAC8r=wXHiHCldNk(
zH(6rLh-ry2)4;2s=%%)`VeEYJ%4OCIOx%)bC&gDEu4mh<J{pm18SR!yJI}SidRAnU
zN!T1OCi{fjr^4<X`(4=oNWmJ)w0HgehM;>VCbi@heLp(@DX7T!YJH)J>70w>#o5MN
zjdy!8L|x+@B$^jE-j~DZ7ulU5${H^d8A&yVQBEyY{w=w#%EXOOx9(OY63BZ2?C$>w
Dt;{iN

delta 488
zcmY+AF;Buk6vul_phs!T(I7%Z1q{Y25;39+aW-Laa!?0?lqeB`xweB&48}+_0dkHG
zegG%kHF0%zDb6kq#=1HAu89M8x!>Krd+-0=z3bGMuDz<NEWr5gKO9~JhFU_r7lsQr
zDKm5~>}jS9jF@2{F%@9+6d5WTpkHLLD{&j?Y$VPg^0*reBRN!D-6*WUEV7oACJ~UO
zgd@t4V7F3sdLE9J4(JN+INX<d(qRA2zLef@o)R{a)=2^$U1VD#?CCU(vJ8&LX5o^B
zWpQ)`52L^`tKbx*KEgVR_!%^KqZ~`D7b+pbo<lDr!;L(O&T-_}P)^3UyNj)cT{UZV
zjV{7<jXlYEi20O1D&sM3&^ZCO2F-z+fn25CuxYbyRn2DIwh$PhN-n7W3sw)D)-f%B
zt;|wN5%VS(I-O!WN+IZ%kzqZhxHZY60<`0RIPVGN-}Harm*gwZ@iw}+-0ql8tFcK-
d;LNjIXDqHZlb#|W&C?|`;pst?_#ptl{eL+aY8n6l

diff --git a/Modules/data_collector.py b/Modules/data_collector.py
index 9aa1598..1a041c4 100644
--- a/Modules/data_collector.py
+++ b/Modules/data_collector.py
@@ -113,15 +113,15 @@ class OCRRegionWidget(QWidget):
 
     def paintEvent(self, event):
         painter = QPainter(self)
-        pen = QPen(QColor(0, 0, 255))
-        pen.setWidth(3)
+        pen = QPen(QColor(255, 255, 0)) # COLOR OF THE BOX ITSELF
+        pen.setWidth(5) # WIDTH OF THE BOX BORDER
         painter.setPen(pen)
 
         # Draw main rectangle
         painter.drawRect(0, 0, self.width(), self.height())
 
         # Draw resize handles
-        painter.setBrush(QColor(0, 0, 255))
+        painter.setBrush(QColor(255, 255, 0)) # COLOR OF THE RESIZE HANDLES
         for handle in self._resize_handles():
             painter.drawRect(handle)
 
diff --git a/Modules/data_manager.py b/Modules/data_manager.py
index 72e9521..b07b4a5 100644
--- a/Modules/data_manager.py
+++ b/Modules/data_manager.py
@@ -31,12 +31,49 @@ def data_api():
     """
     return jsonify(get_data())
 
+@app.route('/exp')
+def exp_api():
+    """
+    Returns the EXP data.
+    """
+    return jsonify({"exp": get_data()["exp"]})
+
+@app.route('/hp')
+def hp_api():
+    """
+    Returns the HP data.
+    """
+    return jsonify({
+        "hp_current": get_data()["hp_current"],
+        "hp_total": get_data()["hp_total"]
+    })
+
+@app.route('/mp')
+def mp_api():
+    """
+    Returns the MP data.
+    """
+    return jsonify({
+        "mp_current": get_data()["mp_current"],
+        "mp_total": get_data()["mp_total"]
+    })
+
+@app.route('/fp')
+def fp_api():
+    """
+    Returns the FP data.
+    """
+    return jsonify({
+        "fp_current": get_data()["fp_current"],
+        "fp_total": get_data()["fp_total"]
+    })
+
 def start_api_server():
     """
     Starts the Flask API server in a separate daemon thread.
     """
     def run():
-        app.run(host="127.0.0.1", port=5000)
+        app.run(host="0.0.0.0", port=5000)  # Allows external connections
     t = threading.Thread(target=run, daemon=True)
     t.start()
 
diff --git a/Nodes/blueprint_node.py b/Nodes/Experimental/blueprint_node.py
similarity index 100%
rename from Nodes/blueprint_node.py
rename to Nodes/Experimental/blueprint_node.py
diff --git a/Nodes/Flyff/__pycache__/flyff_character_status_node.cpython-312.pyc b/Nodes/Flyff/__pycache__/flyff_character_status_node.cpython-312.pyc
index d98ebf349276b113c14be1755a0350290e73c735..cbe246a1b62117e54bde9ff60daa95d9045e42f8 100644
GIT binary patch
delta 19
ZcmeCt=+WRh&CAQh00b)UH*ztF001uY1V#V=

delta 19
ZcmeCt=+WRh&CAQh00gU!Z{%VU0RS;i1f&1}

diff --git a/Nodes/Flyff/__pycache__/flyff_leveling_predictor_node.cpython-312.pyc b/Nodes/Flyff/__pycache__/flyff_leveling_predictor_node.cpython-312.pyc
index c4f52993b93705f807cf6b209823be5d4f7c5b34..a75da59d80f24d0982d3f30251990bedad2ff577 100644
GIT binary patch
delta 19
ZcmbPZGRK7LG%qg~0}vR#-^e8-1pqTY1fc)`

delta 19
ZcmbPZGRK7LG%qg~0}xC*xsgjq3IH_U1mFMw

diff --git a/Nodes/comparison_node.py b/Nodes/General Purpose/comparison_node.py
similarity index 100%
rename from Nodes/comparison_node.py
rename to Nodes/General Purpose/comparison_node.py
diff --git a/Nodes/data_node.py b/Nodes/General Purpose/data_node.py
similarity index 100%
rename from Nodes/data_node.py
rename to Nodes/General Purpose/data_node.py
diff --git a/Nodes/math_operation_node.py b/Nodes/General Purpose/math_operation_node.py
similarity index 100%
rename from Nodes/math_operation_node.py
rename to Nodes/General Purpose/math_operation_node.py
diff --git a/borealis.py b/borealis.py
index f60d6c9..1d5dd20 100644
--- a/borealis.py
+++ b/borealis.py
@@ -11,12 +11,9 @@ from Qt import QtWidgets, QtCore, QtGui
 
 # ------------------------------------------------------------------
 # MONKEY-PATCH to fix "module 'qtpy.QtGui' has no attribute 'QUndoStack'"
-# OdenGraphQt tries to do QtGui.QUndoStack(self).
-# We'll import QUndoStack from QtWidgets and attach it to QtGui.
 try:
     from qtpy.QtWidgets import QUndoStack
     import qtpy
-    # Force QtGui.QUndoStack to reference QtWidgets.QUndoStack
     qtpy.QtGui.QUndoStack = QUndoStack
 except ImportError:
     print("WARNING: Could not monkey-patch QUndoStack. You may see an error if OdenGraphQt needs it.")
@@ -25,70 +22,42 @@ except ImportError:
 # Import your data_manager so we can start the Flask server
 from Modules import data_manager
 
-# --- BEGIN MONKEY PATCH FOR PIPE COLOR (Optional) ---
-# If you want custom pipe colors, uncomment this patch:
-"""
-try:
-    from OdenGraphQt.qgraphics.pipe import PipeItem
-
-    _orig_pipeitem_init = PipeItem.__init__
-
-    def _new_pipeitem_init(self, *args, **kwargs):
-        _orig_pipeitem_init(self, *args, **kwargs)
-        new_color = QtGui.QColor(29, 202, 151)
-        self._pen = QtGui.QPen(new_color, 2.0)
-        self._pen_dragging = QtGui.QPen(new_color, 2.0)
-
-    PipeItem.__init__ = _new_pipeitem_init
-
-except ImportError:
-    print("WARNING: Could not patch PipeItem color - OdenGraphQt.qgraphics.pipe not found.")
-"""
-# --- END MONKEY PATCH FOR PIPE COLOR ---
-
 # --- BEGIN ROBUST PATCH FOR QGraphicsScene.setSelectionArea ---
 _original_setSelectionArea = QtWidgets.QGraphicsScene.setSelectionArea
 
 def _patched_setSelectionArea(self, *args, **kwargs):
     """
     A robust patch that handles various call signatures for QGraphicsScene.setSelectionArea().
-    We try calling the original method with whatever arguments are provided.
-    If a TypeError occurs, we assume it was missing some arguments and re-call with defaults.
     """
     try:
-        # First, try the original call with the given arguments.
         return _original_setSelectionArea(self, *args, **kwargs)
     except TypeError:
-        # If a TypeError occurs, the caller likely used a minimal signature.
-        # We'll fallback to a known signature with default arguments.
         if not args:
-            raise  # If no args at all, we cannot fix it.
-
-        painterPath = args[0]  # QPainterPath
+            raise
+        painterPath = args[0]
         selection_op = QtCore.Qt.ReplaceSelection
         selection_mode = QtCore.Qt.IntersectsItemShape
         transform = QtGui.QTransform()
         return _original_setSelectionArea(self, painterPath, selection_op, selection_mode, transform)
 
 QtWidgets.QGraphicsScene.setSelectionArea = _patched_setSelectionArea
-# --- END ROBUST PATCH FOR QGraphicsScene.setSelectionArea ---
+# --- END PATCH ---
 
 from OdenGraphQt import NodeGraph, BaseNode
 
 def import_nodes_from_folder(package_name):
     """
-    Recursively import all modules from the given package
-    and return a list of classes that subclass BaseNode.
+    Recursively import all modules from the given package.
+    Returns a dictionary where keys are subfolder names, and values are lists of BaseNode subclasses.
     """
-    imported_nodes = []
+    nodes_by_category = {}
     package = importlib.import_module(package_name)
-    
-    # Get the root directory of the package
     package_path = package.__path__[0]
-    
+
     for root, _, files in os.walk(package_path):
         rel_path = os.path.relpath(root, package_path).replace(os.sep, '.')
         module_prefix = f"{package_name}.{rel_path}" if rel_path != '.' else package_name
+        category_name = os.path.basename(root)
 
         for file in files:
             if file.endswith(".py") and file != "__init__.py":
@@ -97,31 +66,27 @@ def import_nodes_from_folder(package_name):
                     module = importlib.import_module(module_name)
                     for name, obj in inspect.getmembers(module, inspect.isclass):
                         if issubclass(obj, BaseNode) and obj.__module__ == module.__name__:
-                            imported_nodes.append(obj)
+                            if category_name not in nodes_by_category:
+                                nodes_by_category[category_name] = []
+                            nodes_by_category[category_name].append(obj)
                 except Exception as e:
                     print(f"Failed to import {module_name}: {e}")
     
-    return imported_nodes
+    return nodes_by_category
 
 def make_node_command(graph, node_type_str):
     """
     Return a function that creates a node of the given type at the current cursor position.
-    For the Flyff Character Status Collector node, check if one already exists.
-    If so, schedule an error message to be shown.
-
-    Also ensure that node creation is delayed until after QApplication is up, to avoid
-    'QWidget: Must construct a QApplication before a QWidget' errors.
+    Ensures that only one FlyffCharacterStatusNode exists.
     """
     def real_create():
-        # Check if we are about to create a duplicate Character Status Collector node.
         if node_type_str.startswith("bunny-lab.io.flyff_character_status_node"):
             for node in graph.all_nodes():
                 if node.__class__.__name__ == "FlyffCharacterStatusNode":
-                    # Show error message about duplicates
                     QtWidgets.QMessageBox.critical(
                         None,
                         "Error",
-                        "Only one Flyff Character Status Collector node is allowed. If you added more, things would break (really) badly."
+                        "Only one Flyff Character Status Collector node is allowed."
                     )
                     return
         try:
@@ -131,68 +96,69 @@ def make_node_command(graph, node_type_str):
             QtWidgets.QMessageBox.critical(None, "Error", str(e))
 
     def command():
-        # If there's already a QApplication running, just create the node now.
         if QtWidgets.QApplication.instance():
             real_create()
         else:
-            # Otherwise, schedule the node creation for the next event cycle.
             QtCore.QTimer.singleShot(0, real_create)
 
     return command
 
 if __name__ == "__main__":
-    # Create the QApplication first
     app = QtWidgets.QApplication([])
 
-    # Start the Flask server from data_manager so /data is always available
+    # Start Flask API Server
     data_manager.start_api_server()
 
-    # Create the NodeGraph controller
-    # (the monkey-patch ensures NodeGraph won't crash if it tries QtGui.QUndoStack(self))
+    # Create the NodeGraph
     graph = NodeGraph()
     graph.widget.setWindowTitle("Project Borealis - Workflow Automation System")
 
     # Dynamically import custom node classes from the 'Nodes' package.
-    custom_nodes = import_nodes_from_folder("Nodes")
-    for node_class in custom_nodes:
-        graph.register_node(node_class)
+    custom_nodes_by_category = import_nodes_from_folder("Nodes")
 
-    # Add context menu commands for dynamic node creation.
+    # Register each node in its category
+    for category, node_classes in custom_nodes_by_category.items():
+        for node_class in node_classes:
+            graph.register_node(node_class)
+
+    # Create categorized context menu
     graph_context_menu = graph.get_context_menu("graph")
-    for node_class in custom_nodes:
-        node_type = f"{node_class.__identifier__}.{node_class.__name__}"
-        node_name = node_class.NODE_NAME
-        graph_context_menu.add_command(
-            f"Add {node_name}",
-            make_node_command(graph, node_type)
-        )
 
-    # Add a "Remove Selected Node" command to the graph context menu.
+    for category, node_classes in custom_nodes_by_category.items():
+        category_menu = graph_context_menu.add_menu(category)  # Create submenu for category
+        for node_class in node_classes:
+            node_type = f"{node_class.__identifier__}.{node_class.__name__}"
+            node_name = node_class.NODE_NAME
+            category_menu.add_command(
+                f"Create: {node_name}",
+                make_node_command(graph, node_type)
+            )
+
+    # Add a "Remove Selected Node" command
     graph_context_menu.add_command(
         "Remove Selected Node",
         lambda: [graph.remove_node(node) for node in graph.selected_nodes()] if graph.selected_nodes() else None
     )
 
     # Grid styling changes
-    # 1) Dark background color
     graph.set_background_color(20, 20, 20)  # Dark gray
-    # 2) Subdued grid color
     graph.set_grid_color(60, 60, 60)        # Gray grid lines
 
-    # Optionally, create a subtle gradient in the scene:
+    # Add gradient background
     scene = graph.scene()
     gradient = QtGui.QLinearGradient(0, 0, 0, 1)
     gradient.setCoordinateMode(QtGui.QGradient.ObjectBoundingMode)
-    gradient.setColorAt(0.0, QtGui.QColor(9, 44, 68))  # Very Top Gradient
-    gradient.setColorAt(0.3, QtGui.QColor(30, 30, 30)) # Middle Gradient
-    gradient.setColorAt(0.7, QtGui.QColor(30, 30, 30)) # Middle Gradient
-    gradient.setColorAt(1.0, QtGui.QColor(9, 44, 68))  # Very Bottom Gradient
+    gradient.setColorAt(0.0, QtGui.QColor(9, 44, 68))  
+    gradient.setColorAt(0.3, QtGui.QColor(30, 30, 30))
+    gradient.setColorAt(0.7, QtGui.QColor(30, 30, 30))
+    gradient.setColorAt(1.0, QtGui.QColor(9, 44, 68))  
     scene.setBackgroundBrush(QtGui.QBrush(gradient))
 
-    # Resize and show the graph widget.
+    # Resize and show the graph widget
     graph.widget.resize(1600, 900)
     graph.widget.show()
 
+    # Global update function
     def global_update():
         for node in graph.all_nodes():
             if hasattr(node, "process_input"):