supply document name as part of the request body rather than query (#186)

Author: pmeier

ragna/deploy/_api/core.py

@@ -4,7 +4,7 @@
 from typing import Annotated, Any, Iterator, Type, cast
 
 import aiofiles
-from fastapi import Depends, FastAPI, Form, HTTPException, Request, UploadFile
+from fastapi import Body, Depends, FastAPI, Form, HTTPException, Request, UploadFile
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import JSONResponse
 
@@ -112,10 +112,10 @@ def get_session() -> Iterator[database.Session]:
         with make_session() as session:  # type: ignore[attr-defined]
             yield session
 
-    @app.get("/document")
-    async def get_document_upload_info(
+    @app.post("/document")
+    async def create_document_upload_info(
         user: UserDependency,
-        name: str,
+        name: Annotated[str, Body(..., embed=True)],
     ) -> schemas.DocumentUploadInfo:
         with get_session() as session:
             document = schemas.Document(name=name)
@@ -127,7 +127,7 @@ async def get_document_upload_info(
             )
             return schemas.DocumentUploadInfo(url=url, data=data, document=document)
 
-    @app.post("/document")
+    @app.put("/document")
     async def upload_document(
         token: Annotated[str, Form()], file: UploadFile
     ) -> schemas.Document:

ragna/deploy/_ui/resources/upload.js

@@ -7,8 +7,10 @@ function upload(files, token, informationsEndpoint, final_callback) {
 }
 
 async function uploadFile(file, token, informationEndpoint) {
-  const response = await fetch(`${informationEndpoint}?name=${file.name}`, {
-    headers: { Authorization: `Bearer ${token}` },
+  const response = await fetch(informationEndpoint, {
+    method: "POST",
+    headers: { "Content-Type": "application/json", Authorization: `Bearer ${token}` },
+    body: JSON.stringify({ name: file.name }),
   });
   const documentInfo = await response.json();
 
@@ -19,7 +21,7 @@ async function uploadFile(file, token, informationEndpoint) {
   body.append("file", file);
 
   await fetch(documentInfo.url, {
-    method: "POST",
+    method: "PUT",
     body: body,
   });
 

scripts/add_chats.py

@@ -35,9 +35,9 @@ def main():
     for i in range(5):
         name = f"document{i}.txt"
         document_info = (
-            client.get("/document", params={"name": name}).raise_for_status().json()
+            client.post("/document", json={"name": name}).raise_for_status().json()
         )
-        client.post(
+        client.put(
             document_info["url"],
             data=document_info["data"],
             files={"file": f"Content of {name}".encode()},

tests/deploy/api/test_e2e.py

@@ -50,15 +50,15 @@ def check_api(config):
         assert client.get("/chats").raise_for_status().json() == []
 
         document_info = (
-            client.get("/document", params={"name": document_path.name})
+            client.post("/document", json={"name": document_path.name})
             .raise_for_status()
             .json()
         )
         document = document_info["document"]
         assert document["name"] == document_path.name
 
         with open(document_path, "rb") as file:
-            client.post(
+            client.put(
                 document_info["url"],
                 data=document_info["data"],
                 files={"file": file},