start server debugging

andy · andy · commit 92fac06d3f58 · 2024-08-08T14:06:11.000+08:00
diff --git a/__start_server__.py b/__start_server__.py
@@ -1,22 +1,35 @@
-from server.start_server import start_server
+import os
+from server.main import start_sever as start_backend_serve
 import subprocess
+from http.server import HTTPServer, BaseHTTPRequestHandler
+from threading import Thread
+
+
+class Handler(BaseHTTPRequestHandler):
+    def do_GET(self):
+        self.send_response(200)
+        self.send_header('Content-type', 'text/html')
+        self.end_headers()
+        message = "Opened"
+        self.wfile.write(bytes(message, 'utf8'))
 
 
 def start_front_server():
-    cmd = 'python -m http.server'
-    process = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True)
-    while True:
-        line = process.stdout.readline()
-        if not line:
-            break  # 如果没有读取到数据，表示子进程已经结束，退出循环
-        else:
-            print(line, end='')  # 实时打印输出
-    process.wait()
+    # _ip = "127.0.0.1"
+    # port = 8000
+    # with HTTPServer((_ip, port), Handler) as httpd:
+    #     httpd.serve_forever()
+    os.system('python -m http.server --directory ./dist')
 
 
-if __name__ == '__main__':
-    # start_front_server()
-    start_server()
+def start_server():
+    print("Open web page on http://127.0.0.1:8000 \n")
 
+    th1 = Thread(target=start_front_server)
+    th1.start()
+    th2 = Thread(target=start_backend_serve)
+    th2.start()
 
 
+if __name__ == '__main__':
+    start_server()
diff --git a/__version__.py b/__version__.py
@@ -1,7 +1,7 @@
 import os
 import subprocess
 
-VERSION = '1.3.0'
+VERSION = '1.3.2'
 
 
 def get_version():
@@ -30,7 +30,8 @@ def explore_requirement():
 
 
 def build():
-    cmd = f'pyinstaller -F --ico="source/logo.ico"  --name=Productions-{VERSION} production_scripts.py'
+    cmd = f'pyinstaller -F --ico="source/logo.ico"  --name=Productions-{VERSION} ' \
+          f'--hidden-import passlib.handlers.bcrypt production_scripts.py'
     process = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True)
     while True:
         line = process.stdout.readline()
