修改部分问题
This commit is contained in:
2
.gitignore
vendored
2
.gitignore
vendored
@ -4,6 +4,8 @@ __pycache__/
|
|||||||
*.py[cod]
|
*.py[cod]
|
||||||
*$py.class
|
*$py.class
|
||||||
|
|
||||||
|
.idea
|
||||||
|
|
||||||
# C extensions
|
# C extensions
|
||||||
*.so
|
*.so
|
||||||
|
|
||||||
|
@ -15,6 +15,7 @@ from app.db.db_session import get_db
|
|||||||
from typing import List
|
from typing import List
|
||||||
from fastapi import APIRouter, Depends, Request, UploadFile, File, Form
|
from fastapi import APIRouter, Depends, Request, UploadFile, File, Form
|
||||||
from fastapi.responses import StreamingResponse
|
from fastapi.responses import StreamingResponse
|
||||||
|
from fastapi.encoders import jsonable_encoder
|
||||||
from sqlalchemy.orm import Session
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
"""项目管理API"""
|
"""项目管理API"""
|
||||||
@ -155,7 +156,8 @@ def get_image_list(project_id: int, session: Session = Depends(get_db)):
|
|||||||
:return:
|
:return:
|
||||||
"""
|
"""
|
||||||
image_list = pimc.get_image_list(project_id, session)
|
image_list = pimc.get_image_list(project_id, session)
|
||||||
return rc.response_success(data=image_list)
|
result = jsonable_encoder(image_list)
|
||||||
|
return rc.response_success(data=result)
|
||||||
|
|
||||||
|
|
||||||
@project.post("/save_img_label")
|
@project.post("/save_img_label")
|
||||||
@ -170,7 +172,7 @@ def save_img_label(img_leafer_label: ProjectImgLeaferLabel, session: Session = D
|
|||||||
return rc.response_success(msg="保存成功")
|
return rc.response_success(msg="保存成功")
|
||||||
|
|
||||||
|
|
||||||
@project.get("/get_img_leafer/{imager_id}")
|
@project.get("/get_img_leafer/{image_id}")
|
||||||
def get_img_leafer(image_id: int, session: Session = Depends(get_db)):
|
def get_img_leafer(image_id: int, session: Session = Depends(get_db)):
|
||||||
"""
|
"""
|
||||||
根据图片id查询图片的leafer信息
|
根据图片id查询图片的leafer信息
|
||||||
@ -179,7 +181,10 @@ def get_img_leafer(image_id: int, session: Session = Depends(get_db)):
|
|||||||
:return:
|
:return:
|
||||||
"""
|
"""
|
||||||
img_leafer_out = ps.get_img_leafer(image_id, session)
|
img_leafer_out = ps.get_img_leafer(image_id, session)
|
||||||
return rc.response_success(data=img_leafer_out.leafer)
|
if img_leafer_out is None:
|
||||||
|
return rc.response_success()
|
||||||
|
else:
|
||||||
|
return rc.response_success(data=img_leafer_out['leafer'])
|
||||||
|
|
||||||
|
|
||||||
@project.get("/run_train/{project_id}")
|
@project.get("/run_train/{project_id}")
|
||||||
@ -201,6 +206,7 @@ async def run_train(project_id: int, session: Session = Depends(get_db)):
|
|||||||
media_type="text/plain")
|
media_type="text/plain")
|
||||||
|
|
||||||
|
|
||||||
|
@project.get("/get_train_list/{project_id}")
|
||||||
def get_train_list(project_id: int, session: Session = Depends(get_db)):
|
def get_train_list(project_id: int, session: Session = Depends(get_db)):
|
||||||
"""
|
"""
|
||||||
根据项目id,获取训练列表
|
根据项目id,获取训练列表
|
||||||
@ -209,7 +215,8 @@ def get_train_list(project_id: int, session: Session = Depends(get_db)):
|
|||||||
:return:
|
:return:
|
||||||
"""
|
"""
|
||||||
train_list = ptnc.get_train_list(project_id, session)
|
train_list = ptnc.get_train_list(project_id, session)
|
||||||
return rc.response_success(data=train_list)
|
result = jsonable_encoder(train_list)
|
||||||
|
return rc.response_success(data=result)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -3,7 +3,6 @@ from fastapi.middleware.cors import CORSMiddleware
|
|||||||
|
|
||||||
from app.application.token_middleware import TokenMiddleware
|
from app.application.token_middleware import TokenMiddleware
|
||||||
from app.application.logger_middleware import LoggerMiddleware
|
from app.application.logger_middleware import LoggerMiddleware
|
||||||
|
|
||||||
from app.api.common.upload_file import upload_files
|
from app.api.common.upload_file import upload_files
|
||||||
from app.api.sys.login_api import login
|
from app.api.sys.login_api import login
|
||||||
from app.api.sys.sys_user_api import user
|
from app.api.sys.sys_user_api import user
|
||||||
|
@ -44,7 +44,7 @@ def get_img_url(image_id: int, session: Session):
|
|||||||
|
|
||||||
def get_image_list(project_id: int, session: Session):
|
def get_image_list(project_id: int, session: Session):
|
||||||
query = session.query(piModel).filter(piModel.project_id == project_id).order_by(asc(piModel.id))
|
query = session.query(piModel).filter(piModel.project_id == project_id).order_by(asc(piModel.id))
|
||||||
image_list = [ProjectImage.from_orm(image).dict() for image in query.all()]
|
image_list = [ProjectImage.from_orm(image) for image in query.all()]
|
||||||
return image_list
|
return image_list
|
||||||
|
|
||||||
|
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
import datetime
|
from datetime import datetime
|
||||||
|
|
||||||
from pydantic import BaseModel, Field
|
from pydantic import BaseModel, Field
|
||||||
from typing import Optional, List
|
from typing import Optional, List
|
||||||
|
|
||||||
@ -8,10 +7,13 @@ class ProjectImage(BaseModel):
|
|||||||
id: Optional[int] = Field(None, description="id")
|
id: Optional[int] = Field(None, description="id")
|
||||||
project_id: Optional[int] = Field(..., description="项目id")
|
project_id: Optional[int] = Field(..., description="项目id")
|
||||||
file_name: Optional[str] = Field(None, description="文件名称")
|
file_name: Optional[str] = Field(None, description="文件名称")
|
||||||
create_time: Optional[datetime.datetime] = Field(None, description="上传时间")
|
create_time: Optional[datetime] = Field(None, description="上传时间")
|
||||||
|
|
||||||
class Config:
|
class Config:
|
||||||
orm_mode = True
|
orm_mode = True
|
||||||
|
json_encoders = {
|
||||||
|
datetime: lambda v: v.strftime("%Y-%m-%d %H:%M:%S")
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
class ProjectImagePager(BaseModel):
|
class ProjectImagePager(BaseModel):
|
||||||
|
Reference in New Issue
Block a user