* fix: lots of fixes and name refactoring * feat: Add workbench preferences * fix: MCP bridge status widget and just command fixes * fix(tests): Use the correct mesa-glx package * fix(ci): Add fontconfig to GUI test dependencies FreeCAD GUI was failing to start with: "Fontconfig error: Cannot load default config file: No such file" Added fontconfig and fonts-dejavu-core packages to the GUI test job dependencies to resolve the font configuration issue. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * refactor(addon): Extract path utilities into shared module Create path_utils.py module that consolidates duplicated path-finding logic from commands.py and InitGui.py: - get_addon_path(): Find addon directory with caching and fallbacks - get_icon_path(): Get full path to an icon file - get_icons_dir(): Get path to icons directory - get_workbench_icon(): Get path to workbench main icon This removes ~100 lines of duplicated code while preserving the same behavior including _addon_path_cache and all fallback methods. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * fix(addon): Prevent stale plugin state on startup failure The StartMCPBridgeCommand.Activated method could leave _mcp_plugin in a partially initialized state if FreecadMCPPlugin.start() failed after the plugin was instantiated. Changes: - Create plugin in a local variable first - Only assign to _mcp_plugin after start() succeeds - Explicitly clear _mcp_plugin and _running_config in exception handlers to ensure clean state for subsequent retry attempts Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * fix: Lot of broad improvements * fix(ci): Use blocking headless_server.py for GUI tests The GUI test was using startup_bridge.py which is non-blocking (designed for interactive use). For CI, even in GUI mode, we need the blocking headless_server.py that calls run_forever() to keep FreeCAD running. GUI features are still available since we use the 'freecad' executable instead of 'freecadcmd'. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * refactor(addon): Rename headless_server.py to blocking_bridge.py The old name was misleading because: - It works with both GUI (freecad) and headless (freecadcmd) modes - The key characteristic is that it BLOCKS with run_forever() New naming convention clarifies the difference: - blocking_bridge.py: Starts bridge and blocks (for CI, servers) - startup_bridge.py: Starts bridge and returns (for interactive GUI) Updated all references across: - GitHub workflow (macro-test.yaml) - Just commands (freecad.just) - Unit tests (test_addon_structure.py) - Documentation (5 files) - CLAUDE.md Also improved the script to detect GUI mode dynamically using FreeCAD.GuiUp and display the appropriate status message. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * fix(just): Remove erroneous rm of startup_bridge.py on error The startup script is now a permanent source file in the repository, not a generated temporary file. The rm -f would have deleted source code if FreeCAD wasn't found. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * fix: General improvements * fix: Lots of general fixes and only stable to PyPi * fix: small cleanup * fix: Small fixes and hopefully fixes the GUI tests * fix: Add proper library paths for FreeCAD GUI in CI - Create wrapper scripts instead of symlinks for AppImage binaries - Set LD_LIBRARY_PATH, QT_PLUGIN_PATH for GUI mode - Add diagnostic output to identify startup failures * fix: Use apprun for GUI tests in CI * fix: Improving Xvfb tests * fix: GUI tests worlk * chore: remove invalid --no-splash comments * fix: ARM64 architecture support and other fixes * fix: cleanup * test: just commands test suite * test: improve just command tests * fix: more general improvements * fix: more cleanup * fix: more updates * fix: small tweaks --------- Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
116 lines
3.9 KiB
Python
Executable File
116 lines
3.9 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
r"""Blocking FreeCAD MCP Bridge Server.
|
|
|
|
SPDX-License-Identifier: MIT
|
|
Copyright (c) 2025 Sean P. Kane (GitHub: spkane)
|
|
|
|
This script starts the MCP bridge server and blocks with run_forever().
|
|
It works with both FreeCAD GUI and FreeCADCmd (headless) modes.
|
|
|
|
Use this script when you need FreeCAD to keep running (CI, background servers).
|
|
For interactive GUI sessions, use startup_bridge.py instead (non-blocking).
|
|
|
|
Usage:
|
|
# Headless mode (no GUI features):
|
|
FreeCADCmd ~/.local/share/FreeCAD/Mod/FreecadRobustMCP/freecad_mcp_bridge/blocking_bridge.py
|
|
|
|
# GUI mode (full features including screenshots):
|
|
freecad ~/.local/share/FreeCAD/Mod/FreecadRobustMCP/freecad_mcp_bridge/blocking_bridge.py
|
|
|
|
# On macOS:
|
|
/Applications/FreeCAD.app/Contents/Resources/bin/freecadcmd \
|
|
~/Library/Application\ Support/FreeCAD/Mod/FreecadRobustMCP/freecad_mcp_bridge/blocking_bridge.py
|
|
|
|
Note: In headless mode (FreeCADCmd), GUI features like screenshots are not available.
|
|
For full functionality, run with FreeCAD GUI executable.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import os
|
|
import sys
|
|
from pathlib import Path
|
|
|
|
# Check if we're running inside FreeCAD
|
|
try:
|
|
import FreeCAD
|
|
|
|
print(f"FreeCAD version: {FreeCAD.Version()[0]}.{FreeCAD.Version()[1]}")
|
|
except ImportError:
|
|
print("ERROR: This script must be run with FreeCAD or FreeCADCmd.")
|
|
print("")
|
|
print("Usage:")
|
|
print(
|
|
" FreeCADCmd /path/to/FreecadRobustMCP/freecad_mcp_bridge/blocking_bridge.py"
|
|
)
|
|
print("")
|
|
print("On macOS (if workbench installed):")
|
|
print(" /Applications/FreeCAD.app/Contents/Resources/bin/freecadcmd \\")
|
|
print(
|
|
" ~/Library/Application\\ Support/FreeCAD/Mod/FreecadRobustMCP/"
|
|
"freecad_mcp_bridge/blocking_bridge.py"
|
|
)
|
|
print("")
|
|
print("On Linux (if workbench installed):")
|
|
print(
|
|
" freecadcmd ~/.local/share/FreeCAD/Mod/FreecadRobustMCP/"
|
|
"freecad_mcp_bridge/blocking_bridge.py"
|
|
)
|
|
sys.exit(1)
|
|
|
|
# Import the plugin server directly from the module file in the same directory
|
|
script_dir = str(Path(__file__).resolve().parent)
|
|
sys.path.insert(0, script_dir)
|
|
from bridge_utils import get_running_plugin # noqa: E402
|
|
from server import FreecadMCPPlugin # noqa: E402
|
|
|
|
# Check if bridge is already running (from auto-start in Init.py)
|
|
plugin = get_running_plugin()
|
|
|
|
if plugin is None:
|
|
# Get configuration from environment variables (with defaults)
|
|
try:
|
|
socket_port = int(os.environ.get("FREECAD_SOCKET_PORT", "9876"))
|
|
xmlrpc_port = int(os.environ.get("FREECAD_XMLRPC_PORT", "9875"))
|
|
except ValueError as e:
|
|
print(f"ERROR: Invalid port configuration: {e}")
|
|
print("FREECAD_SOCKET_PORT and FREECAD_XMLRPC_PORT must be integers.")
|
|
sys.exit(1)
|
|
|
|
# Create and run the plugin
|
|
plugin = FreecadMCPPlugin(
|
|
host="localhost",
|
|
port=socket_port, # JSON-RPC socket port
|
|
xmlrpc_port=xmlrpc_port, # XML-RPC port
|
|
enable_xmlrpc=True,
|
|
)
|
|
|
|
# Start the plugin
|
|
plugin.start()
|
|
|
|
# Print status messages with flush to ensure they appear immediately
|
|
# (FreeCAD's Python may have buffered stdout)
|
|
# Plugin is guaranteed non-None at this point (either from get_running_plugin or created above)
|
|
actual_xmlrpc_port = plugin.xmlrpc_port
|
|
actual_socket_port = plugin.socket_port
|
|
|
|
print("", flush=True)
|
|
print("=" * 60, flush=True)
|
|
gui_mode = "GUI" if FreeCAD.GuiUp else "headless"
|
|
print(f"MCP Bridge started in {gui_mode} mode!", flush=True)
|
|
print(f" - XML-RPC: localhost:{actual_xmlrpc_port}", flush=True)
|
|
print(f" - Socket: localhost:{actual_socket_port}", flush=True)
|
|
print("", flush=True)
|
|
if not FreeCAD.GuiUp:
|
|
print(
|
|
"Note: Screenshot and view features are not available in headless mode.",
|
|
flush=True,
|
|
)
|
|
print("Press Ctrl+C to stop.", flush=True)
|
|
print("=" * 60, flush=True)
|
|
print("", flush=True)
|
|
|
|
# Run forever (blocks until Ctrl+C)
|
|
# Plugin is guaranteed non-None at this point
|
|
plugin.run_forever()
|