更新一些配置与配置相关的代码

This commit is contained in:
zhouchengrong
2024-03-18 17:57:01 +08:00
parent 8383234ba1
commit f84b8aaba1
6 changed files with 71 additions and 12 deletions

View File

@@ -29,3 +29,16 @@ MINIO_SECRET = "uHfqJ7UkwA1PTDGfnA44Hp9ux5YkZTkzZLjeOYhE"
OM_TRITON_IP = "10.1.1.150"
OM_TRITON_PORT = "7000"
ATT_TRITON_IP = "10.1.1.150"
ATT_TRITON_PORT = "6000"
# service env
# LOGSPATH = "logs/errors.log"
# FASHION_CATEGORIES = "app/service/outfit_matcher/config/fashion_categories.json"
# FASHION_CATEGORIES_MAPPING = "app/service/outfit_matcher/config/fashion_category_mapping.json"
# pycharm debug
LOGSPATH = "logs/errors.log"
FASHION_CATEGORIES = "service/outfit_matcher/config/fashion_categories.json"
FASHION_CATEGORIES_MAPPING = "service/outfit_matcher/config/fashion_category_mapping.json"

View File

@@ -13,7 +13,7 @@ from torchvision import transforms
import pandas as pd
from minio import Minio
from app.core.config import MINIO_IP, MINIO_PORT, MINIO_SECURE, MINIO_ACCESS, MINIO_SECRET
from app.core.config import MINIO_IP, MINIO_PORT, MINIO_SECURE, MINIO_ACCESS, MINIO_SECRET, ATT_TRITON_IP, ATT_TRITON_PORT
def Merge(dict1, dict2):
@@ -54,7 +54,7 @@ class Rescale(object):
class AttributeRecognition:
def __init__(self):
self.httpclient = httpclient.InferenceServerClient(url="10.1.1.150:6000")
self.httpclient = httpclient.InferenceServerClient(url=f"{ATT_TRITON_IP}:{ATT_TRITON_PORT}")
self.minio_client = Minio(
f"{MINIO_IP}:{MINIO_PORT}",
access_key=MINIO_ACCESS,

View File

@@ -4,6 +4,8 @@ import itertools
import difflib
from copy import deepcopy
from app.core.config import FASHION_CATEGORIES, FASHION_CATEGORIES_MAPPING
# Helper function to calculate the edit distance similarity between two file names
def sim_score(a, b):
@@ -11,12 +13,8 @@ def sim_score(a, b):
class FashionDataset(object):
fashion_categories = json.load(open(r"app/service/outfit_matcher/config/fashion_categories.json", "r"))
fashion_categories_mapping = json.load(open(r"app/service/outfit_matcher/config/fashion_category_mapping.json", "r"))
# service debug
# fashion_categories = json.load(open(r"service/outfit_matcher/config/fashion_categories.json", "r"))
# fashion_categories_mapping = json.load(open(r"service/outfit_matcher/config/fashion_category_mapping.json", "r"))
fashion_categories = json.load(open(FASHION_CATEGORIES, "r"))
fashion_categories_mapping = json.load(open(FASHION_CATEGORIES_MAPPING, "r"))
def __init__(self, item_metadata):
self.item_metadat = item_metadata

View File

@@ -15,7 +15,7 @@ from app.service.utils.decorator import RunTime
class OutfitMatcher(object):
def __init__(self):
self.tritonclient = httpclient.InferenceServerClient(url="10.1.1.240:10010")
self.tritonclient = httpclient.InferenceServerClient(url=f"{OM_TRITON_IP}:{OM_TRITON_PORT}")
self.minio_client = Minio(
f"{MINIO_IP}:{MINIO_PORT}",
access_key=MINIO_ACCESS,