Change paper-reader to query_llm
Browse files
app.py
CHANGED
|
@@ -50,7 +50,7 @@ BASIC_COMMANDS = {
|
|
| 50 |
}
|
| 51 |
|
| 52 |
PARAMETERIZED_COMMANDS = {
|
| 53 |
-
"
|
| 54 |
}
|
| 55 |
|
| 56 |
|
|
@@ -71,7 +71,7 @@ class Job(BaseModel):
|
|
| 71 |
status: JobStatus = JobStatus.queued
|
| 72 |
result: Optional[str] = None
|
| 73 |
|
| 74 |
-
# Parameters for
|
| 75 |
model: Optional[str] = None
|
| 76 |
gpus: Optional[int] = None
|
| 77 |
user_text: Optional[str] = None
|
|
@@ -114,7 +114,7 @@ def validate_basic_command(command: str) -> None:
|
|
| 114 |
raise HTTPException(status_code=400, detail=f"Command is not allowed: {command}")
|
| 115 |
|
| 116 |
|
| 117 |
-
def
|
| 118 |
model: str,
|
| 119 |
gpus: int,
|
| 120 |
user_text: str,
|
|
@@ -158,8 +158,8 @@ def list_commands(x_broker_token: Optional[str] = Header(default=None)):
|
|
| 158 |
return {
|
| 159 |
"basic_commands": BASIC_COMMANDS,
|
| 160 |
"parameterized_commands": PARAMETERIZED_COMMANDS,
|
| 161 |
-
"
|
| 162 |
-
"command": "
|
| 163 |
"model_options": MODEL_OPTIONS,
|
| 164 |
"gpu_range": [1, 16],
|
| 165 |
"default_gpus": 1,
|
|
@@ -313,8 +313,8 @@ def home():
|
|
| 313 |
<button type="submit">Submit basic job</button>
|
| 314 |
</form>
|
| 315 |
|
| 316 |
-
<form method="post" action="/submit-
|
| 317 |
-
<h2>
|
| 318 |
|
| 319 |
<div>
|
| 320 |
<label><strong>UI token:</strong></label>
|
|
@@ -344,7 +344,7 @@ def home():
|
|
| 344 |
>hello</textarea>
|
| 345 |
</div>
|
| 346 |
|
| 347 |
-
<button type="submit">Submit
|
| 348 |
</form>
|
| 349 |
|
| 350 |
<p>
|
|
@@ -391,8 +391,8 @@ def submit_basic_from_ui(
|
|
| 391 |
return RedirectResponse("/", status_code=303)
|
| 392 |
|
| 393 |
|
| 394 |
-
@app.post("/submit-
|
| 395 |
-
def
|
| 396 |
model: str = Form(...),
|
| 397 |
gpus: int = Form(1),
|
| 398 |
user_text: str = Form("hello"),
|
|
@@ -400,7 +400,7 @@ def submit_paper_reader_from_ui(
|
|
| 400 |
):
|
| 401 |
verify_ui_token(ui_token)
|
| 402 |
|
| 403 |
-
|
| 404 |
model=model,
|
| 405 |
gpus=gpus,
|
| 406 |
user_text=user_text,
|
|
@@ -410,7 +410,7 @@ def submit_paper_reader_from_ui(
|
|
| 410 |
|
| 411 |
jobs[job_id] = Job(
|
| 412 |
id=job_id,
|
| 413 |
-
command="
|
| 414 |
model=model,
|
| 415 |
gpus=gpus,
|
| 416 |
user_text=user_text,
|
|
@@ -444,8 +444,8 @@ def submit_basic_job_api(
|
|
| 444 |
return job
|
| 445 |
|
| 446 |
|
| 447 |
-
@app.post("/api/jobs/
|
| 448 |
-
def
|
| 449 |
model: str = Form(...),
|
| 450 |
gpus: int = Form(1),
|
| 451 |
user_text: str = Form("hello"),
|
|
@@ -453,7 +453,7 @@ def submit_paper_reader_job_api(
|
|
| 453 |
):
|
| 454 |
verify_broker_token(x_broker_token)
|
| 455 |
|
| 456 |
-
|
| 457 |
model=model,
|
| 458 |
gpus=gpus,
|
| 459 |
user_text=user_text,
|
|
@@ -463,7 +463,7 @@ def submit_paper_reader_job_api(
|
|
| 463 |
|
| 464 |
job = Job(
|
| 465 |
id=job_id,
|
| 466 |
-
command="
|
| 467 |
model=model,
|
| 468 |
gpus=gpus,
|
| 469 |
user_text=user_text,
|
|
|
|
| 50 |
}
|
| 51 |
|
| 52 |
PARAMETERIZED_COMMANDS = {
|
| 53 |
+
"query_llm": "Query LLM with model, GPU count, and prompt",
|
| 54 |
}
|
| 55 |
|
| 56 |
|
|
|
|
| 71 |
status: JobStatus = JobStatus.queued
|
| 72 |
result: Optional[str] = None
|
| 73 |
|
| 74 |
+
# Parameters for query_llm
|
| 75 |
model: Optional[str] = None
|
| 76 |
gpus: Optional[int] = None
|
| 77 |
user_text: Optional[str] = None
|
|
|
|
| 114 |
raise HTTPException(status_code=400, detail=f"Command is not allowed: {command}")
|
| 115 |
|
| 116 |
|
| 117 |
+
def validate_query_llm_args(
|
| 118 |
model: str,
|
| 119 |
gpus: int,
|
| 120 |
user_text: str,
|
|
|
|
| 158 |
return {
|
| 159 |
"basic_commands": BASIC_COMMANDS,
|
| 160 |
"parameterized_commands": PARAMETERIZED_COMMANDS,
|
| 161 |
+
"query_llm": {
|
| 162 |
+
"command": "query_llm",
|
| 163 |
"model_options": MODEL_OPTIONS,
|
| 164 |
"gpu_range": [1, 16],
|
| 165 |
"default_gpus": 1,
|
|
|
|
| 313 |
<button type="submit">Submit basic job</button>
|
| 314 |
</form>
|
| 315 |
|
| 316 |
+
<form method="post" action="/submit-query-llm">
|
| 317 |
+
<h2>query_llm</h2>
|
| 318 |
|
| 319 |
<div>
|
| 320 |
<label><strong>UI token:</strong></label>
|
|
|
|
| 344 |
>hello</textarea>
|
| 345 |
</div>
|
| 346 |
|
| 347 |
+
<button type="submit">Submit query_llm job</button>
|
| 348 |
</form>
|
| 349 |
|
| 350 |
<p>
|
|
|
|
| 391 |
return RedirectResponse("/", status_code=303)
|
| 392 |
|
| 393 |
|
| 394 |
+
@app.post("/submit-query-llm")
|
| 395 |
+
def submit_query_llm_from_ui(
|
| 396 |
model: str = Form(...),
|
| 397 |
gpus: int = Form(1),
|
| 398 |
user_text: str = Form("hello"),
|
|
|
|
| 400 |
):
|
| 401 |
verify_ui_token(ui_token)
|
| 402 |
|
| 403 |
+
validate_query_llm_args(
|
| 404 |
model=model,
|
| 405 |
gpus=gpus,
|
| 406 |
user_text=user_text,
|
|
|
|
| 410 |
|
| 411 |
jobs[job_id] = Job(
|
| 412 |
id=job_id,
|
| 413 |
+
command="query_llm",
|
| 414 |
model=model,
|
| 415 |
gpus=gpus,
|
| 416 |
user_text=user_text,
|
|
|
|
| 444 |
return job
|
| 445 |
|
| 446 |
|
| 447 |
+
@app.post("/api/jobs/query-llm")
|
| 448 |
+
def submit_query_llm_job_api(
|
| 449 |
model: str = Form(...),
|
| 450 |
gpus: int = Form(1),
|
| 451 |
user_text: str = Form("hello"),
|
|
|
|
| 453 |
):
|
| 454 |
verify_broker_token(x_broker_token)
|
| 455 |
|
| 456 |
+
validate_query_llm_args(
|
| 457 |
model=model,
|
| 458 |
gpus=gpus,
|
| 459 |
user_text=user_text,
|
|
|
|
| 463 |
|
| 464 |
job = Job(
|
| 465 |
id=job_id,
|
| 466 |
+
command="query_llm",
|
| 467 |
model=model,
|
| 468 |
gpus=gpus,
|
| 469 |
user_text=user_text,
|