Skip to content

Commit 77c224a

Browse files
author
andy
committed
update web ui
1 parent 9e6cee8 commit 77c224a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+6032
-18763
lines changed

__version__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import os
22
import subprocess
33

4-
VERSION = '1.2.8'
4+
VERSION = '1.2.9'
55

66

77
def get_version():

dist/Productions-1.2.9.exe

79.7 MB
Binary file not shown.
Binary file not shown.

ot3_testing/tests/lifetime_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from drivers.ssh import SSHClient
22
from typing import Union
3-
from test_config.lifetime_test_config import Z_STAGE_LIFETIME_TEST
3+
from ot3_testing.test_config.lifetime_test_config import Z_STAGE_LIFETIME_TEST
44
from utils import Utils
55

66

production_scripts.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
from __version__ import get_version
1414
from gravimetric_testing.openwebapp import openweb
1515
from tools.reading_laser import ReadLaser
16+
from server.start_server import start_server
1617

1718
addpathpat = os.path.dirname(__file__)
1819
addpath = os.path.dirname(os.path.dirname(__file__))
@@ -56,6 +57,8 @@
5657
reader.robot_ip = prompt_ip()
5758
reader.add_height = add_height
5859
asyncio.run(reader.run_test("RIGHT-D1", project_path))
60+
elif '9' in test_name:
61+
start_server()
5962
else:
6063
pass
6164

server/engine/router.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
from fastapi import Depends, FastAPI, HTTPException, APIRouter, status
2-
from hardware_control.hardware_control import HardwareControl
2+
from ot3_testing.hardware_control.hardware_control import HardwareControl
33
from textwrap import dedent
44
from server.engine.models import *
55
from typing import Union
6-
from ot_type import Point
6+
from ot3_testing.ot_type import Point
77

88
engine_router = APIRouter()
99
api: Union[None, HardwareControl] = None

server/start_server.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
app = FastAPI()
1212
app.include_router(api_router, prefix='/api')
1313

14+
1415
@app.get(
1516
"/system/info",
1617
summary="Get system information",
@@ -25,5 +26,7 @@ async def get_system_info():
2526
"contact": "[email protected]"}
2627

2728

28-
if __name__ == '__main__':
29+
def start_server():
2930
uvicorn.run(app, host="127.0.0.1", port=8888)
31+
32+

server/testing/router.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
from fastapi import Depends, FastAPI, HTTPException, APIRouter, status
2-
from tests.lifetime_test import LifeTime
2+
from ot3_testing.tests.lifetime_test import LifeTime
33
from textwrap import dedent
44
from server.testing.models import *
55
from typing import Union
6-
from ot_type import Point
6+
from ot3_testing.ot_type import Point
77

88
testing_router = APIRouter()
99

tools/inquirer.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from PyInquirer import prompt
22

3-
test_choices = ['leveling-8ch', 'leveling-96ch', 'leveling-gantry', 'leveling-z-stage', 'leveling-gripper',
4-
'leveling-reading-sensor', 'heat-96ch', 'grav-openweb']
3+
test_choices = ['1.leveling-8ch', '2.leveling-96ch', '3.leveling-gantry', '4.leveling-z-stage', '5.leveling-gripper',
4+
'6.leveling-reading-sensor', '7.heat-96ch', '8.grav-openweb', '9.start-server']
55

66
question_flex = {
77
'type': 'input',

web_ui/ot3_testing_ui/.gitignore renamed to web_ui/.gitignore

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
1-
.DS_Store
2-
node_modules
3-
/dist
4-
5-
6-
# local env files
7-
.env.local
8-
.env.*.local
9-
10-
# Log files
1+
# Logs
2+
logs
3+
*.log
114
npm-debug.log*
125
yarn-debug.log*
136
yarn-error.log*
147
pnpm-debug.log*
8+
lerna-debug.log*
9+
10+
node_modules
11+
dist
12+
dist-ssr
13+
*.local
1514

1615
# Editor directories and files
16+
.vscode/*
17+
!.vscode/extensions.json
1718
.idea
18-
.vscode
19+
.DS_Store
1920
*.suo
2021
*.ntvs*
2122
*.njsproj

0 commit comments

Comments
 (0)