فهرست منبع

修改json加载方式

Sherlock1011 9 ماه پیش
والد
کامیت
cd05074cd9
2فایلهای تغییر یافته به همراه8 افزوده شده و 8 حذف شده
  1. 2 2
      api_test.py
  2. 6 6
      utils/api_service.py

+ 2 - 2
api_test.py

@@ -35,8 +35,8 @@ import json
 # response = requests.post(url, data=json.dumps(payload), headers=headers)
 # print(response.json())
 
-# url = "https://670813644644357-http-7860.northwest1.gpugeek.com:8443/brandanalysis/api/v1/infringe_judgement"
-url = "http://172.18.1.189:7860/brandanalysis/api/v1/infringe_judgement"
+url = "https://670813644644357-http-7860.northwest1.gpugeek.com:8443/brandanalysis/api/v1/infringe_judgement"
+# url = "http://172.18.1.189:7860/brandanalysis/api/v1/infringe_judgement"
 url_data = {
     'title': '李宁云缓震跑步鞋男鞋2025新款春夏季网面透气休闲运动鞋男慢跑鞋',
     'brand_name': '李宁',

+ 6 - 6
utils/api_service.py

@@ -1,6 +1,6 @@
 from agent.agent import Agent
 from db import MongoDao
-import json
+import json5
 
 license_dao = MongoDao("ProductStandard")
 
@@ -20,14 +20,14 @@ class ApiService:
         if url_data['brand_name'] == basic_data['brand_name'] and basic_data['brand_name'] in url_data['title']:
             """商品信息中的商品名称、品牌名称于基础数据中的商标名称完全一致时,使用图像判定"""
             # 判断商标
-            logos_info = json.loads(ApiService.agent.get_log_from_product_images(url_data['product_images']))
+            logos_info = json5.loads(ApiService.agent.get_log_from_product_images(url_data['product_images']))
             if logos_info['is_contained_logo']:
                 for log_name in logos_info['logo_infos']:
                     if log_name.strip() != basic_data['brand_name'] and log_name.strip() != 'LI-NING':
                         return True
             
             # 与授权商品对比
-            similarity_judgement = json.loads(ApiService.agent.multi_products_images_similarity_judgement(url_data['product_images'], basic_data['product_images']))
+            similarity_judgement = json5.loads(ApiService.agent.multi_products_images_similarity_judgement(url_data['product_images'], basic_data['product_images']))
             if similarity_judgement['is_similarity_product']:
                 return False
             else:
@@ -74,7 +74,7 @@ class ApiService:
                 return '信息不全,无法判定'
             for image_url1 in url_data['product_images']:
                 for image_url2 in basic_data['product_images']:
-                    similarity_product_judgement = json.loads(ApiService.agent.product_image_similarity_judgement(image_url1, image_url2))
+                    similarity_product_judgement = json5.loads(ApiService.agent.product_image_similarity_judgement(image_url1, image_url2))
                     if similarity_product_judgement['is_similarity_product']:
                         if url_data['price'] < base_price:
                             return True
@@ -99,7 +99,7 @@ class ApiService:
                 return '信息不全,无法判定'
             for image_url1 in url_data['product_images']:
                 for image_url2 in basic_data['product_images']:
-                    similarity_product_judgement = json.loads(ApiService.agent.product_image_similarity_judgement(image_url1, image_url2))
+                    similarity_product_judgement = json5.loads(ApiService.agent.product_image_similarity_judgement(image_url1, image_url2))
                     if similarity_product_judgement['is_similarity_product']:
                         if url_data['price'] < basic_data['base_price']:
                             return True
@@ -123,7 +123,7 @@ class ApiService:
         license_list = ApiService.get_license_list(basic_data['brand_name'])
         if len(license_list) == 0:
             return '授权列表空,无法判定'
-        result = json.loads(ApiService.agent.license_product_judgement(url_data['title'], license_list))
+        result = json5.loads(ApiService.agent.license_product_judgement(url_data['title'], license_list))
         return result['in_list']
     
 if __name__ == '__main__':