github/ocr_api_server
5
0
Fork 0
mirror of https://github.com/sml2h3/ocr_api_server.git synced 2025-05-04 05:11:39 +08:00
Code Issues Projects Releases Wiki Activity

fix: 修复接口参数校验问题以及镜像启动失败问题

Browse Source
This commit is contained in:
Ruan HongChao 2024-10-07 03:11:00 +00:00
parent f9e3624eff
commit 29145a689e
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -14,4 +14,4 @@ RUN pip install --no-cache-dir -r requirements.txt
EXPOSE 8000 EXPOSE 8000
# 运行应用 # 运行应用
CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000"] CMD ["python", "app/main.py"]

12
app/main.py
View File

@ -15,7 +15,11 @@ async def decode_image(image: Union[UploadFile, StarletteUploadFile, str, None])
raise HTTPException(status_code=400, detail="No image provided") raise HTTPException(status_code=400, detail="No image provided")
if isinstance(image, (UploadFile, StarletteUploadFile)): if isinstance(image, (UploadFile, StarletteUploadFile)):
return await image.read() content = await image.read()
if not content:
raise HTTPException(status_code=400, detail="Uploaded file is empty")
return content
elif isinstance(image, str): elif isinstance(image, str):
try: try:
# 检查是否是 base64 编码的图片 # 检查是否是 base64 编码的图片
@ -38,7 +42,7 @@ async def ocr_endpoint(
png_fix: bool = Form(False) png_fix: bool = Form(False)
): ):
try: try:
if file.size == 0 and image is None: if file is None and image is None:
return APIResponse(code=400, message="Either file or image must be provided") return APIResponse(code=400, message="Either file or image must be provided")
image_bytes = await decode_image(file or image) image_bytes = await decode_image(file or image)
@ -57,7 +61,7 @@ async def slide_match_endpoint(
simple_target: bool = Form(False) simple_target: bool = Form(False)
): ):
try: try:
if (background is None and target is None) or (background_file.size == 0 and target_file.size == 0): if (target_file is None and target is None) or (background_file is None and background is None):
return APIResponse(code=400, message="Both target and background must be provided") return APIResponse(code=400, message="Both target and background must be provided")
target_bytes = await decode_image(target_file or target) target_bytes = await decode_image(target_file or target)
@ -74,7 +78,7 @@ async def detection_endpoint(
image: Optional[str] = Form(None) image: Optional[str] = Form(None)
): ):
try: try:
if file.size == 0 and image is None: if file is None and image is None:
return APIResponse(code=400, message="Either file or image must be provided") return APIResponse(code=400, message="Either file or image must be provided")
image_bytes = await decode_image(file or image) image_bytes = await decode_image(file or image)