rzmk/learnhouse
1
0
Fork 0
mirror of https://github.com/rzmk/learnhouse.git synced 2025-12-19 04:19:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: refactor imageBlock

Browse source
This commit is contained in:
swve 2023-03-23 22:27:14 +01:00
parent 619688676b
commit b16daaa780
6 changed files with 44 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/routers/blocks.py
View file

@ -1,7 +1,7 @@
from fastapi import APIRouter, Depends, UploadFile, Form, Request
from src.dependencies.auth import get_current_user
from fastapi import HTTPException, status, UploadFile
from src.services.blocks.block_types.imageBlock.images import create_image_file, get_image_file
from src.services.blocks.block_types.imageBlock.images import create_image_block, get_image_block
from src.services.blocks.block_types.videoBlock.videoBlock import create_video_block, get_video_block
from src.services.blocks.block_types.pdfBlock.pdfBlock import create_pdf_block, get_pdf_block
from src.services.blocks.block_types.quizBlock.quizBlock import create_quiz_block, get_quiz_block_answers, get_quiz_block_options, quizBlock
@ -18,7 +18,7 @@ async def api_create_image_file_block(request: Request, file_object: UploadFile,
"""
Create new image file
"""
return await create_image_file(request, file_object, lecture_id)
return await create_image_block(request, file_object, lecture_id)
@router.get("/image")
@ -26,7 +26,7 @@ async def api_get_image_file_block(request: Request, file_id: str, current_user:
"""
Get image file
"""
return await get_image_file(request, file_id, current_user)
return await get_image_block(request, file_id, current_user)
####################
# Video Block

127
src/services/blocks/block_types/imageBlock/images.py
View file

@ -3,110 +3,45 @@ from pydantic import BaseModel
from fastapi import HTTPException, status, UploadFile, Request
from fastapi.responses import StreamingResponse
import os
from src.services.blocks.schemas.blocks import Block
from src.services.blocks.utils.upload_files import upload_file_and_return_file_object
from src.services.users.users import PublicUser
class PhotoFile(BaseModel):
file_id: str
file_format: str
file_name: str
file_size: int
file_type: str
lecture_id: str
async def create_image_block(request: Request, image_file: UploadFile, lecture_id: str):
blocks = request.app.db["blocks"]
lecture = request.app.db["lectures"]
block_type = "imageBlock"
# get org_id from lecture
lecture = await lecture.find_one({"lecture_id": lecture_id}, {"_id": 0, "org_id": 1})
org_id = lecture["org_id"]
# get block id
block_id = str(f"block_{uuid4()}")
block_data = await upload_file_and_return_file_object(request, image_file, lecture_id, block_id, ["jpg", "jpeg", "png", "gif"], block_type)
# create block
block = Block(block_id=block_id, lecture_id=lecture_id,
block_type=block_type, block_data=block_data, org_id=org_id)
# insert block
await blocks.insert_one(block.dict())
return block
async def create_image_file(request: Request,image_file: UploadFile, lecture_id: str):
photos = request.app.db["files"]
async def get_image_block(request: Request, file_id: str, current_user: PublicUser):
blocks = request.app.db["blocks"]
# generate file_id
file_id = str(f"file_{uuid4()}")
video_block = await blocks.find_one({"block_id": file_id})
# get file format
file_format = image_file.filename.split(".")[-1]
# validate file format
if file_format not in ["jpg", "jpeg", "png", "gif"]:
raise HTTPException(
status_code=status.HTTP_409_CONFLICT, detail="Image file format not supported")
# create file
file = await image_file.read()
# get file size
file_size = len(file)
# get file type
file_type = image_file.content_type
# get file name
file_name = image_file.filename
# create file object
uploadable_file = PhotoFile(
file_id=file_id,
file_format=file_format,
file_name=file_name,
file_size=file_size,
file_type=file_type,
lecture_id=lecture_id
)
# create folder for lecture
if not os.path.exists(f"content/uploads/files/images/{lecture_id}"):
os.mkdir(f"content/uploads/files/images/{lecture_id}")
# upload file to server
with open(f"content/uploads/files/images/{lecture_id}/{file_id}.{file_format}", 'wb') as f:
f.write(file)
f.close()
# insert file object into database
photo_file_in_db = await photos.insert_one(uploadable_file.dict())
if not photo_file_in_db:
raise HTTPException(
status_code=status.HTTP_409_CONFLICT, detail="Photo file could not be created")
return uploadable_file
async def get_image_object(request: Request,file_id: str):
photos = request.app.db["files"]
photo_file = await photos.find_one({"file_id": file_id})
if photo_file:
photo_file = PhotoFile(**photo_file)
return photo_file
if video_block:
return Block(**video_block)
else:
raise HTTPException(
status_code=status.HTTP_409_CONFLICT, detail="Photo file does not exist")
async def get_image_file(request: Request,file_id: str, current_user: PublicUser):
photos = request.app.db["files"]
photo_file = await photos.find_one({"file_id": file_id})
# TODO : check if user has access to file
if photo_file:
# check media type
if photo_file.format not in ["jpg", "jpeg", "png", "gif"]:
raise HTTPException(
status_code=status.HTTP_409_CONFLICT, detail="Photo file format not supported")
# stream file
photo_file = PhotoFile(**photo_file)
file_format = photo_file.file_format
lecture_id = photo_file.lecture_id
file = open(
f"content/uploads/files/images/{lecture_id}/{file_id}.{file_format}", 'rb')
return StreamingResponse(file, media_type=photo_file.file_type)
else:
raise HTTPException(
status_code=status.HTTP_409_CONFLICT, detail="Photo file does not exist")
status_code=status.HTTP_409_CONFLICT, detail="Image block does not exist")

2
src/services/blocks/schemas/blocks.py
View file

@ -9,5 +9,5 @@ class Block(BaseModel):
block_id: str
lecture_id: str
org_id: str
block_type: Literal["quizBlock", "videoBlock", "pdfBlock"]
block_type: Literal["quizBlock", "videoBlock", "pdfBlock", "imageBlock"]
block_data: Any