merge

2024-03-28 10:38:16 +08:00
parent 300dc60673 1f23781b16
commit 8d34a4ed7f
110 changed files with 1418 additions and 1833 deletions
--- a/app/api/api_attribute.py
+++ b/app/api/api_attribute.py
@@ -1,9 +1,10 @@
 import logging
+from pprint import pprint

 from fastapi import APIRouter

 from app.schemas.attribute import AttributeModel
-from app.service.attribute_recognition import const
+from app.service.attribute_recognition import const, const_debug
 from app.service.attribute_recognition.service import AttributeRecognition

 logger = logging.getLogger()
--- a/app/api/api_outfit_matcher.py
+++ b/app/api/api_outfit_matcher.py
@@ -20,25 +20,28 @@ def outfit_matcher(request_item: OutfitMatcher):
    for i in range(len(request_item['database'])):
        request_item['database'][i] = dict(request_item['database'][i])

-    try:
-        fashion_dataset = FashionDataset(request_item['database'])
-        service = OutfitMaterTypeAware()
-        result = []
-        start_time = time.time()
-        for item in request_item['query']:
-            outfits = fashion_dataset.generate_outfit(item, request_item["topk"], request_item["max_outfits"])
-            scores = service.get_result(outfits)
-            if request_item['is_best']:
-                best_outfits, best_scores = service.visualize(outfits, scores, request_item["topk"], best=True,
-                                                              # output_path=os.path.join(r"E:\workspace\outfit_matcher\2024 SS Outfit", f"{item['item_name']}_best_{param['topk']}.png")
-                                                              )
-                result.append({"outfits": best_outfits, "scores": best_scores})
-            else:
-                bad_outfits, bad_scores = service.visualize(outfits, scores, request_item["topk"], best=False,
-                                                            # output_path=os.path.join(r"E:\workspace\outfit_matcher\2024 SS Outfit", f"{item['item_name']}_worst_{param['topk']}.png")
-                                                            )
-                result.append({"outfits": bad_outfits, "scores": bad_scores})
-        logger.info(f"run time is : {time.time() - start_time}")
-        return {"message": "ok", "data": result}
-    except Exception as e:
-        return {"message": f"{e}", "data": e}
+    # try:
+    fashion_dataset = FashionDataset(request_item['database'])
+    service = OutfitMaterTypeAware()
+    result = []
+    start_time = time.time()
+    for item in request_item['query']:
+        outfits = fashion_dataset.generate_outfit(item, request_item["topk"], request_item["max_outfits"])
+        scores, features = service.get_result(outfits)
+        # save features in databases
+
+        if request_item['is_best']:
+            best_outfits, best_scores = service.visualize(outfits, scores, request_item["topk"], best=True,
+                                                          # output_path=os.path.join(r"E:\workspace\outfit_matcher\2024 SS Outfit", f"{item['item_name']}_best_{param['topk']}.png")
+                                                          )
+            result.append({"outfits": best_outfits, "scores": best_scores})
+        else:
+            bad_outfits, bad_scores = service.visualize(outfits, scores, request_item["topk"], best=False,
+                                                        # output_path=os.path.join(r"E:\workspace\outfit_matcher\2024 SS Outfit", f"{item['item_name']}_worst_{param['topk']}.png")
+                                                        )
+            result.append({"outfits": bad_outfits, "scores": bad_scores})
+    logger.info(f"run time is : {time.time() - start_time}")
+    return {"message": "ok", "data": result}
+    # except Exception as e:
+    #     logger.warning(e)
+    #     return {"message": f"{e}", "data": e}
--- a/app/api/api_route.py
+++ b/app/api/api_route.py
@@ -3,9 +3,11 @@ from fastapi import APIRouter
 from app.api import api_test
 from app.api import api_outfit_matcher
 from app.api import api_attribute
+from app.api import api_similar_match

 router = APIRouter()

 router.include_router(api_test.router, tags=["test"], prefix="/test")
 router.include_router(api_outfit_matcher.router, tags=["outfit_matcher"], prefix="/api/outfit_matcher")
 router.include_router(api_attribute.router, tags=["attribute"], prefix="/api/attribute")
+router.include_router(api_similar_match.router, tags=["similar_match"], prefix="/api/similar_match")
--- a/app/api/api_similar_match.py
+++ b/app/api/api_similar_match.py
@@ -0,0 +1,28 @@
+import logging
+import time
+
+from fastapi import APIRouter
+
+from app.schemas.similar_match import SimilarMatchMItem
+from app.service.similar_match.service import SimilarMatch
+from app.service.utils.decorator import RunTime
+
+logger = logging.getLogger()
+router = APIRouter()
+
+
+@RunTime
+@router.post("similar_match")
+def similar_match(request_item: SimilarMatchMItem):
+    try:
+        if request_item.result_number <= 0:
+            raise KeyError("result number can't be less than 0")
+        service = SimilarMatch(request_item)
+        search_response = service.match_features()
+        response_data = []
+        for response in search_response[0]:
+            response_data.append(response['entity'])
+        return {"message": "ok", "data": response_data}
+    except KeyError as e:
+        logger.warning(str(e))
+        return {"message": "result number can't be less than 0", "data": []}
--- a/app/core/config.py
+++ b/app/core/config.py
@@ -27,20 +27,36 @@ 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

-ATT_TRITON_IP = "10.1.1.150"
-ATT_TRITON_PORT = "6000"
+ATT_TRITON_IP = "10.1.1.240"
+ATT_TRITON_PORT = "10020"

 # service env
-# LOGSPATH = "logs/errors.log"
+# LOGS_PATH = "app/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
+<<<<<<< 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
--- a/app/schemas/similar_match.py
+++ b/app/schemas/similar_match.py
@@ -0,0 +1,6 @@
+from pydantic import BaseModel
+
+
+class SimilarMatchMItem(BaseModel):
+    image_path: str
+    result_number: int
--- a/app/service/attribute_recognition/const.py
+++ b/app/service/attribute_recognition/const.py
@@ -1,20 +1,20 @@
 import torch

 device = torch.device('cuda')
-top_discription_list = ['service/attribute_recognition/discriptor/top/1_top_length.csv',
-                        'service/attribute_recognition/discriptor/top/2_top_type.csv',
-                        'service/attribute_recognition/discriptor/top/3_top_Sleeve_length.csv',
-                        'service/attribute_recognition/discriptor/top/4_top_Sleeve_shape.csv',
-                        'service/attribute_recognition/discriptor/top/5_top_Sleeve_shoulder.csv',
-                        'service/attribute_recognition/discriptor/top/6_top_Neckline.csv',
-                        'service/attribute_recognition/discriptor/top/7_outer_Print.csv',
-                        'service/attribute_recognition/discriptor/top/8_outer_Material.csv',
-                        #   'service/attribute_recognition/discriptor/top/9_top_Material.csv',
-                        'service/attribute_recognition/discriptor/top/9_top_Softness.csv',
-                        'service/attribute_recognition/discriptor/top/10_top_Design.csv',
-                        'service/attribute_recognition/discriptor/top/11_top_OPType.csv',
-                        'service/attribute_recognition/discriptor/top/12_top_Silhouette.csv',
-                        'service/attribute_recognition/discriptor/top/7_top_Collar.csv']
+top_discription_list = ['app/service/attribute_recognition/discriptor/top/1_top_length.csv',
+                        'app/service/attribute_recognition/discriptor/top/2_top_type.csv',
+                        'app/service/attribute_recognition/discriptor/top/3_top_Sleeve_length.csv',
+                        'app/service/attribute_recognition/discriptor/top/4_top_Sleeve_shape.csv',
+                        'app/service/attribute_recognition/discriptor/top/5_top_Sleeve_shoulder.csv',
+                        'app/service/attribute_recognition/discriptor/top/6_top_Neckline.csv',
+                        'app/service/attribute_recognition/discriptor/top/7_outer_Print.csv',
+                        'app/service/attribute_recognition/discriptor/top/8_outer_Material.csv',
+                        #   'app/service/attribute_recognition/discriptor/top/9_top_Material.csv',
+                        'app/service/attribute_recognition/discriptor/top/9_top_Softness.csv',
+                        'app/service/attribute_recognition/discriptor/top/10_top_Design.csv',
+                        'app/service/attribute_recognition/discriptor/top/11_top_OPType.csv',
+                        'app/service/attribute_recognition/discriptor/top/12_top_Silhouette.csv',
+                        'app/service/attribute_recognition/discriptor/top/7_top_Collar.csv']

 top_model_list = ['top_length',
                  'top_type',
@@ -32,15 +32,15 @@ top_model_list = ['top_length',
                  ]

 bottom_discription_list = [
-    'service/attribute_recognition/discriptor/bottom/2_bottom_subtype.csv',
-    #    'service/attribute_recognition/discriptor/bottom/3_bottom_structure.csv',
-    'service/attribute_recognition/discriptor/bottom/3_bottom_length.csv',
-    'service/attribute_recognition/discriptor/bottom/7_outer_Print.csv',
-    'service/attribute_recognition/discriptor/bottom/8_outer_Material.csv',
-    'service/attribute_recognition/discriptor/bottom/5_bottom_Softness.csv',
-    'service/attribute_recognition/discriptor/bottom/8_bottom_Silhouette.csv',
-    'service/attribute_recognition/discriptor/bottom/7_bottom_OPType.csv',
-    'service/attribute_recognition/discriptor/bottom/6_bottom_Design.csv']
+    'app/service/attribute_recognition/discriptor/bottom/2_bottom_subtype.csv',
+    #    'app/service/attribute_recognition/discriptor/bottom/3_bottom_structure.csv',
+    'app/service/attribute_recognition/discriptor/bottom/3_bottom_length.csv',
+    'app/service/attribute_recognition/discriptor/bottom/7_outer_Print.csv',
+    'app/service/attribute_recognition/discriptor/bottom/8_outer_Material.csv',
+    'app/service/attribute_recognition/discriptor/bottom/5_bottom_Softness.csv',
+    'app/service/attribute_recognition/discriptor/bottom/8_bottom_Silhouette.csv',
+    'app/service/attribute_recognition/discriptor/bottom/7_bottom_OPType.csv',
+    'app/service/attribute_recognition/discriptor/bottom/6_bottom_Design.csv']

 bottom_model_list = [
    'bottom_sub-Type',
@@ -50,21 +50,21 @@ bottom_model_list = [
    'bottom_Softness_B',
    'bottom_Silhouette_B',
    'bottom_OPType_B',
-    'bottom_Design_B']
+    'bottom_design']

