Browse Source

Fix import due to refactor

StrayWarrior 2 months ago
parent
commit
5a9be19834
3 changed files with 18 additions and 17 deletions
  1. 10 9
      pqai_agent/agent_service.py
  2. 3 3
      pqai_agent/dialogue_manager.py
  3. 5 5
      pqai_agent/message_queue_backend.py

+ 10 - 9
pqai_agent/agent_service.py

@@ -1,6 +1,7 @@
 #! /usr/bin/env python
 # -*- coding: utf-8 -*-
 # vim:fenc=utf-8
+
 import re
 import signal
 import sys
@@ -8,25 +9,25 @@ import time
 from typing import Dict, List, Optional
 import logging
 from datetime import datetime, timedelta
+import threading
 import traceback
 
 import apscheduler.triggers.cron
 from apscheduler.schedulers.background import BackgroundScheduler
 
-import chat_service
 from pqai_agent import configs
-import logging_service
-from configs import apollo_config
+from pqai_agent import logging_service
+from pqai_agent.configs import apollo_config
 from pqai_agent.logging_service import logger
+from pqai_agent import chat_service
 from pqai_agent.chat_service import CozeChat, ChatServiceType
-from dialogue_manager import DialogueManager, DialogueState, DialogueStateCache
-from rate_limiter import MessageSenderRateLimiter
-from response_type_detector import ResponseTypeDetector
+from pqai_agent.dialogue_manager import DialogueManager, DialogueState, DialogueStateCache
+from pqai_agent.rate_limiter import MessageSenderRateLimiter
+from pqai_agent.response_type_detector import ResponseTypeDetector
 from pqai_agent.user_manager import UserManager, LocalUserManager, MySQLUserManager, MySQLUserRelationManager, UserRelationManager, \
     LocalUserRelationManager
-from message_queue_backend import MessageQueueBackend, MemoryQueueBackend, AliyunRocketMQQueueBackend
-from user_profile_extractor import UserProfileExtractor
-import threading
+from pqai_agent.message_queue_backend import MessageQueueBackend, MemoryQueueBackend, AliyunRocketMQQueueBackend
+from pqai_agent.user_profile_extractor import UserProfileExtractor
 from pqai_agent.message import MessageType, Message, MessageChannel
 
 

+ 3 - 3
pqai_agent/dialogue_manager.py

@@ -485,9 +485,9 @@ class DialogueManager:
     @staticmethod
     def _select_prompt(state):
         state_to_prompt_map = {
-            DialogueState.GREETING: GENERAL_GREETING_PROMPT,
-            DialogueState.CHITCHAT: CHITCHAT_PROMPT_COZE,
-            DialogueState.FAREWELL: GENERAL_GREETING_PROMPT
+            DialogueState.GREETING: prompt_templates.GENERAL_GREETING_PROMPT,
+            DialogueState.CHITCHAT: prompt_templates.CHITCHAT_PROMPT_COZE,
+            DialogueState.FAREWELL: prompt_templates.GENERAL_GREETING_PROMPT
         }
         return state_to_prompt_map[state]
 

+ 5 - 5
pqai_agent/message_queue_backend.py

@@ -4,15 +4,15 @@
 
 import abc
 import time
-from pqai_agent.logging_service import logger
 from typing import Optional
-from pqai_agent import configs
+import rocketmq
+from rocketmq import ClientConfiguration, Credentials, SimpleConsumer
 
-import logging_service
+from pqai_agent import configs
+from pqai_agent import logging_service
+from pqai_agent.logging_service import logger
 from pqai_agent.message import Message, MessageType, MessageChannel
 
-import rocketmq
-from rocketmq import ClientConfiguration, Credentials, SimpleConsumer
 
 
 class MessageQueueBackend(abc.ABC):