Fix circular import error in server/app.py

Dockerfile

@@ -1,21 +1,16 @@
 FROM python:3.11-slim
 
-# Create non-root user
-RUN useradd -m -u 1000 user
-USER user
-ENV PATH="/home/user/.local/bin:$PATH"
-
 WORKDIR /app
 
 # Copy requirements first
 COPY requirements.txt .
-RUN pip install --no-cache-dir --upgrade -r requirements.txt
+RUN pip install --no-cache-dir -r requirements.txt
 
 # Copy all files
-COPY --chown=user . /app
+COPY . .
 
 # Expose port 7860 (Hugging Face default)
 EXPOSE 7860
 
-# Run the server
+# Run the server directly from server.app
 CMD ["uvicorn", "server.app:app", "--host", "0.0.0.0", "--port", "7860"]

server/app.py

@@ -4,37 +4,8 @@ sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 from fastapi import FastAPI, HTTPException
 from fastapi.middleware.cors import CORSMiddleware
-from pydantic import BaseModel
-from typing import Optional, Dict, Any, List
-from enum import Enum
-from server.app import app as quant_gym_app
-
-
-app = quant_gym_app
-
-# Simple models for the API
-class ActionType(str, Enum):
-    GET_PRICE = "GET_PRICE"
-    GET_NEWS = "GET_NEWS"
-    BUY = "BUY"
-    SELL = "SELL"
-    BACKTEST = "BACKTEST"
-
-class AgentAction(BaseModel):
-    type: ActionType
-    symbol: Optional[str] = "AAPL"
-    amount: Optional[int] = 0
-    explanation: Optional[str] = None
-    strategy: Optional[str] = None
-
-class MarketObservation(BaseModel):
-    timestamp: str = ""
-    price: float = 150.0
-    balance: float = 10000.0
-    holdings: int = 0
-    portfolio_value: float = 10000.0
-    last_news: Optional[Dict[str, Any]] = None
-    backtest_results: Optional[Dict[str, float]] = None
+from models import AgentAction
+from server.environment import TradingEnvironment
 
 app = FastAPI(title="Quant-Gym", description="Financial Analysis Environment")
 
@@ -46,64 +17,7 @@ app.add_middleware(
     allow_headers=["*"],
 )
 
-# Simple environment state
-class SimpleEnv:
-    def __init__(self):
-        self.prices = [150, 152, 151, 153, 155, 154, 156, 158, 157, 159]
-        self.news = [
-            {"headline": "Apple announces new AI chip", "sentiment": "positive"},
-            {"headline": "Supply chain delays expected", "sentiment": "negative"},
-            {"headline": "Analysts raise price target", "sentiment": "positive"},
-            {"headline": "Market shows strong growth", "sentiment": "positive"},
-        ]
-        self.reset()
-    
-    def reset(self):
-        self.idx = 0
-        self.cash = 10000.0
-        self.shares = 0
-        return self._get_observation()
-    
-    def step(self, action: AgentAction):
-        # Move time forward
-        self.idx = min(self.idx + 1, len(self.prices) - 1)
-        price = self.prices[self.idx]
-        
-        if action.type == "BUY" and action.amount:
-            cost = price * action.amount
-            if cost <= self.cash:
-                self.cash -= cost
-                self.shares += action.amount
-        elif action.type == "SELL" and action.amount:
-            if action.amount <= self.shares:
-                self.cash += price * action.amount
-                self.shares -= action.amount
-        
-        return self._get_observation()
-    
-    def _get_observation(self):
-        price = self.prices[self.idx]
-        news_idx = self.idx % len(self.news)
-        
-        return MarketObservation(
-            timestamp=f"step_{self.idx}",
-            price=float(price),
-            balance=round(self.cash, 2),
-            holdings=self.shares,
-            portfolio_value=round(self.cash + self.shares * price, 2),
-            last_news=self.news[news_idx]
-        )
-    
-    def get_state(self):
-        obs = self._get_observation()
-        return {
-            "current_step": self.idx,
-            "total_steps": len(self.prices),
-            "observation": obs.dict(),
-            "tasks_completed": []
-        }
-
-env = SimpleEnv()
+env = TradingEnvironment()
 
 @app.get("/")
 def root():
@@ -128,7 +42,7 @@ def step(action: AgentAction):
 
 @app.get("/state")
 def get_state():
-    return env.get_state()
+    return env.state()
 
 @app.get("/tasks")
 def get_tasks():