-outwear_discription_list = ['service/attribute_recognition/discriptor/outwear/1_outer_length.csv',
-                            #    'service/attribute_recognition/discriptor/outwear/2_outer_type.csv',
-                            'service/attribute_recognition/discriptor/outwear/3_outer_sleeve_length.csv',
-                            'service/attribute_recognition/discriptor/outwear/4_outer_sleeve_shape.csv',
-                            'service/attribute_recognition/discriptor/outwear/5_outer_sleeve_shoulder.csv',
-                            'service/attribute_recognition/discriptor/outwear/6_outer_Collar.csv',
-                            'service/attribute_recognition/discriptor/outwear/7_outer_Print.csv',
-                            'service/attribute_recognition/discriptor/outwear/8_outer_Material.csv',
-                            'service/attribute_recognition/discriptor/outwear/9_outer_Softness.csv',
-                            'service/attribute_recognition/discriptor/outwear/10_outer_Design.csv',
-                            #    'service/attribute_recognition/discriptor/outwear/11_outer_opening.csv',
-                            'service/attribute_recognition/discriptor/outwear/12_outer_OPType.csv',
-                            'service/attribute_recognition/discriptor/outwear/13_outer_Silhouette.csv', ]
+outwear_discription_list = ['app/service/attribute_recognition/discriptor/outwear/1_outer_length.csv',
+                            #    'app/service/attribute_recognition/discriptor/outwear/2_outer_type.csv',
+                            'app/service/attribute_recognition/discriptor/outwear/3_outer_sleeve_length.csv',
+                            'app/service/attribute_recognition/discriptor/outwear/4_outer_sleeve_shape.csv',
+                            'app/service/attribute_recognition/discriptor/outwear/5_outer_sleeve_shoulder.csv',
+                            'app/service/attribute_recognition/discriptor/outwear/6_outer_Collar.csv',
+                            'app/service/attribute_recognition/discriptor/outwear/7_outer_Print.csv',
+                            'app/service/attribute_recognition/discriptor/outwear/8_outer_Material.csv',
+                            'app/service/attribute_recognition/discriptor/outwear/9_outer_Softness.csv',
+                            'app/service/attribute_recognition/discriptor/outwear/10_outer_Design.csv',
+                            #    'app/service/attribute_recognition/discriptor/outwear/11_outer_opening.csv',
+                            'app/service/attribute_recognition/discriptor/outwear/12_outer_OPType.csv',
+                            'app/service/attribute_recognition/discriptor/outwear/13_outer_Silhouette.csv', ]

 outwear_model_list = ['outwear_outer_length',
                      #   'outwear_2_outer_type',
@@ -80,18 +80,18 @@ outwear_model_list = ['outwear_outer_length',
                      'outwear_outer_optype',
                      'outwear_outer_silhouette']

-jumpsuit_discription_list = ['service/attribute_recognition/discriptor/jumpsuit/1_jumsuit_length.csv',
-                             'service/attribute_recognition/discriptor/jumpsuit/2_jumpsuit_Sleeve_length.csv',
-                             'service/attribute_recognition/discriptor/jumpsuit/3_jumpsuit_Sleeve_shape.csv',
-                             'service/attribute_recognition/discriptor/jumpsuit/4_jumpsuit_Sleeve_shoulder.csv',
-                             'service/attribute_recognition/discriptor/jumpsuit/5_jumpsuit_Neckline.csv',
-                             'service/attribute_recognition/discriptor/jumpsuit/6_jumpsuit_Collar.csv',
-                             'service/attribute_recognition/discriptor/jumpsuit/7_jumpsuit_Print.csv',
-                             'service/attribute_recognition/discriptor/jumpsuit/8_jumpsuit_Material.csv',
-                             'service/attribute_recognition/discriptor/jumpsuit/9_jumpsuit_Softness.csv',
-                             'service/attribute_recognition/discriptor/jumpsuit/10_jumsuit_design.csv',
-                             'service/attribute_recognition/discriptor/jumpsuit/11_jumpsuit_OPType.csv',
-                             'service/attribute_recognition/discriptor/jumpsuit/12_jumpsuit_subtype.csv']
+jumpsuit_discription_list = ['app/service/attribute_recognition/discriptor/jumpsuit/1_jumsuit_length.csv',
+                             'app/service/attribute_recognition/discriptor/jumpsuit/2_jumpsuit_Sleeve_length.csv',
+                             'app/service/attribute_recognition/discriptor/jumpsuit/3_jumpsuit_Sleeve_shape.csv',
+                             'app/service/attribute_recognition/discriptor/jumpsuit/4_jumpsuit_Sleeve_shoulder.csv',
+                             'app/service/attribute_recognition/discriptor/jumpsuit/5_jumpsuit_Neckline.csv',
+                             'app/service/attribute_recognition/discriptor/jumpsuit/6_jumpsuit_Collar.csv',
+                             'app/service/attribute_recognition/discriptor/jumpsuit/7_jumpsuit_Print.csv',
+                             'app/service/attribute_recognition/discriptor/jumpsuit/8_jumpsuit_Material.csv',
+                             'app/service/attribute_recognition/discriptor/jumpsuit/9_jumpsuit_Softness.csv',
+                             'app/service/attribute_recognition/discriptor/jumpsuit/10_jumsuit_design.csv',
+                             'app/service/attribute_recognition/discriptor/jumpsuit/11_jumpsuit_OPType.csv',
+                             'app/service/attribute_recognition/discriptor/jumpsuit/12_jumpsuit_subtype.csv']

 jumpsuit_model_list = ['jumpsuit_length',
                       'jumpsuit_sleeve_length',
@@ -106,19 +106,19 @@ jumpsuit_model_list = ['jumpsuit_length',
                       'jumpsuit_optype',
                       'jumpsuit_subtype']

-dress_discription_list = ['service/attribute_recognition/discriptor/dress/1_dress_length.csv',
-                          'service/attribute_recognition/discriptor/dress/3_top_Sleeve_length.csv',
-                          'service/attribute_recognition/discriptor/dress/4_top_Sleeve_shape.csv',
-                          'service/attribute_recognition/discriptor/dress/5_top_Sleeve_shoulder.csv',
-                          'service/attribute_recognition/discriptor/dress/ori5_dress_Neckline.csv',
-                          'service/attribute_recognition/discriptor/dress/7_outer_Print.csv',
-                          'service/attribute_recognition/discriptor/dress/7_top_Collar.csv',
-                          'service/attribute_recognition/discriptor/dress/8_outer_Material.csv',
-                          'service/attribute_recognition/discriptor/dress/9_dress_Design.csv',
-                          'service/attribute_recognition/discriptor/dress/9_top_Softness.csv',
-                          'service/attribute_recognition/discriptor/dress/11_dress_Silhouette.csv',
-                          # 'service/attribute_recognition/discriptor/dress/11_top_OPType.csv',
-                          'service/attribute_recognition/discriptor/dress/12_dress_type.csv']
+dress_discription_list = ['app/service/attribute_recognition/discriptor/dress/1_dress_length.csv',
+                          'app/service/attribute_recognition/discriptor/dress/3_top_Sleeve_length.csv',
+                          'app/service/attribute_recognition/discriptor/dress/4_top_Sleeve_shape.csv',
+                          'app/service/attribute_recognition/discriptor/dress/5_top_Sleeve_shoulder.csv',
+                          'app/service/attribute_recognition/discriptor/dress/ori5_dress_Neckline.csv',
+                          'app/service/attribute_recognition/discriptor/dress/7_outer_Print.csv',
+                          'app/service/attribute_recognition/discriptor/dress/7_top_Collar.csv',
+                          'app/service/attribute_recognition/discriptor/dress/8_outer_Material.csv',
+                          'app/service/attribute_recognition/discriptor/dress/9_dress_Design.csv',
+                          'app/service/attribute_recognition/discriptor/dress/9_top_Softness.csv',
+                          'app/service/attribute_recognition/discriptor/dress/11_dress_Silhouette.csv',
+                          # 'app/service/attribute_recognition/discriptor/dress/11_top_OPType.csv',
+                          'app/service/attribute_recognition/discriptor/dress/12_dress_type.csv']

 dress_model_list = ['dress_length',
                    'dress_sleeve_length',
@@ -135,5 +135,5 @@ dress_model_list = ['dress_length',
                    'dress_type'
                    ]

-category_discription = 'service/attribute_recognition/discriptor/category/category_dis.csv'
+category_discription = 'app/service/attribute_recognition/discriptor/category/category_dis.csv'
 category_model = 'category'
--- a/app/service/attribute_recognition/const_debug.py
+++ b/app/service/attribute_recognition/const_debug.py
@@ -0,0 +1,139 @@
+import torch
+
+device = torch.device('cuda')
+top_discription_list = [r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\top\1_top_length.csv',
+                        r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\top\2_top_type.csv',
+                        r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\top\3_top_Sleeve_length.csv',
+                        r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\top\4_top_Sleeve_shape.csv',
+                        r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\top\5_top_Sleeve_shoulder.csv',
+                        r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\top\6_top_Neckline.csv',
+                        r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\top\7_outer_Print.csv',
+                        r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\top\8_outer_Material.csv',
+                        #   r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\top\9_top_Material.csv',
+                        r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\top\9_top_Softness.csv',
+                        r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\top\10_top_Design.csv',
+                        r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\top\11_top_OPType.csv',
+                        r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\top\12_top_Silhouette.csv',
+                        r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\top\7_top_Collar.csv']
+
+top_model_list = ['top_length',
+                  'top_type',
+                  'top_Sleeve_length',
+                  'top_Sleeve_shape',
+                  'top_Sleeve_shoulder',
+                  'top_Neckline',
+                  'top_print',
+                  'top_material',
+                  'top_Softness',
+                  'top_Design',
+                  'top_optype',
+                  'top_Silhouette',
+                  'top_Collar'
+                  ]
+
+bottom_discription_list = [
+    r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\bottom\2_bottom_subtype.csv',
+    #    r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\bottom\3_bottom_structure.csv',
+    r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\bottom\3_bottom_length.csv',
+    r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\bottom\7_outer_Print.csv',
+    r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\bottom\8_outer_Material.csv',
+    r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\bottom\5_bottom_Softness.csv',
+    r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\bottom\8_bottom_Silhouette.csv',
+    r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\bottom\7_bottom_OPType.csv',
+    r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\bottom\6_bottom_Design.csv']
+
+bottom_model_list = [
+    'bottom_sub-Type',
+    'bottom_length',
+    'bottom_print',
+    'bottom_material',
+    'bottom_Softness_B',
+    'bottom_Silhouette_B',
+    'bottom_OPType_B',
+    'bottom_design']
+
+outwear_discription_list = [r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\outwear\1_outer_length.csv',
+                            #    r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\outwear\2_outer_type.csv',
+                            r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\outwear\3_outer_sleeve_length.csv',
+                            r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\outwear\4_outer_sleeve_shape.csv',
+                            r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\outwear\5_outer_sleeve_shoulder.csv',
+                            r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\outwear\6_outer_Collar.csv',
+                            r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\outwear\7_outer_Print.csv',
+                            r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\outwear\8_outer_Material.csv',
+                            r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\outwear\9_outer_Softness.csv',
+                            r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\outwear\10_outer_Design.csv',
+                            #    r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\outwear\11_outer_opening.csv',
+                            r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\outwear\12_outer_OPType.csv',
+                            r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\outwear\13_outer_Silhouette.csv', ]
+
+outwear_model_list = ['outwear_outer_length',
+                      #   'outwear_2_outer_type',
+                      'outwear_outer_sleeve_length',
+                      'outwear_outer_sleeve_shape',
+                      'outwear_outer_sleeve_shoulder',
+                      'outwear_outer_collar',
+                      'outwear_print',
+                      'outwear_material',
+                      'outwear_outer_softness',
+                      'outwear_outer_design',
+                      #   'outwear_11_outer_opening',
+                      'outwear_outer_optype',
+                      'outwear_outer_silhouette']
+
+jumpsuit_discription_list = [r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\jumpsuit\1_jumsuit_length.csv',
+                             r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\jumpsuit\2_jumpsuit_Sleeve_length.csv',
+                             r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\jumpsuit\3_jumpsuit_Sleeve_shape.csv',
+                             r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\jumpsuit\4_jumpsuit_Sleeve_shoulder.csv',
+                             r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\jumpsuit\5_jumpsuit_Neckline.csv',
+                             r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\jumpsuit\6_jumpsuit_Collar.csv',
+                             r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\jumpsuit\7_jumpsuit_Print.csv',
+                             r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\jumpsuit\8_jumpsuit_Material.csv',
+                             r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\jumpsuit\9_jumpsuit_Softness.csv',
+                             r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\jumpsuit\10_jumsuit_design.csv',
+                             r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\jumpsuit\11_jumpsuit_OPType.csv',
+                             r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\jumpsuit\12_jumpsuit_subtype.csv']
+
+jumpsuit_model_list = ['jumpsuit_length',
+                       'jumpsuit_sleeve_length',
+                       'jumpsuit_sleeve_shape',
+                       'jumpsuit_sleeve_shoulder',
+                       'jumpsuit_neckline',
+                       'jumpsuit_collar',
+                       'jumpsuit_print',
+                       'jumpsuit_material',
+                       'jumpsuit_softness',
+                       'jumpsuit_design',
+                       'jumpsuit_optype',
+                       'jumpsuit_subtype']
+
+dress_discription_list = [r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\dress\1_dress_length.csv',
+                          r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\dress\3_top_Sleeve_length.csv',
+                          r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\dress\4_top_Sleeve_shape.csv',
+                          r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\dress\5_top_Sleeve_shoulder.csv',
+                          r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\dress\ori5_dress_Neckline.csv',
+                          r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\dress\7_outer_Print.csv',
+                          r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\dress\7_top_Collar.csv',
+                          r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\dress\8_outer_Material.csv',
+                          r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\dress\9_dress_Design.csv',
+                          r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\dress\9_top_Softness.csv',
+                          r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\dress\11_dress_Silhouette.csv',
+                          # r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\dress\11_top_OPType.csv',
+                          r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\dress\12_dress_type.csv']
+
+dress_model_list = ['dress_length',
+                    'dress_sleeve_length',
+                    'dress_sleeve_shape',
+                    'dress_sleeve_shoulder',
+                    'dress_neckline',
+                    'dress_print',
+                    'dress_collar',
+                    'dress_material',
+                    'dress_design',
+                    'dress_softness',
+                    'dress_silohouette12',
+                    #   'dress_'
+                    'dress_type'
+                    ]
+
+category_discription = r'E:\workspace\trinity_client_mixi\app\service\attribute_recognition\discriptor\category\category_dis.csv'
+category_model = 'category'
--- a/app/service/attribute_recognition/discriptor/bottom/2_bottom_subtype.csv
+++ b/app/service/attribute_recognition/discriptor/bottom/2_bottom_subtype.csv
@@ -1,21 +1,21 @@
 labelName,join_attr,taskName,taskId
-A Line Skirt,bottom_Sub-Type_1,BTM_Sub-Type,2
-Bodycon Skirt,bottom_Sub-Type_2,BTM_Sub-Type,2
-Boot-Cut,bottom_Sub-Type_3,BTM_Sub-Type,2
-Bubble skirt,bottom_Sub-Type_4,BTM_Sub-Type,2
-Cargo Pants,bottom_Sub-Type_5,BTM_Sub-Type,2
-Culottes,bottom_Sub-Type_6,BTM_Sub-Type,2
-Handkerchief Skirt,bottom_Sub-Type_7,BTM_Sub-Type,2
-Jeans,bottom_Sub-Type_8,BTM_Sub-Type,2
-Joggers,bottom_Sub-Type_9,BTM_Sub-Type,2
-Leather pants,bottom_Sub-Type_10,BTM_Sub-Type,2
-Leggings,bottom_Sub-Type_11,BTM_Sub-Type,2
-Mermaid,bottom_Sub-Type_12,BTM_Sub-Type,2
-Pattened pants,bottom_Sub-Type_13,BTM_Sub-Type,2
-Peg leg Pants-Cigarette Pants,bottom_Sub-Type_14,BTM_Sub-Type,2
-Pencil Skirt,bottom_Sub-Type_15,BTM_Sub-Type,2
-Pleated Skirt,bottom_Sub-Type_16,BTM_Sub-Type,2
-Shorts,bottom_Sub-Type_17,BTM_Sub-Type,2
-Skater Skirt,bottom_Sub-Type_18,BTM_Sub-Type,2
-Suit Trousers,bottom_Sub-Type_19,BTM_Sub-Type,2
-Tier Skirt,bottom_Sub-Type_20,BTM_Sub-Type,2
+A Line Skirt,bottom_Sub-Type_1,Sub_Type,2
+Bodycon Skirt,bottom_Sub-Type_2,Sub_Type,2
+Boot-Cut,bottom_Sub-Type_3,Sub_Type,2
+Bubble skirt,bottom_Sub-Type_4,Sub_Type,2
+Cargo Pants,bottom_Sub-Type_5,Sub_Type,2
+Culottes,bottom_Sub-Type_6,Sub_Type,2
+Handkerchief Skirt,bottom_Sub-Type_7,Sub_Type,2
+Jeans,bottom_Sub-Type_8,Sub_Type,2
+Joggers,bottom_Sub-Type_9,Sub_Type,2
+Leather pants,bottom_Sub-Type_10,Sub_Type,2
+Leggings,bottom_Sub-Type_11,Sub_Type,2
+Mermaid,bottom_Sub-Type_12,Sub_Type,2
+Pattened pants,bottom_Sub-Type_13,Sub_Type,2
+Peg leg Pants-Cigarette Pants,bottom_Sub-Type_14,Sub_Type,2
+Pencil Skirt,bottom_Sub-Type_15,Sub_Type,2
+Pleated Skirt,bottom_Sub-Type_16,Sub_Type,2
+Shorts,bottom_Sub-Type_17,Sub_Type,2
+Skater Skirt,bottom_Sub-Type_18,Sub_Type,2
+Suit Trousers,bottom_Sub-Type_19,Sub_Type,2
+Tier Skirt,bottom_Sub-Type_20,Sub_Type,2
--- a/app/service/attribute_recognition/discriptor/bottom/3_bottom_length.csv
+++ b/app/service/attribute_recognition/discriptor/bottom/3_bottom_length.csv
@@ -1,6 +1,6 @@
 labelName,join_attr,taskName,taskId
-Short,attr_BTM_length_1,BTM_length,3
-Middle,attr_BTM_length_2,BTM_length,3
-Seven,attr_BTM_length_3,BTM_length,3
-Nine,attr_BTM_length_4,BTM_length,3
-Long,attr_BTM_length_5,BTM_length,3
+Short,attr_BTM_length_1,Length,3
+Middle,attr_BTM_length_2,Length,3
+Seven,attr_BTM_length_3,Length,3
+Nine,attr_BTM_length_4,Length,3
+Long,attr_BTM_length_5,Length,3
--- a/app/service/attribute_recognition/discriptor/bottom/5_bottom_Softness.csv
+++ b/app/service/attribute_recognition/discriptor/bottom/5_bottom_Softness.csv
@@ -1,4 +1,4 @@
 labelName,join_attr,taskName,taskId
-Soft,attr_Softness_B_1,Softness_B,5
-Medium,attr_Softness_B_2,Softness_B,5
-Hard,attr_Softness_B_3,Softness_B,5
+Soft,attr_Softness_B_1,Softness,5
+Medium,attr_Softness_B_2,Softness,5
+Hard,attr_Softness_B_3,Softness,5
--- a/app/service/attribute_recognition/discriptor/bottom/6_bottom_Design.csv
+++ b/app/service/attribute_recognition/discriptor/bottom/6_bottom_Design.csv
@@ -1,17 +1,17 @@
 labelName,join_attr,taskName,taskId
-Asymmetrical,attr_Design_B_1,Design_B,6
-Tiered,attr_Design_B_2,Design_B,6
-Tassel,attr_Design_B_3,Design_B,6
-Ruffle,attr_Design_B_4,Design_B,6
-Pleated,attr_Design_B_5,Design_B,6
-Wrap,attr_Design_B_6,Design_B,6
-Ripped,attr_Design_B_7,Design_B,6
-Cut out,attr_Design_B_8,Design_B,6
-Eyelet,attr_Design_B_9,Design_B,6
-Folded,attr_Design_B_10,Design_B,6
-Tied,attr_Design_B_11,Design_B,6
-Drapes,attr_Design_B_12,Design_B,6
-Ribbon,attr_Design_B_13,Design_B,6
-Button,attr_Design_B_14,Design_B,6
-Split,attr_Design_B_15,Design_B,6
-Fishtail,attr_Design_B_16,Design_B,6
+Asymmetrical,attr_Design_B_1,Design,6
+Tiered,attr_Design_B_2,Design,6
+Tassel,attr_Design_B_3,Design,6
+Ruffle,attr_Design_B_4,Design,6
+Pleated,attr_Design_B_5,Design,6
+Wrap,attr_Design_B_6,Design,6
+Ripped,attr_Design_B_7,Design,6
+Cut out,attr_Design_B_8,Design,6
+Eyelet,attr_Design_B_9,Design,6
+Folded,attr_Design_B_10,Design,6
+Tied,attr_Design_B_11,Design,6
+Drapes,attr_Design_B_12,Design,6
+Ribbon,attr_Design_B_13,Design,6
+Button,attr_Design_B_14,Design,6
+Split,attr_Design_B_15,Design,6
+Fishtail,attr_Design_B_16,Design,6
--- a/app/service/attribute_recognition/discriptor/bottom/7_bottom_OPType.csv
+++ b/app/service/attribute_recognition/discriptor/bottom/7_bottom_OPType.csv
@@ -1,6 +1,6 @@
 labelName,join_attr,taskName,taskId
-Button,attr_OPType_B_1,OPType_B,7
-Zipper,attr_OPType_B_2,OPType_B,7
-Thread,attr_OPType_B_3,OPType_B,7
-Hook,attr_OPType_B_4,OPType_B,7
-Elastic,attr_OPType_B_5,OPType_B,7
+Button,attr_OPType_B_1,Opening_Type,7
+Zipper,attr_OPType_B_2,Opening_Type,7
+Thread,attr_OPType_B_3,Opening_Type,7
+Hook,attr_OPType_B_4,Opening_Type,7
+Elastic,attr_OPType_B_5,Opening_Type,7
--- a/app/service/attribute_recognition/discriptor/bottom/7_outer_Print.csv
+++ b/app/service/attribute_recognition/discriptor/bottom/7_outer_Print.csv
@@ -1,16 +1,16 @@
 labelName,join_attr,taskName,taskId
-Abstract,attr_Print_O_1,Print_B,7
-Allover,attr_Print_O_2,Print_B,7
-Animal,attr_Print_O_3,Print_B,7
-Camouflage,attr_Print_O_4,Print_B,7
-Checks,attr_Print_O_5,Print_B,7
-Color_block,attr_Print_O_6,Print_B,7
-Disty print,attr_Print_O_7,Print_B,7
-Dotted,attr_Print_O_8,Print_B,7
-Floral,attr_Print_O_9,Print_B,7
-Graphic print,attr_Print_O_10,Print_B,7
-Logo and slogan,attr_Print_O_11,Print_B,7
-Patchwork,attr_Print_O_12,Print_B,7
-Plain,attr_Print_O_13,Print_B,7
-Plain_dnim,attr_Print_O_14,Print_B,7
-Stripe,attr_Print_O_15,Print_B,7
+Abstract,attr_Print_O_1,Print,7
+Allover,attr_Print_O_2,Print,7
+Animal,attr_Print_O_3,Print,7
+Camouflage,attr_Print_O_4,Print,7
+Checks,attr_Print_O_5,Print,7
+Color_block,attr_Print_O_6,Print,7
+Disty print,attr_Print_O_7,Print,7
+Dotted,attr_Print_O_8,Print,7
+Floral,attr_Print_O_9,Print,7
+Graphic print,attr_Print_O_10,Print,7
+Logo and slogan,attr_Print_O_11,Print,7
+Patchwork,attr_Print_O_12,Print,7
+Plain,attr_Print_O_13,Print,7
+Plain_dnim,attr_Print_O_14,Print,7
+Stripe,attr_Print_O_15,Print,7
--- a/app/service/attribute_recognition/discriptor/bottom/8_bottom_Silhouette.csv
+++ b/app/service/attribute_recognition/discriptor/bottom/8_bottom_Silhouette.csv
@@ -1,6 +1,6 @@
 labelName,join_attr,taskName,taskId
-A Line,attr_Silhouette_B_1,Silhouette_B,8
-H Shape,attr_Silhouette_B_2,Silhouette_B,8
-Slim,attr_Silhouette_B_3,Silhouette_B,8
-Peg-leg,attr_Silhouette_B_4,Silhouette_B,8
-Peplum,attr_Silhouette_B_5,Silhouette_B,8
+A Line,attr_Silhouette_B_1,Silhouette,8
+H Shape,attr_Silhouette_B_2,Silhouette,8
+Slim,attr_Silhouette_B_3,Silhouette,8
+Peg-leg,attr_Silhouette_B_4,Silhouette,8
+Peplum,attr_Silhouette_B_5,Silhouette,8
--- a/app/service/attribute_recognition/discriptor/bottom/8_outer_Material.csv
+++ b/app/service/attribute_recognition/discriptor/bottom/8_outer_Material.csv
@@ -1,28 +1,28 @@
 labelName,join_attr,taskName,taskId
-Canvas,attr_Material_O_1,Material_B,8
-Chambray,attr_Material_O_2,Material_B,8
-Chenille,attr_Material_O_3,Material_B,8
-Chiffon,attr_Material_O_4,Material_B,8
-Corduroy,attr_Material_O_5,Material_B,8
-Crepe,attr_Material_O_6,Material_B,8
-Denim,attr_Material_O_7,Material_B,8
-Faux_fur,attr_Material_O_8,Material_B,8
-Faux_leather,attr_Material_O_9,Material_B,8
-Flannel,attr_Material_O_10,Material_B,8
-Fleece,attr_Material_O_11,Material_B,8
-Gingham,attr_Material_O_12,Material_B,8
-Jersey,attr_Material_O_13,Material_B,8
-Knit,attr_Material_O_14,Material_B,8
-Lace,attr_Material_O_15,Material_B,8
-Lawn,attr_Material_O_16,Material_B,8
-Neoprene,attr_Material_O_17,Material_B,8
-Organza,attr_Material_O_18,Material_B,8
-Plush,attr_Material_O_19,Material_B,8
-Satin,attr_Material_O_20,Material_B,8
-Serge,attr_Material_O_21,Material_B,8
-Taffeta,attr_Material_O_22,Material_B,8
-Tulle,attr_Material_O_23,Material_B,8
-Tweed,attr_Material_O_24,Material_B,8
-Twill,attr_Material_O_25,Material_B,8
-Velvet,attr_Material_O_26,Material_B,8
-Vinyl,attr_Material_O_27,Material_B,8
+Canvas,attr_Material_O_1,Material,8
+Chambray,attr_Material_O_2,Material,8
+Chenille,attr_Material_O_3,Material,8
+Chiffon,attr_Material_O_4,Material,8
+Corduroy,attr_Material_O_5,Material,8
+Crepe,attr_Material_O_6,Material,8
+Denim,attr_Material_O_7,Material,8
+Faux_fur,attr_Material_O_8,Material,8
+Faux_leather,attr_Material_O_9,Material,8
+Flannel,attr_Material_O_10,Material,8
+Fleece,attr_Material_O_11,Material,8
+Gingham,attr_Material_O_12,Material,8
+Jersey,attr_Material_O_13,Material,8
+Knit,attr_Material_O_14,Material,8
+Lace,attr_Material_O_15,Material,8
+Lawn,attr_Material_O_16,Material,8
+Neoprene,attr_Material_O_17,Material,8
+Organza,attr_Material_O_18,Material,8
+Plush,attr_Material_O_19,Material,8
+Satin,attr_Material_O_20,Material,8
+Serge,attr_Material_O_21,Material,8
+Taffeta,attr_Material_O_22,Material,8
+Tulle,attr_Material_O_23,Material,8
+Tweed,attr_Material_O_24,Material,8
+Twill,attr_Material_O_25,Material,8
+Velvet,attr_Material_O_26,Material,8
+Vinyl,attr_Material_O_27,Material,8
--- a/app/service/attribute_recognition/discriptor/bottom/ori10_bottom_Silhoutte.csv
+++ b/app/service/attribute_recognition/discriptor/bottom/ori10_bottom_Silhoutte.csv
@@ -1,6 +1,6 @@
 labelName,join_attr,taskName,taskId
-A Line,attr_Silhouette_B_1,Silhouette_B,10
-H Shape,attr_Silhouette_B_2,Silhouette_B,10
-Slim,attr_Silhouette_B_3,Silhouette_B,10
-Peg-top,attr_Silhouette_B_4,Silhouette_B,10
-Peplum,attr_Silhouette_B_5,Silhouette_B,10
+A Line,attr_Silhouette_B_1,Silhouette,10
+H Shape,attr_Silhouette_B_2,Silhouette,10
+Slim,attr_Silhouette_B_3,Silhouette,10
+Peg-top,attr_Silhouette_B_4,Silhouette,10
+Peplum,attr_Silhouette_B_5,Silhouette,10
--- a/app/service/attribute_recognition/discriptor/bottom/ori1_bottom_Type.csv
+++ b/app/service/attribute_recognition/discriptor/bottom/ori1_bottom_Type.csv
@@ -1,3 +1,3 @@
 labelName,join_attr,taskName,taskId
-Pants,BTM_Type_1,BTM_Type,1
-Skirt,BTM_Type_2,BTM_Type,1
+Pants,BTM_Type_1,Type,1
+Skirt,BTM_Type_2,Type,1
--- a/app/service/attribute_recognition/discriptor/bottom/ori2_bottom_subtype.csv
+++ b/app/service/attribute_recognition/discriptor/bottom/ori2_bottom_subtype.csv
@@ -1,47 +1,47 @@
 labelName,join_attr,taskName,taskId
-Jeans,BTM_Sub-Type_1,BTM_Sub-Type,2
-Leggings,BTM_Sub-Type_2,BTM_Sub-Type,2
-Joggers,BTM_Sub-Type_3,BTM_Sub-Type,2
-Suit Trousers,BTM_Sub-Type_4,BTM_Sub-Type,2
-Cargo Pants,BTM_Sub-Type_5,BTM_Sub-Type,2
-Culottes,BTM_Sub-Type_6,BTM_Sub-Type,2
-Peg leg Pants ,BTM_Sub-Type_7,BTM_Sub-Type,2
-A Line Skirt_gathered,BTM_Sub-Type_8,BTM_Sub-Type,2
-Pencil Skirt,BTM_Sub-Type_9,BTM_Sub-Type,2
-Handkerchief Skirt,BTM_Sub-Type_10,BTM_Sub-Type,2
-Mermaid/Fishtail Skirt,BTM_Sub-Type_11,BTM_Sub-Type,2
-Skater Skirt,BTM_Sub-Type_12,BTM_Sub-Type,2
-Bodycon Skirt,BTM_Sub-Type_13,BTM_Sub-Type,2
-Shorts,BTM_Sub-Type_14,BTM_Sub-Type,2
-boot-cut_flare,BTM_Sub-Type_15,BTM_Sub-Type,2
-Pleated Skirt,BTM_Sub-Type_16,BTM_Sub-Type,2
-Bubble skirt,BTM_Sub-Type_17,BTM_Sub-Type,2
-Leather pants,BTM_Sub-Type_18,BTM_Sub-Type,2
-pattened pants,BTM_Sub-Type_19,BTM_Sub-Type,2
-Tier Skirt,BTM_Sub-Type_20,BTM_Sub-Type,2
-asymmetric_mullet,BTM_Sub-Type_21,BTM_Sub-Type,2
-baggy,BTM_Sub-Type_22,BTM_Sub-Type,2
-denim skirt,BTM_Sub-Type_23,BTM_Sub-Type,2
-flare skirt,BTM_Sub-Type_24,BTM_Sub-Type,2
-fringe skirt,BTM_Sub-Type_25,BTM_Sub-Type,2
-godet skirt,BTM_Sub-Type_26,BTM_Sub-Type,2
-high rise pants,BTM_Sub-Type_27,BTM_Sub-Type,2
-hight waist skirt,BTM_Sub-Type_28,BTM_Sub-Type,2
-hat pants,BTM_Sub-Type_29,BTM_Sub-Type,2
-leather skirts,BTM_Sub-Type_30,BTM_Sub-Type,2
-long skirts,BTM_Sub-Type_31,BTM_Sub-Type,2
-low rise pants,BTM_Sub-Type_32,BTM_Sub-Type,2
-mini skirt,BTM_Sub-Type_33,BTM_Sub-Type,2
-panel kirt,BTM_Sub-Type_34,BTM_Sub-Type,2
-peg top skirt,BTM_Sub-Type_35,BTM_Sub-Type,2
-pencil pants,BTM_Sub-Type_36,BTM_Sub-Type,2
-shorts (denim),BTM_Sub-Type_37,BTM_Sub-Type,2
-skinny_cigarette pants,BTM_Sub-Type_38,BTM_Sub-Type,2
-split skirt,BTM_Sub-Type_39,BTM_Sub-Type,2
-stirrup,BTM_Sub-Type_40,BTM_Sub-Type,2
-stranget pants,BTM_Sub-Type_41,BTM_Sub-Type,2
-straight skirt,BTM_Sub-Type_42,BTM_Sub-Type,2
-wide leg pants,BTM_Sub-Type_43,BTM_Sub-Type,2
-wrap skirt,BTM_Sub-Type_44,BTM_Sub-Type,2
-Jeans,BTM_Sub-Type_45,BTM_Sub-Type,2
-Leggings,BTM_Sub-Type_46,BTM_Sub-Type,2
+Jeans,BTM_Sub-Type_1,Sub_Type,2
+Leggings,BTM_Sub-Type_2,Sub_Type,2
+Joggers,BTM_Sub-Type_3,Sub_Type,2
+Suit Trousers,BTM_Sub-Type_4,Sub_Type,2
+Cargo Pants,BTM_Sub-Type_5,Sub_Type,2
+Culottes,BTM_Sub-Type_6,Sub_Type,2
+Peg leg Pants ,BTM_Sub-Type_7,Sub_Type,2
+A Line Skirt_gathered,BTM_Sub-Type_8,Sub_Type,2
+Pencil Skirt,BTM_Sub-Type_9,Sub_Type,2
+Handkerchief Skirt,BTM_Sub-Type_10,Sub_Type,2
+Mermaid/Fishtail Skirt,BTM_Sub-Type_11,Sub_Type,2
+Skater Skirt,BTM_Sub-Type_12,Sub_Type,2
+Bodycon Skirt,BTM_Sub-Type_13,Sub_Type,2
+Shorts,BTM_Sub-Type_14,Sub_Type,2
+boot-cut_flare,BTM_Sub-Type_15,Sub_Type,2
+Pleated Skirt,BTM_Sub-Type_16,Sub_Type,2
+Bubble skirt,BTM_Sub-Type_17,Sub_Type,2
+Leather pants,BTM_Sub-Type_18,Sub_Type,2
+pattened pants,BTM_Sub-Type_19,Sub_Type,2
+Tier Skirt,BTM_Sub-Type_20,Sub_Type,2
+asymmetric_mullet,BTM_Sub-Type_21,Sub_Type,2
+baggy,BTM_Sub-Type_22,Sub_Type,2
+denim skirt,BTM_Sub-Type_23,Sub_Type,2
+flare skirt,BTM_Sub-Type_24,Sub_Type,2
+fringe skirt,BTM_Sub-Type_25,Sub_Type,2
+godet skirt,BTM_Sub-Type_26,Sub_Type,2
+high rise pants,BTM_Sub-Type_27,Sub_Type,2
+hight waist skirt,BTM_Sub-Type_28,Sub_Type,2
+hat pants,BTM_Sub-Type_29,Sub_Type,2
+leather skirts,BTM_Sub-Type_30,Sub_Type,2
+long skirts,BTM_Sub-Type_31,Sub_Type,2
+low rise pants,BTM_Sub-Type_32,Sub_Type,2
+mini skirt,BTM_Sub-Type_33,Sub_Type,2
+panel kirt,BTM_Sub-Type_34,Sub_Type,2
+peg top skirt,BTM_Sub-Type_35,Sub_Type,2
+pencil pants,BTM_Sub-Type_36,Sub_Type,2
+shorts (denim),BTM_Sub-Type_37,Sub_Type,2
+skinny_cigarette pants,BTM_Sub-Type_38,Sub_Type,2
+split skirt,BTM_Sub-Type_39,Sub_Type,2
+stirrup,BTM_Sub-Type_40,Sub_Type,2
+stranget pants,BTM_Sub-Type_41,Sub_Type,2
+straight skirt,BTM_Sub-Type_42,Sub_Type,2
+wide leg pants,BTM_Sub-Type_43,Sub_Type,2
+wrap skirt,BTM_Sub-Type_44,Sub_Type,2
+Jeans,BTM_Sub-Type_45,Sub_Type,2
+Leggings,BTM_Sub-Type_46,Sub_Type,2
--- a/app/service/attribute_recognition/discriptor/bottom/ori3_bottom_structure.csv
+++ b/app/service/attribute_recognition/discriptor/bottom/ori3_bottom_structure.csv
@@ -1,4 +1,4 @@
 labelName,join_attr,taskName,taskId
-Woven,attr_BTM_Structure_1,BTM_Structure,3
-Knit,attr_BTM_Structure_2,BTM_Structure,3
-Sweater,attr_BTM_Structure_3,BTM_Structure,3
+Woven,attr_BTM_Structure_1,Structure,3
+Knit,attr_BTM_Structure_2,Structure,3
+Sweater,attr_BTM_Structure_3,Structure,3
--- a/app/service/attribute_recognition/discriptor/bottom/ori4_bottom_length.csv
+++ b/app/service/attribute_recognition/discriptor/bottom/ori4_bottom_length.csv
@@ -1,6 +1,6 @@
 labelName,join_attr,taskName,taskId
-Short,attr_BTM_length_1,BTM_length,4
-Middle,attr_BTM_length_2,BTM_length,4
-Seven,attr_BTM_length_3,BTM_length,4
-Nine,attr_BTM_length_4,BTM_length,4
-Long,attr_BTM_length_5,BTM_length,4
+Short,attr_BTM_length_1,Length,4
+Middle,attr_BTM_length_2,Length,4
+Seven,attr_BTM_length_3,Length,4
+Nine,attr_BTM_length_4,Length,4
+Long,attr_BTM_length_5,Length,4
--- a/app/service/attribute_recognition/discriptor/bottom/ori5_bottom_Print.csv
+++ b/app/service/attribute_recognition/discriptor/bottom/ori5_bottom_Print.csv
@@ -1,16 +1,16 @@
 labelName,join_attr,taskName,taskId
-abstract,attr_Print_B_1,Print_B,5
-allover,attr_Print_B_2,Print_B,5
-animal printed,attr_Print_B_3,Print_B,5
-Camouflage,attr_Print_B_4,Print_B,5
-checks,attr_Print_B_5,Print_B,5
-color_block,attr_Print_B_6,Print_B,5
-disty print,attr_Print_B_7,Print_B,5
-dotted,attr_Print_B_8,Print_B,5
-floral,attr_Print_B_9,Print_B,5
-graphic print,attr_Print_B_10,Print_B,5
-logo and slogan print,attr_Print_B_11,Print_B,5
-patchwork,attr_Print_B_12,Print_B,5
-plain,attr_Print_B_13,Print_B,5
-plain_dnim,attr_Print_B_14,Print_B,5
-stripe,attr_Print_B_15,Print_B,5
+abstract,attr_Print_B_1,Print,5
+allover,attr_Print_B_2,Print,5
+animal printed,attr_Print_B_3,Print,5
+Camouflage,attr_Print_B_4,Print,5
+checks,attr_Print_B_5,Print,5
+color_block,attr_Print_B_6,Print,5
+disty print,attr_Print_B_7,Print,5
+dotted,attr_Print_B_8,Print,5
+floral,attr_Print_B_9,Print,5
+graphic print,attr_Print_B_10,Print,5
+logo and slogan print,attr_Print_B_11,Print,5
+patchwork,attr_Print_B_12,Print,5
+plain,attr_Print_B_13,Print,5
+plain_dnim,attr_Print_B_14,Print,5
+stripe,attr_Print_B_15,Print,5
--- a/app/service/attribute_recognition/discriptor/bottom/ori6_bottom_Material.csv
+++ b/app/service/attribute_recognition/discriptor/bottom/ori6_bottom_Material.csv
@@ -1,28 +1,28 @@
 labelName,join_attr,taskName,taskId
-canvas,attr_Material_B_1,Material_B,6
-chambray,attr_Material_B_2,Material_B,6
-chenille,attr_Material_B_3,Material_B,6
-chiffon,attr_Material_B_4,Material_B,6
-corduroy,attr_Material_B_5,Material_B,6
-crepe,attr_Material_B_6,Material_B,6
-denim,attr_Material_B_7,Material_B,6
-faux_fur,attr_Material_B_8,Material_B,6
-faux_leather,attr_Material_B_9,Material_B,6
-flannel,attr_Material_B_10,Material_B,6
-fleece,attr_Material_B_11,Material_B,6
-gingham,attr_Material_B_12,Material_B,6
-jersey,attr_Material_B_13,Material_B,6
-knit,attr_Material_B_14,Material_B,6
-lace,attr_Material_B_15,Material_B,6
-lawn,attr_Material_B_16,Material_B,6
-neoprene,attr_Material_B_17,Material_B,6
-organza,attr_Material_B_18,Material_B,6
-plush,attr_Material_B_19,Material_B,6
-satin,attr_Material_B_20,Material_B,6
-serge,attr_Material_B_21,Material_B,6
-taffeta,attr_Material_B_22,Material_B,6
-tulle,attr_Material_B_23,Material_B,6
-tweed,attr_Material_B_24,Material_B,6
-twill,attr_Material_B_25,Material_B,6
-velvet,attr_Material_B_26,Material_B,6
-vinyl,attr_Material_B_27,Material_B,6
+canvas,attr_Material_B_1,Material,6
+chambray,attr_Material_B_2,Material,6
+chenille,attr_Material_B_3,Material,6
+chiffon,attr_Material_B_4,Material,6
+corduroy,attr_Material_B_5,Material,6
+crepe,attr_Material_B_6,Material,6
+denim,attr_Material_B_7,Material,6
+faux_fur,attr_Material_B_8,Material,6
+faux_leather,attr_Material_B_9,Material,6
+flannel,attr_Material_B_10,Material,6
+fleece,attr_Material_B_11,Material,6
+gingham,attr_Material_B_12,Material,6
+jersey,attr_Material_B_13,Material,6
+knit,attr_Material_B_14,Material,6
+lace,attr_Material_B_15,Material,6
+lawn,attr_Material_B_16,Material,6
+neoprene,attr_Material_B_17,Material,6
+organza,attr_Material_B_18,Material,6
+plush,attr_Material_B_19,Material,6
+satin,attr_Material_B_20,Material,6
+serge,attr_Material_B_21,Material,6
+taffeta,attr_Material_B_22,Material,6
+tulle,attr_Material_B_23,Material,6
+tweed,attr_Material_B_24,Material,6
+twill,attr_Material_B_25,Material,6
+velvet,attr_Material_B_26,Material,6
+vinyl,attr_Material_B_27,Material,6
--- a/app/service/attribute_recognition/discriptor/bottom/ori7_bottom_Softness.csv
+++ b/app/service/attribute_recognition/discriptor/bottom/ori7_bottom_Softness.csv
@@ -1,4 +1,4 @@
 labelName,join_attr,taskName,taskId
-Soft,attr_Softness_B_1,Softness_B,7
-Medium,attr_Softness_B_2,Softness_B,7
-Hard,attr_Softness_B_3,Softness_B,7
+Soft,attr_Softness_B_1,Softness,7
+Medium,attr_Softness_B_2,Softness,7
+Hard,attr_Softness_B_3,Softness,7
--- a/app/service/attribute_recognition/discriptor/bottom/ori8_bottom_Design.csv
+++ b/app/service/attribute_recognition/discriptor/bottom/ori8_bottom_Design.csv
@@ -1,17 +1,17 @@
 labelName,join_attr,taskName,taskId
-Asymmetrical,attr_Design_B_1,Design_B,8
-Tiered,attr_Design_B_2,Design_B,8
-Tassel,attr_Design_B_3,Design_B,8
-Ruffle,attr_Design_B_4,Design_B,8
-Pleated,attr_Design_B_5,Design_B,8
-Wrap,attr_Design_B_6,Design_B,8
-Ripped,attr_Design_B_7,Design_B,8
-Cut out,attr_Design_B_8,Design_B,8
-Eyelet,attr_Design_B_9,Design_B,8
-Folded,attr_Design_B_10,Design_B,8
-Tied,attr_Design_B_11,Design_B,8
-Drapes,attr_Design_B_12,Design_B,8
-Ribbon,attr_Design_B_13,Design_B,8
-Button,attr_Design_B_14,Design_B,8
-Split,attr_Design_B_15,Design_B,8
-Fishtail,attr_Design_B_16,Design_B,8
+Asymmetrical,attr_Design_B_1,Design,8
+Tiered,attr_Design_B_2,Design,8
+Tassel,attr_Design_B_3,Design,8
+Ruffle,attr_Design_B_4,Design,8
+Pleated,attr_Design_B_5,Design,8
+Wrap,attr_Design_B_6,Design,8
+Ripped,attr_Design_B_7,Design,8
+Cut out,attr_Design_B_8,Design,8
+Eyelet,attr_Design_B_9,Design,8
+Folded,attr_Design_B_10,Design,8
+Tied,attr_Design_B_11,Design,8
+Drapes,attr_Design_B_12,Design,8
+Ribbon,attr_Design_B_13,Design,8
+Button,attr_Design_B_14,Design,8
+Split,attr_Design_B_15,Design,8
+Fishtail,attr_Design_B_16,Design,8
--- a/app/service/attribute_recognition/discriptor/bottom/ori9_bottom_OPType.csv
+++ b/app/service/attribute_recognition/discriptor/bottom/ori9_bottom_OPType.csv
@@ -1,6 +1,6 @@
 labelName,join_attr,taskName,taskId
-Button,attr_OPType_B_1,OPType_B,9
-Zipper,attr_OPType_B_2,OPType_B,9
-Thread,attr_OPType_B_3,OPType_B,9
-Hook,attr_OPType_B_4,OPType_B,9
-Elastic,attr_OPType_B_5,OPType_B,9
+Button,attr_OPType_B_1,Opening_Type,9
+Zipper,attr_OPType_B_2,Opening_Type,9
+Thread,attr_OPType_B_3,Opening_Type,9
+Hook,attr_OPType_B_4,Opening_Type,9
+Elastic,attr_OPType_B_5,Opening_Type,9
--- a/app/service/attribute_recognition/discriptor/dress/11_dress_Silhouette.csv
+++ b/app/service/attribute_recognition/discriptor/dress/11_dress_Silhouette.csv
@@ -1,11 +1,11 @@
 labelName,join_attr,taskName,taskId
-A Line,attr_Silhouette_U_1,Silhouette_D,11
-H Shape,attr_Silhouette_U_2,Silhouette_D,11
-Slim,attr_Silhouette_U_3,Silhouette_D,11
-Oversized,attr_Silhouette_U_4,Silhouette_D,11
-Cacoon,attr_Silhouette_U_5,Silhouette_D,11
-Empire,attr_Silhouette_U_6,Silhouette_D,11
-Hourglass,attr_Silhouette_U_7,Silhouette_D,11
-Mermaid,attr_Silhouette_U_8,Silhouette_D,11
-Sheath,attr_Silhouette_U_9,Silhouette_D,11
-Tent,attr_Silhouette_U_10,Silhouette_D,11
+A Line,attr_Silhouette_U_1,Silhouette,11
+H Shape,attr_Silhouette_U_2,Silhouette,11
+Slim,attr_Silhouette_U_3,Silhouette,11
+Oversized,attr_Silhouette_U_4,Silhouette,11
+Cacoon,attr_Silhouette_U_5,Silhouette,11
+Empire,attr_Silhouette_U_6,Silhouette,11
+Hourglass,attr_Silhouette_U_7,Silhouette,11
+Mermaid,attr_Silhouette_U_8,Silhouette,11
+Sheath,attr_Silhouette_U_9,Silhouette,11
+Tent,attr_Silhouette_U_10,Silhouette,11
--- a/app/service/attribute_recognition/discriptor/dress/11_top_OPType.csv
+++ b/app/service/attribute_recognition/discriptor/dress/11_top_OPType.csv
@@ -1,5 +1,5 @@
 labelName,join_attr,taskName,taskId
-Button,attr_OPType_U_1,OPType_D,11
-Zipper,attr_OPType_U_2,OPType_D,11
-Thread,attr_OPType_U_3,OPType_D,11
-Hook,attr_OPType_U_4,OPType_D,11
+Button,attr_OPType_U_1,Opening_Type,11
+Zipper,attr_OPType_U_2,Opening_Type,11
+Thread,attr_OPType_U_3,Opening_Type,11
+Hook,attr_OPType_U_4,Opening_Type,11
--- a/app/service/attribute_recognition/discriptor/dress/12_dress_type.csv
+++ b/app/service/attribute_recognition/discriptor/dress/12_dress_type.csv
@@ -1,20 +1,20 @@
 labelName,join_attr,taskName,taskId
-Evening gown,attr_dresstype_1,Dress_Type,12
-Shirt-dress,attr_dresstype_2,Dress_Type,12
-Coat dress,attr_dresstype_3,Dress_Type,12
-Handkerchief dress,attr_dresstype_4,Dress_Type,12
-Jumper dress,attr_dresstype_5,Dress_Type,12
-Dungaree dress,attr_dresstype_6,Dress_Type,12
-Skater dress,attr_dresstype_7,Dress_Type,12
-Tea dress,attr_dresstype_8,Dress_Type,12
-Mermaid dress,attr_dresstype_9,Dress_Type,12
-Cocktail dress,attr_dresstype_10,Dress_Type,12
-A-Line dress,attr_dresstype_11,Dress_Type,12
-Bodycon dress,attr_dresstype_12,Dress_Type,12
-Maxi dress,attr_dresstype_13,Dress_Type,12
-Office dress,attr_dresstype_14,Dress_Type,12
-Pencil dress,attr_dresstype_15,Dress_Type,12
-Sheer dress,attr_dresstype_16,Dress_Type,12
-Shift dress,attr_dresstype_17,Dress_Type,12
-Slip dress,attr_dresstype_18,Dress_Type,12
-T-shirt dress,attr_dresstype_19,Dress_Type,12
+Evening gown,attr_dresstype_1,Type,12
+Shirt-dress,attr_dresstype_2,Type,12
+Coat dress,attr_dresstype_3,Type,12
+Handkerchief dress,attr_dresstype_4,Type,12
+Jumper dress,attr_dresstype_5,Type,12
+Dungaree dress,attr_dresstype_6,Type,12
+Skater dress,attr_dresstype_7,Type,12
+Tea dress,attr_dresstype_8,Type,12
+Mermaid dress,attr_dresstype_9,Type,12
+Cocktail dress,attr_dresstype_10,Type,12
+A-Line dress,attr_dresstype_11,Type,12
+Bodycon dress,attr_dresstype_12,Type,12
+Maxi dress,attr_dresstype_13,Type,12
+Office dress,attr_dresstype_14,Type,12
+Pencil dress,attr_dresstype_15,Type,12
+Sheer dress,attr_dresstype_16,Type,12
+Shift dress,attr_dresstype_17,Type,12
+Slip dress,attr_dresstype_18,Type,12
+T-shirt dress,attr_dresstype_19,Type,12
--- a/app/service/attribute_recognition/discriptor/dress/1_dress_length.csv
+++ b/app/service/attribute_recognition/discriptor/dress/1_dress_length.csv
@@ -1,6 +1,6 @@
 labelName,join_attr,taskName,taskId
-Maxi,attr_Dress_length_1,Dress_length,1
-Midi,attr_Dress_length_2,Dress_length,1
-Mini,attr_Dress_length_3,Dress_length,1
-Over the knee,attr_Dress_length_4,Dress_length,1
-Floor Length,attr_Dress_length_5,Dress_length,1
+Maxi,attr_Dress_length_1,Length,1
+Midi,attr_Dress_length_2,Length,1
+Mini,attr_Dress_length_3,Length,1
+Over the knee,attr_Dress_length_4,Length,1
+Floor Length,attr_Dress_length_5,Length,1
--- a/app/service/attribute_recognition/discriptor/dress/3_top_Sleeve_length.csv
+++ b/app/service/attribute_recognition/discriptor/dress/3_top_Sleeve_length.csv
@@ -1,6 +1,6 @@
 labelName,join_attr,taskName,taskId
-Sleeveless,attr_Sleeve_length_1,Sleeve_length,3
-Short,attr_Sleeve_length_2,Sleeve_length,3
-Middle,attr_Sleeve_length_3,Sleeve_length,3
-Seven,attr_Sleeve_length_4,Sleeve_length,3
-Long,attr_Sleeve_length_5,Sleeve_length,3
+Sleeveless,attr_Sleeve_length_1,Sleeve_Length,3
+Short,attr_Sleeve_length_2,Sleeve_Length,3
+Middle,attr_Sleeve_length_3,Sleeve_Length,3
+Seven,attr_Sleeve_length_4,Sleeve_Length,3
+Long,attr_Sleeve_length_5,Sleeve_Length,3
--- a/app/service/attribute_recognition/discriptor/dress/4_top_Sleeve_shape.csv
+++ b/app/service/attribute_recognition/discriptor/dress/4_top_Sleeve_shape.csv
@@ -1,9 +1,9 @@
 labelName,join_attr,taskName,taskId
-Regular,attr_Sleeve_shape_1,Sleeve_shape,4
-Slim,attr_Sleeve_shape_2,Sleeve_shape,4
-Puff,attr_Sleeve_shape_3,Sleeve_shape,4
-Bell,attr_Sleeve_shape_4,Sleeve_shape,4
-Batwing,attr_Sleeve_shape_5,Sleeve_shape,4
-Shirt,attr_Sleeve_shape_6,Sleeve_shape,4
-Rib,attr_Sleeve_shape_7,Sleeve_shape,4
-Raglan,attr_Sleeve_shape_8,Sleeve_shape,4
+Regular,attr_Sleeve_shape_1,Sleeve_Shape,4
+Slim,attr_Sleeve_shape_2,Sleeve_Shape,4
+Puff,attr_Sleeve_shape_3,Sleeve_Shape,4
+Bell,attr_Sleeve_shape_4,Sleeve_Shape,4
+Batwing,attr_Sleeve_shape_5,Sleeve_Shape,4
+Shirt,attr_Sleeve_shape_6,Sleeve_Shape,4
+Rib,attr_Sleeve_shape_7,Sleeve_Shape,4
+Raglan,attr_Sleeve_shape_8,Sleeve_Shape,4
--- a/app/service/attribute_recognition/discriptor/dress/5_top_Sleeve_shoulder.csv
+++ b/app/service/attribute_recognition/discriptor/dress/5_top_Sleeve_shoulder.csv
@@ -1,5 +1,5 @@
 labelName,join_attr,taskName,taskId
-Regular,attr_Sleeve_shoulder_1,Sleeve_shoulder,5
-Cold,attr_Sleeve_shoulder_2,Sleeve_shoulder,5
-Tucked,attr_Sleeve_shoulder_3,Sleeve_shoulder,5
-Balmain,attr_Sleeve_shoulder_4,Sleeve_shoulder,5
+Regular,attr_Sleeve_shoulder_1,Sleeve_Shoulder,5
+Cold,attr_Sleeve_shoulder_2,Sleeve_Shoulder,5
+Tucked,attr_Sleeve_shoulder_3,Sleeve_Shoulder,5
+Balmain,attr_Sleeve_shoulder_4,Sleeve_Shoulder,5
--- a/app/service/attribute_recognition/discriptor/dress/7_outer_Print.csv
+++ b/app/service/attribute_recognition/discriptor/dress/7_outer_Print.csv
@@ -1,16 +1,16 @@
 labelName,join_attr,taskName,taskId
-Abstract,attr_Print_O_1,Print_D,7
-Allover,attr_Print_O_2,Print_D,7
-Animal,attr_Print_O_3,Print_D,7
-Camouflage,attr_Print_O_4,Print_D,7
-Checks,attr_Print_O_5,Print_D,7
-Color_block,attr_Print_O_6,Print_D,7
-Disty print,attr_Print_O_7,Print_D,7
-Dotted,attr_Print_O_8,Print_D,7
-Floral,attr_Print_O_9,Print_D,7
-Graphic print,attr_Print_O_10,Print_D,7
-Logo and slogan,attr_Print_O_11,Print_D,7
-Patchwork,attr_Print_O_12,Print_D,7
-Plain,attr_Print_O_13,Print_D,7
-Plain_dnim,attr_Print_O_14,Print_D,7
-Stripe,attr_Print_O_15,Print_D,7
+Abstract,attr_Print_O_1,Print,7
+Allover,attr_Print_O_2,Print,7
+Animal,attr_Print_O_3,Print,7
+Camouflage,attr_Print_O_4,Print,7
+Checks,attr_Print_O_5,Print,7
+Color_block,attr_Print_O_6,Print,7
+Disty print,attr_Print_O_7,Print,7
+Dotted,attr_Print_O_8,Print,7
+Floral,attr_Print_O_9,Print,7
+Graphic print,attr_Print_O_10,Print,7
+Logo and slogan,attr_Print_O_11,Print,7
+Patchwork,attr_Print_O_12,Print,7
+Plain,attr_Print_O_13,Print,7
+Plain_dnim,attr_Print_O_14,Print,7
+Stripe,attr_Print_O_15,Print,7
--- a/app/service/attribute_recognition/discriptor/dress/8_outer_Material.csv
+++ b/app/service/attribute_recognition/discriptor/dress/8_outer_Material.csv
@@ -1,28 +1,28 @@
 labelName,join_attr,taskName,taskId
-Canvas,attr_Material_O_1,Material_D,8
-Chambray,attr_Material_O_2,Material_D,8
-Chenille,attr_Material_O_3,Material_D,8
-Chiffon,attr_Material_O_4,Material_D,8
-Corduroy,attr_Material_O_5,Material_D,8
-Crepe,attr_Material_O_6,Material_D,8
-Denim,attr_Material_O_7,Material_D,8
-Faux_fur,attr_Material_O_8,Material_D,8
-Faux_leather,attr_Material_O_9,Material_D,8
-Flannel,attr_Material_O_10,Material_D,8
-Fleece,attr_Material_O_11,Material_D,8
-Gingham,attr_Material_O_12,Material_D,8
-Jersey,attr_Material_O_13,Material_D,8
-Knit,attr_Material_O_14,Material_D,8
-Lace,attr_Material_O_15,Material_D,8
-Lawn,attr_Material_O_16,Material_D,8
-Neoprene,attr_Material_O_17,Material_D,8
-Organza,attr_Material_O_18,Material_D,8
-Plush,attr_Material_O_19,Material_D,8
-Satin,attr_Material_O_20,Material_D,8
-Serge,attr_Material_O_21,Material_D,8
-Taffeta,attr_Material_O_22,Material_D,8
-Tulle,attr_Material_O_23,Material_D,8
-Tweed,attr_Material_O_24,Material_D,8
-Twill,attr_Material_O_25,Material_D,8
-Velvet,attr_Material_O_26,Material_D,8
-Vinyl,attr_Material_O_27,Material_D,8
+Canvas,attr_Material_O_1,Material,8
+Chambray,attr_Material_O_2,Material,8
+Chenille,attr_Material_O_3,Material,8
+Chiffon,attr_Material_O_4,Material,8
+Corduroy,attr_Material_O_5,Material,8
+Crepe,attr_Material_O_6,Material,8
+Denim,attr_Material_O_7,Material,8
+Faux_fur,attr_Material_O_8,Material,8
+Faux_leather,attr_Material_O_9,Material,8
+Flannel,attr_Material_O_10,Material,8
+Fleece,attr_Material_O_11,Material,8
+Gingham,attr_Material_O_12,Material,8
+Jersey,attr_Material_O_13,Material,8
+Knit,attr_Material_O_14,Material,8
+Lace,attr_Material_O_15,Material,8
+Lawn,attr_Material_O_16,Material,8
+Neoprene,attr_Material_O_17,Material,8
+Organza,attr_Material_O_18,Material,8
+Plush,attr_Material_O_19,Material,8
+Satin,attr_Material_O_20,Material,8
+Serge,attr_Material_O_21,Material,8
+Taffeta,attr_Material_O_22,Material,8
+Tulle,attr_Material_O_23,Material,8
+Tweed,attr_Material_O_24,Material,8
+Twill,attr_Material_O_25,Material,8
+Velvet,attr_Material_O_26,Material,8
+Vinyl,attr_Material_O_27,Material,8
--- a/app/service/attribute_recognition/discriptor/dress/9_dress_Design.csv
+++ b/app/service/attribute_recognition/discriptor/dress/9_dress_Design.csv
@@ -1,19 +1,19 @@
 labelName,join_attr,taskName,taskId
-Asymmetrical,attr_Design_U_1,Design_D,9
-Tiered,attr_Design_U_2,Design_D,9
-Tassel,attr_Design_U_3,Design_D,9
-Ruffle,attr_Design_U_4,Design_D,9
-Pleated,attr_Design_U_5,Design_D,9
-Wrap,attr_Design_U_6,Design_D,9
-Ripped,attr_Design_U_7,Design_D,9
-Cut out,attr_Design_U_8,Design_D,9
-Eyelet,attr_Design_U_9,Design_D,9
-Folded,attr_Design_U_10,Design_D,9
-Tied,attr_Design_U_11,Design_D,9
-Drapes,attr_Design_U_12,Design_D,9
-Ribbon,attr_Design_U_13,Design_D,9
-Button,attr_Design_U_14,Design_D,9
-Split,attr_Design_U_15,Design_D,9
-Fishtail,attr_Design_U_16,Design_D,9
-Cami dress,attr_Design_U_17,Design_D,9
-Gathering,attr_Design_U_18,Design_D,9
+Asymmetrical,attr_Design_U_1,Design,9
+Tiered,attr_Design_U_2,Design,9
+Tassel,attr_Design_U_3,Design,9
+Ruffle,attr_Design_U_4,Design,9
+Pleated,attr_Design_U_5,Design,9
+Wrap,attr_Design_U_6,Design,9
+Ripped,attr_Design_U_7,Design,9
+Cut out,attr_Design_U_8,Design,9
+Eyelet,attr_Design_U_9,Design,9
+Folded,attr_Design_U_10,Design,9
+Tied,attr_Design_U_11,Design,9
+Drapes,attr_Design_U_12,Design,9
+Ribbon,attr_Design_U_13,Design,9
+Button,attr_Design_U_14,Design,9
+Split,attr_Design_U_15,Design,9
+Fishtail,attr_Design_U_16,Design,9
+Cami dress,attr_Design_U_17,Design,9
+Gathering,attr_Design_U_18,Design,9
--- a/app/service/attribute_recognition/discriptor/dress/9_top_Softness.csv
+++ b/app/service/attribute_recognition/discriptor/dress/9_top_Softness.csv
@@ -1,4 +1,4 @@
 labelName,join_attr,taskName,taskId
-Soft,attr_Softness_U_1,Softness_D,9
-Medium,attr_Softness_U_2,Softness_D,9
-Hard,attr_Softness_U_3,Softness_D,9
+Soft,attr_Softness_U_1,Softness,9
+Medium,attr_Softness_U_2,Softness,9
+Hard,attr_Softness_U_3,Softness,9
--- a/app/service/attribute_recognition/discriptor/dress/ori10_dress_Design.csv
+++ b/app/service/attribute_recognition/discriptor/dress/ori10_dress_Design.csv
@@ -1,16 +1,16 @@
 labelName,join_attr,taskName,taskId
-Asymmetrical,attr_Design_D_1,Design_D,10
-Tiered,attr_Design_D_2,Design_D,10
-Tassel,attr_Design_D_3,Design_D,10
-Ruffle,attr_Design_D_4,Design_D,10
-Pleated,attr_Design_D_5,Design_D,10
-Wrap,attr_Design_D_6,Design_D,10
-Ripped,attr_Design_D_7,Design_D,10
-Cut out,attr_Design_D_8,Design_D,10
-Eyelet,attr_Design_D_9,Design_D,10
-Folded,attr_Design_D_10,Design_D,10
-Tied,attr_Design_D_11,Design_D,10
-Drapes,attr_Design_D_12,Design_D,10
-Ribbon,attr_Design_D_13,Design_D,10
-Button,attr_Design_D_14,Design_D,10
-Gathering,attr_Design_D_15,Design_D,10
+Asymmetrical,attr_Design_D_1,Design,10
+Tiered,attr_Design_D_2,Design,10
+Tassel,attr_Design_D_3,Design,10
+Ruffle,attr_Design_D_4,Design,10
+Pleated,attr_Design_D_5,Design,10
+Wrap,attr_Design_D_6,Design,10
+Ripped,attr_Design_D_7,Design,10
+Cut out,attr_Design_D_8,Design,10
+Eyelet,attr_Design_D_9,Design,10
+Folded,attr_Design_D_10,Design,10
+Tied,attr_Design_D_11,Design,10
+Drapes,attr_Design_D_12,Design,10
+Ribbon,attr_Design_D_13,Design,10
+Button,attr_Design_D_14,Design,10
+Gathering,attr_Design_D_15,Design,10
--- a/app/service/attribute_recognition/discriptor/dress/ori11_dress_OPType.csv
+++ b/app/service/attribute_recognition/discriptor/dress/ori11_dress_OPType.csv
@@ -1,5 +1,5 @@
 labelName,join_attr,taskName,taskId
-Button,attr_OPType_D_1,OPType_D,11
-Zipper,attr_OPType_D_2,OPType_D,11
-Thread,attr_OPType_D_3,OPType_D,11
-Hook,attr_OPType_D_4,OPType_D,11
+Button,attr_OPType_D_1,Opening_Type,11
+Zipper,attr_OPType_D_2,Opening_Type,11
+Thread,attr_OPType_D_3,Opening_Type,11
+Hook,attr_OPType_D_4,Opening_Type,11
--- a/app/service/attribute_recognition/discriptor/dress/ori12_dress_Silhouette.csv
+++ b/app/service/attribute_recognition/discriptor/dress/ori12_dress_Silhouette.csv
@@ -1,11 +1,11 @@
 labelName,join_attr,taskName,taskId
-A Line,attr_Silhouette_D_1,Silhouette_D,12
-H Shape,attr_Silhouette_D_2,Silhouette_D,12
-Slim,attr_Silhouette_D_3,Silhouette_D,12
-Oversized,attr_Silhouette_D_4,Silhouette_D,12
-Cacoon,attr_Silhouette_D_5,Silhouette_D,12
-Empire,attr_Silhouette_D_6,Silhouette_D,12
-Hourglass,attr_Silhouette_D_7,Silhouette_D,12
-Mermaid,attr_Silhouette_D_8,Silhouette_D,12
-Sheath,attr_Silhouette_D_9,Silhouette_D,12
-Tent,attr_Silhouette_D_10,Silhouette_D,12
+A Line,attr_Silhouette_D_1,Silhouette,12
+H Shape,attr_Silhouette_D_2,Silhouette,12
+Slim,attr_Silhouette_D_3,Silhouette,12
+Oversized,attr_Silhouette_D_4,Silhouette,12
+Cacoon,attr_Silhouette_D_5,Silhouette,12
+Empire,attr_Silhouette_D_6,Silhouette,12
+Hourglass,attr_Silhouette_D_7,Silhouette,12
+Mermaid,attr_Silhouette_D_8,Silhouette,12
+Sheath,attr_Silhouette_D_9,Silhouette,12
+Tent,attr_Silhouette_D_10,Silhouette,12
--- a/app/service/attribute_recognition/discriptor/dress/ori13_dress_Type.csv
+++ b/app/service/attribute_recognition/discriptor/dress/ori13_dress_Type.csv
@@ -1,20 +1,20 @@
 labelName,join_attr,taskName,taskId
-Evening gown,attr_Dress_Type_1,Dress_Type,13
-Shirt-dress,attr_Dress_Type_2,Dress_Type,13
-Coat dress,attr_Dress_Type_3,Dress_Type,13
-Handkerchief dress,attr_Dress_Type_4,Dress_Type,13
-Jumper dress,attr_Dress_Type_5,Dress_Type,13
-Dungaree dress,attr_Dress_Type_6,Dress_Type,13
-Skater dress,attr_Dress_Type_7,Dress_Type,13
-Tea dress,attr_Dress_Type_8,Dress_Type,13
-Mermaid dress,attr_Dress_Type_9,Dress_Type,13
-Cocktail dress,attr_Dress_Type_10,Dress_Type,13
-A-Line dress,attr_Dress_Type_11,Dress_Type,13
-Bodycon dress,attr_Dress_Type_12,Dress_Type,13
-Maxi dress,attr_Dress_Type_13,Dress_Type,13
-Office dress,attr_Dress_Type_14,Dress_Type,13
-Pencil dress,attr_Dress_Type_15,Dress_Type,13
-Sheer dress,attr_Dress_Type_16,Dress_Type,13
-Shift dress,attr_Dress_Type_17,Dress_Type,13
-Slip dress,attr_Dress_Type_18,Dress_Type,13
-T-shirt dress,attr_Dress_Type_19,Dress_Type,13
+Evening gown,attr_Dress_Type_1,Type,13
+Shirt-dress,attr_Dress_Type_2,Type,13
+Coat dress,attr_Dress_Type_3,Type,13
+Handkerchief dress,attr_Dress_Type_4,Type,13
+Jumper dress,attr_Dress_Type_5,Type,13
+Dungaree dress,attr_Dress_Type_6,Type,13
+Skater dress,attr_Dress_Type_7,Type,13
+Tea dress,attr_Dress_Type_8,Type,13
+Mermaid dress,attr_Dress_Type_9,Type,13
+Cocktail dress,attr_Dress_Type_10,Type,13
+A-Line dress,attr_Dress_Type_11,Type,13
+Bodycon dress,attr_Dress_Type_12,Type,13
+Maxi dress,attr_Dress_Type_13,Type,13
+Office dress,attr_Dress_Type_14,Type,13
+Pencil dress,attr_Dress_Type_15,Type,13
+Sheer dress,attr_Dress_Type_16,Type,13
+Shift dress,attr_Dress_Type_17,Type,13
+Slip dress,attr_Dress_Type_18,Type,13
+T-shirt dress,attr_Dress_Type_19,Type,13
--- a/app/service/attribute_recognition/discriptor/dress/ori1_dress_length.csv
+++ b/app/service/attribute_recognition/discriptor/dress/ori1_dress_length.csv
@@ -1,6 +1,6 @@
 labelName,join_attr,taskName,taskId
-Maxi,attr_Dress_length_1,Dress_length,1
-Midi,attr_Dress_length_2,Dress_length,1
-Mini,attr_Dress_length_3,Dress_length,1
-Over the knee,attr_Dress_length_4,Dress_length,1
-Floor Length,attr_Dress_length_5,Dress_length,1
+Maxi,attr_Dress_length_1,Length,1
+Midi,attr_Dress_length_2,Length,1
+Mini,attr_Dress_length_3,Length,1
+Over the knee,attr_Dress_length_4,Length,1
+Floor Length,attr_Dress_length_5,Length,1
--- a/app/service/attribute_recognition/discriptor/dress/ori2_dress_Sleeve_length.csv
+++ b/app/service/attribute_recognition/discriptor/dress/ori2_dress_Sleeve_length.csv
@@ -1,6 +1,6 @@
 labelName,join_attr,taskName,taskId
-Sleeveless,attr_Sleeve_length_D_1,Sleeve_length_D,2
-Short,attr_Sleeve_length_D_2,Sleeve_length_D,2
-Middle,attr_Sleeve_length_D_3,Sleeve_length_D,2
-Seven,attr_Sleeve_length_D_4,Sleeve_length_D,2
-Long,attr_Sleeve_length_D_5,Sleeve_length_D,2
+Sleeveless,attr_Sleeve_length_D_1,Sleeve_Length,2
+Short,attr_Sleeve_length_D_2,Sleeve_Length,2
+Middle,attr_Sleeve_length_D_3,Sleeve_Length,2
+Seven,attr_Sleeve_length_D_4,Sleeve_Length,2
+Long,attr_Sleeve_length_D_5,Sleeve_Length,2
--- a/app/service/attribute_recognition/discriptor/dress/ori3_dress_Sleeve_shape.csv
+++ b/app/service/attribute_recognition/discriptor/dress/ori3_dress_Sleeve_shape.csv
@@ -1,9 +1,9 @@
 labelName,join_attr,taskName,taskId
-Regular,attr_Sleeve_shape_D_1,Sleeve_shape_D,3
-Slim,attr_Sleeve_shape_D_2,Sleeve_shape_D,3
-Puff,attr_Sleeve_shape_D_3,Sleeve_shape_D,3
-Bell,attr_Sleeve_shape_D_4,Sleeve_shape_D,3
-Batwing,attr_Sleeve_shape_D_5,Sleeve_shape_D,3
-Shirt,attr_Sleeve_shape_D_6,Sleeve_shape_D,3
-Rib,attr_Sleeve_shape_D_7,Sleeve_shape_D,3
-Raglan,attr_Sleeve_shape_D_8,Sleeve_shape_D,3
+Regular,attr_Sleeve_shape_D_1,Sleeve_Shape,3
+Slim,attr_Sleeve_shape_D_2,Sleeve_Shape,3
+Puff,attr_Sleeve_shape_D_3,Sleeve_Shape,3
+Bell,attr_Sleeve_shape_D_4,Sleeve_Shape,3
+Batwing,attr_Sleeve_shape_D_5,Sleeve_Shape,3
+Shirt,attr_Sleeve_shape_D_6,Sleeve_Shape,3
+Rib,attr_Sleeve_shape_D_7,Sleeve_Shape,3
+Raglan,attr_Sleeve_shape_D_8,Sleeve_Shape,3
--- a/app/service/attribute_recognition/discriptor/dress/ori4_dress_Sleeve_shoulder.csv
+++ b/app/service/attribute_recognition/discriptor/dress/ori4_dress_Sleeve_shoulder.csv
@@ -1,5 +1,5 @@
 labelName,join_attr,taskName,taskId
-Regular,attr_Sleeve_shoulder_D_1,Sleeve_shoulder_D,4
-Cold,attr_Sleeve_shoulder_D_2,Sleeve_shoulder_D,4
-Tucked,attr_Sleeve_shoulder_D_3,Sleeve_shoulder_D,4
-Balmain,attr_Sleeve_shoulder_D_4,Sleeve_shoulder_D,4
+Regular,attr_Sleeve_shoulder_D_1,Sleeve_Shoulder,4
+Cold,attr_Sleeve_shoulder_D_2,Sleeve_Shoulder,4
+Tucked,attr_Sleeve_shoulder_D_3,Sleeve_Shoulder,4
+Balmain,attr_Sleeve_shoulder_D_4,Sleeve_Shoulder,4
--- a/app/service/attribute_recognition/discriptor/dress/ori5_dress_Neckline.csv
+++ b/app/service/attribute_recognition/discriptor/dress/ori5_dress_Neckline.csv
@@ -1,17 +1,17 @@
 labelName,join_attr,taskName,taskId
-Round,attr_Neckline_D_1,Neckline_D,5
-V,attr_Neckline_D_2,Neckline_D,5
-Square,attr_Neckline_D_3,Neckline_D,5
-One-shoulder,attr_Neckline_D_4,Neckline_D,5
-Off-shoulder,attr_Neckline_D_5,Neckline_D,5
-Strapless,attr_Neckline_D_6,Neckline_D,5
-Turtle,attr_Neckline_D_7,Neckline_D,5
-Boat,attr_Neckline_D_8,Neckline_D,5
-Halter,attr_Neckline_D_9,Neckline_D,5
-Spaghetti Strap,attr_Neckline_D_10,Neckline_D,5
-Sweetheart,attr_Neckline_D_11,Neckline_D,5
-U,attr_Neckline_D_12,Neckline_D,5
-choker,attr_Neckline_D_13,Neckline_D,5
-cowl,attr_Neckline_D_14,Neckline_D,5
-keyhole,attr_Neckline_D_15,Neckline_D,5
-split,attr_Neckline_D_16,Neckline_D,5
+Round,attr_Neckline_D_1,Neckline,5
+V,attr_Neckline_D_2,Neckline,5
+Square,attr_Neckline_D_3,Neckline,5
+One-shoulder,attr_Neckline_D_4,Neckline,5
+Off-shoulder,attr_Neckline_D_5,Neckline,5
+Strapless,attr_Neckline_D_6,Neckline,5
+Turtle,attr_Neckline_D_7,Neckline,5
+Boat,attr_Neckline_D_8,Neckline,5
+Halter,attr_Neckline_D_9,Neckline,5
+Spaghetti Strap,attr_Neckline_D_10,Neckline,5
+Sweetheart,attr_Neckline_D_11,Neckline,5
+U,attr_Neckline_D_12,Neckline,5
+choker,attr_Neckline_D_13,Neckline,5
+cowl,attr_Neckline_D_14,Neckline,5
+keyhole,attr_Neckline_D_15,Neckline,5
+split,attr_Neckline_D_16,Neckline,5
--- a/app/service/attribute_recognition/discriptor/dress/ori6_dress_Collar.csv
+++ b/app/service/attribute_recognition/discriptor/dress/ori6_dress_Collar.csv
@@ -1,11 +1,11 @@
 labelName,join_attr,taskName,taskId
-Peterpan-Bertha,attr_Collar_D_1,Collar_D,6
-Shirt,attr_Collar_D_2,Collar_D,6
-Rib,attr_Collar_D_3,Collar_D,6
-Turtle,attr_Collar_D_4,Collar_D,6
-Lapel,attr_Collar_D_5,Collar_D,6
-Hoodie,attr_Collar_D_6,Collar_D,6
-Mandarin,attr_Collar_D_7,Collar_D,6
-Tie,attr_Collar_D_8,Collar_D,6
-Ruffle,attr_Collar_D_9,Collar_D,6
-Cowl,attr_Collar_D_10,Collar_D,6
+Peterpan-Bertha,attr_Collar_D_1,Collar,6
+Shirt,attr_Collar_D_2,Collar,6
+Rib,attr_Collar_D_3,Collar,6
+Turtle,attr_Collar_D_4,Collar,6
+Lapel,attr_Collar_D_5,Collar,6
+Hoodie,attr_Collar_D_6,Collar,6
+Mandarin,attr_Collar_D_7,Collar,6
+Tie,attr_Collar_D_8,Collar,6
+Ruffle,attr_Collar_D_9,Collar,6
+Cowl,attr_Collar_D_10,Collar,6
--- a/app/service/attribute_recognition/discriptor/dress/ori7_dress_Print.csv
+++ b/app/service/attribute_recognition/discriptor/dress/ori7_dress_Print.csv
@@ -1,16 +1,16 @@
 labelName,join_attr,taskName,taskId
-abstract,attr_Print_D_1,Print_D,7
-allover,attr_Print_D_2,Print_D,7
-animal printed,attr_Print_D_3,Print_D,7
-Camouflage,attr_Print_D_4,Print_D,7
-checks,attr_Print_D_5,Print_D,7
-color_block,attr_Print_D_6,Print_D,7
-disty print,attr_Print_D_7,Print_D,7
-dotted,attr_Print_D_8,Print_D,7
-floral,attr_Print_D_9,Print_D,7
-graphic print,attr_Print_D_10,Print_D,7
-logo and slogan print,attr_Print_D_11,Print_D,7
-patchwork,attr_Print_D_12,Print_D,7
-plain,attr_Print_D_13,Print_D,7
-plain_dnim,attr_Print_D_14,Print_D,7
-stripe,attr_Print_D_15,Print_D,7
+abstract,attr_Print_D_1,Print,7
+allover,attr_Print_D_2,Print,7
+animal printed,attr_Print_D_3,Print,7
+Camouflage,attr_Print_D_4,Print,7
+checks,attr_Print_D_5,Print,7
+color_block,attr_Print_D_6,Print,7
+disty print,attr_Print_D_7,Print,7
+dotted,attr_Print_D_8,Print,7
+floral,attr_Print_D_9,Print,7
+graphic print,attr_Print_D_10,Print,7
+logo and slogan print,attr_Print_D_11,Print,7
+patchwork,attr_Print_D_12,Print,7
+plain,attr_Print_D_13,Print,7
+plain_dnim,attr_Print_D_14,Print,7
+stripe,attr_Print_D_15,Print,7
--- a/app/service/attribute_recognition/discriptor/dress/ori8_dress_Material.csv
+++ b/app/service/attribute_recognition/discriptor/dress/ori8_dress_Material.csv
@@ -1,28 +1,28 @@
 labelName,join_attr,taskName,taskId
-canvas,attr_Material_D_1,Material_D,8
-chambray,attr_Material_D_2,Material_D,8
-chenille,attr_Material_D_3,Material_D,8
-chiffon,attr_Material_D_4,Material_D,8
-corduroy,attr_Material_D_5,Material_D,8
-crepe,attr_Material_D_6,Material_D,8
-denim,attr_Material_D_7,Material_D,8
-faux_fur,attr_Material_D_8,Material_D,8
-faux_leather,attr_Material_D_9,Material_D,8
-flannel,attr_Material_D_10,Material_D,8
-fleece,attr_Material_D_11,Material_D,8
-gingham,attr_Material_D_12,Material_D,8
-jersey,attr_Material_D_13,Material_D,8
-knit,attr_Material_D_14,Material_D,8
-lace,attr_Material_D_15,Material_D,8
-lawn,attr_Material_D_16,Material_D,8
-neoprene,attr_Material_D_17,Material_D,8
-organza,attr_Material_D_18,Material_D,8
-plush,attr_Material_D_19,Material_D,8
-satin,attr_Material_D_20,Material_D,8
-serge,attr_Material_D_21,Material_D,8
-taffeta,attr_Material_D_22,Material_D,8
-tulle,attr_Material_D_23,Material_D,8
-tweed,attr_Material_D_24,Material_D,8
-twill,attr_Material_D_25,Material_D,8
-velvet,attr_Material_D_26,Material_D,8
-vinyl,attr_Material_D_27,Material_D,8
+canvas,attr_Material_D_1,Material,8
+chambray,attr_Material_D_2,Material,8
+chenille,attr_Material_D_3,Material,8
+chiffon,attr_Material_D_4,Material,8
+corduroy,attr_Material_D_5,Material,8
+crepe,attr_Material_D_6,Material,8
+denim,attr_Material_D_7,Material,8
+faux_fur,attr_Material_D_8,Material,8
+faux_leather,attr_Material_D_9,Material,8
+flannel,attr_Material_D_10,Material,8
+fleece,attr_Material_D_11,Material,8
+gingham,attr_Material_D_12,Material,8
+jersey,attr_Material_D_13,Material,8
+knit,attr_Material_D_14,Material,8
+lace,attr_Material_D_15,Material,8
+lawn,attr_Material_D_16,Material,8
+neoprene,attr_Material_D_17,Material,8
+organza,attr_Material_D_18,Material,8
+plush,attr_Material_D_19,Material,8
+satin,attr_Material_D_20,Material,8
+serge,attr_Material_D_21,Material,8
+taffeta,attr_Material_D_22,Material,8
+tulle,attr_Material_D_23,Material,8
+tweed,attr_Material_D_24,Material,8
+twill,attr_Material_D_25,Material,8
+velvet,attr_Material_D_26,Material,8
+vinyl,attr_Material_D_27,Material,8
--- a/app/service/attribute_recognition/discriptor/dress/ori9_dress_Softness.csv
+++ b/app/service/attribute_recognition/discriptor/dress/ori9_dress_Softness.csv
@@ -1,4 +1,4 @@
 labelName,join_attr,taskName,taskId
-Soft,attr_Softness_D_1,Softness_D,9
-Medium,attr_Softness_D_2,Softness_D,9
-Hard,attr_Softness_D_3,Softness_D,9
+Soft,attr_Softness_D_1,Softness,9
+Medium,attr_Softness_D_2,Softness,9
+Hard,attr_Softness_D_3,Softness,9
--- a/app/service/attribute_recognition/discriptor/jumpsuit/10_jumsuit_design.csv
+++ b/app/service/attribute_recognition/discriptor/jumpsuit/10_jumsuit_design.csv
@@ -1,17 +1,17 @@
 labelName,join_attr,taskName,taskId
-Asymmetrical,attr_Design_J_1,Design_J,9
-Tassel,attr_Design_J_2,Design_J,9
-Ruffle,attr_Design_J_3,Design_J,9
-Pleated,attr_Design_J_4,Design_J,9
-Wrap,attr_Design_J_5,Design_J,9
-Cut out,attr_Design_J_6,Design_J,9
-Tied,attr_Design_J_7,Design_J,9
-Drapes,attr_Design_J_8,Design_J,9
-Ribbon,attr_Design_J_9,Design_J,9
-Button,attr_Design_J_10,Design_J,9
-Cami,attr_Design_J_11,Design_J,9
-Gathering,attr_Design_J_12,Design_J,9
-Pocket,attr_Design_J_13,Design_J,9
-Dungaree,attr_Design_J_14,Design_J,9
-Layering,attr_Design_J_15,Design_J,9
-Belted,attr_Design_J_16,Design_J,9
+Asymmetrical,attr_Design_J_1,Design,9
+Tassel,attr_Design_J_2,Design,9
+Ruffle,attr_Design_J_3,Design,9
+Pleated,attr_Design_J_4,Design,9
+Wrap,attr_Design_J_5,Design,9
+Cut out,attr_Design_J_6,Design,9
+Tied,attr_Design_J_7,Design,9
+Drapes,attr_Design_J_8,Design,9
+Ribbon,attr_Design_J_9,Design,9
+Button,attr_Design_J_10,Design,9
+Cami,attr_Design_J_11,Design,9
+Gathering,attr_Design_J_12,Design,9
+Pocket,attr_Design_J_13,Design,9
+Dungaree,attr_Design_J_14,Design,9
+Layering,attr_Design_J_15,Design,9
+Belted,attr_Design_J_16,Design,9
--- a/app/service/attribute_recognition/discriptor/jumpsuit/11_jumpsuit_OPType.csv
+++ b/app/service/attribute_recognition/discriptor/jumpsuit/11_jumpsuit_OPType.csv
@@ -1,5 +1,5 @@
 labelName,join_attr,taskName,taskId
-Button,attr_OPType_J_1,OPType_J,11
-Zipper,attr_OPType_J_2,OPType_J,11
-Thread,attr_OPType_J_3,OPType_J,11
-Hook,attr_OPType_J_4,OPType_J,11
+Button,attr_OPType_J_1,Opening_Type,11
+Zipper,attr_OPType_J_2,Opening_Type,11
+Thread,attr_OPType_J_3,Opening_Type,11
+Hook,attr_OPType_J_4,Opening_Type,11
--- a/app/service/attribute_recognition/discriptor/jumpsuit/12_jumpsuit_subtype.csv
+++ b/app/service/attribute_recognition/discriptor/jumpsuit/12_jumpsuit_subtype.csv
@@ -1,6 +1,6 @@
 labelName,join_attr,taskName,taskId
-Peg leg,attr_Jumpsuit_subtype_1,Jumpsuit_subtype,12
-Straight leg,attr_Jumpsuit_subtype_2,Jumpsuit_subtype,12
-Wide leg,attr_Jumpsuit_subtype_3,Jumpsuit_subtype,12
-Boot-cut flare,attr_Jumpsuit_subtype_4,Jumpsuit_subtype,12
-Slim fit,attr_Jumpsuit_subtype_5,Jumpsuit_subtype,12
+Peg leg,attr_Jumpsuit_subtype_1,Subtype,12
+Straight leg,attr_Jumpsuit_subtype_2,Subtype,12
+Wide leg,attr_Jumpsuit_subtype_3,Subtype,12
+Boot-cut flare,attr_Jumpsuit_subtype_4,Subtype,12
+Slim fit,attr_Jumpsuit_subtype_5,Subtype,12
--- a/app/service/attribute_recognition/discriptor/jumpsuit/1_jumsuit_length.csv
+++ b/app/service/attribute_recognition/discriptor/jumpsuit/1_jumsuit_length.csv
@@ -1,6 +1,6 @@
 labelName,join_attr,taskName,taskId
-Short,attr_Jumpsuit_length_1,Jumpsuit_length,1
-Middle,attr_Jumpsuit_length_2,Jumpsuit_length,1
-Seven,attr_Jumpsuit_length_3,Jumpsuit_length,1
-Nine,attr_Jumpsuit_length_4,Jumpsuit_length,1
-Long,attr_Jumpsuit_length_5,Jumpsuit_length,1
+Short,attr_Jumpsuit_length_1,Length,1
+Middle,attr_Jumpsuit_length_2,Length,1
+Seven,attr_Jumpsuit_length_3,Length,1
+Nine,attr_Jumpsuit_length_4,Length,1
+Long,attr_Jumpsuit_length_5,Length,1
--- a/app/service/attribute_recognition/discriptor/jumpsuit/2_jumpsuit_Sleeve_length.csv
+++ b/app/service/attribute_recognition/discriptor/jumpsuit/2_jumpsuit_Sleeve_length.csv
@@ -1,6 +1,6 @@
 labelName,join_attr,taskName,taskId
-Sleeveless,attr_Sleeve_length_J_1,Sleeve_length_J,2
-Short,attr_Sleeve_length_J_2,Sleeve_length_J,2
-Middle,attr_Sleeve_length_J_3,Sleeve_length_J,2
-Seven,attr_Sleeve_length_J_4,Sleeve_length_J,2
-Long,attr_Sleeve_length_J_5,Sleeve_length_J,2
+Sleeveless,attr_Sleeve_length_J_1,Sleeve_Length,2
+Short,attr_Sleeve_length_J_2,Sleeve_Length,2
+Middle,attr_Sleeve_length_J_3,Sleeve_Length,2
+Seven,attr_Sleeve_length_J_4,Sleeve_Length,2
+Long,attr_Sleeve_length_J_5,Sleeve_Length,2
--- a/app/service/attribute_recognition/discriptor/jumpsuit/3_jumpsuit_Sleeve_shape.csv
+++ b/app/service/attribute_recognition/discriptor/jumpsuit/3_jumpsuit_Sleeve_shape.csv
@@ -1,9 +1,9 @@
 labelName,join_attr,taskName,taskId
-Regular,attr_Sleeve_shape_J_1,Sleeve_shape_J,3
-Slim,attr_Sleeve_shape_J_2,Sleeve_shape_J,3
-Puff,attr_Sleeve_shape_J_3,Sleeve_shape_J,3
-Bell,attr_Sleeve_shape_J_4,Sleeve_shape_J,3
-Batwing,attr_Sleeve_shape_J_5,Sleeve_shape_J,3
-Shirt,attr_Sleeve_shape_J_6,Sleeve_shape_J,3
-Rib,attr_Sleeve_shape_J_7,Sleeve_shape_J,3
-Raglan,attr_Sleeve_shape_J_8,Sleeve_shape_J,3
+Regular,attr_Sleeve_shape_J_1,Sleeve_Shape,3
+Slim,attr_Sleeve_shape_J_2,Sleeve_Shape,3
+Puff,attr_Sleeve_shape_J_3,Sleeve_Shape,3
+Bell,attr_Sleeve_shape_J_4,Sleeve_Shape,3
+Batwing,attr_Sleeve_shape_J_5,Sleeve_Shape,3
+Shirt,attr_Sleeve_shape_J_6,Sleeve_Shape,3
+Rib,attr_Sleeve_shape_J_7,Sleeve_Shape,3
+Raglan,attr_Sleeve_shape_J_8,Sleeve_Shape,3
--- a/app/service/attribute_recognition/discriptor/jumpsuit/4_jumpsuit_Sleeve_shoulder.csv
+++ b/app/service/attribute_recognition/discriptor/jumpsuit/4_jumpsuit_Sleeve_shoulder.csv
@@ -1,5 +1,5 @@
 labelName,join_attr,taskName,taskId
-Regular,attr_Sleeve_shoulder_J_1,Sleeve_shoulder_J,4
-Cold,attr_Sleeve_shoulder_J_2,Sleeve_shoulder_J,4
-Tucked,attr_Sleeve_shoulder_J_3,Sleeve_shoulder_J,4
-Balmain,attr_Sleeve_shoulder_J_4,Sleeve_shoulder_J,4
+Regular,attr_Sleeve_shoulder_J_1,Sleeve_Shoulder,4
+Cold,attr_Sleeve_shoulder_J_2,Sleeve_Shoulder,4
+Tucked,attr_Sleeve_shoulder_J_3,Sleeve_Shoulder,4
+Balmain,attr_Sleeve_shoulder_J_4,Sleeve_Shoulder,4
--- a/app/service/attribute_recognition/discriptor/jumpsuit/6_jumpsuit_Collar.csv
+++ b/app/service/attribute_recognition/discriptor/jumpsuit/6_jumpsuit_Collar.csv
@@ -1,11 +1,11 @@
 labelName,join_attr,taskName,taskId
-Peterpan,attr_Collar_J_1,Collar_J,6
-Shirt,attr_Collar_J_2,Collar_J,6
-Rib,attr_Collar_J_3,Collar_J,6
-Turtle,attr_Collar_J_4,Collar_J,6
-Lapel,attr_Collar_J_5,Collar_J,6
-Hoodie,attr_Collar_J_6,Collar_J,6
-Mandarin,attr_Collar_J_7,Collar_J,6
-Tie,attr_Collar_J_8,Collar_J,6
-Ruffle,attr_Collar_J_9,Collar_J,6
-Cowl,attr_Collar_J_10,Collar_J,6
+Peterpan,attr_Collar_J_1,Collar,6
+Shirt,attr_Collar_J_2,Collar,6
+Rib,attr_Collar_J_3,Collar,6
+Turtle,attr_Collar_J_4,Collar,6
+Lapel,attr_Collar_J_5,Collar,6
+Hoodie,attr_Collar_J_6,Collar,6
+Mandarin,attr_Collar_J_7,Collar,6
+Tie,attr_Collar_J_8,Collar,6
+Ruffle,attr_Collar_J_9,Collar,6
+Cowl,attr_Collar_J_10,Collar,6
--- a/app/service/attribute_recognition/discriptor/jumpsuit/7_jumpsuit_Print.csv
+++ b/app/service/attribute_recognition/discriptor/jumpsuit/7_jumpsuit_Print.csv
@@ -1,16 +1,16 @@
 labelName,join_attr,taskName,taskId
-Abstract,attr_Print_J_1,Print_J,7
-Allover,attr_Print_J_2,Print_J,7
-Animal,attr_Print_J_3,Print_J,7
-Camouflage,attr_Print_J_4,Print_J,7
-Checks,attr_Print_J_5,Print_J,7
-Color_block,attr_Print_J_6,Print_J,7
-Disty print,attr_Print_J_7,Print_J,7
-Dotted,attr_Print_J_8,Print_J,7
-Floral,attr_Print_J_9,Print_J,7
-Graphic print,attr_Print_J_10,Print_J,7
-Logo and slogan,attr_Print_J_11,Print_J,7
-Patchwork,attr_Print_J_12,Print_J,7
-Plain,attr_Print_J_13,Print_J,7
-Plain_dnim,attr_Print_J_14,Print_J,7
-Stripe,attr_Print_J_15,Print_J,7
+Abstract,attr_Print_J_1,Print,7
+Allover,attr_Print_J_2,Print,7
+Animal,attr_Print_J_3,Print,7
+Camouflage,attr_Print_J_4,Print,7
+Checks,attr_Print_J_5,Print,7
+Color_block,attr_Print_J_6,Print,7
+Disty Print,attr_Print_J_7,Print,7
+Dotted,attr_Print_J_8,Print,7
+Floral,attr_Print_J_9,Print,7
+Graphic Print,attr_Print_J_10,Print,7
+Logo and slogan,attr_Print_J_11,Print,7
+Patchwork,attr_Print_J_12,Print,7
+Plain,attr_Print_J_13,Print,7
+Plain_dnim,attr_Print_J_14,Print,7
+Stripe,attr_Print_J_15,Print,7
--- a/app/service/attribute_recognition/discriptor/jumpsuit/8_jumpsuit_Material.csv
+++ b/app/service/attribute_recognition/discriptor/jumpsuit/8_jumpsuit_Material.csv
@@ -1,28 +1,28 @@
 labelName,join_attr,taskName,taskId
-Canvas,attr_Material_J_1,Material_J,8
-Chambray,attr_Material_J_2,Material_J,8
-Chenille,attr_Material_J_3,Material_J,8
-Chiffon,attr_Material_J_4,Material_J,8
-Corduroy,attr_Material_J_5,Material_J,8
-Crepe,attr_Material_J_6,Material_J,8
-Denim,attr_Material_J_7,Material_J,8
-Faux_fur,attr_Material_J_8,Material_J,8
-Faux_leather,attr_Material_J_9,Material_J,8
-Flannel,attr_Material_J_10,Material_J,8
-Fleece,attr_Material_J_11,Material_J,8
-Gingham,attr_Material_J_12,Material_J,8
-Jersey,attr_Material_J_13,Material_J,8
-Knit,attr_Material_J_14,Material_J,8
-Lace,attr_Material_J_15,Material_J,8
-Lawn,attr_Material_J_16,Material_J,8
-Neoprene,attr_Material_J_17,Material_J,8
-Organza,attr_Material_J_18,Material_J,8
-Plush,attr_Material_J_19,Material_J,8
-Satin,attr_Material_J_20,Material_J,8
-Serge,attr_Material_J_21,Material_J,8
-Taffeta,attr_Material_J_22,Material_J,8
-Tulle,attr_Material_J_23,Material_J,8
-Tweed,attr_Material_J_24,Material_J,8
-Twill,attr_Material_J_25,Material_J,8
-Velvet,attr_Material_J_26,Material_J,8
-Vinyl,attr_Material_J_27,Material_J,8
+Canvas,attr_Material_J_1,Material,8
+Chambray,attr_Material_J_2,Material,8
+Chenille,attr_Material_J_3,Material,8
+Chiffon,attr_Material_J_4,Material,8
+Corduroy,attr_Material_J_5,Material,8
+Crepe,attr_Material_J_6,Material,8
+Denim,attr_Material_J_7,Material,8
+Faux_fur,attr_Material_J_8,Material,8
+Faux_leather,attr_Material_J_9,Material,8
+Flannel,attr_Material_J_10,Material,8
+Fleece,attr_Material_J_11,Material,8
+Gingham,attr_Material_J_12,Material,8
+Jersey,attr_Material_J_13,Material,8
+Knit,attr_Material_J_14,Material,8
+Lace,attr_Material_J_15,Material,8
+Lawn,attr_Material_J_16,Material,8
+Neoprene,attr_Material_J_17,Material,8
+Organza,attr_Material_J_18,Material,8
+Plush,attr_Material_J_19,Material,8
+Satin,attr_Material_J_20,Material,8
+Serge,attr_Material_J_21,Material,8
+Taffeta,attr_Material_J_22,Material,8
+Tulle,attr_Material_J_23,Material,8
+Tweed,attr_Material_J_24,Material,8
+Twill,attr_Material_J_25,Material,8
+Velvet,attr_Material_J_26,Material,8
+Vinyl,attr_Material_J_27,Material,8
--- a/app/service/attribute_recognition/discriptor/jumpsuit/9_jumpsuit_Softness.csv
+++ b/app/service/attribute_recognition/discriptor/jumpsuit/9_jumpsuit_Softness.csv
@@ -1,4 +1,4 @@
 labelName,join_attr,taskName,taskId
-Soft,attr_Softness_J_1,Softness_J,9
-Medium,attr_Softness_J_2,Softness_J,9
-Hard,attr_Softness_J_3,Softness_J,9
+Soft,attr_Softness_J_1,Softness,9
+Medium,attr_Softness_J_2,Softness,9
+Hard,attr_Softness_J_3,Softness,9
--- a/app/service/attribute_recognition/discriptor/outwear/10_outer_Design.csv
+++ b/app/service/attribute_recognition/discriptor/outwear/10_outer_Design.csv
@@ -1,19 +1,19 @@
 labelName,join_attr,taskName,taskId
-Asymmetrical,attr_Design_O_1,Design_O,10
-Tiered,attr_Design_O_2,Design_O,10
-Tassel,attr_Design_O_3,Design_O,10
-Ruffles,attr_Design_O_4,Design_O,10
-Pleated,attr_Design_O_5,Design_O,10
-Wrap,attr_Design_O_6,Design_O,10
-Ripped,attr_Design_O_7,Design_O,10
-Cut out,attr_Design_O_8,Design_O,10
-Eyelet,attr_Design_O_9,Design_O,10
-Folded,attr_Design_O_10,Design_O,10
-Tied,attr_Design_O_11,Design_O,10
-Drapes,attr_Design_O_12,Design_O,10
-Ribbon,attr_Design_O_13,Design_O,10
-Button,attr_Design_O_14,Design_O,10
-Crossed-over zipper,attr_Design_O_15,Design_O,10
-Crossed-over button,attr_Design_O_16,Design_O,10
-Single breasted,attr_Design_O_17,Design_O,10
-Double breasted,attr_Design_O_18,Design_O,10
+Asymmetrical,attr_Design_O_1,Design,10
+Tiered,attr_Design_O_2,Design,10
+Tassel,attr_Design_O_3,Design,10
+Ruffles,attr_Design_O_4,Design,10
+Pleated,attr_Design_O_5,Design,10
+Wrap,attr_Design_O_6,Design,10
+Ripped,attr_Design_O_7,Design,10
+Cut out,attr_Design_O_8,Design,10
+Eyelet,attr_Design_O_9,Design,10
+Folded,attr_Design_O_10,Design,10
+Tied,attr_Design_O_11,Design,10
+Drapes,attr_Design_O_12,Design,10
+Ribbon,attr_Design_O_13,Design,10
+Button,attr_Design_O_14,Design,10
+Crossed-over zipper,attr_Design_O_15,Design,10
+Crossed-over button,attr_Design_O_16,Design,10
+Single breasted,attr_Design_O_17,Design,10
+Double breasted,attr_Design_O_18,Design,10
--- a/app/service/attribute_recognition/discriptor/outwear/11_outer_opening.csv
+++ b/app/service/attribute_recognition/discriptor/outwear/11_outer_opening.csv
@@ -1,3 +1,3 @@
 labelName,join_attr,taskName,taskId
-Full,attr_Opening_O_1,Opening_O,11
-Half,attr_Opening_O_2,Opening_O,11
+Full,attr_Opening_O_1,Opening_Type,11
+Half,attr_Opening_O_2,Opening_Type,11
--- a/app/service/attribute_recognition/discriptor/outwear/12_outer_OPType.csv
+++ b/app/service/attribute_recognition/discriptor/outwear/12_outer_OPType.csv
@@ -1,5 +1,5 @@
 labelName,join_attr,taskName,taskId
-Button,attr_OPType_O_1,OPType_O,12
-Zipper,attr_OPType_O_2,OPType_O,12
-Thread,attr_OPType_O_3,OPType_O,12
-Hook,attr_OPType_O_4,OPType_O,12
+Button,attr_OPType_O_1,Opening_Type,12
+Zipper,attr_OPType_O_2,Opening_Type,12
+Thread,attr_OPType_O_3,Opening_Type,12
+Hook,attr_OPType_O_4,Opening_Type,12
--- a/app/service/attribute_recognition/discriptor/outwear/13_outer_Silhouette.csv
+++ b/app/service/attribute_recognition/discriptor/outwear/13_outer_Silhouette.csv
@@ -1,7 +1,7 @@
 labelName,join_attr,taskName,taskId
-A Line,attr_Silhouette_O_1,Silhouette_O,13
-H Shape,attr_Silhouette_O_2,Silhouette_O,13
-Slim,attr_Silhouette_O_3,Silhouette_O,13
-Flyman,attr_Silhouette_O_4,Silhouette_O,13
-Peplum,attr_Silhouette_O_5,Silhouette_O,13
-Oversize,attr_Silhouette_O_6,Silhouette_O,13
+A Line,attr_Silhouette_O_1,Silhouette,13
+H Shape,attr_Silhouette_O_2,Silhouette,13
+Slim,attr_Silhouette_O_3,Silhouette,13
+Flyman,attr_Silhouette_O_4,Silhouette,13
+Peplum,attr_Silhouette_O_5,Silhouette,13
+Oversize,attr_Silhouette_O_6,Silhouette,13
--- a/app/service/attribute_recognition/discriptor/outwear/1_outer_length.csv
+++ b/app/service/attribute_recognition/discriptor/outwear/1_outer_length.csv
@@ -1,4 +1,4 @@
 labelName,join_attr,taskName,taskId
-Short,attr_Outer_length_1,Outer_length,1
-Regular,attr_Outer_length_2,Outer_length,1
-Long,attr_Outer_length_3,Outer_length,1
+Short,attr_Outer_length_1,Length,1
+Regular,attr_Outer_length_2,Length,1
+Long,attr_Outer_length_3,Length,1
--- a/app/service/attribute_recognition/discriptor/outwear/2_outer_type.csv
+++ b/app/service/attribute_recognition/discriptor/outwear/2_outer_type.csv
@@ -1,18 +1,18 @@
 labelName,join_attr,taskName,taskId
-Coat,attr_Outer_type_1,Outer_Type,2
-Trench,attr_Outer_type_2,Outer_Type,2
-Baseball jacket,attr_Outer_type_3,Outer_Type,2
-Hoodie jacket,attr_Outer_type_4,Outer_Type,2
-Active jacket,attr_Outer_type_5,Outer_Type,2
-Jacket,attr_Outer_type_6,Outer_Type,2
-Blazer,attr_Outer_type_7,Outer_Type,2
-Cardigan,attr_Outer_type_8,Outer_Type,2
-Capes,attr_Outer_type_9,Outer_Type,2
-Fleeces Jacket,attr_Outer_type_10,Outer_Type,2
-Gilets/Puffer,attr_Outer_type_11,Outer_Type,2
-Aviator jacket,attr_Outer_type_12,Outer_Type,2
-Biker jacket,attr_Outer_type_13,Outer_Type,2
-Pea coat,attr_Outer_type_14,Outer_Type,2
-Shacket,attr_Outer_type_15,Outer_Type,2
-Denim jacket,attr_Outer_type_16,Outer_Type,2
-Raincoat,attr_Outer_type_17,Outer_Type,2
+Coat,attr_Outer_type_1,Type,2
+Trench,attr_Outer_type_2,Type,2
+Baseball jacket,attr_Outer_type_3,Type,2
+Hoodie jacket,attr_Outer_type_4,Type,2
+Active jacket,attr_Outer_type_5,Type,2
+Jacket,attr_Outer_type_6,Type,2
+Blazer,attr_Outer_type_7,Type,2
+Cardigan,attr_Outer_type_8,Type,2
+Capes,attr_Outer_type_9,Type,2
+Fleeces Jacket,attr_Outer_type_10,Type,2
+Gilets/Puffer,attr_Outer_type_11,Type,2
+Aviator jacket,attr_Outer_type_12,Type,2
+Biker jacket,attr_Outer_type_13,Type,2
+Pea coat,attr_Outer_type_14,Type,2
+Shacket,attr_Outer_type_15,Type,2
+Denim jacket,attr_Outer_type_16,Type,2
+Raincoat,attr_Outer_type_17,Type,2
--- a/app/service/attribute_recognition/discriptor/outwear/3_outer_sleeve_length.csv
+++ b/app/service/attribute_recognition/discriptor/outwear/3_outer_sleeve_length.csv
@@ -1,6 +1,6 @@
 labelName,join_attr,taskName,taskId
-Sleeveless,attr_Sleeve_length_O_1,Sleeve_length_O,3
-Short,attr_Sleeve_length_O_2,Sleeve_length_O,3
-Middle,attr_Sleeve_length_O_3,Sleeve_length_O,3
-Seven,attr_Sleeve_length_O_4,Sleeve_length_O,3
-Long,attr_Sleeve_length_O_5,Sleeve_length_O,3
+Sleeveless,attr_sleeve_length_1,Sleeve_Length,3
+Short,attr_sleeve_length_2,Sleeve_Length,3
+Middle,attr_sleeve_length_3,Sleeve_Length,3
+Seven,attr_sleeve_length_4,Sleeve_Length,3
+Long,attr_sleeve_length_5,Sleeve_Length,3
--- a/app/service/attribute_recognition/discriptor/outwear/4_outer_sleeve_shape.csv
+++ b/app/service/attribute_recognition/discriptor/outwear/4_outer_sleeve_shape.csv
@@ -1,9 +1,9 @@
 labelName,join_attr,taskName,taskId
-Regular,attr_Sleeve_shape_O_1,Sleeve_shape,4
-Slim,attr_Sleeve_shape_O_2,Sleeve_shape,4
-Puff,attr_Sleeve_shape_O_3,Sleeve_shape,4
-Bell,attr_Sleeve_shape_O_4,Sleeve_shape,4
-Batwing,attr_Sleeve_shape_O_5,Sleeve_shape,4
-Shirt,attr_Sleeve_shape_O_6,Sleeve_shape,4
-Rib,attr_Sleeve_shape_O_7,Sleeve_shape,4
-Raglan,attr_Sleeve_shape_O_8,Sleeve_shape,4
+Regular,attr_sleeve_shape_O_1,Sleeve_Shape,4
+Slim,attr_sleeve_shape_O_2,Sleeve_Shape,4
+Puff,attr_sleeve_shape_O_3,Sleeve_Shape,4
+Bell,attr_sleeve_shape_O_4,Sleeve_Shape,4
+Batwing,attr_sleeve_shape_O_5,Sleeve_Shape,4
+Shirt,attr_sleeve_shape_O_6,Sleeve_Shape,4
+Rib,attr_sleeve_shape_O_7,Sleeve_Shape,4
+Raglan,attr_sleeve_shape_O_8,Sleeve_Shape,4
--- a/app/service/attribute_recognition/discriptor/outwear/5_outer_sleeve_shoulder.csv
+++ b/app/service/attribute_recognition/discriptor/outwear/5_outer_sleeve_shoulder.csv
@@ -1,6 +1,6 @@
 labelName,join_attr,taskName,taskId
-Regular,attr_Sleeve_shoulder_O_1,Sleeve_shoulder,5
-Cold,attr_Sleeve_shoulder_O_2,Sleeve_shoulder,5
-Tucked,attr_Sleeve_shoulder_O_3,Sleeve_shoulder,5
-Balmain,attr_Sleeve_shoulder_O_4,Sleeve_shoulder,5
-Drop Shoulder,attr_Sleeve_shoulder_O_5,Sleeve_shoulder,5
+Regular,attr_sleeve_shoulder_O_1,Sleeve_Shoulder,5
+Cold,attr_sleeve_shoulder_O_2,Sleeve_Shoulder,5
+Tucked,attr_sleeve_shoulder_O_3,Sleeve_Shoulder,5
+Balmain,attr_sleeve_shoulder_O_4,Sleeve_Shoulder,5
+Drop Shoulder,attr_sleeve_shoulder_O_5,Sleeve_Shoulder,5
--- a/app/service/attribute_recognition/discriptor/outwear/7_outer_Print.csv
+++ b/app/service/attribute_recognition/discriptor/outwear/7_outer_Print.csv
@@ -1,16 +1,16 @@
 labelName,join_attr,taskName,taskId
-Abstract,attr_Print_O_1,Print_O,7
-Allover,attr_Print_O_2,Print_O,7
-Animal,attr_Print_O_3,Print_O,7
-Camouflage,attr_Print_O_4,Print_O,7
-Checks,attr_Print_O_5,Print_O,7
-Color_block,attr_Print_O_6,Print_O,7
-Disty print,attr_Print_O_7,Print_O,7
-Dotted,attr_Print_O_8,Print_O,7
-Floral,attr_Print_O_9,Print_O,7
-Graphic print,attr_Print_O_10,Print_O,7
-Logo and slogan,attr_Print_O_11,Print_O,7
-Patchwork,attr_Print_O_12,Print_O,7
-Plain,attr_Print_O_13,Print_O,7
-Plain_dnim,attr_Print_O_14,Print_O,7
-Stripe,attr_Print_O_15,Print_O,7
+Abstract,attr_Print_O_1,Print,7
+Allover,attr_Print_O_2,Print,7
+Animal,attr_Print_O_3,Print,7
+Camouflage,attr_Print_O_4,Print,7
+Checks,attr_Print_O_5,Print,7
+Color_block,attr_Print_O_6,Print,7
+Disty print,attr_Print_O_7,Print,7
+Dotted,attr_Print_O_8,Print,7
+Floral,attr_Print_O_9,Print,7
+Graphic print,attr_Print_O_10,Print,7
+Logo and slogan,attr_Print_O_11,Print,7
+Patchwork,attr_Print_O_12,Print,7
+Plain,attr_Print_O_13,Print,7
+Plain_dnim,attr_Print_O_14,Print,7
+Stripe,attr_Print_O_15,Print,7
--- a/app/service/attribute_recognition/discriptor/outwear/8_outer_Material.csv
+++ b/app/service/attribute_recognition/discriptor/outwear/8_outer_Material.csv
@@ -1,28 +1,28 @@
 labelName,join_attr,taskName,taskId
-Canvas,attr_Material_O_1,Material_O,8
-Chambray,attr_Material_O_2,Material_O,8
-Chenille,attr_Material_O_3,Material_O,8
-Chiffon,attr_Material_O_4,Material_O,8
-Corduroy,attr_Material_O_5,Material_O,8
-Crepe,attr_Material_O_6,Material_O,8
-Denim,attr_Material_O_7,Material_O,8
-Faux_fur,attr_Material_O_8,Material_O,8
-Faux_leather,attr_Material_O_9,Material_O,8
-Flannel,attr_Material_O_10,Material_O,8
-Fleece,attr_Material_O_11,Material_O,8
-Gingham,attr_Material_O_12,Material_O,8
-Jersey,attr_Material_O_13,Material_O,8
-Knit,attr_Material_O_14,Material_O,8
-Lace,attr_Material_O_15,Material_O,8
-Lawn,attr_Material_O_16,Material_O,8
-Neoprene,attr_Material_O_17,Material_O,8
-Organza,attr_Material_O_18,Material_O,8
-Plush,attr_Material_O_19,Material_O,8
-Satin,attr_Material_O_20,Material_O,8
-Serge,attr_Material_O_21,Material_O,8
-Taffeta,attr_Material_O_22,Material_O,8
-Tulle,attr_Material_O_23,Material_O,8
-Tweed,attr_Material_O_24,Material_O,8
-Twill,attr_Material_O_25,Material_O,8
-Velvet,attr_Material_O_26,Material_O,8
-Vinyl,attr_Material_O_27,Material_O,8
+Canvas,attr_Material_O_1,Material,8
+Chambray,attr_Material_O_2,Material,8
+Chenille,attr_Material_O_3,Material,8
+Chiffon,attr_Material_O_4,Material,8
+Corduroy,attr_Material_O_5,Material,8
+Crepe,attr_Material_O_6,Material,8
+Denim,attr_Material_O_7,Material,8
+Faux_fur,attr_Material_O_8,Material,8
+Faux_leather,attr_Material_O_9,Material,8
+Flannel,attr_Material_O_10,Material,8
+Fleece,attr_Material_O_11,Material,8
+Gingham,attr_Material_O_12,Material,8
+Jersey,attr_Material_O_13,Material,8
+Knit,attr_Material_O_14,Material,8
+Lace,attr_Material_O_15,Material,8
+Lawn,attr_Material_O_16,Material,8
+Neoprene,attr_Material_O_17,Material,8
+Organza,attr_Material_O_18,Material,8
+Plush,attr_Material_O_19,Material,8
+Satin,attr_Material_O_20,Material,8
+Serge,attr_Material_O_21,Material,8
+Taffeta,attr_Material_O_22,Material,8
+Tulle,attr_Material_O_23,Material,8
+Tweed,attr_Material_O_24,Material,8
+Twill,attr_Material_O_25,Material,8
+Velvet,attr_Material_O_26,Material,8
+Vinyl,attr_Material_O_27,Material,8
--- a/app/service/attribute_recognition/discriptor/outwear/9_outer_Softness.csv
+++ b/app/service/attribute_recognition/discriptor/outwear/9_outer_Softness.csv
@@ -1,4 +1,4 @@
 labelName,join_attr,taskName,taskId
-Soft,attr_Softness_O_1,Softness_O,9
-Medium,attr_Softness_O_2,Softness_O,9
-Hard,attr_Softness_O_3,Softness_O,9
+Soft,attr_Softness_O_1,Softness,9
+Medium,attr_Softness_O_2,Softness,9
+Hard,attr_Softness_O_3,Softness,9
--- a/app/service/attribute_recognition/discriptor/top/10_top_Design.csv
+++ b/app/service/attribute_recognition/discriptor/top/10_top_Design.csv
@@ -1,15 +1,15 @@
 labelName,join_attr,taskName,taskId
-Asymmetrical,attr_Design_U_1,Design_U,10
-Tiered,attr_Design_U_2,Design_U,10
-Tassel,attr_Design_U_3,Design_U,10
-Ruffle,attr_Design_U_4,Design_U,10
-Pleated,attr_Design_U_5,Design_U,10
-Wrap,attr_Design_U_6,Design_U,10
-Ripped,attr_Design_U_7,Design_U,10
-Cut out,attr_Design_U_8,Design_U,10
-Eyelet,attr_Design_U_9,Design_U,10
-Folded,attr_Design_U_10,Design_U,10
-Tied,attr_Design_U_11,Design_U,10
-Drapes,attr_Design_U_12,Design_U,10
-Ribbon,attr_Design_U_13,Design_U,10
-Button,attr_Design_U_14,Design_U,10
+Asymmetrical,attr_Design_U_1,Design,10
+Tiered,attr_Design_U_2,Design,10
+Tassel,attr_Design_U_3,Design,10
+Ruffle,attr_Design_U_4,Design,10
+Pleated,attr_Design_U_5,Design,10
+Wrap,attr_Design_U_6,Design,10
+Ripped,attr_Design_U_7,Design,10
+Cut out,attr_Design_U_8,Design,10
+Eyelet,attr_Design_U_9,Design,10
+Folded,attr_Design_U_10,Design,10
+Tied,attr_Design_U_11,Design,10
+Drapes,attr_Design_U_12,Design,10
+Ribbon,attr_Design_U_13,Design,10
+Button,attr_Design_U_14,Design,10
--- a/app/service/attribute_recognition/discriptor/top/11_top_OPType.csv
+++ b/app/service/attribute_recognition/discriptor/top/11_top_OPType.csv
@@ -1,5 +1,5 @@
 labelName,join_attr,taskName,taskId
-Button,attr_OPType_U_1,OPType_U,11
-Zipper,attr_OPType_U_2,OPType_U,11
-Thread,attr_OPType_U_3,OPType_U,11
-Hook,attr_OPType_U_4,OPType_U,11
+Button,attr_OPType_U_1,Opening_Type,11
+Zipper,attr_OPType_U_2,Opening_Type,11
+Thread,attr_OPType_U_3,Opening_Type,11
+Hook,attr_OPType_U_4,Opening_Type,11
--- a/app/service/attribute_recognition/discriptor/top/12_top_Silhouette.csv
+++ b/app/service/attribute_recognition/discriptor/top/12_top_Silhouette.csv
@@ -1,7 +1,7 @@
 labelName,join_attr,taskName,taskId
-A Line,attr_Silhouette_U_1,Silhouette_U,12
-H Shape,attr_Silhouette_U_2,Silhouette_U,12
-Slim,attr_Silhouette_U_3,Silhouette_U,12
-Flyman,attr_Silhouette_U_4,Silhouette_U,12
-Peplum,attr_Silhouette_U_5,Silhouette_U,12
-Oversize,attr_Silhouette_U_6,Silhouette_U,12
+A Line,attr_Silhouette_U_1,Silhouette,12
+H Shape,attr_Silhouette_U_2,Silhouette,12
+Slim,attr_Silhouette_U_3,Silhouette,12
+Flyman,attr_Silhouette_U_4,Silhouette,12
+Peplum,attr_Silhouette_U_5,Silhouette,12
+Oversize,attr_Silhouette_U_6,Silhouette,12
--- a/app/service/attribute_recognition/discriptor/top/1_top_length.csv
+++ b/app/service/attribute_recognition/discriptor/top/1_top_length.csv
@@ -1,4 +1,4 @@
 labelName,join_attr,taskName,taskId
-Short,attr_Top_length_1,Top_length,1
-Regular,attr_Top_length_2,Top_length,1
-Long,attr_Top_length_3,Top_length,1
+Short,attr_Top_length_1,Length,1
+Regular,attr_Top_length_2,Length,1
+Long,attr_Top_length_3,Length,1
--- a/app/service/attribute_recognition/discriptor/top/2_top_type.csv
+++ b/app/service/attribute_recognition/discriptor/top/2_top_type.csv
@@ -1,15 +1,15 @@
 labelName,join_attr,taskName,taskId
-Bandeau,attr_toptype_1,Top_Type,2
-Blouse,attr_toptype_2,Top_Type,2
-Bodysuit,attr_toptype_3,Top_Type,2
-Bralets,attr_toptype_4,Top_Type,2
-Camisole,attr_toptype_5,Top_Type,2
-Crop Top,attr_toptype_6,Top_Type,2
-Hoodie,attr_toptype_7,Top_Type,2
-Pullover,attr_toptype_8,Top_Type,2
-Polo shirt,attr_toptype_9,Top_Type,2
-Shirt,attr_toptype_10,Top_Type,2
-strapeless,attr_toptype_11,Top_Type,2
-Sweater,attr_toptype_12,Top_Type,2
-Tank Top,attr_toptype_13,Top_Type,2
-T-shirt,attr_toptype_14,Top_Type,2
+Bandeau,attr_toptype_1,Type,2
+Blouse,attr_toptype_2,Type,2
+Bodysuit,attr_toptype_3,Type,2
+Bralets,attr_toptype_4,Type,2
+Camisole,attr_toptype_5,Type,2
+Crop Top,attr_toptype_6,Type,2
+Hoodie,attr_toptype_7,Type,2
+Pullover,attr_toptype_8,Type,2
+Polo shirt,attr_toptype_9,Type,2
+Shirt,attr_toptype_10,Type,2
+strapeless,attr_toptype_11,Type,2
+Sweater,attr_toptype_12,Type,2
+Tank Top,attr_toptype_13,Type,2
+T-shirt,attr_toptype_14,Type,2
--- a/app/service/attribute_recognition/discriptor/top/3_top_Sleeve_length.csv
+++ b/app/service/attribute_recognition/discriptor/top/3_top_Sleeve_length.csv
@@ -1,6 +1,6 @@
 labelName,join_attr,taskName,taskId
-Sleeveless,attr_Sleeve_length_1,Sleeve_length,3
-Short,attr_Sleeve_length_2,Sleeve_length,3
-Middle,attr_Sleeve_length_3,Sleeve_length,3
-Seven,attr_Sleeve_length_4,Sleeve_length,3
-Long,attr_Sleeve_length_5,Sleeve_length,3
+Sleeveless,attr_Sleeve_length_1,Sleeve_Length,3
+Short,attr_Sleeve_length_2,Sleeve_Length,3
+Middle,attr_Sleeve_length_3,Sleeve_Length,3
+Seven,attr_Sleeve_length_4,Sleeve_Length,3
+Long,attr_Sleeve_length_5,Sleeve_Length,3
--- a/app/service/attribute_recognition/discriptor/top/4_top_Sleeve_shape.csv
+++ b/app/service/attribute_recognition/discriptor/top/4_top_Sleeve_shape.csv
@@ -1,9 +1,9 @@
 labelName,join_attr,taskName,taskId
-Regular,attr_Sleeve_shape_1,Sleeve_shape,4
-Slim,attr_Sleeve_shape_2,Sleeve_shape,4
-Puff,attr_Sleeve_shape_3,Sleeve_shape,4
-Bell,attr_Sleeve_shape_4,Sleeve_shape,4
-Batwing,attr_Sleeve_shape_5,Sleeve_shape,4
-Shirt,attr_Sleeve_shape_6,Sleeve_shape,4
-Rib,attr_Sleeve_shape_7,Sleeve_shape,4
-Raglan,attr_Sleeve_shape_8,Sleeve_shape,4
+Regular,attr_Sleeve_shape_1,Sleeve_Shape,4
+Slim,attr_Sleeve_shape_2,Sleeve_Shape,4
+Puff,attr_Sleeve_shape_3,Sleeve_Shape,4
+Bell,attr_Sleeve_shape_4,Sleeve_Shape,4
+Batwing,attr_Sleeve_shape_5,Sleeve_Shape,4
+Shirt,attr_Sleeve_shape_6,Sleeve_Shape,4
+Rib,attr_Sleeve_shape_7,Sleeve_Shape,4
+Raglan,attr_Sleeve_shape_8,Sleeve_Shape,4
--- a/app/service/attribute_recognition/discriptor/top/5_top_Sleeve_shoulder.csv
+++ b/app/service/attribute_recognition/discriptor/top/5_top_Sleeve_shoulder.csv
@@ -1,5 +1,5 @@
 labelName,join_attr,taskName,taskId
-Regular,attr_Sleeve_shoulder_1,Sleeve_shoulder,5
-Cold,attr_Sleeve_shoulder_2,Sleeve_shoulder,5
-Tucked,attr_Sleeve_shoulder_3,Sleeve_shoulder,5
-Balmain,attr_Sleeve_shoulder_4,Sleeve_shoulder,5
+Regular,attr_Sleeve_shoulder_1,Sleeve_Shoulder,5
+Cold,attr_Sleeve_shoulder_2,Sleeve_Shoulder,5
+Tucked,attr_Sleeve_shoulder_3,Sleeve_Shoulder,5
+Balmain,attr_Sleeve_shoulder_4,Sleeve_Shoulder,5
--- a/app/service/attribute_recognition/discriptor/top/7_outer_Print.csv
+++ b/app/service/attribute_recognition/discriptor/top/7_outer_Print.csv
@@ -1,16 +1,16 @@
 labelName,join_attr,taskName,taskId
-Abstract,attr_Print_O_1,Print_U,7
-Allover,attr_Print_O_2,Print_U,7
-Animal,attr_Print_O_3,Print_U,7
-Camouflage,attr_Print_O_4,Print_U,7
-Checks,attr_Print_O_5,Print_U,7
-Color_block,attr_Print_O_6,Print_U,7
-Disty print,attr_Print_O_7,Print_U,7
-Dotted,attr_Print_O_8,Print_U,7
-Floral,attr_Print_O_9,Print_U,7
-Graphic print,attr_Print_O_10,Print_U,7
-Logo and slogan,attr_Print_O_11,Print_U,7
-Patchwork,attr_Print_O_12,Print_U,7
-Plain,attr_Print_O_13,Print_U,7
-Plain_dnim,attr_Print_O_14,Print_U,7
-Stripe,attr_Print_O_15,Print_U,7
+Abstract,attr_Print_O_1,Print,7
+Allover,attr_Print_O_2,Print,7
+Animal,attr_Print_O_3,Print,7
+Camouflage,attr_Print_O_4,Print,7
+Checks,attr_Print_O_5,Print,7
+Color_block,attr_Print_O_6,Print,7
+Disty print,attr_Print_O_7,Print,7
+Dotted,attr_Print_O_8,Print,7
+Floral,attr_Print_O_9,Print,7
+Graphic print,attr_Print_O_10,Print,7
+Logo and slogan,attr_Print_O_11,Print,7
+Patchwork,attr_Print_O_12,Print,7
+Plain,attr_Print_O_13,Print,7
+Plain_dnim,attr_Print_O_14,Print,7
+Stripe,attr_Print_O_15,Print,7
--- a/app/service/attribute_recognition/discriptor/top/8_outer_Material.csv
+++ b/app/service/attribute_recognition/discriptor/top/8_outer_Material.csv
@@ -1,28 +1,28 @@
 labelName,join_attr,taskName,taskId
-Canvas,attr_Material_O_1,Material_U,8
-Chambray,attr_Material_O_2,Material_U,8
-Chenille,attr_Material_O_3,Material_U,8
-Chiffon,attr_Material_O_4,Material_U,8
-Corduroy,attr_Material_O_5,Material_U,8
-Crepe,attr_Material_O_6,Material_U,8
-Denim,attr_Material_O_7,Material_U,8
-Faux_fur,attr_Material_O_8,Material_U,8
-Faux_leather,attr_Material_O_9,Material_U,8
-Flannel,attr_Material_O_10,Material_U,8
-Fleece,attr_Material_O_11,Material_U,8
-Gingham,attr_Material_O_12,Material_U,8
-Jersey,attr_Material_O_13,Material_U,8
-Knit,attr_Material_O_14,Material_U,8
-Lace,attr_Material_O_15,Material_U,8
-Lawn,attr_Material_O_16,Material_U,8
-Neoprene,attr_Material_O_17,Material_U,8
-Organza,attr_Material_O_18,Material_U,8
-Plush,attr_Material_O_19,Material_U,8
-Satin,attr_Material_O_20,Material_U,8
-Serge,attr_Material_O_21,Material_U,8
-Taffeta,attr_Material_O_22,Material_U,8
-Tulle,attr_Material_O_23,Material_U,8
-Tweed,attr_Material_O_24,Material_U,8
-Twill,attr_Material_O_25,Material_U,8
-Velvet,attr_Material_O_26,Material_U,8
-Vinyl,attr_Material_O_27,Material_U,8
+Canvas,attr_Material_O_1,Material,8
+Chambray,attr_Material_O_2,Material,8
+Chenille,attr_Material_O_3,Material,8
+Chiffon,attr_Material_O_4,Material,8
+Corduroy,attr_Material_O_5,Material,8
+Crepe,attr_Material_O_6,Material,8
+Denim,attr_Material_O_7,Material,8
+Faux_fur,attr_Material_O_8,Material,8
+Faux_leather,attr_Material_O_9,Material,8
+Flannel,attr_Material_O_10,Material,8
+Fleece,attr_Material_O_11,Material,8
+Gingham,attr_Material_O_12,Material,8
+Jersey,attr_Material_O_13,Material,8
+Knit,attr_Material_O_14,Material,8
+Lace,attr_Material_O_15,Material,8
+Lawn,attr_Material_O_16,Material,8
+Neoprene,attr_Material_O_17,Material,8
+Organza,attr_Material_O_18,Material,8
+Plush,attr_Material_O_19,Material,8
+Satin,attr_Material_O_20,Material,8
+Serge,attr_Material_O_21,Material,8
+Taffeta,attr_Material_O_22,Material,8
+Tulle,attr_Material_O_23,Material,8
+Tweed,attr_Material_O_24,Material,8
+Twill,attr_Material_O_25,Material,8
+Velvet,attr_Material_O_26,Material,8
+Vinyl,attr_Material_O_27,Material,8
--- a/app/service/attribute_recognition/discriptor/top/9_top_Softness.csv
+++ b/app/service/attribute_recognition/discriptor/top/9_top_Softness.csv
@@ -1,4 +1,4 @@
 labelName,join_attr,taskName,taskId
-Soft,attr_Softness_U_1,Softness_U,9
-Medium,attr_Softness_U_2,Softness_U,9
-Hard,attr_Softness_U_3,Softness_U,9
+Soft,attr_Softness_U_1,Softness,9
+Medium,attr_Softness_U_2,Softness,9
+Hard,attr_Softness_U_3,Softness,9
--- a/app/service/attribute_recognition/discriptor/top/ori10_top_Softness.csv
+++ b/app/service/attribute_recognition/discriptor/top/ori10_top_Softness.csv
@@ -1,4 +1,4 @@
 labelName,join_attr,taskName,taskId
-Soft,attr_Softness_U_1,Softness_U,10
-Medium,attr_Softness_U_2,Softness_U,10
-Hard,attr_Softness_U_3,Softness_U,10
+Soft,attr_Softness_U_1,Softness,10
+Medium,attr_Softness_U_2,Softness,10
+Hard,attr_Softness_U_3,Softness,10
--- a/app/service/attribute_recognition/discriptor/top/ori11_top_Design.csv
+++ b/app/service/attribute_recognition/discriptor/top/ori11_top_Design.csv
@@ -1,16 +1,16 @@
 labelName,join_attr,taskName,taskId
-Asymmetrical,attr_Design_U_1,Design_U,11
-Tiered,attr_Design_U_2,Design_U,11
-Tassel,attr_Design_U_3,Design_U,11
-Ruffle,attr_Design_U_4,Design_U,11
-Pleated,attr_Design_U_5,Design_U,11
-Wrap,attr_Design_U_6,Design_U,11
-Ripped,attr_Design_U_7,Design_U,11
-Cut out,attr_Design_U_8,Design_U,11
-Eyelet,attr_Design_U_9,Design_U,11
-Folded,attr_Design_U_10,Design_U,11
-Tied,attr_Design_U_11,Design_U,11
-Drapes,attr_Design_U_12,Design_U,11
-Ribbon,attr_Design_U_13,Design_U,11
-Button,attr_Design_U_14,Design_U,11
-Gathering,attr_Design_U_15,Design_U,11
+Asymmetrical,attr_Design_U_1,Design,11
+Tiered,attr_Design_U_2,Design,11
+Tassel,attr_Design_U_3,Design,11
+Ruffle,attr_Design_U_4,Design,11
+Pleated,attr_Design_U_5,Design,11
+Wrap,attr_Design_U_6,Design,11
+Ripped,attr_Design_U_7,Design,11
+Cut out,attr_Design_U_8,Design,11
+Eyelet,attr_Design_U_9,Design,11
+Folded,attr_Design_U_10,Design,11
+Tied,attr_Design_U_11,Design,11
+Drapes,attr_Design_U_12,Design,11
+Ribbon,attr_Design_U_13,Design,11
+Button,attr_Design_U_14,Design,11
+Gathering,attr_Design_U_15,Design,11
--- a/app/service/attribute_recognition/discriptor/top/ori12_top_OPType.csv
+++ b/app/service/attribute_recognition/discriptor/top/ori12_top_OPType.csv
@@ -1,5 +1,5 @@
 labelName,join_attr,taskName,taskId
-Button,attr_OPType_U_1,OPType_U,12
-Zipper,attr_OPType_U_2,OPType_U,12
-Thread,attr_OPType_U_3,OPType_U,12
-Hook,attr_OPType_U_4,OPType_U,12
+Button,attr_OPType_U_1,Opening_Type,12
+Zipper,attr_OPType_U_2,Opening_Type,12
+Thread,attr_OPType_U_3,Opening_Type,12
+Hook,attr_OPType_U_4,Opening_Type,12
--- a/app/service/attribute_recognition/discriptor/top/ori13_top_Silhouette.csv
+++ b/app/service/attribute_recognition/discriptor/top/ori13_top_Silhouette.csv
@@ -1,7 +1,7 @@
 labelName,join_attr,taskName,taskId
-A Line,attr_Silhouette_U_1,Silhouette_U,13
-H Shape,attr_Silhouette_U_2,Silhouette_U,13
-Slim,attr_Silhouette_U_3,Silhouette_U,13
-Flyman,attr_Silhouette_U_4,Silhouette_U,13
-Peplum,attr_Silhouette_U_5,Silhouette_U,13
-Oversize,attr_Silhouette_U_6,Silhouette_U,13
+A Line,attr_Silhouette_U_1,Silhouette,13
+H Shape,attr_Silhouette_U_2,Silhouette,13
+Slim,attr_Silhouette_U_3,Silhouette,13
+Flyman,attr_Silhouette_U_4,Silhouette,13
+Peplum,attr_Silhouette_U_5,Silhouette,13
+Oversize,attr_Silhouette_U_6,Silhouette,13
--- a/app/service/attribute_recognition/discriptor/top/ori1_Top_length.csv
+++ b/app/service/attribute_recognition/discriptor/top/ori1_Top_length.csv
@@ -1,4 +1,4 @@
 labelName,join_attr,taskName,taskId
-Short,attr_Top_length_1,Top_length,1
-Regular,attr_Top_length_2,Top_length,1
-Long,attr_Top_length_3,Top_length,1
+Short,attr_Top_length_1,Length,1
+Regular,attr_Top_length_2,Length,1
+Long,attr_Top_length_3,Length,1
--- a/app/service/attribute_recognition/discriptor/top/ori2_Top_type.csv
+++ b/app/service/attribute_recognition/discriptor/top/ori2_Top_type.csv
@@ -1,15 +1,15 @@
 labelName,join_attr,taskName,taskId
-Blouse,attr_Top_type_1,Top_type,2
-Camisole,attr_Top_type_2,Top_type,2
-Shirt,attr_Top_type_3,Top_type,2
-T-shirt,attr_Top_type_4,Top_type,2
-Jumper-Pullover,attr_Top_type_5,Top_type,2
-Hoodie,attr_Top_type_6,Top_type,2
-Tank Top,attr_Top_type_7,Top_type,2
-Polo shirt,attr_Top_type_8,Top_type,2
-Crop Top,attr_Top_type_9,Top_type,2
-Bralets,attr_Top_type_10,Top_type,2
-Bodysuit,attr_Top_type_11,Top_type,2
-Bandeau,attr_Top_type_12,Top_type,2
-Sweater,attr_Top_type_13,Top_type,2
-Strapless,attr_Top_type_14,Top_type,2
+Blouse,attr_Top_type_1,Type,2
+Camisole,attr_Top_type_2,Type,2
+Shirt,attr_Top_type_3,Type,2
+T-shirt,attr_Top_type_4,Type,2
+Jumper-Pullover,attr_Top_type_5,Type,2
+Hoodie,attr_Top_type_6,Type,2
+Tank Top,attr_Top_type_7,Type,2
+Polo shirt,attr_Top_type_8,Type,2
+Crop Top,attr_Top_type_9,Type,2
+Bralets,attr_Top_type_10,Type,2
+Bodysuit,attr_Top_type_11,Type,2
+Bandeau,attr_Top_type_12,Type,2
+Sweater,attr_Top_type_13,Type,2
+Strapless,attr_Top_type_14,Type,2
--- a/app/service/attribute_recognition/discriptor/top/ori3_top_Sleeve_length.csv
+++ b/app/service/attribute_recognition/discriptor/top/ori3_top_Sleeve_length.csv
@@ -1,6 +1,6 @@
 labelName,join_attr,taskName,taskId
-Sleeveless,attr_Sleeve_length_U_1,Sleeve_length_U,3
-Short,attr_Sleeve_length_U_2,Sleeve_length_U,3
-Middle,attr_Sleeve_length_U_3,Sleeve_length_U,3
-Seven,attr_Sleeve_length_U_4,Sleeve_length_U,3
-Long,attr_Sleeve_length_U_5,Sleeve_length_U,3
+Sleeveless,attr_Sleeve_length_U_1,Sleeve_Length,3
+Short,attr_Sleeve_length_U_2,Sleeve_Length,3
+Middle,attr_Sleeve_length_U_3,Sleeve_Length,3
+Seven,attr_Sleeve_length_U_4,Sleeve_Length,3
+Long,attr_Sleeve_length_U_5,Sleeve_Length,3
--- a/app/service/attribute_recognition/discriptor/top/ori4_top_Sleeve_shape.csv
+++ b/app/service/attribute_recognition/discriptor/top/ori4_top_Sleeve_shape.csv
@@ -1,9 +1,9 @@
 labelName,join_attr,taskName,taskId
-Regular,attr_Sleeve_shape_U_1,Sleeve_shape_U,4
-Slim,attr_Sleeve_shape_U_2,Sleeve_shape_U,4
-Puff,attr_Sleeve_shape_U_3,Sleeve_shape_U,4
-Bell,attr_Sleeve_shape_U_4,Sleeve_shape_U,4
-Batwing,attr_Sleeve_shape_U_5,Sleeve_shape_U,4
-Shirt,attr_Sleeve_shape_U_6,Sleeve_shape_U,4
-Rib,attr_Sleeve_shape_U_7,Sleeve_shape_U,4
-Raglan,attr_Sleeve_shape_U_8,Sleeve_shape_U,4
+Regular,attr_Sleeve_shape_U_1,Sleeve_Shape,4
+Slim,attr_Sleeve_shape_U_2,Sleeve_Shape,4
+Puff,attr_Sleeve_shape_U_3,Sleeve_Shape,4
+Bell,attr_Sleeve_shape_U_4,Sleeve_Shape,4
+Batwing,attr_Sleeve_shape_U_5,Sleeve_Shape,4
+Shirt,attr_Sleeve_shape_U_6,Sleeve_Shape,4
+Rib,attr_Sleeve_shape_U_7,Sleeve_Shape,4
+Raglan,attr_Sleeve_shape_U_8,Sleeve_Shape,4
--- a/app/service/attribute_recognition/discriptor/top/ori5_top_Sleeve_shoulder.csv
+++ b/app/service/attribute_recognition/discriptor/top/ori5_top_Sleeve_shoulder.csv
@@ -1,5 +1,5 @@
 labelName,join_attr,taskName,taskId
-Regular,attr_Sleeve_shoulder_U_1,Sleeve_shoulder_U,5
-Cold,attr_Sleeve_shoulder_U_2,Sleeve_shoulder_U,5
-Tucked,attr_Sleeve_shoulder_U_3,Sleeve_shoulder_U,5
-Balmain,attr_Sleeve_shoulder_U_4,Sleeve_shoulder_U,5
+Regular,attr_Sleeve_shoulder_U_1,Sleeve_Shoulder,5
+Cold,attr_Sleeve_shoulder_U_2,Sleeve_Shoulder,5
+Tucked,attr_Sleeve_shoulder_U_3,Sleeve_Shoulder,5
+Balmain,attr_Sleeve_shoulder_U_4,Sleeve_Shoulder,5
--- a/app/service/attribute_recognition/discriptor/top/ori6_top_Neckline.csv
+++ b/app/service/attribute_recognition/discriptor/top/ori6_top_Neckline.csv
@@ -1,16 +1,16 @@
 labelName,join_attr,taskName,taskId
-Round,attr_Neckline_U_1,Neckline_U,6
-V,attr_Neckline_U_2,Neckline_U,6
-Square,attr_Neckline_U_3,Neckline_U,6
-One-shoulder,attr_Neckline_U_4,Neckline_U,6
-Off-shoulder,attr_Neckline_U_5,Neckline_U,6
-Strapless,attr_Neckline_U_6,Neckline_U,6
-boat,attr_Neckline_U_7,Neckline_U,6
-choker,attr_Neckline_U_8,Neckline_U,6
-cowl,attr_Neckline_U_9,Neckline_U,6
-halter,attr_Neckline_U_10,Neckline_U,6
-keyhole,attr_Neckline_U_11,Neckline_U,6
-spaghetti,attr_Neckline_U_12,Neckline_U,6
-split,attr_Neckline_U_13,Neckline_U,6
-sweetheart,attr_Neckline_U_14,Neckline_U,6
-U,attr_Neckline_U_15,Neckline_U,6
+Round,attr_Neckline_U_1,Neckline,6
+V,attr_Neckline_U_2,Neckline,6
+Square,attr_Neckline_U_3,Neckline,6
+One-shoulder,attr_Neckline_U_4,Neckline,6
+Off-shoulder,attr_Neckline_U_5,Neckline,6
+Strapless,attr_Neckline_U_6,Neckline,6
+boat,attr_Neckline_U_7,Neckline,6
+choker,attr_Neckline_U_8,Neckline,6
+cowl,attr_Neckline_U_9,Neckline,6
+halter,attr_Neckline_U_10,Neckline,6
+keyhole,attr_Neckline_U_11,Neckline,6
+spaghetti,attr_Neckline_U_12,Neckline,6
+split,attr_Neckline_U_13,Neckline,6
+sweetheart,attr_Neckline_U_14,Neckline,6
+U,attr_Neckline_U_15,Neckline,6
--- a/app/service/attribute_recognition/discriptor/top/ori7_top_Collar.csv
+++ b/app/service/attribute_recognition/discriptor/top/ori7_top_Collar.csv
@@ -1,11 +1,11 @@
 labelName,join_attr,taskName,taskId
-Peterpan-Bertha,attr_Collar_U_1,Collar_U,7
-Shirt,attr_Collar_U_2,Collar_U,7
-Rib,attr_Collar_U_3,Collar_U,7
-Turtle,attr_Collar_U_4,Collar_U,7
-Lapel,attr_Collar_U_5,Collar_U,7
-Hoodie,attr_Collar_U_6,Collar_U,7
-Mandarin,attr_Collar_U_7,Collar_U,7
-Tie,attr_Collar_U_8,Collar_U,7
-Ruffle,attr_Collar_U_9,Collar_U,7
-Cowl,attr_Collar_U_10,Collar_U,7
+Peterpan-Bertha,attr_Collar_U_1,Collar,7
+Shirt,attr_Collar_U_2,Collar,7
+Rib,attr_Collar_U_3,Collar,7
+Turtle,attr_Collar_U_4,Collar,7
+Lapel,attr_Collar_U_5,Collar,7
+Hoodie,attr_Collar_U_6,Collar,7
+Mandarin,attr_Collar_U_7,Collar,7
+Tie,attr_Collar_U_8,Collar,7
+Ruffle,attr_Collar_U_9,Collar,7
+Cowl,attr_Collar_U_10,Collar,7
--- a/app/service/attribute_recognition/discriptor/top/ori8_top_Print.csv
+++ b/app/service/attribute_recognition/discriptor/top/ori8_top_Print.csv
@@ -1,16 +1,16 @@
 labelName,join_attr,taskName,taskId
-abstract,attr_Print_U_1,Print_U,8
-allover,attr_Print_U_2,Print_U,8
-animal printed,attr_Print_U_3,Print_U,8
-Camouflage,attr_Print_U_4,Print_U,8
-checks,attr_Print_U_5,Print_U,8
-color_block,attr_Print_U_6,Print_U,8
-disty print,attr_Print_U_7,Print_U,8
-dotted,attr_Print_U_8,Print_U,8
-floral,attr_Print_U_9,Print_U,8
-graphic print,attr_Print_U_10,Print_U,8
-logo and slogan print,attr_Print_U_11,Print_U,8
-patchwork,attr_Print_U_12,Print_U,8
-plain,attr_Print_U_13,Print_U,8
-plain_dnim,attr_Print_U_14,Print_U,8
-stripe,attr_Print_U_15,Print_U,8
+abstract,attr_Print_U_1,Print,8
+allover,attr_Print_U_2,Print,8
+animal printed,attr_Print_U_3,Print,8
+Camouflage,attr_Print_U_4,Print,8
+checks,attr_Print_U_5,Print,8
+color_block,attr_Print_U_6,Print,8
+disty print,attr_Print_U_7,Print,8
+dotted,attr_Print_U_8,Print,8
+floral,attr_Print_U_9,Print,8
+graphic print,attr_Print_U_10,Print,8
+logo and slogan print,attr_Print_U_11,Print,8
+patchwork,attr_Print_U_12,Print,8
+plain,attr_Print_U_13,Print,8
+plain_dnim,attr_Print_U_14,Print,8
+stripe,attr_Print_U_15,Print,8
--- a/app/service/attribute_recognition/discriptor/top/ori9_top_Material.csv
+++ b/app/service/attribute_recognition/discriptor/top/ori9_top_Material.csv
@@ -1,28 +1,28 @@
 labelName,join_attr,taskName,taskId
-canvas,attr_Material_U_1,Material_U,9
-chambray,attr_Material_U_2,Material_U,9
-chenille,attr_Material_U_3,Material_U,9
-chiffon,attr_Material_U_4,Material_U,9
-corduroy,attr_Material_U_5,Material_U,9
-crepe,attr_Material_U_6,Material_U,9
-denim,attr_Material_U_7,Material_U,9
-faux_fur,attr_Material_U_8,Material_U,9
-faux_leather,attr_Material_U_9,Material_U,9
-flannel,attr_Material_U_10,Material_U,9
-fleece,attr_Material_U_11,Material_U,9
-gingham,attr_Material_U_12,Material_U,9
-jersey,attr_Material_U_13,Material_U,9
-knit,attr_Material_U_14,Material_U,9
-lace,attr_Material_U_15,Material_U,9
-lawn,attr_Material_U_16,Material_U,9
-neoprene,attr_Material_U_17,Material_U,9
-organza,attr_Material_U_18,Material_U,9
-plush,attr_Material_U_19,Material_U,9
-satin,attr_Material_U_20,Material_U,9
-serge,attr_Material_U_21,Material_U,9
-taffeta,attr_Material_U_22,Material_U,9
-tulle,attr_Material_U_23,Material_U,9
-tweed,attr_Material_U_24,Material_U,9
-twill,attr_Material_U_25,Material_U,9
-velvet,attr_Material_U_26,Material_U,9
-vinyl,attr_Material_U_27,Material_U,9
+canvas,attr_Material_U_1,Material,9
+chambray,attr_Material_U_2,Material,9
+chenille,attr_Material_U_3,Material,9
+chiffon,attr_Material_U_4,Material,9
+corduroy,attr_Material_U_5,Material,9
+crepe,attr_Material_U_6,Material,9
+denim,attr_Material_U_7,Material,9
+faux_fur,attr_Material_U_8,Material,9
+faux_leather,attr_Material_U_9,Material,9
+flannel,attr_Material_U_10,Material,9
+fleece,attr_Material_U_11,Material,9
+gingham,attr_Material_U_12,Material,9
+jersey,attr_Material_U_13,Material,9
+knit,attr_Material_U_14,Material,9
+lace,attr_Material_U_15,Material,9
+lawn,attr_Material_U_16,Material,9
+neoprene,attr_Material_U_17,Material,9
+organza,attr_Material_U_18,Material,9
+plush,attr_Material_U_19,Material,9
+satin,attr_Material_U_20,Material,9
+serge,attr_Material_U_21,Material,9
+taffeta,attr_Material_U_22,Material,9
+tulle,attr_Material_U_23,Material,9
+tweed,attr_Material_U_24,Material,9
+twill,attr_Material_U_25,Material,9
+velvet,attr_Material_U_26,Material,9
+vinyl,attr_Material_U_27,Material,9
--- a/app/service/attribute_recognition/service.py
+++ b/app/service/attribute_recognition/service.py
@@ -208,8 +208,8 @@ class AttributeRecognition:


 if __name__ == '__main__':
-    from app.service.attribute_recognition import const
+    from app.service.attribute_recognition import const_debug

    request_data = {'upload_img_path': ['./test_top1.jpg'], 'upload_img_id': ["2"]}
    service = AttributeRecognition()
-    pprint(service.attribute(const, request_data))
+    pprint(service.attribute(const_debug, request_data))
--- a/app/service/outfit_matcher/dataset.py
+++ b/app/service/outfit_matcher/dataset.py
@@ -59,7 +59,7 @@ class FashionDataset(object):
        if given_cate == 'tops' or given_cate == "bottoms":
            complementary_cate = "bottoms" if given_cate == "tops" else "tops"
            # check bottom num
-            if not self.cate2num[complementary_cate]:
+            if complementary_cate not in self.cate2num.keys() or not self.cate2num[complementary_cate]:
                raise ValueError(f"Not enough {complementary_cate} available to generate outfits.")

            complementary_items = deepcopy(self.cate2item[complementary_cate])
@@ -80,12 +80,12 @@ class FashionDataset(object):
                    used_items.add(item["item_name"])
                    outfit = [query_item, item]
                    outfit_list.append(tuple(outfit))
-
-                    # 20% chance to include an outerwear
-                    if self.cate2num['outerwear'] > 0 and random.random() < 0.2:
-                        outerwear = random.choice(self.cate2item['outerwear'])
-                        outfit.append(outerwear)
-                        outfit_list.append(tuple(outfit))
+                    if "outerwear" in self.cate2item.keys():
+                        # 20% chance to include an outerwear
+                        if self.cate2num['outerwear'] > 0 and random.random() < 0.2:
+                            outerwear = random.choice(self.cate2item['outerwear'])
+                            outfit.append(outerwear)
+                            outfit_list.append(tuple(outfit))
            if len(outfit_list) < topk:
                raise ValueError(f"Cannot generate more than {topk} outfits!")

--- a/app/service/outfit_matcher/outfit_evaluator.py
+++ b/app/service/outfit_matcher/outfit_evaluator.py
@@ -8,7 +8,7 @@ from matplotlib import pyplot as plt, image as mpimg
 from minio import Minio
 from torchvision import transforms

-from app.core.config import MINIO_IP, MINIO_ACCESS, MINIO_SECRET, MINIO_SECURE, MINIO_PORT, OM_TRITON_PORT, OM_TRITON_IP
+from app.core.config import *
 from app.service.outfit_matcher.foco import extract_main_colors
 from app.service.utils.decorator import RunTime

@@ -379,6 +379,7 @@ class OutfitMaterTypeAware(OutfitMatcher):
        Returns:
            scores: List of float
        """
+<<<<<<< HEAD
        outfit_images, outfit_categories = self.preprocess(outfits, features)
        scores = []
        for images, categories in zip(outfit_images, outfit_categories):
@@ -399,3 +400,28 @@ class OutfitMaterTypeAware(OutfitMatcher):

        scores = np.stack(scores, axis=0)
        return scores.flatten()
+=======
+        image, category, mask = self.preprocess(outfits)
+        client = httpclient.InferenceServerClient(url=f"{OM_TRITON_IP}:{OM_TRITON_PORT}")
+        # 输入集
+        inputs = [
+            httpclient.InferInput("input__0", image.shape, datatype="FP32"),
+            httpclient.InferInput("input__1", category.shape, datatype="INT16"),
+            httpclient.InferInput("input__2", mask.shape, datatype="FP32"),
+        ]
+        inputs[0].set_data_from_numpy(image.astype(np.float32), binary_data=True)
+        inputs[1].set_data_from_numpy(category.astype(np.int16), binary_data=True)
+        inputs[2].set_data_from_numpy(mask.astype(np.float32), binary_data=True)
+        # 输出集
+        outputs = [
+            httpclient.InferRequestedOutput("output__0", binary_data=True),
+            httpclient.InferRequestedOutput("output__1", binary_data=True)
+        ]
+        results = client.infer(model_name="outfit_matcher_type_aware", inputs=inputs, outputs=outputs)
+        # 推理
+        # 取结果
+        scores = torch.from_numpy(results.as_numpy("output__0"))  # Shape (N, 1)
+        features = torch.from_numpy(results.as_numpy("output__1"))  # Shape (N, 64)
+
+        return scores, features
+>>>>>>> 1f23781b16e59bfbcbbb4d252e6a61685267e6c7
--- a/Show More
+++ b/Show More