aidlab/sora_python
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
pangkaicheng
2024-03-28 10:56:21 +08:00
parent 4e832bbadb
commit 7d5e2b28e9
3 changed files with 744 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/core/config.py
View File

@@ -27,15 +27,10 @@ MINIO_SECURE = False
MINIO_ACCESS = "e8zc55mzDOh4IzRrZ9Oa"
MINIO_SECRET = "uHfqJ7UkwA1PTDGfnA44Hp9ux5YkZTkzZLjeOYhE"
<<<<<<< HEAD
# OM_TRITON_IP = "10.1.1.150"
# OM_TRITON_PORT = "7000"
OM_TRITON_IP = "127.0.0.1"
OM_TRITON_PORT = "8000"
=======
OM_TRITON_IP = "10.1.1.240"
OM_TRITON_PORT = "10010"
>>>>>>> 1f23781b16e59bfbcbbb4d252e6a61685267e6c7
# OM_TRITON_IP = "10.1.1.240"
# OM_TRITON_PORT = "10010"
ATT_TRITON_IP = "10.1.1.240"
ATT_TRITON_PORT = "10020"
@@ -46,17 +41,9 @@ ATT_TRITON_PORT = "10020"
# FASHION_CATEGORIES_MAPPING = "app/service/outfit_matcher/config/fashion_category_mapping.json"
# pycharm debug
<<<<<<< HEAD
LOGSPATH = "logs/errors.log"
FASHION_CATEGORIES = "config/fashion_categories.json"
FASHION_CATEGORIES_MAPPING = "config/fashion_category_mapping.json"
=======
LOGS_PATH = "logs/errors.log"
FASHION_CATEGORIES = "service/outfit_matcher/config/fashion_categories.json"
FASHION_CATEGORIES_MAPPING = "service/outfit_matcher/config/fashion_category_mapping.json"
# LOGS_PATH = "app/logs/errors.log"
# FASHION_CATEGORIES = "./config/fashion_categories.json"
# FASHION_CATEGORIES_MAPPING = "./config/fashion_category_mapping.json"
>>>>>>> 1f23781b16e59bfbcbbb4d252e6a61685267e6c7
# LOGS_PATH = "logs/errors.log"
# FASHION_CATEGORIES = "service/outfit_matcher/config/fashion_categories.json"
# FASHION_CATEGORIES_MAPPING = "service/outfit_matcher/config/fashion_category_mapping.json"