Merge pull request #32 from bhowiebkr/bug-fixing

Restructure project for better organization and Nuitka compilation

Author: bhowiebkr

.github/workflows/windows-build.yml

@@ -65,21 +65,22 @@ jobs:
 
       - name: Build app with Nuitka
         run: |
+          cd src
           python -m nuitka `
             --standalone `
             --enable-plugin=pyside6 `
             --include-qt-plugins=platforms `
-            --output-dir=NodeEditor_Build `
-            --include-package=src `
+            --output-dir=../NodeEditor_Build `
             --nofollow-import-to=tkinter,unittest,setuptools,pip,wheel `
             --windows-disable-console `
             --remove-output `
             --lto=yes `
-            --include-data-dir=examples=examples `
+            --include-data-dir=../examples=examples `
             --include-data-dir=resources=resources `
-            --include-data-file=dark_theme.qss=dark_theme.qss `
+            --include-data-file=../dark_theme.qss=dark_theme.qss `
             --assume-yes-for-downloads `
-            src/main.py
+            main.py
+          cd ..
 
       - name: Copy Python runtime after Nuitka build
         shell: pwsh

CLAUDE.md

@@ -6,6 +6,10 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co
 
 PyFlowGraph is a universal node-based visual scripting editor built with Python and PySide6. It allows users to create, connect, and execute Python code as nodes in a data-driven graph. The project follows a "Code as Nodes" philosophy where pins are automatically generated by parsing Python function signatures.
 
+# git and Github
+
+- Don't ever add that it was generated with claude at the end of comments. This is bloat! Stop that!
+
 ## Common Commands
 
 ### Running the Application
@@ -144,4 +148,4 @@ PyFlowGraph/
 - All nodes execute in isolated environments for security
 - Dependencies are managed via `requirements.txt` (PySide6, Nuitka for compilation)
 
-- Don't add claude attribution to git commits
+- Don't add claude attribution to git commits

pre-release/PyFlowGraph-Windows-v0.7.1.zip

@@ -25,11 +25,17 @@ if not exist "%PYTHON_SCRIPT%" (
     exit /b 1
 )
 
+rem Change to src directory so Python can find modules
+cd src
+
 rem Execute the python script.
 rem Any arguments passed to run.bat will be passed to main.py
 rem For example: run.bat arg1 arg2
-echo Running %PYTHON_SCRIPT%...
-python "%PYTHON_SCRIPT%" %*
+echo Running main.py from src directory...
+python main.py %*
+
+rem Return to original directory
+cd ..
 
 rem Deactivate the virtual environment after the script finishes.
 call deactivate

run.bat

@@ -31,11 +31,17 @@ if [ ! -f "$PYTHON_SCRIPT" ]; then
     exit 1
 fi
 
+# Change to src directory so Python can find modules
+cd src
+
 # Execute the python script.
 # Any arguments passed to run.sh will be passed to main.py
 # For example: ./run.sh arg1 arg2
-echo "Running $PYTHON_SCRIPT..."
-python "$PYTHON_SCRIPT" "$@"
+echo "Running main.py from src directory..."
+python main.py "$@"
+
+# Return to original directory
+cd ..
 
 # The script will automatically deactivate the venv when it exits.
 # You can also add 'deactivate' here if you have cleanup commands to run after.

run.sh

@@ -4,7 +4,7 @@
 
 from PySide6.QtWidgets import QDialog, QVBoxLayout, QDialogButtonBox, QTabWidget
 from PySide6.QtGui import QFont
-from .python_code_editor import PythonCodeEditor
+from python_code_editor import PythonCodeEditor
 
 
 class CodeEditorDialog(QDialog):

src/code_editor_dialog.py

@@ -2,9 +2,9 @@
 # Execution controller for managing batch and live mode execution
 
 from PySide6.QtWidgets import QPushButton, QLabel
-from .graph_executor import GraphExecutor
-from .event_system import LiveGraphExecutor
-from .ui_utils import ButtonStyleManager
+from graph_executor import GraphExecutor
+from event_system import LiveGraphExecutor
+from ui_utils import ButtonStyleManager
 
 
 class ExecutionController:

src/execution_controller.py

@@ -5,7 +5,7 @@
 import os
 from PySide6.QtWidgets import QFileDialog
 from PySide6.QtCore import QSettings
-from .flow_format import FlowFormatHandler, extract_title_from_filename
+from flow_format import FlowFormatHandler, extract_title_from_filename
 
 
 class FileOperationsManager:

src/file_operations.py

@@ -7,8 +7,8 @@
 import os
 import sys
 from collections import deque
-from .node import Node
-from .reroute_node import RerouteNode
+from node import Node
+from reroute_node import RerouteNode
 
 
 class GraphExecutor:

src/graph_executor.py

@@ -4,16 +4,10 @@
 
 import sys
 import os
-
-# Add project root to Python path so we can import from src
-project_root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-if project_root not in sys.path:
-    sys.path.insert(0, project_root)
-
 from PySide6.QtWidgets import QApplication
 from PySide6.QtCore import qInstallMessageHandler, QtMsgType
 from PySide6.QtGui import QFontDatabase
-from src.node_editor_window import NodeEditorWindow
+from node_editor_window import NodeEditorWindow
 
 
 def custom_message_handler(mode, context, message):
@@ -33,7 +27,7 @@ def custom_message_handler(mode, context, message):
     app = QApplication(sys.argv)
 
     # --- Load Font Awesome Regular ---
-    font_path_regular = os.path.join(os.path.dirname(os.path.dirname(__file__)), "resources", "Font Awesome 7 Free-Regular-400.otf")
+    font_path_regular = os.path.join(os.path.dirname(__file__), "resources", "Font Awesome 7 Free-Regular-400.otf")
     if os.path.exists(font_path_regular):
         font_id = QFontDatabase.addApplicationFont(font_path_regular)
         if font_id == -1:
@@ -44,7 +38,7 @@ def custom_message_handler(mode, context, message):
         print("Warning: Font Awesome Regular font file not found at 'resources/Font Awesome 7 Free-Regular-400.otf'", file=sys.stderr)
 
     # --- Load Font Awesome Solid ---
-    font_path_solid = os.path.join(os.path.dirname(os.path.dirname(__file__)), "resources", "Font Awesome 6 Free-Solid-900.otf")
+    font_path_solid = os.path.join(os.path.dirname(__file__), "resources", "Font Awesome 6 Free-Solid-900.otf")
     if os.path.exists(font_path_solid):
         font_id = QFontDatabase.addApplicationFont(font_path_solid)
         if font_id == -1:
@@ -56,7 +50,7 @@ def custom_message_handler(mode, context, message):
 
     # Load the dark theme stylesheet
     try:
-        with open(os.path.join(os.path.dirname(os.path.dirname(__file__)), "dark_theme.qss"), "r") as f:
+        with open("dark_theme.qss", "r") as f:
             style = f.read()
             app.setStyleSheet(style)
     except FileNotFoundError: