Изменил загрузку картинок
This commit is contained in:
parent
fc12bc0464
commit
85cde7fb6c
2 changed files with 28 additions and 8 deletions
|
@ -8,20 +8,40 @@ router = APIRouter(
|
||||||
tags=["Загрузка картинок"]
|
tags=["Загрузка картинок"]
|
||||||
)
|
)
|
||||||
|
|
||||||
|
async def upload_file(file: UploadFile, remote_server_url: str) -> httpx.Response:
|
||||||
@router.post('')
|
|
||||||
async def upload_image(file: UploadFile):
|
|
||||||
remote_server_url = settings.IMAGE_UPLOAD_SERVER + "images"
|
|
||||||
async with httpx.AsyncClient() as client:
|
async with httpx.AsyncClient() as client:
|
||||||
try:
|
try:
|
||||||
file_content = await file.read()
|
file_content = await file.read()
|
||||||
response = await client.post(remote_server_url, files={"file": file_content})
|
response = await client.post(remote_server_url, files={"file": file_content})
|
||||||
if response.status_code != 200:
|
if response.status_code != 200:
|
||||||
raise HTTPException(status_code=response.status_code,
|
raise HTTPException(status_code=response.status_code,
|
||||||
detail="Ошибка при загрузке файла на удаленный сервер")
|
detail="Ошибка при загрузке файла на удаленный сервер")
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
raise HTTPException(status_code=500, detail=str(e))
|
raise HTTPException(status_code=500, detail=str(e))
|
||||||
image_name = response.json()['image_url']
|
return response
|
||||||
image_url = '/'.join(image_name.split('/')[1:])
|
|
||||||
|
@router.post('/upload_avatar')
|
||||||
|
async def upload_avatar(file: UploadFile):
|
||||||
|
remote_server_url = settings.IMAGE_UPLOAD_SERVER + "upload_avatar"
|
||||||
|
response = await upload_file(file, remote_server_url)
|
||||||
|
image_url = response.json()['image_url']
|
||||||
image_url = settings.IMAGE_UPLOAD_SERVER + image_url
|
image_url = settings.IMAGE_UPLOAD_SERVER + image_url
|
||||||
return image_url
|
return image_url
|
||||||
|
|
||||||
|
|
||||||
|
@router.post('/upload_image')
|
||||||
|
async def upload_avatar(file: UploadFile):
|
||||||
|
remote_server_url = settings.IMAGE_UPLOAD_SERVER + "upload_image"
|
||||||
|
response = await upload_file(file, remote_server_url)
|
||||||
|
image_url = response.json()['image_url']
|
||||||
|
image_url = settings.IMAGE_UPLOAD_SERVER + image_url
|
||||||
|
return image_url
|
||||||
|
|
||||||
|
|
||||||
|
@router.post('/upload_background')
|
||||||
|
async def upload_avatar(file: UploadFile):
|
||||||
|
remote_server_url = settings.IMAGE_UPLOAD_SERVER + "upload_background"
|
||||||
|
response = await upload_file(file, remote_server_url)
|
||||||
|
uploaded_backgrounds = response.json()
|
||||||
|
uploaded_backgrounds = [settings.IMAGE_UPLOAD_SERVER + background for background in uploaded_backgrounds]
|
||||||
|
return uploaded_backgrounds
|
||||||
|
|
|
@ -24,7 +24,7 @@ async def get_teleport():
|
||||||
return RedirectResponse(url="https://www.youtube.com/watch?v=dQw4w9WgXcQ")
|
return RedirectResponse(url="https://www.youtube.com/watch?v=dQw4w9WgXcQ")
|
||||||
|
|
||||||
|
|
||||||
@router.get("/", response_model=list[SUser])
|
@router.get("", response_model=list[SUser])
|
||||||
async def get_all_users():
|
async def get_all_users():
|
||||||
users = await UserDAO.find_all()
|
users = await UserDAO.find_all()
|
||||||
return users
|
return users
|
||||||
|
|
Loading…
Add table
Reference in a new issue