diff --git a/apps/ai/helmet/algo.py b/apps/ai/helmet/algo.py index 1c615307..1d9e2078 100644 --- a/apps/ai/helmet/algo.py +++ b/apps/ai/helmet/algo.py @@ -1,10 +1,7 @@ -import traceback + import grpc import BeiHangGrpc_pb2_grpc import BeiHangGrpc_pb2 -import logging - -myLogger = logging.getLogger('log') def helmet(ip: str, pic_url: str): @@ -25,15 +22,12 @@ def helmet(ip: str, pic_url: str): # request = BeiHangGrpc_pb2.JinYu_Request(zzid=image_id,imgsbase64=image_base64) request = BeiHangGrpc_pb2.JinYu_Request(zzid=image_id, imgUrl=pic_url) - try: - response = stub.sendHelmet_Info(request) - if response.helmetinfoList: - for i in response.helmetinfoList: - if i.head_helmet == 0: - return True, response - return False, response - except Exception: - myLogger.error(traceback.format_exc()) + response = stub.sendHelmet_Info(request) + if response.helmetinfoList: + for i in response.helmetinfoList: + if i.head_helmet == 0: + return True, response + return False, response if __name__ == "__main__": diff --git a/apps/ai/main.py b/apps/ai/main.py index b94c49c8..08ff6e8b 100644 --- a/apps/ai/main.py +++ b/apps/ai/main.py @@ -1,7 +1,10 @@ + +algo_dict = { + "helmet": "apps.helmet.algo.helmet" +} + + class AiService: - algo_dict = { - "helmet": "apps.helmet.algo.helmet" - } def analyse(codes: list, path: str): """多线程进行算法分析图片 @@ -10,4 +13,6 @@ class AiService: codes: 算法列表 path (str): 图片地址 """ - pass + for i in codes: + if i in algo_dict: + pass diff --git a/apps/third/views_d.py b/apps/third/views_d.py index c1398994..78eb8a0d 100644 --- a/apps/third/views_d.py +++ b/apps/third/views_d.py @@ -376,7 +376,7 @@ class TDeviceViewSet(ListModelMixin, UpdateModelMixin, DestroyModelMixin, Custom @action(methods=['post'], detail=True, perms_map={'post': 'tdevice.label_location'}, serializer_class=LabelLocationSerializer) - def label_location(self, request): + def label_location(self, request, pk=None): """ 标注坐标位置