FERMAT_TEST_REST_SERVER/GLASSES_AI_SERVER
4
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

edit : 요청값보다 벡터파일에 등록된 갯수가 적을경우 각 항목 null로 처리

Browse Source
This commit is contained in:
김재웅
2025-12-04 16:48:17 +09:00
parent fce9eedfae
commit 7eed2e9868
4 changed files with 39 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
custom_apps/FEATURE_VECTOR_SIMILARITY_FAISS/faiss_functions.py
View File

@@ -128,6 +128,11 @@ def get_clip_info(model, query_image_path, item_info, top_k=4):
# index_type=model.value[1].index_type)
inference_times, result_img_paths, result_percents = vector_model.query_faiss(query_image_path, top_k=top_k)
for i in range(len(result_percents)):
if float(result_percents[i]) < 0.0:
result_percents[i] = None
result_img_paths[i] = None
report_info = ReportInfo(
feature_extraction_model=ReportInfoConst.feature_extraction_model,

8
custom_apps/FEATURE_VECTOR_SIMILARITY_FAISS/utils.py
View File

@@ -7,6 +7,14 @@ def search_glass_parts(image_path_list):
result = []
for image_path in image_path_list:
if image_path is None:
result.append(None)
continue
elif not os.path.exists(image_path):
result.append(None)
continue
parts_path = Path(os.path.join(os.path.dirname(os.path.dirname(image_path)),ImageDepths.parts))
parts_files_generator = parts_path.rglob('*.png')

4
main_rest/app/models.py
View File

@@ -659,8 +659,8 @@ class VectorGlassesImageResult(BaseModel):
class VectorPartsImageResult(BaseModel):
image : str | None = Field("", description='이미지 데이터', example='')
percents: float = Field(0.0, description='percents 값', example='')
imageInfo : str = Field("", description='원본이미지 이름', example='')
percents: float | None = Field(0.0, description='percents 값', example='')
imageInfo : str | None = Field("", description='원본이미지 이름', example='')
#===============================================================================
#===============================================================================
#===============================================================================

32
main_rest/app/routes/services.py
View File

@@ -535,11 +535,19 @@ async def vactor_vit_input_glasses_img_data(request: Request, request_body_info:
for img, percents, parts in zip(result_image_paths, result_percents, result_parts):
b64_data = None
if os.path.exists(img):
b64_data = image_to_base64_string(img)
float_percent = float(percents)
float_percent = None
img_info = None
info = M.VectorGlassesImageResult(image=b64_data, percents=float_percent, imageInfo=os.path.split(img)[-1], parts=parts)
if img is not None:
if os.path.exists(img):
b64_data = image_to_base64_string(img)
img_info = os.path.split(img)[-1]
if percents is not None:
if percents.isnumeric:
float_percent = float(percents)
info = M.VectorGlassesImageResult(image=b64_data, percents=float_percent, imageInfo=img_info, parts=parts)
vector_image_results.append(info)
@@ -621,11 +629,19 @@ async def vactor_vit_input_parts_img_data(request: Request, request_body_info: M
for img, percents in zip(result_image_paths, result_percents):
b64_data = None
if os.path.exists(img):
b64_data = image_to_base64_string(img)
float_percent = float(percents)
float_percent = None
img_info = None
info = M.VectorPartsImageResult(image=b64_data, percents=float_percent, imageInfo=os.path.split(img)[-1])
if img is not None:
if os.path.exists(img):
b64_data = image_to_base64_string(img)
img_info = os.path.split(img)[-1]
if percents is not None:
if percents.isnumeric:
float_percent = float(percents)
info = M.VectorPartsImageResult(image=b64_data, percents=float_percent, imageInfo=img_info)
vector_image_results.append(info)