wangdongxu

jira:NYJ-1550 desc:结构调整

@@ -71,14 +71,8 @@ class FootballReplayMatch: @@ -71,14 +71,8 @@ class FootballReplayMatch:
71 logger.info(f'通过时间找到匹配的事件') 71 logger.info(f'通过时间找到匹配的事件')
72 72
73 73
74 -  
75 -import json  
76 -import os  
77 -from pathlib import Path  
78 -  
79 -  
80 from .llm_image import Video2Frame 74 from .llm_image import Video2Frame
81 -from ..util.football_replay_match_live import FootballReplayMatchLive 75 +from football_replay_match.core.football_replay_match_live import FootballReplayMatchLive
82 from ..config import settings 76 from ..config import settings
83 77
84 78
@@ -6,7 +6,7 @@ from langchain_core.messages import SystemMessage, HumanMessage @@ -6,7 +6,7 @@ from langchain_core.messages import SystemMessage, HumanMessage
6 from langchain_openai import ChatOpenAI 6 from langchain_openai import ChatOpenAI
7 7
8 try: 8 try:
9 - from .llm_video_content import contents as video_contents 9 + from football_replay_match.util.llm_video_content import contents as video_contents
10 except: 10 except:
11 from llm_video_content import contents as video_contents 11 from llm_video_content import contents as video_contents
12 12
@@ -6,7 +6,7 @@ from langchain_core.messages import SystemMessage, HumanMessage @@ -6,7 +6,7 @@ from langchain_core.messages import SystemMessage, HumanMessage
6 from langchain_openai import ChatOpenAI 6 from langchain_openai import ChatOpenAI
7 7
8 try: 8 try:
9 - from .llm_video_content import contents as video_contents 9 + from football_replay_match.util.llm_video_content import contents as video_contents
10 except: 10 except:
11 from llm_video_content import contents as video_contents 11 from llm_video_content import contents as video_contents
12 12
1 import base64 1 import base64
2 import hashlib 2 import hashlib
3 import subprocess 3 import subprocess
4 -from pathlib import Path  
5 4
6 import cv2 5 import cv2
7 6
@@ -349,7 +348,7 @@ if __name__ == "__main__": @@ -349,7 +348,7 @@ if __name__ == "__main__":
349 print("\n[TEST 3] FootballReplayVideoEvent 进球识别(可选)") 348 print("\n[TEST 3] FootballReplayVideoEvent 进球识别(可选)")
350 349
351 try: 350 try:
352 - from ..util.football_replay_video_event_by_llm import FootballReplayVideoEvent 351 + from football_replay_match.core.football_replay_video_event_by_llm import FootballReplayVideoEvent
353 except ImportError: 352 except ImportError:
354 import sys 353 import sys
355 from pathlib import Path 354 from pathlib import Path
1 -from football_replay_match_live import FootballReplayMatchLive 1 +from football_replay_match.core.football_replay_match_live import FootballReplayMatchLive
2 from qwen_asr_util import QwenAsr 2 from qwen_asr_util import QwenAsr
3 -from football_replay_video_event_by_llm import FootballReplayVideoEvent 3 +from football_replay_match.core.football_replay_video_event_by_llm import FootballReplayVideoEvent
4 import os 4 import os
5 -import json  
6 5
7 6
8 def batch_match(): 7 def batch_match():
1 -import json  
2 import os 1 import os
3 2
4 -from football_replay_video_event_by_llm import FootballReplayVideoEvent 3 +from football_replay_match.core.football_replay_video_event_by_llm import FootballReplayVideoEvent
5 from qwen_asr_util import QwenAsr 4 from qwen_asr_util import QwenAsr
6 def batch_with_asr(): 5 def batch_with_asr():
7 fbrv = FootballReplayVideoEvent(base_url="http://192.168.1.59:11434/v1", model="Qwen3.6-35B-A3B-UD-Q8_K_XL.gguf", temperature=0.7) 6 fbrv = FootballReplayVideoEvent(base_url="http://192.168.1.59:11434/v1", model="Qwen3.6-35B-A3B-UD-Q8_K_XL.gguf", temperature=0.7)