Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 47 additions & 0 deletions src/image_object_detection/model_manager.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# model_manager.py
"""
模型管理器模块。
提供模型热切换能力,封装 DetectionEngine 的重新初始化逻辑。
"""

from detection_engine import DetectionEngine, ModelLoadError

class ModelManager:
"""管理当前使用的 DetectionEngine 实例,支持动态切换模型。"""

def __init__(self, initial_model_path, conf_threshold):
"""
初始化模型管理器。
:param initial_model_path: 初始模型路径
:param conf_threshold: 置信度阈值
"""
self.conf_threshold = conf_threshold
self.engine = None
self._load_model(initial_model_path)

def _load_model(self, model_path):
"""内部方法:加载模型并创建 DetectionEngine 实例。"""
try:
self.engine = DetectionEngine(model_path=model_path, conf_threshold=self.conf_threshold)
print(f"✅ Model successfully loaded: {model_path}")
return True
except ModelLoadError as e:
print(f"❌ Failed to load model '{model_path}': {e}")
return False

def switch_model(self, new_model_path):
"""
尝试切换到新模型。
:param new_model_path: 新模型路径(如 'yolov8s.pt' 或 './models/custom.pt')
:return: bool,是否切换成功
"""
success = self._load_model(new_model_path)
if success:
print(f"🔄 Detection engine now using: {new_model_path}")
else:
print("⚠️ Model switch failed. Keeping current model.")
return success

def get_current_engine(self):
"""返回当前可用的 DetectionEngine 实例。"""
return self.engine
66 changes: 52 additions & 14 deletions src/image_object_detection/ui_handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@
# - 调度静态图像检测、实时摄像头检测 或 批量图像检测
# - 处理用户中断(Ctrl+C)并优雅退出
# - 保存检测结果图像并反馈保存状态
# - 支持运行时切换检测模型(热切换)
#
# 设计原则:
# - 用户友好:错误提示具体到“文件不存在”、“无权限”、“格式不支持”
# - 安全兜底:即使用户输错路径,也不崩溃,而是返回主菜单
# - 安全兜底:即使用户输错路径或模型,也不崩溃,而是返回主菜单
# - 松耦合:依赖 DetectionEngine、CameraDetector 和 BatchDetector,但不硬编码其内部逻辑
# - 可扩展:支持未来新增模式(如视频文件检测)

Expand All @@ -21,6 +22,7 @@

from detection_engine import DetectionEngine, ModelLoadError
from camera_detector import CameraOpenError
from model_manager import ModelManager # ← 新增导入


def parse_args():
Expand All @@ -38,23 +40,25 @@ def parse_args():
class UIHandler:
"""
用户界面控制器。
初始化时加载模型,失败则立即退出。
支持 CLI 模式和交互式菜单。
初始化时加载初始模型,失败则立即退出。
支持 CLI 模式、交互式菜单及模型热切换。
"""

def __init__(self, config):
"""
初始化 UIHandler。
若 DetectionEngine 初始化失败(如模型加载错误),打印错误并退出。
若初始模型加载失败,打印错误并退出。
"""
self.config = config
try:
self.engine = DetectionEngine(
model_path=config.model_path,
# 使用 ModelManager 管理检测引擎,支持后续热切换
self.model_manager = ModelManager(
initial_model_path=config.model_path,
conf_threshold=config.confidence_threshold
)
except ModelLoadError as e:
print(f"❌ Fatal: Failed to initialize detection engine: {e}")
except Exception as e:
# ModelManager 内部已处理加载异常,但若完全无法初始化,应退出
print(f"❌ Fatal: Cannot initialize detection engine with initial model: {e}")
raise SystemExit(1)

def run(self):
Expand Down Expand Up @@ -90,8 +94,9 @@ def _interactive_menu(self):
print("1. Static Image Detection")
print("2. Live Camera Detection")
print("3. Batch Image Detection")
print("4. Exit")
choice = input("Please select an option (1-4): ").strip()
print("4. Switch Detection Model") # ← 新增选项
print("5. Exit")
choice = input("Please select an option (1-5): ").strip()
except KeyboardInterrupt:
print("\nUser cancelled. Exiting...")
return
Expand All @@ -103,9 +108,11 @@ def _interactive_menu(self):
elif choice == "3":
self._run_batch_detection_interactive()
elif choice == "4":
self._switch_model_interactive() # ← 新增方法
elif choice == "5":
print("Goodbye!")
else:
print("Invalid option. Please enter 1, 2, 3, or 4.")
print("Invalid option. Please enter 1, 2, 3, 4, or 5.")
self._interactive_menu()

def _choose_image_source(self):
Expand Down Expand Up @@ -169,7 +176,8 @@ def _run_static_detection(self, image_path):
print(f"❌ Unsupported or corrupted image format: {image_path}")
return

annotated_frame, _ = self.engine.detect(frame)
# 使用当前模型进行检测
annotated_frame, _ = self.model_manager.get_current_engine().detect(frame)

window_name = "YOLO Detection Result"
cv2.namedWindow(window_name, cv2.WINDOW_NORMAL)
Expand Down Expand Up @@ -199,7 +207,7 @@ def _run_camera_detection(self):
try:
from camera_detector import CameraDetector
detector = CameraDetector(
detection_engine=self.engine,
detection_engine=self.model_manager.get_current_engine(), # ← 使用当前模型
output_interval=self.config.output_interval
)
detector.start_detection(camera_index=self.config.camera_index)
Expand Down Expand Up @@ -242,11 +250,41 @@ def _run_batch_detection(self, input_dir, output_dir=None):
try:
from batch_detector import BatchDetector
detector = BatchDetector(
detection_engine=self.engine,
detection_engine=self.model_manager.get_current_engine(), # ← 使用当前模型
input_dir=input_dir,
output_dir=output_dir
)
detector.run()
except ValueError as e:
print(f"❌ Batch detection setup error: {e}")
except Exception as e:
print(f"💥 Batch detection failed: {e}")
traceback.print_exc()

def _switch_model_interactive(self):
"""
交互式切换检测模型。
允许用户输入新模型路径(本地文件或官方名称),尝试热加载。
成功后,所有后续检测将使用新模型。
"""
print("\n--- Switch Detection Model ---")
print("Examples:")
print(" • yolov8n.pt (smallest, fastest)")
print(" • yolov8s.pt (balanced)")
print(" • yolov8m.pt (more accurate)")
print(" • ./models/custom.pt (your own model)")
try:
new_model = input("Enter new model path or name: ").strip()
except KeyboardInterrupt:
print("\nModel switch cancelled.")
return

if not new_model:
print("Empty input. Model switch cancelled.")
return

success = self.model_manager.switch_model(new_model)
if success:
print("✅ Model switch completed successfully.")
else:
print("⚠️ Model switch failed. Current model remains active.")
Loading