فهرست منبع

feat(): Add docker and adapt to the linux system

ryland 1 سال پیش
والد
کامیت
138d7e1956

+ 3 - 0
deploy/docker/.dockerignore

@@ -0,0 +1,3 @@
+
+requirements_generator.py
+

+ 37 - 0
deploy/docker/Dockerfile

@@ -0,0 +1,37 @@
+# docker build -t qwerty/oas:latest .
+# docker run -v ${PWD}:/app/OnmyojiAutoScript -p 22288:22288 --name oas -it --rm qwerty/oas
+
+
+FROM python:3.10-slim-bookworm
+
+WORKDIR /app/OnmyojiAutoScript
+
+COPY requirements.txt /tmp/requirements.txt
+
+# python:3.10-slim is based on debian:12, apt source from https://developer.aliyun.com/mirror/debian
+RUN echo "\
+deb https://mirrors.cloud.tencent.com/debian/ bookworm main non-free non-free-firmware contrib \n\
+deb-src https://mirrors.cloud.tencent.com/debian/ bookworm main non-free non-free-firmware contrib \n\
+deb https://mirrors.cloud.tencent.com/debian-security/ bookworm-security main \n\
+deb-src https://mirrors.cloud.tencent.com/debian-security/ bookworm-security main \n\
+deb https://mirrors.cloud.tencent.com/debian/ bookworm-updates main non-free non-free-firmware contrib \n\
+deb-src https://mirrors.cloud.tencent.com/debian/ bookworm-updates main non-free non-free-firmware contrib \n\
+deb https://mirrors.cloud.tencent.com/debian/ bookworm-backports main non-free non-free-firmware contrib \n\
+deb-src https://mirrors.cloud.tencent.com/debian/ bookworm-backports main non-free non-free-firmware contrib \
+    "\
+> /etc/apt/sources.list\
+ && apt update \
+ && apt install -y git adb libgomp1 openssh-client \
+ && git config --global --add safe.directory '*' \
+ && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
+ && echo 'Asia/Shanghai' > /etc/timezone \
+ && pip config set global.index-url https://pypi.tuna.tsinghua.edu.cn/simple \
+ && pip install -r /tmp/requirements.txt \
+ && pip uninstall -y opencv-python\
+ && pip uninstall -y opencv-python-headless\
+ && pip install opencv-python-headless==4.7.0.72\
+ && rm /tmp/requirements.txt \
+ && rm -r ~/.cache/pip
+
+CMD python server.py
+#CMD /bin/bash

+ 32 - 0
deploy/docker/Dockerfile.cn

@@ -0,0 +1,32 @@
+# docker build -t qwerty/oas:latest .
+# docker run -v ${PWD}:/app/OnmyojiAutoScript -p 22288:22288 --name oas -it --rm qwerty/oas
+
+
+FROM python:3.10-slim-bullseye
+
+WORKDIR /app/OnmyojiAutoScript
+
+COPY requirements.txt /tmp/requirements.txt
+
+# python:3.10-slim is based on debian:11, apt source from https://developer.aliyun.com/mirror/debian
+RUN echo "\
+deb https://mirrors.aliyun.com/debian/ bullseye main non-free contrib\n\
+deb-src https://mirrors.aliyun.com/debian/ bullseye main non-free contrib\n\
+deb https://mirrors.aliyun.com/debian-security/ bullseye-security main\n\
+deb-src https://mirrors.aliyun.com/debian-security/ bullseye-security main\n\
+deb https://mirrors.aliyun.com/debian/ bullseye-updates main non-free contrib\n\
+deb-src https://mirrors.aliyun.com/debian/ bullseye-updates main non-free contrib\n\
+# deb https://mirrors.aliyun.com/debian/ bullseye-backports main non-free contrib\n\
+# deb-src https://mirrors.aliyun.com/debian/ bullseye-backports main non-free contrib" \
+> /etc/apt/sources.list \
+ && apt update \
+ && apt install -y git adb libgomp1 openssh-client \
+ && git config --global --add safe.directory '*' \
+ && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
+ && echo 'Asia/Shanghai' > /etc/timezone \
+ && pip config set global.index-url https://pypi.tuna.tsinghua.edu.cn/simple \
+ && pip install -r /tmp/requirements.txt \
+ && rm /tmp/requirements.txt \
+ && rm -r ~/.cache/pip
+
+ CMD python --version

