Add model, GPU and prompt options

app.py

@@ -30,7 +30,7 @@ if not UI_TOKEN:
 
 
 # =============================================================================
-# Safe, predefined options exposed in the UI
+# Safe predefined options
 # =============================================================================
 
 MODEL_OPTIONS = {
@@ -40,16 +40,6 @@ MODEL_OPTIONS = {
     "qwen2.5-coder-32b": "Qwen/Qwen2.5-Coder-32B-Instruct",
 }
 
-# Replace these with your real second-parameter options.
-# This is intentionally a fixed allowlist.
-RUN_MODE_OPTIONS = {
-    "scan": "scan",
-    "summarize": "summarize",
-    "full": "full",
-}
-
-# Simple predefined operational commands.
-# These do not accept user free text.
 BASIC_COMMANDS = {
     "hostname": "Run hostname",
     "whoami": "Run whoami",
@@ -59,6 +49,10 @@ BASIC_COMMANDS = {
     "list_home": "List home directory",
 }
 
+PARAMETERIZED_COMMANDS = {
+    "run_paper_reader": "Run paper_reader with model, GPU count, and prompt",
+}
+
 
 # =============================================================================
 # Data model
@@ -79,7 +73,6 @@ class Job(BaseModel):
 
     # Parameters for run_paper_reader
     model: Optional[str] = None
-    run_mode: Optional[str] = None
     gpus: Optional[int] = None
     user_text: Optional[str] = None
 
@@ -96,9 +89,9 @@ jobs: dict[str, Job] = {}
 
 def verify_broker_token(x_broker_token: Optional[str]) -> None:
     """
-    Used by the Fury worker.
+    Used by the Fury worker and command-line API calls.
 
-    The worker sends:
+    Header:
         X-Broker-Token: BROKER_TOKEN
     """
     if x_broker_token != BROKER_TOKEN:
@@ -107,9 +100,10 @@ def verify_broker_token(x_broker_token: Optional[str]) -> None:
 
 def verify_ui_token(ui_token: Optional[str]) -> None:
     """
-    Used by the browser UI.
+    Used by browser form submissions.
 
-    The browser form sends the UI token as a form field.
+    Form field:
+        ui_token
     """
     if ui_token != UI_TOKEN:
         raise HTTPException(status_code=401, detail="Invalid UI token")
@@ -122,31 +116,30 @@ def validate_basic_command(command: str) -> None:
 
 def validate_paper_reader_args(
     model: str,
-    run_mode: str,
     gpus: int,
     user_text: str,
 ) -> None:
     if model not in MODEL_OPTIONS:
         raise HTTPException(status_code=400, detail=f"Model is not allowed: {model}")
 
-    if run_mode not in RUN_MODE_OPTIONS:
-        raise HTTPException(status_code=400, detail=f"Run mode is not allowed: {run_mode}")
-
     if gpus < 1 or gpus > 16:
         raise HTTPException(status_code=400, detail="GPUs must be between 1 and 16")
 
     if user_text is None:
-        raise HTTPException(status_code=400, detail="User text is required")
+        raise HTTPException(status_code=400, detail="Prompt is required")
 
     if len(user_text.strip()) == 0:
-        raise HTTPException(status_code=400, detail="User text cannot be empty")
+        raise HTTPException(status_code=400, detail="Prompt cannot be empty")
 
     if len(user_text) > 10_000:
-        raise HTTPException(status_code=400, detail="User text is too long; max 10,000 characters")
+        raise HTTPException(
+            status_code=400,
+            detail="Prompt is too long; max 10,000 characters",
+        )
 
 
 # =============================================================================
-# Health and API inspection
+# Health and inspection APIs
 # =============================================================================
 
 @app.get("/health")
@@ -164,9 +157,14 @@ def list_commands(x_broker_token: Optional[str] = Header(default=None)):
 
     return {
         "basic_commands": BASIC_COMMANDS,
-        "model_options": MODEL_OPTIONS,
-        "run_mode_options": RUN_MODE_OPTIONS,
-        "gpu_range": [1, 16],
+        "parameterized_commands": PARAMETERIZED_COMMANDS,
+        "paper_reader": {
+            "command": "run_paper_reader",
+            "model_options": MODEL_OPTIONS,
+            "gpu_range": [1, 16],
+            "default_gpus": 1,
+            "default_prompt": "hello",
+        },
     }
 
 
@@ -186,13 +184,8 @@ def home():
         for key, value in MODEL_OPTIONS.items()
     )
 
-    run_mode_options_html = "\n".join(
-        f'<option value="{escape(key)}">{escape(value)}</option>'
-        for key, value in RUN_MODE_OPTIONS.items()
-    )
-
     gpu_options_html = "\n".join(
-        f'<option value="{i}">{i}</option>'
+        f'<option value="{i}" {"selected" if i == 1 else ""}>{i}</option>'
         for i in range(1, 17)
     )
 
@@ -204,9 +197,6 @@ def home():
         if job.model:
             details.append(f"model={job.model}")
 
-        if job.run_mode:
-            details.append(f"run_mode={job.run_mode}")
-
         if job.gpus:
             details.append(f"gpus={job.gpus}")
 
@@ -214,7 +204,7 @@ def home():
             preview = job.user_text[:500]
             if len(job.user_text) > 500:
                 preview += "..."
-            details.append(f"user_text={preview}")
+            details.append(f"prompt={preview}")
 
         safe_details = escape("\n".join(details))
         safe_result = escape(job.result or "")
@@ -300,8 +290,9 @@ def home():
             </div>
 
             <div class="warning">
-                This UI does not allow arbitrary shell commands. It only submits predefined
-                command names and validated parameters. The Fury worker validates again locally.
+                This UI does not allow arbitrary shell commands.
+                It submits only predefined command names and validated parameters.
+                Fury validates the job again locally before execution.
             </div>
 
             <form method="post" action="/submit-basic">
@@ -323,7 +314,7 @@ def home():
             </form>
 
             <form method="post" action="/submit-paper-reader">
-                <h2>Run Paper Reader on Fury</h2>
+                <h2>run_paper_reader</h2>
 
                 <div>
                     <label><strong>UI token:</strong></label>
@@ -337,13 +328,6 @@ def home():
                     </select>
                 </div>
 
-                <div>
-                    <label><strong>Run mode:</strong></label>
-                    <select name="run_mode">
-                        {run_mode_options_html}
-                    </select>
-                </div>
-
                 <div>
                     <label><strong>Number of GPUs:</strong></label>
                     <select name="gpus">
@@ -352,16 +336,15 @@ def home():
                 </div>
 
                 <div>
-                    <label><strong>Free text to send to the LLM:</strong></label><br>
+                    <label><strong>Prompt to send to the LLM:</strong></label><br>
                     <textarea
                         name="user_text"
-                        rows="10"
-                        placeholder="Enter the text/question/instructions to send to the model..."
+                        rows="8"
                         required
-                    ></textarea>
+                    >hello</textarea>
                 </div>
 
-                <button type="submit">Submit paper reader job</button>
+                <button type="submit">Submit run_paper_reader job</button>
             </form>
 
             <p>
@@ -411,16 +394,14 @@ def submit_basic_from_ui(
 @app.post("/submit-paper-reader")
 def submit_paper_reader_from_ui(
     model: str = Form(...),
-    run_mode: str = Form(...),
-    gpus: int = Form(...),
-    user_text: str = Form(...),
+    gpus: int = Form(1),
+    user_text: str = Form("hello"),
     ui_token: str = Form(...),
 ):
     verify_ui_token(ui_token)
 
     validate_paper_reader_args(
         model=model,
-        run_mode=run_mode,
         gpus=gpus,
         user_text=user_text,
     )
@@ -431,7 +412,6 @@ def submit_paper_reader_from_ui(
         id=job_id,
         command="run_paper_reader",
         model=model,
-        run_mode=run_mode,
         gpus=gpus,
         user_text=user_text,
         status=JobStatus.queued,
@@ -467,16 +447,14 @@ def submit_basic_job_api(
 @app.post("/api/jobs/paper-reader")
 def submit_paper_reader_job_api(
     model: str = Form(...),
-    run_mode: str = Form(...),
-    gpus: int = Form(...),
-    user_text: str = Form(...),
+    gpus: int = Form(1),
+    user_text: str = Form("hello"),
     x_broker_token: Optional[str] = Header(default=None),
 ):
     verify_broker_token(x_broker_token)
 
     validate_paper_reader_args(
         model=model,
-        run_mode=run_mode,
         gpus=gpus,
         user_text=user_text,
     )
@@ -487,7 +465,6 @@ def submit_paper_reader_job_api(
         id=job_id,
         command="run_paper_reader",
         model=model,
-        run_mode=run_mode,
         gpus=gpus,
         user_text=user_text,
         status=JobStatus.queued,
@@ -497,7 +474,7 @@ def submit_paper_reader_job_api(
     return job
 
 
-# Backward-compatible endpoint for your previous add_job.sh.
+# Backward-compatible endpoint for simple jobs.
 @app.post("/api/jobs")
 def submit_job_legacy_api(
     command: str = Form(...),
@@ -534,7 +511,6 @@ def get_next_job(x_broker_token: Optional[str] = Header(default=None)):
                 "id": job.id,
                 "command": job.command,
                 "model": job.model,
-                "run_mode": job.run_mode,
                 "gpus": job.gpus,
                 "user_text": job.user_text,
             }