updated toml

.gitignore

@@ -3,4 +3,4 @@ __pycache__
 quantum_env
 *.pyc
 .env
-openenv_quantum_openenv_env.egg-info/
+*.egg-info/

__init__.py

@@ -6,9 +6,9 @@
 
 """Quantum Openenv Env Environment."""
 
-from .client import QuantumOpenenvEnv
-from .models import QuantumAction, QuantumObservation
-from .graders import grade_easy, grade_medium, grade_hard
+from client import QuantumOpenenvEnv
+from models import QuantumAction, QuantumObservation
+from graders import grade_easy, grade_medium, grade_hard
 
 __all__ = [
     "QuantumAction",

graders.py

@@ -8,7 +8,7 @@
 Standalone graders for the Quantum Circuit Optimization Environment.
 """
 
-from .models import QuantumObservation
+from models import QuantumObservation
 
 
 def grade_easy(observation: QuantumObservation) -> float:

openenv.yaml

@@ -1,22 +1,22 @@
 name: "quantum_circuit_optimizer"
 version: "0.1.0"
 description: "An OpenEnv environment for optimizing multi-qubit quantum circuits using RL/LLM agents."
-entrypoint: "quantum_openenv_env.server.quantum_openenv_env_environment:QuantumCircuitOptimizationEnvironment"
+entrypoint: "server.quantum_openenv_env_environment:QuantumCircuitOptimizationEnvironment"
 tasks:
   - id: "easy"
     name: "Easy Circuit Optimization"
     description: "2 qubits, single-qubit gates only."
     difficulty: "easy"
-    grader: "quantum_openenv_env:grade_easy"
+    grader: "graders:grade_easy"
     
   - id: "medium"
     name: "Medium Circuit Optimization"
     description: "4 qubits with basic CNOT/SWAP entanglement."
     difficulty: "medium"
-    grader: "quantum_openenv_env:grade_medium"
+    grader: "graders:grade_medium"
     
   - id: "hard"
     name: "Hard Circuit Optimization"
     description: "6 qubits with deep entanglement and complex blockades."
     difficulty: "hard"
-    grader: "quantum_openenv_env:grade_hard"
+    grader: "graders:grade_hard"

pyproject.toml

@@ -31,11 +31,12 @@ dev = [
 ]
 
 [project.scripts]
-# Server entry point - enables running via: uv run --project . server
-# or: python -m quantum_openenv_env.server.app
-server = "quantum_openenv_env.server.app:main"
+# Server entry point updated to match the standard layout
+server = "server.app:main"
 
 [tool.setuptools]
 include-package-data = true
-packages = ["quantum_openenv_env", "quantum_openenv_env.server"]
-package-dir = { "quantum_openenv_env" = ".", "quantum_openenv_env.server" = "server" }
+# We explicitly tell setuptools to package the 'server' folder 
+# and the standalone python scripts at the root level, without aliases.
+packages = ["server"]
+py-modules = ["client", "graders", "inference", "models"]

server/__init__.py

@@ -7,7 +7,7 @@
 """Quantum Openenv Env environment server components."""
 
 from .quantum_openenv_env_environment import QuantumCircuitOptimizationEnvironment
-from quantum_openenv_env.graders import grade_easy, grade_medium, grade_hard
+from graders import grade_easy, grade_medium, grade_hard
 
 __all__ = [
     "QuantumCircuitOptimizationEnvironment",

server/app.py

@@ -35,12 +35,8 @@ except Exception as e:  # pragma: no cover
         "openenv is required for the web interface. Install dependencies with '\n    uv sync\n'"
     ) from e
 
-try:
-    from models import QuantumAction, QuantumObservation
-    from .quantum_openenv_env_environment import QuantumCircuitOptimizationEnvironment
-except ModuleNotFoundError:
-    from models import QuantumAction, QuantumObservation
-    from server.quantum_openenv_env_environment import QuantumCircuitOptimizationEnvironment
+from models import QuantumAction, QuantumObservation
+from server.quantum_openenv_env_environment import QuantumCircuitOptimizationEnvironment
 
 
 # Create the app with web interface and README integration

server/quantum_openenv_env_environment.py

@@ -20,10 +20,8 @@ from uuid import uuid4
 from openenv.core.env_server.interfaces import Environment
 from openenv.core.env_server.types import State
 
-try:
-    from ..models import QuantumAction, QuantumGate, QuantumObservation
-except ImportError:
-    from models import QuantumAction, QuantumGate, QuantumObservation
+
+from models import QuantumAction, QuantumGate, QuantumObservation
 
 
 # ============================================================================
@@ -83,7 +81,7 @@ TASK_CONFIGS = {
 # Graders are now defined in ../graders.py
 
 # Exporting for inference.py and Hackathon Platform
-from quantum_openenv_env.graders import grade_easy, grade_medium, grade_hard
+from graders import grade_easy, grade_medium, grade_hard
 
 GRADERS = {
     "easy": grade_easy,