Jelajahi Sumber

feat(ocr): 添加OCR服务器关闭功能并优化资源管理

- 在.gitignore中添加AI相关文件和目录忽略规则
- 从server.py的kill_server端点调用shutdown_ocr_server函数
- 实现shutdown_ocr_server函数用于安全终止OCR服务器进程
- 使用atexit注册OCR服务器清理函数确保程序退出时释放资源
- 在主服务器启动流程中添加try-finally块确保OCR服务器正常关闭
- 移除已废弃的.claude/settings.local.json忽略规则
AzurTian 8 bulan lalu
induk
melakukan
40e5b5c1b0
4 mengubah file dengan 48 tambahan dan 14 penghapusan
  1. 6 9
      .gitignore
  2. 32 0
      module/ocr/rpc.py
  3. 2 0
      module/server/home_router.py
  4. 8 5
      server.py

+ 6 - 9
.gitignore

@@ -42,14 +42,12 @@ oas-backend.bat
 .eslintignore
 .eslintrc.js
 .prettierrc.js
-
-
-
-
-
-
-
-
+# ai
+AGENTS.md
+CLAUDE.md
+.codex/
+.claude/
+openspec/
 
 
 # Created by .ignore support plugin (hsz.mobi)
@@ -272,6 +270,5 @@ adb_port.ini
 *.zip
 console.bat
 .vscode/*
-.claude/settings.local.json
 tasks/AutoCheckinBigGod/frida-server-17.6.2-android-x86_64
 oas.bat

+ 32 - 0
module/ocr/rpc.py

@@ -1,6 +1,7 @@
 # This Python file uses the following encoding: utf-8
 # @author runhey
 # github https://github.com/runhey
+import atexit
 import multiprocessing
 import pickle
 import socket
@@ -82,6 +83,34 @@ def ensure_ocr_server_started() -> bool:
     return False
 
 
+def shutdown_ocr_server(timeout: float = 2.0) -> bool:
+    global _OCR_SERVER_PROCESS
+
+    process = _OCR_SERVER_PROCESS
+    if process is None:
+        return False
+
+    if not process.is_alive():
+        _OCR_SERVER_PROCESS = None
+        return False
+
+    logger.info("Stopping OCR server process")
+    try:
+        process.terminate()
+        process.join(timeout=timeout)
+        if process.is_alive():
+            logger.warning("OCR server process did not exit in time, force killing")
+            process.kill()
+            process.join(timeout=1.0)
+        logger.info("OCR server process stopped")
+        return True
+    except Exception as e:
+        logger.exception(e)
+        return False
+    finally:
+        _OCR_SERVER_PROCESS = None
+
+
 def run_ocr_server(host: str, port: int) -> None:
     server = zerorpc.Server(OcrServer())
     server.bind(f"tcp://{host}:{port}")
@@ -176,3 +205,6 @@ class ModelProxy:
             BoxedResult(np.array(item["box"]), None, item["ocr_text"], item["score"])
             for item in results
         ]
+
+
+atexit.register(shutdown_ocr_server)

+ 2 - 0
module/server/home_router.py

@@ -7,6 +7,7 @@ from pathlib import Path
 
 from module.config.utils import write_file
 from module.logger import logger
+from module.ocr.rpc import shutdown_ocr_server
 from module.server.main_manager import MainManager
 from module.server.updater import Updater
 from module.server.i18n import I18n
@@ -46,6 +47,7 @@ async def notify_test(setting: str, title: str, content: str):
 
 @home_app.get('/kill_server')
 async def kill_server():
+    shutdown_ocr_server()
     MainManager.signal_kill_server = True
     return 'success'
 

+ 8 - 5
server.py

@@ -28,7 +28,7 @@ import threading
 
 from module.logger import logger
 from module.server.setting import State
-from module.ocr.rpc import ensure_ocr_server_started
+from module.ocr.rpc import ensure_ocr_server_started, shutdown_ocr_server
 
 
 def fun(ev: threading.Event):
@@ -82,10 +82,13 @@ def fun(ev: threading.Event):
 
     ensure_ocr_server_started()
 
-    uvicorn.run("module.server.app:fastapi_app",
-                host=host,
-                port=port,
-                factory=True)
+    try:
+        uvicorn.run("module.server.app:fastapi_app",
+                    host=host,
+                    port=port,
+                    factory=True)
+    finally:
+        shutdown_ocr_server()
 
 
 if __name__ == "__main__":