+ 62 - 0
deploy/docker/requirements_generator.py

@@ -0,0 +1,62 @@
+import os
+
+from deploy.logger import logger
+
+BASE_FOLDER = os.path.dirname(os.path.abspath(__file__))
+logger.info(BASE_FOLDER)
+
+
+def read_file(file):
+    out = {}
+    with open(file, 'r', encoding='utf-8') as f:
+        for line in f.readlines():
+            if not line.strip():
+                continue
+            res = [s.strip() for s in line.split('==')]
+            if len(res) > 1:
+                name, version = res
+            else:
+                name, version = res[0], None
+            out[name] = version
+
+    return out
+
+
+def write_file(file, data):
+    lines = []
+    for name, version in data.items():
+        if version:
+            lines.append(f'{name}=={version}')
+        else:
+            lines.append(str(name))
+
+    with open(file, 'w', encoding='utf-8', newline='') as f:
+        text = '\n'.join(lines)
+        text = text.replace('#', '\n#').strip()
+        f.write(text)
+
+
+def docker_requirements_generate(requirements_in='requirements.txt'):
+    requirements = read_file(requirements_in)
+
+    logger.info(f'Generate requirements for Docker image')
+    lock = {}
+    new = {}
+    logger.info(requirements)
+    for name, version in requirements.items():
+        # alas-webapp is for windows only
+        if name == 'alas-webapp' or name == 'pywin32':
+            continue
+        if name == 'opencv-python':
+            name = 'opencv-python-headless'
+            version = '4.7.0.72'
+        if name in lock:
+            version = lock[name] if not isinstance(lock[name], dict) else lock[name]['version']
+            name = name if not isinstance(lock[name], dict) else lock[name]['name']
+        new[name] = version
+
+    write_file(os.path.join(BASE_FOLDER, f'./requirements.txt'), data=new)
+
+
+if __name__ == '__main__':
+    docker_requirements_generate()

+ 13 - 0
docker-compose.yaml

@@ -0,0 +1,13 @@
+
+services:
+    OAS:
+        network_mode: host
+        volumes:
+            - '.:/app/OnmyojiAutoScript:rw'
+            - '/etc/localtime:/etc/localtime:ro'
+        container_name: 'oas-env'
+        image: 'oas-env'
+        build:
+            context: ./deploy/docker/
+            dockerfile: ./Dockerfile
+            # dockerfile: ./Dockerfile

+ 1 - 1
module/device/control.py

@@ -7,7 +7,7 @@ from module.base.utils import *
 from module.device.method.minitouch import Minitouch
 from module.device.method.minitouch import Minitouch
 from module.device.method.adb import Adb
 from module.device.method.adb import Adb
 from module.device.method.scrcpy import Scrcpy
 from module.device.method.scrcpy import Scrcpy
-from module.device.method.window import Window
+from module.device.method.windows import Window
 from module.logger import logger
 from module.logger import logger
 
 
 
 

+ 0 - 1
module/device/device.py

