Ver Fonte

优化AI推送代码-处理识别结果函数

locky há 2 anos atrás
pai
commit
9e1cf6d49a

+ 22 - 0
AnsjerPush/Config/aiConfig.py

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+"""
+@Author : Rocky
+@Time : 2022/12/2 9:51
+@File :aiConfig.py
+"""
+
+# 标签
+LABEL_DICT = {
+    '1': ['Person', 'Human'],  # 人
+    '2': ['Pet', 'Dog', 'Canine', 'Animal', 'Puppy', 'Cat'],  # 动物
+    '3': ['Vehicle', 'Car', 'Transportation', 'Automobile', 'Bus'],  # 车
+    '4': ['Package', 'Carton', 'Cardboard', 'Package Delivery']  # 包裹
+}
+
+# AI识别标签
+AI_IDENTIFICATION_TAGS_DICT = {
+    '1': 'Person',
+    '2': 'Pet',
+    '3': 'Vehicle',
+    '4': 'Package'
+}

+ 0 - 8
AnsjerPush/config.py

@@ -125,11 +125,3 @@ APP_BUNDLE_DICT = {
     'com.ansjer.customizeda_a': 'Guardian365',
     'com.ansjer.customizedc_a': 'PatrolSecure',
 }
-
-# AI识别标签
-AI_IDENTIFICATION_TAGS_DICT = {
-    '1': 'Person',
-    '2': 'Pet',
-    '3': 'Vehicle',
-    '4': 'Package'
-}

Diff do ficheiro suprimidas por serem muito extensas
+ 5 - 3
Controller/AiController.py


+ 20 - 12
Object/ResponseObject.py

@@ -6,7 +6,9 @@ class ResponseObject(object):
     def __init__(self, lang='en'):
         self.lang = lang
 
-    def data(self, code, res={}):
+    def data(self, code, res=None):
+        if res is None:
+            res = {}
         data_en = {
             0: 'Success',
             5: 'Please try again one minute later!',
@@ -18,16 +20,16 @@ class ResponseObject(object):
             48: 'System object error!',
             89: 'Already send the code, please check it or get it again after 10m',
             90: 'please check code or get it again after 1m',
-            99: 'Mail doesn\'t exist!',
+            99: 'Mail does not exist!',
             100: 'Phone format error!',
             101: 'Phone already existed!',
-            102: 'Phone doesn\'t exist!',
+            102: 'Phone does not exist!',
             103: 'Mail already existed!',
-            104: 'Account doesn\'t exist!',
+            104: 'Account does not exist!',
             105: 'Email format error!',
             107: 'The username not conform to the rules!',
             109: 'The password not conform to the rules!',
-            110: 'user doesn\'t activated',
+            110: 'user does not activated',
             111: 'Error password',
             119: 'The qr code has expired',
             120: 'The code has expired',
@@ -111,6 +113,7 @@ class ResponseObject(object):
             906: '文件操作错误',
             907: '文件不存在!',
         }
+
         if self.lang == 'cn':
             msg = data_cn
         elif self.lang == 'zh-Hans':
@@ -119,16 +122,21 @@ class ResponseObject(object):
             msg = data_cn
         else:
             msg = data_en
-        try:
-            message = msg[code]
-        except Exception as e:
-            message = '系统错误,code不存在'
-        return {'result_code': code, 'reason': message, 'result': res, 'error_code': code}
 
-    def formal(self, code, res={}):
+        reason = msg.get(code)
+        if reason is None:
+            reason = 'code不存在'
+
+        return {'result_code': code, 'reason': reason, 'result': res, 'error_code': code}
+
+    def formal(self, code, res=None):
+        if res is None:
+            res = {}
         formal_data = self.data(code, res)
         return json.dumps(formal_data, ensure_ascii=False)
 
-    def json(self, code, res={}):
+    def json(self, code, res=None):
+        if res is None:
+            res = {}
         result = self.formal(code, res)
         return HttpResponse(result)

Alguns ficheiros não foram mostrados porque muitos ficheiros mudaram neste diff