refactor: revert to root-level package structure with proper imports and hacky pyproject.toml setup

.env

@@ -1,20 +0,0 @@
-# Environment configuration for Energy & Memory RAM Optimization RL Environment
-# OPTION A: Qwen/Qwen3.5-27B (Recommended for technical reasoning)
-#
-# Required Environment Variables:
-# - API_BASE_URL: The API endpoint for the LLM
-# - MODEL_NAME: The model identifier to use for inference
-# - HF_TOKEN: Your Hugging Face / API key
-# - LOCAL_IMAGE_NAME: The name of the local image to use for the environment (optional)
-
-# The API endpoint for the LLM
-API_BASE_URL=https://router.huggingface.co/v1
-
-# The model identifier to use for inference (Option A: Qwen for technical optimization)
-MODEL_NAME=Qwen/Qwen3.5-27B
-
-# Your Hugging Face / API key
-HF_TOKEN=
-
-# The name of the local image to use for the environment if using from_docker_image() method
-LOCAL_IMAGE_NAME=energy-optimization-rl

he_demo/__init__.py → __init__.py

@@ -6,9 +6,9 @@
 
 """Energy & Memory RAM Optimization Environment."""
 
-from he_demo.client import EnergyOptimizationEnv
-from he_demo.models import EnergyOptimizationAction, EnergyOptimizationObservation, Task
-from he_demo.task_graders import (
+from client import EnergyOptimizationEnv
+from models import EnergyOptimizationAction, EnergyOptimizationObservation, Task
+from task_graders import (
     TASK_GRADERS,
     get_grader,
     get_all_graders,
@@ -19,14 +19,14 @@ from he_demo.task_graders import (
     task_4_advanced_efficiency_grader,
     task_5_expert_optimization_grader,
 )
-from he_demo.task_registry import (
+from task_registry import (
     TASK_REGISTRY,
     get_all_tasks_with_graders,
     get_task_grader,
     get_tasks_count,
     is_grader_requirement_met,
 )
-from he_demo.grader_manifest import (
+from grader_manifest import (
     GRADERS_MANIFEST,
     get_graders_manifest,
     get_active_graders_count,

he_demo/client.py → client.py

@@ -12,7 +12,7 @@ from openenv.core import EnvClient
 from openenv.core.client_types import StepResult
 from openenv.core.env_server.types import State
 
-from .models import EnergyOptimizationAction, EnergyOptimizationObservation, Task, TaskSummary
+from models import EnergyOptimizationAction, EnergyOptimizationObservation, Task, TaskSummary
 
 
 class EnergyOptimizationEnv(

evaluate_inference.py

@@ -23,9 +23,9 @@ os.environ.setdefault("MODEL_NAME", "Qwen/Qwen2.5-72B-Instruct")
 os.environ.setdefault("LOCAL_SERVER_URL", "http://localhost:8000")
 
 # Import after setting environment variables
-from he_demo.client import EnergyOptimizationEnv
-from he_demo.models import EnergyOptimizationAction, EnergyOptimizationObservation
-from he_demo.task_graders import get_grader, get_grader_metadata, TASK_GRADERS
+from client import EnergyOptimizationEnv
+from models import EnergyOptimizationAction, EnergyOptimizationObservation
+from task_graders import get_grader, get_grader_metadata, TASK_GRADERS
 
 print("=" * 80)
 print("LLM INFERENCE EVALUATION SCRIPT")

gym_wrapper.py

@@ -9,18 +9,9 @@ import gymnasium as gym
 import numpy as np
 sys.path.insert(0, os.path.dirname(__file__))
 
-# Mock the he_demo package
-import types
-he_demo = types.ModuleType('he_demo')
+# Import from root level modules
 from models import EnergyOptimizationAction, EnergyOptimizationObservation, Task, TaskSummary
-he_demo.EnergyOptimizationAction = EnergyOptimizationAction
-he_demo.EnergyOptimizationObservation = EnergyOptimizationObservation
-he_demo.Task = Task
-he_demo.TaskSummary = TaskSummary
-sys.modules['he_demo'] = he_demo
-sys.modules['he_demo.models'] = he_demo
-
-from he_demo.server.he_demo_environment import EnergyOptimizationEnvironment
+from server.he_demo_environment import EnergyOptimizationEnvironment
 
 class EnergyOptimizationGymEnv(gym.Env):
     """Gym wrapper for the Energy Optimization Environment."""

inference.py

@@ -32,8 +32,8 @@ if TYPE_CHECKING:
 # Lazy imports - Only imported when needed to avoid hanging on startup
 # from openai import OpenAI, OpenAIError
 
-from he_demo.client import EnergyOptimizationEnv
-from he_demo.models import EnergyOptimizationAction, EnergyOptimizationObservation
+from client import EnergyOptimizationEnv
+from models import EnergyOptimizationAction, EnergyOptimizationObservation
 
 
 # Lazy OpenAI client initialization

inference_v2.py

@@ -27,8 +27,8 @@ from dataclasses import dataclass, asdict
 from datetime import datetime
 import statistics
 
-from he_demo.client import EnergyOptimizationEnv
-from he_demo.models import EnergyOptimizationObservation, EnergyOptimizationAction
+from client import EnergyOptimizationEnv
+from models import EnergyOptimizationObservation, EnergyOptimizationAction
 
 
 # ============================================================================

pyproject.toml

@@ -41,4 +41,6 @@ server = "he_demo.server.app:main"
 
 [tool.setuptools]
 include-package-data = true
-packages = ["he_demo", "he_demo.server"]
+package-dir = {"he_demo" = "."}
+py-modules = ["models", "client", "task_graders", "task_registry", "grader_manifest"]
+packages = ["server"]

{he_demo/server → server}/app.py

@@ -35,12 +35,17 @@ except Exception as e:  # pragma: no cover
         "openenv is required for the web interface. Install dependencies with '\n    uv sync\n'"
     ) from e
 
+import sys
+import os
+# Add parent directory to path so we can import root-level modules
+sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
+
 from fastapi import FastAPI
-from he_demo.models import EnergyOptimizationAction, EnergyOptimizationObservation
-from he_demo.server.he_demo_environment import EnergyOptimizationEnvironment
-from he_demo.task_graders import get_grader_metadata, TASK_GRADERS
-from he_demo.task_registry import get_all_tasks_with_graders, get_tasks_count, is_grader_requirement_met
-from he_demo.grader_manifest import get_graders_manifest, is_validator_satisfied
+from models import EnergyOptimizationAction, EnergyOptimizationObservation
+from .he_demo_environment import EnergyOptimizationEnvironment
+from task_graders import get_grader_metadata, TASK_GRADERS
+from task_registry import get_all_tasks_with_graders, get_tasks_count, is_grader_requirement_met
+from grader_manifest import get_graders_manifest, is_validator_satisfied
 
 
 # Create the app with web interface and README integration

{he_demo/server → server}/he_demo_environment.py

@@ -14,12 +14,17 @@ RAM usage and energy consumption through various optimization strategies.
 import random
 from typing import List
 from uuid import uuid4
+import sys
+import os
+
+# Add parent directory to path so we can import root-level modules
+sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
 
 from openenv.core.env_server.interfaces import Environment
 from openenv.core.env_server.types import State
 
-from he_demo.models import EnergyOptimizationAction, EnergyOptimizationObservation, Task, TaskSummary
-from he_demo.task_graders import TASK_GRADERS, get_grader, get_all_graders, get_grader_metadata
+from models import EnergyOptimizationAction, EnergyOptimizationObservation, Task, TaskSummary
+from task_graders import TASK_GRADERS, get_grader, get_all_graders, get_grader_metadata
 
 
 class EnergyOptimizationEnvironment(Environment):

he_demo/task_graders.py → task_graders.py

@@ -18,7 +18,7 @@ The graders are exposed through the TASK_GRADERS registry for easy discovery.
 """
 
 from typing import Callable, Dict, Any
-from he_demo.models import EnergyOptimizationObservation
+from models import EnergyOptimizationObservation
 
 
 # ============================================================================

he_demo/task_registry.py → task_registry.py

@@ -6,7 +6,7 @@ for easy discovery and validation.
 """
 
 from typing import Dict, Callable, Any
-from he_demo.task_graders import (
+from task_graders import (
     task_1_basic_ram_reduction_grader,
     task_2_energy_optimization_grader,
     task_3_balanced_optimization_grader,

test_environment.py

@@ -10,23 +10,9 @@ import os
 project_root = os.path.dirname(__file__)
 sys.path.insert(0, project_root)
 
-# Mock the he_demo package for testing
-import types
-he_demo = types.ModuleType('he_demo')
-
-# Import models and add to he_demo
+# Import from root level modules
 from models import EnergyOptimizationAction, EnergyOptimizationObservation, Task, TaskSummary
-he_demo.EnergyOptimizationAction = EnergyOptimizationAction
-he_demo.EnergyOptimizationObservation = EnergyOptimizationObservation
-he_demo.Task = Task
-he_demo.TaskSummary = TaskSummary
-
-# Add to sys.modules
-sys.modules['he_demo'] = he_demo
-sys.modules['he_demo.models'] = he_demo
-
-# Now import the environment
-from he_demo.server.he_demo_environment import EnergyOptimizationEnvironment
+from server.he_demo_environment import EnergyOptimizationEnvironment
 
 def test_environment():
     """Test the energy optimization environment."""

train_agent.py

@@ -10,17 +10,8 @@ import sys
 import os
 sys.path.insert(0, os.path.dirname(__file__))
 
-# Mock the he_demo package for direct testing
-import types
-he_demo = types.ModuleType('he_demo')
+# Import from root level modules
 from models import EnergyOptimizationAction, EnergyOptimizationObservation, Task, TaskSummary
-he_demo.EnergyOptimizationAction = EnergyOptimizationAction
-he_demo.EnergyOptimizationObservation = EnergyOptimizationObservation
-he_demo.Task = Task
-he_demo.TaskSummary = TaskSummary
-sys.modules['he_demo'] = he_demo
-sys.modules['he_demo.models'] = he_demo
-
 from gym_wrapper import EnergyOptimizationGymEnv
 from task_graders import TASK_GRADERS, get_grader_metadata
 from stable_baselines3 import PPO

validate.py

@@ -5,10 +5,10 @@ Final validation script for the Energy & Memory RAM Optimization Environment.
 Per hackathon requirements, this validation includes grader configuration verification.
 """
 
-# Import from properly structured he_demo package
-from he_demo.models import EnergyOptimizationAction, EnergyOptimizationObservation, Task, TaskSummary
-from he_demo.task_graders import TASK_GRADERS, get_grader_metadata, get_grader
-from he_demo.server.he_demo_environment import EnergyOptimizationEnvironment
+# Import models and graders from root level
+from models import EnergyOptimizationAction, EnergyOptimizationObservation, Task, TaskSummary
+from task_graders import TASK_GRADERS, get_grader_metadata, get_grader
+from server.he_demo_environment import EnergyOptimizationEnvironment
 
 def main():
     print("🔋 Energy & Memory RAM Optimization Environment - Final Validation")

validate_comprehensive.py

@@ -11,10 +11,10 @@ import os
 project_root = os.path.dirname(__file__)
 sys.path.insert(0, project_root)
 
-# Import from properly structured he_demo package
-from he_demo.models import EnergyOptimizationAction, EnergyOptimizationObservation, Task, TaskSummary
-from he_demo.task_graders import TASK_GRADERS, get_grader, get_grader_metadata
-from he_demo.server.he_demo_environment import EnergyOptimizationEnvironment
+# Import models and graders from root level
+from models import EnergyOptimizationAction, EnergyOptimizationObservation, Task, TaskSummary
+from task_graders import TASK_GRADERS, get_grader, get_grader_metadata
+from server.he_demo_environment import EnergyOptimizationEnvironment
 
 def create_observation(ram_usage, energy_consumption, steps_taken):
     """Helper to create observations for testing."""