@@ -22,7 +22,6 @@ from module.exception import (GameNotRunningError,
 from module.logger import logger
 from module.logger import logger
 
 
 
 
-
 class Device(Platform, Screenshot, Control, AppControl):
 class Device(Platform, Screenshot, Control, AppControl):
     _screen_size_checked = False
     _screen_size_checked = False
     detect_record = set()
     detect_record = set()

+ 19 - 0
module/device/method/windows.py

@@ -0,0 +1,19 @@
+
+
+from module.device.env import IS_WINDOWS
+
+
+if IS_WINDOWS:
+    from module.device.method.windows_impl import Window
+    print("dd")
+
+else:
+    class Window:
+        pass
+
+
+
+
+
+
+

+ 4 - 0
module/device/method/window.py → module/device/method/windows_impl.py

@@ -21,6 +21,7 @@ from win32ui import CreateDCFromHandle, CreateBitmap
 from win32api import GetSystemMetrics, SendMessage, MAKELONG, PostMessage
 from win32api import GetSystemMetrics, SendMessage, MAKELONG, PostMessage
 from win32con import SRCCOPY
 from win32con import SRCCOPY
 
 
+
 from module.base.cBezier import BezierTrajectory
 from module.base.cBezier import BezierTrajectory
 from module.exception import RequestHumanTakeover, ScriptError
 from module.exception import RequestHumanTakeover, ScriptError
 from module.base.decorator import Config
 from module.base.decorator import Config
@@ -29,6 +30,8 @@ from module.logger import logger
 from module.device.handle import Handle, window_scale_rate, EmulatorFamily
 from module.device.handle import Handle, window_scale_rate, EmulatorFamily
 
 
 
 
+
+
 class Window(Handle):
 class Window(Handle):
 
 
     def __init__(self, *args, **kwargs):
     def __init__(self, *args, **kwargs):
@@ -357,6 +360,7 @@ class Window(Handle):
 
 
 
 
 
 
+
 if __name__ == "__main__":
 if __name__ == "__main__":
     w = Window(config='oas1')
     w = Window(config='oas1')
     # img = w.screenshot_window_background()
     # img = w.screenshot_window_background()

+ 2 - 1
module/device/screenshot.py

@@ -12,7 +12,7 @@ from module.base.decorator import cached_property
 from module.base.timer import Timer
 from module.base.timer import Timer
 from module.base.utils import get_color, image_size, limit_in, save_image
 from module.base.utils import get_color, image_size, limit_in, save_image
 from module.device.method.adb import Adb
 from module.device.method.adb import Adb
-from module.device.method.window import Window
+from module.device.method.windows import Window
 from module.device.method.droidcast import DroidCast
 from module.device.method.droidcast import DroidCast
 from module.device.method.scrcpy import Scrcpy
 from module.device.method.scrcpy import Scrcpy
 from module.device.method.nemu_ipc import NemuIpc
 from module.device.method.nemu_ipc import NemuIpc
@@ -272,4 +272,5 @@ class Screenshot(Adb, DroidCast, Scrcpy, Window, NemuIpc):
 if __name__ == "__main__":
 if __name__ == "__main__":
     s = Screenshot(config="oas1")
     s = Screenshot(config="oas1")
     s.screenshot()
     s.screenshot()
+
     s.image_show()
     s.image_show()

+ 5 - 3
script.py

@@ -29,12 +29,13 @@ from module.config.utils import convert_to_underscore
 from module.config.config import Config
 from module.config.config import Config
 from module.config.config_model import ConfigModel
 from module.config.config_model import ConfigModel
 from module.device.device import Device
 from module.device.device import Device
+from module.device.env import IS_WINDOWS
 from module.base.utils import load_module
 from module.base.utils import load_module
 from module.base.decorator import del_cached_property
 from module.base.decorator import del_cached_property
 from module.logger import logger
 from module.logger import logger
 from module.exception import *
 from module.exception import *
 from module.server.i18n import I18n
 from module.server.i18n import I18n
-from module.device.platform2.platform_windows import minimize_by_name,show_window_by_name
+
 
 
 
 
 _log_switch_lock = threading.Lock()#线程锁
 _log_switch_lock = threading.Lock()#线程锁
@@ -442,7 +443,8 @@ class Script:
         self.config.model.running_task = ''
         self.config.model.running_task = ''
 
 
         # Update GUI 防呆, 读取设置并立刻显示后台模拟器到前台
         # Update GUI 防呆, 读取设置并立刻显示后台模拟器到前台
-        if not self.config.script.device.run_background_only:
+        if not self.config.script.device.run_background_only and IS_WINDOWS:
+            from module.device.platform2.platform_windows import minimize_by_name, show_window_by_name
             target_window_name = self.config.script.device.handle  # 在这里输入你的具体窗口名称
             target_window_name = self.config.script.device.handle  # 在这里输入你的具体窗口名称
             if self.config.script.device.emulator_window_minimize:
             if self.config.script.device.emulator_window_minimize:
                 minimize_by_name(target_window_name)
                 minimize_by_name(target_window_name)
@@ -539,5 +541,5 @@ class Script:
 
 
 
 
 if __name__ == "__main__":
 if __name__ == "__main__":
-    script = Script("oas2")
+    script = Script("oas1")
     script.loop()
     script.loop()

+ 2 - 2
tasks/AbyssShadows/config.py

@@ -5,8 +5,8 @@
 # github    https://github.com/roarhill/oas
 # github    https://github.com/roarhill/oas
 
 
 from pydantic import BaseModel, Field
 from pydantic import BaseModel, Field
-from pygments.lexer import default
-from scripts.regsetup import description
+# from pygments.lexer import default
+# from scripts.regsetup import description
 from sympy.testing.pytest import Failed
 from sympy.testing.pytest import Failed
 
 
 from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
 from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig