Add auth to control endpoints, sigmoid Farquhar transition

backend/api/routes/control.py

@@ -6,6 +6,7 @@ import logging
 
 from fastapi import APIRouter, Depends, HTTPException
 
+from backend.api.auth import optional_auth
 from backend.api.deps import get_datahub, get_redis_client
 from src.data.data_providers import DataHub
 
@@ -14,7 +15,7 @@ router = APIRouter()
 
 
 @router.get("/status")
-async def control_status():
+async def control_status(user: dict = Depends(optional_auth)):
     """Last ControlLoop tick result (stored in Redis by the worker)."""
     redis = get_redis_client()
     if redis:
@@ -25,7 +26,7 @@ async def control_status():
 
 
 @router.get("/plan")
-async def control_plan():
+async def control_plan(user: dict = Depends(optional_auth)):
     """Current day-ahead plan."""
     redis = get_redis_client()
     if redis:
@@ -36,17 +37,24 @@ async def control_plan():
     try:
         import json
         from config.settings import DAILY_PLAN_PATH
-        with open(DAILY_PLAN_PATH) as f:
+        from pathlib import Path
+
+        plan_path = Path(DAILY_PLAN_PATH)
+        if not plan_path.is_relative_to(plan_path.parent.parent):
+            raise HTTPException(status_code=400, detail="Invalid plan path")
+        with open(plan_path) as f:
             return json.load(f)
     except FileNotFoundError:
         return {"status": "waiting", "message": "No plan generated yet", "slots": []}
+    except HTTPException:
+        raise
     except Exception as exc:
         log.error("Failed to load plan from file: %s", exc)
         raise HTTPException(status_code=500, detail="Plan loading failed")
 
 
 @router.get("/budget")
-async def control_budget():
+async def control_budget(user: dict = Depends(optional_auth)):
     """Current energy budget state."""
     redis = get_redis_client()
     if redis:

src/models/farquhar_model.py

@@ -272,12 +272,22 @@ class FarquharModel:
         Ac, Aj, Rd = self._compute_rates(PAR, Tleaf, CO2, VPD, CWSI or 0.0)
         An = min(Ac, Aj) - Rd
 
-        if Tleaf < transition_temp:
+        # Smooth sigmoid transition (28–32°C) instead of hard threshold.
+        # rubisco_weight = 0 below 28°C, 1 above 32°C, sigmoid in between.
+        import math
+        _TRANSITION_WIDTH = 2.0  # °C half-width of sigmoid zone
+        rubisco_weight = 1.0 / (1.0 + math.exp(-(Tleaf - transition_temp) / (_TRANSITION_WIDTH / 2.5)))
+
+        if rubisco_weight < 0.3:
             state = "RuBP_Limited"
-            shading_helps = False
-        else:
+        elif rubisco_weight > 0.7:
             state = "Rubisco_Limited"
-            shading_helps = (Aj > Ac)
+        else:
+            state = "Transition"
+
+        # shading_helps is weighted: only meaningful when Rubisco-limited
+        # AND light is abundant relative to enzyme capacity (Aj > Ac)
+        shading_helps = rubisco_weight > 0.5 and (Aj > Ac)
 
         return float(max(0.0, An)), state, shading_helps