Rename server/ to origami_server/ to avoid module name conflict with uvicorn.server

Dockerfile

@@ -11,4 +11,4 @@ COPY . /app
 
 EXPOSE 8000
 
-CMD ["uvicorn", "server.app:app", "--host", "0.0.0.0", "--port", "8000"]
+CMD ["uvicorn", "origami_server.app:app", "--host", "0.0.0.0", "--port", "8000"]

client.py

@@ -5,7 +5,7 @@ from typing import Any, Dict
 from openenv.core.client_types import StepResult
 from openenv.core.env_client import EnvClient
 
-from server.models import OrigamiAction, OrigamiObservation, OrigamiState
+from origami_server.models import OrigamiAction, OrigamiObservation, OrigamiState
 
 
 class OrigamiEnv(EnvClient[OrigamiAction, OrigamiObservation, OrigamiState]):

models.py

@@ -1,5 +1,5 @@
-"""Re-export models from server.models for OpenEnv client usage."""
+"""Re-export models from origami_server.models for OpenEnv client usage."""
 
-from server.models import OrigamiAction, OrigamiObservation, OrigamiState
+from origami_server.models import OrigamiAction, OrigamiObservation, OrigamiState
 
 __all__ = ["OrigamiAction", "OrigamiObservation", "OrigamiState"]

openenv.yaml

@@ -2,5 +2,5 @@ spec_version: 1
 name: origami_env
 type: space
 runtime: fastapi
-app: server.app:app
+app: origami_server.app:app
 port: 8000

pyproject.toml

@@ -18,7 +18,7 @@ dependencies = [
 ]
 
 [project.scripts]
-server = "server.app:main"
+server = "origami_server.app:main"
 
 [project.optional-dependencies]
 training = [

server/requirements.txt

@@ -1,6 +0,0 @@
-openenv-core>=0.2.1
-numpy>=1.24
-scipy>=1.10
-pydantic>=2.0
-fastapi>=0.100
-uvicorn>=0.22

tests/test_origami.py

@@ -3,12 +3,12 @@
 import numpy as np
 import pytest
 
-from server.engine.fold_parser import parse_fold, validate_fold
-from server.engine.shape_match import compute_shape_match
-from server.engine.simulate import simulate
-from server.environment import OrigamiEnvironment
-from server.models import OrigamiAction
-from server.tasks import TASKS, get_task, list_tasks
+from origami_server.engine.fold_parser import parse_fold, validate_fold
+from origami_server.engine.shape_match import compute_shape_match
+from origami_server.engine.simulate import simulate
+from origami_server.environment import OrigamiEnvironment
+from origami_server.models import OrigamiAction
+from origami_server.tasks import TASKS, get_task, list_tasks
 from training.reward import extract_fold_json, shape_match, valid_fold
 
 # --- Fixtures ---
@@ -239,7 +239,7 @@ class TestAPI:
     def client(self):
         from fastapi.testclient import TestClient
 
-        from server.app import app
+        from origami_server.app import app
 
         return TestClient(app)
 

training/reward.py

@@ -11,10 +11,10 @@ from typing import Any
 
 import numpy as np
 
-from server.engine.fold_parser import validate_fold
-from server.engine.shape_match import compute_shape_match
-from server.engine.simulate import simulate
-from server.tasks import get_task
+from origami_server.engine.fold_parser import validate_fold
+from origami_server.engine.shape_match import compute_shape_match
+from origami_server.engine.simulate import simulate
+from origami_server.tasks import get_task
 
 
 def extract_fold_json(response: str) -> dict | None:

training/train_grpo.py

@@ -55,7 +55,7 @@ def main():
     from trl import GRPOConfig, GRPOTrainer
     from unsloth import FastLanguageModel
 
-    from server.tasks import get_task
+    from origami_server.tasks import get_task
     from training.reward import shape_match, valid_fold
 
     task = get_task(args.task)