Restructure to place adapters into subpackages.

Author: CodeReclaimers

.github/workflows/test.yml

@@ -30,13 +30,13 @@ jobs:
         run: ruff check .
 
       - name: Run type checker
-        run: mypy core --ignore-missing-imports
+        run: mypy morphe --ignore-missing-imports
 
       - name: Run tests
         run: pytest tests/ -v --ignore=tests/test_freecad_roundtrip.py
 
       - name: Run tests with coverage
-        run: pytest tests/ --cov=core --cov-report=xml --ignore=tests/test_freecad_roundtrip.py
+        run: pytest tests/ --cov=morphe --cov-report=xml --ignore=tests/test_freecad_roundtrip.py
 
   test-freecad:
     runs-on: ubuntu-latest

README.md

@@ -11,11 +11,11 @@ A CAD-agnostic 2D sketch geometry and constraint representation with adapter sup
 
 This project provides:
 
-- **`core`**: Platform-independent schema for 2D sketch geometry and constraints
-- **`adapter_freecad`**: Adapter for FreeCAD's Sketcher workbench
-- **`adapter_fusion`**: Adapter for Autodesk Fusion 360
-- **`adapter_solidworks`**: Adapter for SolidWorks (Windows only, via COM)
-- **`adapter_inventor`**: Adapter for Autodesk Inventor (Windows only, via COM)
+- **`morphe`**: Platform-independent schema for 2D sketch geometry and constraints
+- **`morphe.adapters.freecad`**: Adapter for FreeCAD's Sketcher workbench
+- **`morphe.adapters.fusion`**: Adapter for Autodesk Fusion 360
+- **`morphe.adapters.solidworks`**: Adapter for SolidWorks (Windows only, via COM)
+- **`morphe.adapters.inventor`**: Adapter for Autodesk Inventor (Windows only, via COM)
 
 The canonical format enables constrained sketches to be stored, transferred, and manipulated independently of any specific CAD system.
 
@@ -44,7 +44,7 @@ pip install pywin32
 ## Quick Start
 
 ```python
-from core import (
+from morphe import (
     SketchDocument, Point2D, Line, Circle, Horizontal, Radius,
     save_sketch, load_sketch
 )
@@ -66,8 +66,8 @@ sketch = load_sketch("my_sketch.json")
 ## FreeCAD Integration
 
 ```python
-from core import load_sketch
-from adapter_freecad import FreeCADAdapter
+from morphe import load_sketch
+from morphe.adapters.freecad import FreeCADAdapter
 
 sketch = load_sketch("my_sketch.json")
 adapter = FreeCADAdapter()
@@ -87,10 +87,10 @@ The Fusion 360 adapter runs as a script or add-in within Fusion 360:
 ```python
 # Run this inside Fusion 360's Scripts environment
 import sys
-sys.path.insert(0, r"path/to/morphe")
+sys.path.insert(0, r"path/to/morphe-repo")
 
-from core import load_sketch
-from adapter_fusion import FusionAdapter
+from morphe import load_sketch
+from morphe.adapters.fusion import FusionAdapter
 
 def run(context):
     sketch = load_sketch("my_sketch.json")
@@ -111,8 +111,8 @@ def run(context):
 The SolidWorks adapter uses COM automation via `pywin32` (Windows only):
 
 ```python
-from core import load_sketch
-from adapter_solidworks import SolidWorksAdapter, SOLIDWORKS_AVAILABLE
+from morphe import load_sketch
+from morphe.adapters.solidworks import SolidWorksAdapter, SOLIDWORKS_AVAILABLE
 
 if SOLIDWORKS_AVAILABLE:
     sketch = load_sketch("my_sketch.json")
@@ -146,8 +146,8 @@ if SOLIDWORKS_AVAILABLE:
 The Inventor adapter uses COM automation via `pywin32` (Windows only):
 
 ```python
-from core import load_sketch
-from adapter_inventor import InventorAdapter, INVENTOR_AVAILABLE
+from morphe import load_sketch
+from morphe.adapters.inventor import InventorAdapter, INVENTOR_AVAILABLE
 
 if INVENTOR_AVAILABLE:
     sketch = load_sketch("my_sketch.json")

SPECIFICATION.md

@@ -12,11 +12,13 @@ This document defines a CAD-agnostic representation for 2D sketch geometry and c
 
 ### 1.1 Project structure
 ```