diff --git a/dist/Productions-1.3.2.exe b/dist/Productions-1.3.2.exe
diff --git a/dist/server/database/__init__.py b/dist/server/database/__init__.py
diff --git a/dist/server/database/device_status.json b/dist/server/database/device_status.json
@@ -0,0 +1,76 @@
+{
+    "device": [
+        {
+            "date": "2024-03-15",
+            "auth": "default",
+            "device_name": "Z-Stage-7",
+            "device_address": "192.168.6.8",
+            "device_tag": "工装,Z轴老化",
+            "online": "Unknow"
+        },
+        {
+            "date": "2024-03-15",
+            "auth": "default",
+            "device_name": "Z-Stage-2",
+            "device_address": "192.168.6.189",
+            "device_tag": "工装,Z轴老化",
+            "online": "Unknow"
+        },
+        {
+            "date": "2024-03-15",
+            "auth": "default",
+            "device_name": "Z-Stage-8",
+            "device_address": "192.168.6.206",
+            "device_tag": "工装,Z轴老化",
+            "online": "Unknow"
+        },
+        {
+            "date": "2024-03-15",
+            "auth": "default",
+            "device_name": "Z-Stage-6",
+            "device_address": "192.168.6.40",
+            "device_tag": "工装,Z轴老化",
+            "online": "Unknow"
+        },
+        {
+            "date": "2024-03-15",
+            "auth": "default",
+            "device_name": "Z-Stage-5",
+            "device_address": "192.168.6.185",
+            "device_tag": "工装,Z轴老化",
+            "online": "Unknow"
+        },
+        {
+            "date": "2024-03-15",
+            "auth": "default",
+            "device_name": "Z-Stage-11",
+            "device_address": "192.168.6.54",
+            "device_tag": "工装,Z轴老化",
+            "online": "Unknow"
+        },
+        {
+            "date": "2024-03-15",
+            "auth": "default",
+            "device_name": "Z-Stage-10",
+            "device_address": "192.168.6.215",
+            "device_tag": "工装,Z轴老化",
+            "online": "Unknow"
+        },
+        {
+            "date": "2024-03-15",
+            "auth": "default",
+            "device_name": "Z-Stage-9",
+            "device_address": "192.168.6.47",
+            "device_tag": "工装,Z轴老化",
+            "online": "Unknow"
+        },
+        {
+            "date": "2024-08-08",
+            "auth": "default",
+            "device_name": "96通道老化",
+            "device_address": "192.168.6.11",
+            "device_tag": "工装,诊断,老化",
+            "online": "Unknow"
+        }
+    ]
+}
diff --git a/dist/server/database/register.json b/dist/server/database/register.json
@@ -0,0 +1,14 @@
+{
+    "0": {
+        "username": "opentrons",
+        "password": "11"
+    },
+    "1709573833.4121604": {
+        "username": "zhangsan",
+        "password": "$2b$12$iL7usZLNUnnO2Zg1zlRS1OFS09r8PrMPi0S.6nK02MuKhMPz3Vx/a"
+    },
+    "1709573957.2382584": {
+        "username": "lisi",
+        "password": "$2b$12$X6AYFe2DG/OM3ei7jawB7uEbGzl7cBY/P612V1bTsYfU/mQJoBPsC"
+    }
+}
diff --git a/dist/server/database/tests.json b/dist/server/database/tests.json
@@ -0,0 +1,23 @@
+{
+    "96ch": [
+        {
+            "date": "2024-03-18",
+            "auth": "default",
+            "robot_name": "Z-Stage7",
+            "device_ip": "192.168.6.8",
+            "use_key": true,
+            "description": "Z-Stage7  Z轴老化测试",
+            "cmd": "cd /opt/opentrons-robot-server/ && nohup python3 -m hardware_testing.scripts.force_pick_up_test",
+            "type": [
+                "lifetime"
+            ],
+            "params": [
+                "--speed 10",
+                "--current 0.55",
+                "--target Z-Stage7"
+            ],
+            "id": "736e1637c9a353f056d39dba5bca6d33"
+        }
+    ],
+    "robot": []
+}
diff --git a/dist/server/server_files/__init__.py b/dist/server/server_files/__init__.py
diff --git a/dist/server/server_files/setting.zip b/dist/server/server_files/setting.zip
diff --git a/dist/server/server_files/test.txt b/dist/server/server_files/test.txt
@@ -0,0 +1 @@
+dafadfdfadfas
diff --git a/production_scripts.py b/production_scripts.py
@@ -13,8 +13,8 @@
 from __version__ import get_version
 from gravimetric_testing.openwebapp import openweb
 from tools.reading_laser import ReadLaser
-from server.start_server import start_server
 from tools.high_voltage_test.main import run_high_voltage_test
+from __start_server__ import start_server
 
 addpathpat = os.path.dirname(__file__)
 addpath = os.path.dirname(os.path.dirname(__file__))
diff --git a/server/api/device/device.py b/server/api/device/device.py
@@ -1,12 +1,12 @@
 from fastapi import Depends, FastAPI, HTTPException, APIRouter
 from typing import List
-from api.device.models import *
-from ot_type import Mount, Point
-from utils import write_local_json, read_local_json
+from server.api.device.models import *
+from server.ot_type import Mount, Point
+from server.utils import write_local_json, read_local_json
 
 router = APIRouter()
 
-database_path = 'database/device_status.json'
+database_path = 'server/database/device_status.json'
 
 
 def judge_ipaddress_repeat(device: list, target: dict) -> bool:
@@ -21,6 +21,7 @@ def judge_ipaddress_repeat(device: list, target: dict) -> bool:
             return False
     return True
 
+
 def get_target_ip_device(device: list, target_ip):
     """
     get target
@@ -34,7 +35,6 @@ def get_target_ip_device(device: list, target_ip):
     return -1
 
 
-
 @router.get('/status', status_code=200)
 async def get_device_status():
     """
diff --git a/server/api/files/files.py b/server/api/files/files.py
@@ -9,7 +9,7 @@
 from fastapi import File, UploadFile
 
 router = APIRouter()
