冲突解决

app/configs/global_var.py

@@ -8,7 +8,8 @@
 
 """
 import multiprocessing
-
+global active_connections
+global active_connections_dist
 
 def _init():  # 初始化
     # 中断标志
@@ -16,14 +17,18 @@ def _init():  # 初始化
     _global_dict = {}
 
     # ws列表存储
-    global active_connections
     active_connections = multiprocessing.Manager().list()
 
     # ws字典存储
-    global active_connections_dist
     active_connections_dist = multiprocessing.Manager().dict()
 
 
+def get_active_connections():
+    return active_connections
+
+def get_active_connections_dist():
+    return active_connections_dist
+
 def set_value(key, value):
     # 定义一个全局变量
     _global_dict[key] = value

app/run.py

@@ -10,11 +10,7 @@ from flask_sockets import Sockets
 
 
 import sys 
-<<<<<<< HEAD
 sys.path.append("/mnt/sdc/algorithm/R-ODY")
-=======
-sys.path.append("/mnt/sdc/algorithm/AICheck-MaskRCNN")
->>>>>>> 168c803f56a54a8da33a41e91459154b9abe9dbd
 # sys.path.append('E:/alg_demo-master/alg_demo/app/yolov5')
 from app.core.common_utils import logger
 from app.core.err_handler import page_not_found, method_not_allowed, exception_500, exception_400

app/utils/websocket_tool.py

@@ -1,8 +1,6 @@
 """
 @Time ： 2022/10/12 17:55
 @Auth ： 东
-@File ：websocket_tool.py
-@IDE ：PyCharm
 @Motto：ABC(Always Be Coding)
 @Desc：
 
@@ -10,32 +8,35 @@
 import json
 from typing import Union, List, Dict
 
-from core.common_utils import logger
+from app.core.common_utils import logger
-from utils.JSONEncodeTools import MyEncoder
+from app.utils.JSONEncodeTools import MyEncoder
-
+from configs.global_var import *
 
 class WebsocketUtil:
-    def __init__(self):
-        self.active_connections: List = []
-        self.active_connections_dist: Dict = {}
 
     def connect(self, ws, id: str):
         # 等待连接
         msg = ws.receive()
         # 存储ws连接对象
-        self.active_connections.append(ws)
+        global active_connections
-        if id in self.active_connections_dist:
+        # active_connections = get_active_connections()
-            self.active_connections_dist[id].append(ws)
+        active_connections.append(ws)
+        global active_connections_dist
+        # active_connections_dist = get_active_connections_dist()
+        if id in active_connections_dist:
+            active_connections_dist[id].append(ws)
         else:
             ws_list = [ws, ]
-            self.active_connections_dist[id] = ws_list
+            active_connections_dist[id] = ws_list
 
     def disconnect(self, ws, id):
         # ws关闭时 移除ws对象
         if ws.closed:
-            if ws in self.active_connections_dist.values():
+            if ws in active_connections_dist.values():
-                self.active_connections.remove(ws)
+                global active_connections
-                self.active_connections_dist[id].pop(ws)
+                active_connections.remove(ws)
+                global active_connections_dist
+                active_connections_dist[id].pop(ws)
 
     @staticmethod
     async def send_personal_message(message: str, ws):
@@ -44,12 +45,14 @@ class WebsocketUtil:
 
     def broadcast(self, message: str):
         # 广播消息
-        for connection in self.active_connections:
+        global active_connections
+        for connection in active_connections:
             connection.send(message)
 
     def send_message_proj_json(self, message: Union[str, int, List, Dict], id: str):
         # 广播该项目的消息
-        for connection in self.active_connections_dist[id]:
+        global active_connections_dist
+        for connection in active_connections_dist[id]:
             try:
                 connection.send(json.dumps(message, cls=MyEncoder, indent=4), )
             except Exception as e:

app/yolov5/data/coco128.yaml

@@ -1,9 +1,9 @@
 path: null
-train: /mnt/sdc/IntelligentizeAI/IntelligentizeAI/data_set/190857268466688000/trained/images/train/
+train: /mnt/sdc/aicheck/IntelligentizeAI/data_set/193120735164768256/trained/images/train/
-val: /mnt/sdc/IntelligentizeAI/IntelligentizeAI/data_set/190857268466688000/trained/images/val/
+val: /mnt/sdc/aicheck/IntelligentizeAI/data_set/193120735164768256/trained/images/val/
 test: null
 names:
   0: hole
   1: '456'
-  2: zui
+  2: dog
-  3: mianbang
+  3: cat