space_manufactoring folder elimination

Dockerfile

@@ -74,21 +74,21 @@ WORKDIR /app
 # Copy the virtual environment from builder
 COPY --from=builder /app/env/.venv /app/.venv
 
-# Copy the environment code
+# Copy the flat package source (SpaceFactory/ root contains all .py modules)
 COPY --from=builder /app/env /app/env
 
-# Copy built frontend assets into expected location
+# Copy built frontend assets
 COPY --from=frontend-builder /app/frontend/dist /app/env/frontend/dist
 
 # Set PATH to use the virtual environment
 ENV PATH="/app/.venv/bin:$PATH"
 
-# Set PYTHONPATH so the space_manufacturing package is importable
+# All modules (env.py, models.py, server/, etc.) are directly under /app/env
 ENV PYTHONPATH="/app/env:$PYTHONPATH"
 
 # Health check
 HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 \
     CMD curl -f http://localhost:8000/health || exit 1
 
-# Run the FastAPI server
-CMD ["sh", "-c", "cd /app/env && uvicorn space_manufacturing.server.app:app --host 0.0.0.0 --port 8000"]
+# server/ is a sub-package of /app/env, importable as `server.app`
+CMD ["uvicorn", "server.app:app", "--host", "0.0.0.0", "--port", "8000"]

inference.py

@@ -27,7 +27,6 @@ Usage:
 from __future__ import annotations
 
 import asyncio
-import importlib.util
 import json
 import os
 import re
@@ -49,35 +48,16 @@ try:
 except Exception:  # pragma: no cover
     load_dotenv = None  # type: ignore[assignment]
 
-# ── package import with importlib fallback ─────────────────────────────────────
-try:
-    from space_manufacturing import (
-        EasyTask,
-        HardTask,
-        ManufacturingAction,
-        ManufacturingTaskEnv,
-        MediumTask,
-    )
-    from space_manufacturing.graders import ManufacturingTaskGrader
-    from space_manufacturing.models import ManufacturingObservation
-except ImportError:  # pragma: no cover — script executed directly from SpaceFactory/
-    _pkg_root = Path(__file__).resolve().parent
-    _spec = importlib.util.spec_from_file_location(
-        "space_manufacturing",
-        _pkg_root / "__init__.py",
-        submodule_search_locations=[str(_pkg_root)],
-    )
-    if _spec is None or _spec.loader is None:
-        raise
-    _sm = importlib.util.module_from_spec(_spec)
-    sys.modules["space_manufacturing"] = _sm
-    _spec.loader.exec_module(_sm)  # type: ignore[union-attr]
-    EasyTask = _sm.EasyTask
-    HardTask = _sm.HardTask
-    MediumTask = _sm.MediumTask
-    ManufacturingAction = _sm.ManufacturingAction
-    ManufacturingTaskEnv = _sm.ManufacturingTaskEnv
-    ManufacturingTaskGrader = _sm.ManufacturingTaskGrader  # type: ignore[attr-defined]
+# ── package imports ────────────────────────────────────────────────────────────
+# inference.py lives at the root of SpaceFactory/, so all sibling modules are
+# importable directly (no package prefix needed).
+from env import ManufacturingTaskEnv          # noqa: E402
+from graders import ManufacturingTaskGrader   # noqa: E402
+from models import (                           # noqa: E402
+    ManufacturingAction,
+    ManufacturingObservation,
+)
+from tasks import EasyTask, HardTask, MediumTask  # noqa: E402
     ManufacturingObservation = _sm.ManufacturingObservation  # type: ignore[attr-defined]
 
 if load_dotenv is not None:

pyproject.toml

@@ -14,7 +14,7 @@ dependencies = [
 ]
 
 [project.scripts]
-server = "space_manufacturing.server.app:main"
+server = "server.app:main"
 
 [build-system]
 requires = ["setuptools>=68", "wheel"]
@@ -22,4 +22,4 @@ build-backend = "setuptools.build_meta"
 
 [tool.setuptools.packages.find]
 where = ["."]
-include = ["space_manufacturing*"]
+include = ["server*"]

server/app.py

@@ -17,16 +17,9 @@ try:
 except ImportError as exc:
     raise SystemExit(f"FastAPI is required: pip install fastapi uvicorn\n{exc}") from exc
 
-sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", ".."))
-
-try:
-    from space_manufacturing.env import ManufacturingTaskEnv
-    from space_manufacturing.models import ManufacturingAction, ManufacturingObservation
-    from space_manufacturing.server.ui_demo import ManufacturingUIDemo
-except ImportError:
-    from ..env import ManufacturingTaskEnv  # type: ignore
-    from ..models import ManufacturingAction, ManufacturingObservation  # type: ignore
-    from .ui_demo import ManufacturingUIDemo  # type: ignore
+from .ui_demo import ManufacturingUIDemo
+from ..env import ManufacturingTaskEnv
+from ..models import ManufacturingAction, ManufacturingObservation
 
 # ── app ────────────────────────────────────────────────────────────────────────
 app = FastAPI(
@@ -213,7 +206,7 @@ def _fallback_html() -> str:
         f"Total reward: {s.total_reward:.2f} | Done: {s.done}</p>"
         f"<h2>Platforms</h2><ul>{platforms_html}</ul>"
         f"<p class='warn'>Frontend not built. Run: "
-        f"cd space_manufacturing/frontend &amp;&amp; npm install &amp;&amp; npm run build</p>"
+        f"cd frontend &amp;&amp; npm install &amp;&amp; npm run build</p>"
         f"</body></html>"
     )
 
@@ -227,7 +220,7 @@ def main() -> None:
     if sys.platform == "win32":
         asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
 
-    uvicorn.run("space_manufacturing.server.app:app", host="0.0.0.0", port=8000, reload=False)
+    uvicorn.run("server.app:app", host="0.0.0.0", port=8000, reload=False)
 
 
 if __name__ == "__main__":

server/ui_demo.py

@@ -3,27 +3,13 @@
 from __future__ import annotations
 
 import math
-import os
 import sys
 from threading import Lock
 from typing import Any, Dict, List
 
-_here = os.path.dirname(__file__)
-sys.path.insert(0, os.path.join(_here, "..", ".."))
-
-try:
-    from space_manufacturing.models import ManufacturingAction
-    from space_manufacturing.env import ManufacturingTaskEnv
-    from space_manufacturing.graders import ManufacturingTaskGrader
-except ImportError:
-    try:
-        from ..models import ManufacturingAction  # type: ignore
-        from ..env import ManufacturingTaskEnv  # type: ignore
-        from ..graders import ManufacturingTaskGrader  # type: ignore
-    except ImportError:
-        from models import ManufacturingAction  # type: ignore
-        from env import ManufacturingTaskEnv  # type: ignore
-        from graders import ManufacturingTaskGrader  # type: ignore
+from ..models import ManufacturingAction
+from ..env import ManufacturingTaskEnv
+from ..graders import ManufacturingTaskGrader
 
 
 # ── geometry helpers ───────────────────────────────────────────────────────────