-files_path = './server_files/'
+files_path = './server/server_files/'
 
 
 @router.post("/uploadfile/")
diff --git a/server/api/hardware/hardware.py b/server/api/hardware/hardware.py
@@ -1,9 +1,9 @@
-from hardware_control.hardware_control import HardwareControl
-from protocol_control.protocol_control import ProtocolContext
+from server.hardware_control.hardware_control import HardwareControl
+from server.protocol_control.protocol_control import ProtocolContext
 from fastapi import Depends, FastAPI, HTTPException, APIRouter
 from typing import List
-from api.hardware.models import *
-from ot_type import Mount, Point
+from server.api.hardware.models import *
+from server.ot_type import Mount, Point
 from utils import Utils
 
 
diff --git a/server/api/tests/tests.py b/server/api/tests/tests.py
@@ -1,13 +1,13 @@
 from fastapi import Depends, FastAPI, HTTPException, APIRouter
 from typing import List
-from api.tests.models import *
-from ot_type import Mount, Point
-from utils import Utils, create_id
-from utils import write_local_json, read_local_json
+from server.api.tests.models import *
+from server.ot_type import Mount, Point
+from server.utils import Utils, create_id
+from server.utils import write_local_json, read_local_json
 
 router = APIRouter()
 
-database_path = 'database/tests.json'
+database_path = 'server/database/tests.json'
 
 
 @router.get('/get/runs', status_code=200)
diff --git a/server/api/user/user.py b/server/api/user/user.py
@@ -1,10 +1,10 @@
 from fastapi import Depends, FastAPI, HTTPException, APIRouter
-from api.user.models import *
-from utils import write_local_json, read_local_json
+from server.api.user.models import *
+from server.utils import write_local_json, read_local_json
 import time
-from user.auth import AuthHandler
+from server.user.auth import AuthHandler
 
-register_path = 'database/register.json'
+register_path = 'server/database/register.json'
 
 router = APIRouter()
 auth_handler = AuthHandler()
diff --git a/server/hardware_control/hardware_control.py b/server/hardware_control/hardware_control.py
@@ -1,5 +1,5 @@
-from http_client import HttpClient
-from ot_type import PositionSel, Mount, Point, Target, Axis, LabWare, Instrument
+from server.http_client import HttpClient
+from server.ot_type import PositionSel, Mount, Point, Target, Axis, LabWare, Instrument
 from typing import Union, List
 import asyncio
 
diff --git a/server/main.py b/server/main.py
@@ -1,7 +1,7 @@
 from fastapi import FastAPI, APIRouter
 import uvicorn
 from fastapi.middleware.cors import CORSMiddleware
-from user.auth import AuthHandler
+from server.user.auth import AuthHandler
 from server.api.user import user
 from server.api.hardware import hardware
 from server.api.device import device
@@ -35,5 +35,9 @@ async def say_hi():
             "success": True}
 
 
+def start_sever():
+    uvicorn.run(app, host='127.0.0.1', port=8080)
+
+
 if __name__ == '__main__':
     uvicorn.run(app, host='127.0.0.1', port=8080)
diff --git a/server/protocol_control/protocol_control.py b/server/protocol_control/protocol_control.py
@@ -1,9 +1,9 @@
 import asyncio
 import time
 
-from hardware_control.hardware_control import HardwareControl
-from http_client import HttpClient
-from ot_type import LabWare, Instrument, ModuleName, Mount, Target, Axis, Point, LabwareResult, PipetteResult
+from server.hardware_control.hardware_control import HardwareControl
+from server.http_client import HttpClient
+from server.ot_type import LabWare, Instrument, ModuleName, Mount, Target, Axis, Point, LabwareResult, PipetteResult
 from typing import Union, List
 
 
diff --git a/server/user/auth.py b/server/user/auth.py
@@ -38,4 +38,4 @@ def decode_token(self, token):
             raise HTTPException(status_code=401, detail='Invalid token')
 
     def auth_wrapper(self, auth: HTTPAuthorizationCredentials = Security(security)):
-        return self.decode_token(auth.credentials)
+        return self.decode_token(auth.credentials)
