yaso_meth/mih-project
2
4
Fork 2
Code Issues 8 Pull Requests Actions Packages Projects Releases 1 Wiki Activity

update get file api

Browse Source
This commit is contained in:
yaso-meth
2024-09-04 10:19:55 +02:00
parent 5d964f8d33
commit 3afe83f3ad
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/Minio_Storage/minioConnection.py
View File

@@ -1,7 +1,7 @@
from minio import Minio from minio import Minio
def minioConnect(env): def minioConnect(env):
if(env == "dev"): if(env == "Dev"):
return Minio( return Minio(
"minio:9000", "minio:9000",
# "minio.mzansi-innovation-hub.co.za", # "minio.mzansi-innovation-hub.co.za",

11
backend/routers/fileStorage.py
View File

@@ -71,14 +71,18 @@ class perscriptionList(BaseModel):
sig_path: str sig_path: str
data: List[perscription] data: List[perscription]
@router.get("/minio/pull/file/{app_id}/{folder}/{file_name}/{env}", tags=["Minio"]) @router.get("/minio/pull/file/{env}/{app_id}/{folder}/{file_name}", tags=["Minio"])
async def pull_File_from_user(app_id: str, folder: str, file_name: str, env: str, session: SessionContainer = Depends(verify_session())): #, session: SessionContainer = Depends(verify_session()) async def pull_File_from_user(app_id: str, folder: str, file_name: str, env: str, session: SessionContainer = Depends(verify_session())): #, session: SessionContainer = Depends(verify_session())
path = app_id + "/" + folder + "/" + file_name path = app_id + "/" + folder + "/" + file_name
try: try:
# print(f"env: {env}")
# uploudFile(app_id, file.filename, extension[1], content) # uploudFile(app_id, file.filename, extension[1], content)
client = Minio_Storage.minioConnection.minioConnect(env) client = Minio_Storage.minioConnection.minioConnect(env)
miniourl = client.presigned_get_object("mih", path) miniourl = client.presigned_get_object("mih", path)
# if(env == "Dev"):
# miniourl.replace("minio", "localhost")
# temp = minioResponse.data#.encode('utf-8').strip() # temp = minioResponse.data#.encode('utf-8').strip()
# print(temp) # print(temp)
# print("=======================================================================") # print("=======================================================================")
@@ -87,6 +91,11 @@ async def pull_File_from_user(app_id: str, folder: str, file_name: str, env: str
except Exception as error: except Exception as error:
raise HTTPException(status_code=404, detail=miniourl) raise HTTPException(status_code=404, detail=miniourl)
# return {"message": error} # return {"message": error}
if(env == "Dev"):
return {
"minioURL": f"http://localhost:9000/mih/{app_id}/{folder}/{file_name}",
}
else:
return { return {
"minioURL": miniourl, "minioURL": miniourl,
} }