-core/              # Core schema, validation, serialization (Python)
-adapter_freecad/   # FreeCAD adapter (Python, open source)
-adapter_solidworks/  # SolidWorks adapter (Python, Windows only via COM)
-adapter_inventor/    # Inventor adapter (Python, Windows only via COM)
-adapter_fusion/      # Fusion 360 adapter (Python, runs inside Fusion)
+morphe/                      # Main package
+  __init__.py                # Core schema, validation, serialization (Python)
+  adapters/
+    freecad/                 # FreeCAD adapter (Python, open source)
+    solidworks/              # SolidWorks adapter (Python, Windows only via COM)
+    inventor/                # Inventor adapter (Python, Windows only via COM)
+    fusion/                  # Fusion 360 adapter (Python, runs inside Fusion)
 ```
 
 Each adapter project has:

demo.py

@@ -29,7 +29,7 @@
 import sys
 from pathlib import Path
 
-from core import (
+from morphe import (
     Arc,
     Circle,
     Distance,
@@ -382,8 +382,8 @@ def export_to_freecad(doc: SketchDocument) -> None:
 import sys
 sys.path.insert(0, {repr(str(project_root))})
 
-from core import sketch_from_json
-from adapter_freecad import FreeCADAdapter
+from morphe import sketch_from_json
+from morphe.adapters.freecad import FreeCADAdapter
 import FreeCADGui
 
 # Load the sketch from JSON

demo_rpc.py

@@ -10,7 +10,7 @@
     2. In FreeCAD's Python console, run:
        >>> import sys
        >>> sys.path.insert(0, '/path/to/morphe')
-       >>> from adapter_freecad import start_server
+       >>> from morphe.adapters.freecad import start_server
        >>> start_server()
 
     3. Then run this script from the command line:
@@ -28,7 +28,7 @@
 import sys
 from pathlib import Path
 
-from adapter_freecad import FreeCADClient, check_server
+from morphe.adapters.freecad import FreeCADClient, check_server
 
 
 def print_status(client: FreeCADClient) -> None:
@@ -130,7 +130,7 @@ def main() -> None:
         formatter_class=argparse.RawDescriptionHelpFormatter,
         epilog="""
 To start the server in FreeCAD:
-    >>> from adapter_freecad import start_server
+    >>> from morphe.adapters.freecad import start_server
     >>> start_server()
         """,
     )
@@ -168,7 +168,7 @@ def main() -> None:
     if not check_server(args.host, args.port, timeout=2.0):
         print("\nError: Cannot connect to FreeCAD RPC server.")
         print("\nMake sure FreeCAD is running and the server is started:")
-        print("  >>> from adapter_freecad import start_server")
+        print("  >>> from morphe.adapters.freecad import start_server")
         print("  >>> start_server()")
         sys.exit(1)
 

core/__init__.py morphe/__init__.pycore/__init__.py renamed to morphe/__init__.py

@@ -6,7 +6,7 @@
 Inventor, Fusion 360).
 
 Example usage:
-    from core import (
+    from morphe import (
         SketchDocument, Point2D, Line, Arc, Circle, Ellipse, EllipticalArc, Spline,
         Coincident, Tangent, Horizontal, Radius,
         PointRef, PointType,

core/adapter.py morphe/adapter.pycore/adapter.py renamed to morphe/adapter.py

@@ -0,0 +1,14 @@
+"""
+Morphe CAD Adapters
+
+This package contains adapters for various CAD applications:
+- common: Shared client/server infrastructure
+- freecad: FreeCAD adapter
+- fusion: Autodesk Fusion 360 adapter
+- inventor: Autodesk Inventor adapter
+- solidworks: SolidWorks adapter
+"""
+
+from . import common, freecad, fusion, inventor, solidworks
+
+__all__ = ["common", "freecad", "fusion", "inventor", "solidworks"]

morphe/adapters/__init__.py

@@ -12,7 +12,7 @@
 import xmlrpc.client
 from typing import Any, ClassVar
 
-from core import SketchDocument, sketch_from_json, sketch_to_json
+from morphe import SketchDocument, sketch_from_json, sketch_to_json
 
 DEFAULT_HOST = "localhost"
 DEFAULT_TIMEOUT = 30.0  # Longer timeout for sketch operations