Skip to content

Commit 16b0282

Browse files
authored
chore: clean some variables begining with KUBE_CHAT_ (#696)
1 parent 9c1fba8 commit 16b0282

File tree

6 files changed

+23
-23
lines changed

6 files changed

+23
-23
lines changed

aperag/chat/websocket/base_consumer.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
welcome_response,
3838
)
3939
from aperag.db.ops import query_bot, query_user_quota
40-
from aperag.pipeline.base_pipeline import KUBE_CHAT_DOC_QA_REFERENCES, KUBE_CHAT_RELATED_QUESTIONS, \
41-
KUBE_CHAT_DOCUMENT_URLS
40+
from aperag.pipeline.base_pipeline import DOC_QA_REFERENCES, RELATED_QUESTIONS, \
41+
DOCUMENT_URLS
4242
from aperag.utils.constant import KEY_BOT_ID, KEY_CHAT_ID, KEY_USER_ID, KEY_WEBSOCKET_PROTOCOL
4343
from aperag.utils.utils import now_unix_milliseconds
4444

@@ -133,14 +133,14 @@ async def receive(self, text_data=None, bytes_data=None):
133133
return
134134

135135
async for tokens in self.predict(data["data"], message_id=message_id):
136-
if tokens.startswith(KUBE_CHAT_DOC_QA_REFERENCES):
137-
references = json.loads(tokens[len(KUBE_CHAT_DOC_QA_REFERENCES):])
136+
if tokens.startswith(DOC_QA_REFERENCES):
137+
references = json.loads(tokens[len(DOC_QA_REFERENCES):])
138138
continue
139-
if tokens.startswith(KUBE_CHAT_RELATED_QUESTIONS):
140-
related_question = ast.literal_eval(tokens[len(KUBE_CHAT_RELATED_QUESTIONS):])
139+
if tokens.startswith(RELATED_QUESTIONS):
140+
related_question = ast.literal_eval(tokens[len(RELATED_QUESTIONS):])
141141
continue
142-
if tokens.startswith(KUBE_CHAT_DOCUMENT_URLS):
143-
urls = ast.literal_eval(tokens[len(KUBE_CHAT_DOCUMENT_URLS):])
142+
if tokens.startswith(DOCUMENT_URLS):
143+
urls = ast.literal_eval(tokens[len(DOCUMENT_URLS):])
144144
continue
145145

146146
# streaming response

aperag/chat/websocket/common_consumer.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
success_response,
3030
)
3131
from aperag.chat.websocket.base_consumer import BaseConsumer
32-
from aperag.pipeline.base_pipeline import KUBE_CHAT_RELATED_QUESTIONS
32+
from aperag.pipeline.base_pipeline import RELATED_QUESTIONS
3333
from aperag.pipeline.common_pipeline import CommonPipeline
3434
from aperag.readers.base_readers import DEFAULT_FILE_READER_CLS
3535
from aperag.source.utils import gen_temporary_file
@@ -97,8 +97,8 @@ async def receive(self, text_data=None, bytes_data=None):
9797
return
9898

9999
async for tokens in self.predict(data["data"], message_id=message_id, file=self.file):
100-
if tokens.startswith(KUBE_CHAT_RELATED_QUESTIONS):
101-
related_question = ast.literal_eval(tokens[len(KUBE_CHAT_RELATED_QUESTIONS):])
100+
if tokens.startswith(RELATED_QUESTIONS):
101+
related_question = ast.literal_eval(tokens[len(RELATED_QUESTIONS):])
102102
continue
103103

104104
# streaming response

aperag/pipeline/base_pipeline.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ class Message(BaseModel):
4545
llm_context_window: Optional[int] = None
4646

4747

48-
KUBE_CHAT_DOC_QA_REFERENCES = "|KUBE_CHAT_DOC_QA_REFERENCES|"
49-
KUBE_CHAT_RELATED_QUESTIONS = "|KUBE_CHAT_RELATED_QUESTIONS|"
50-
KUBE_CHAT_DOCUMENT_URLS = "|KUBE_CHAT_DOCUMENT_URLS|"
48+
DOC_QA_REFERENCES = "|DOC_QA_REFERENCES|"
49+
RELATED_QUESTIONS = "|RELATED_QUESTIONS|"
50+
DOCUMENT_URLS = "|DOCUMENT_URLS|"
5151

5252

5353
class Pipeline(ABC):

aperag/pipeline/common_pipeline.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
from langchain import PromptTemplate
2121

2222
from aperag.llm.prompts import COMMON_FILE_TEMPLATE
23-
from aperag.pipeline.base_pipeline import KUBE_CHAT_RELATED_QUESTIONS, Message, Pipeline
23+
from aperag.pipeline.base_pipeline import RELATED_QUESTIONS, Message, Pipeline
2424
from aperag.utils.utils import now_unix_milliseconds
2525

2626
logger = logging.getLogger(__name__)
@@ -111,4 +111,4 @@ async def run(self, message, gen_references=False, message_id="", file=None):
111111
related_questions.update(related_question_generate)
112112
related_questions = list(related_questions)
113113
random.shuffle(related_questions)
114-
yield KUBE_CHAT_RELATED_QUESTIONS + str(related_questions[:3])
114+
yield RELATED_QUESTIONS + str(related_questions[:3])

aperag/pipeline/fake_pipeline.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
from aperag.pipeline.base_pipeline import Pipeline
2020

21-
KUBE_CHAT_DOC_QA_REFERENCES = "|KUBE_CHAT_DOC_QA_REFERENCES|"
21+
DOC_QA_REFERENCES = "|DOC_QA_REFERENCES|"
2222

2323

2424
class FakePipeline(Pipeline):
@@ -61,4 +61,4 @@ async def run(self, message, gen_references=False, message_id=""):
6161
await self.add_ai_message(message, message_id, response, references, urls=[])
6262

6363
if gen_references:
64-
yield KUBE_CHAT_DOC_QA_REFERENCES + json.dumps(references)
64+
yield DOC_QA_REFERENCES + json.dumps(references)

aperag/pipeline/knowledge_pipeline.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
DEFAULT_CHINESE_PROMPT_TEMPLATE_V3,
2828
DEFAULT_MODEL_MEMOTY_PROMPT_TEMPLATES,
2929
)
30-
from aperag.pipeline.base_pipeline import KUBE_CHAT_DOC_QA_REFERENCES, KUBE_CHAT_RELATED_QUESTIONS, \
31-
Message, Pipeline, KUBE_CHAT_DOCUMENT_URLS
30+
from aperag.pipeline.base_pipeline import DOC_QA_REFERENCES, RELATED_QUESTIONS, \
31+
Message, Pipeline, DOCUMENT_URLS
3232
from aperag.pipeline.keyword_extractor import IKExtractor
3333
from aperag.query.query import DocumentWithScore, get_packed_answer
3434
from aperag.readers.base_embedding import get_embedding_model, rerank
@@ -249,11 +249,11 @@ async def run(self, message, gen_references=False, message_id=""):
249249
related_questions.update(related_question_generate)
250250
related_questions = list(related_questions)
251251
random.shuffle(related_questions)
252-
yield KUBE_CHAT_RELATED_QUESTIONS + str(related_questions[:3])
252+
yield RELATED_QUESTIONS + str(related_questions[:3])
253253

254254
if gen_references:
255-
yield KUBE_CHAT_DOC_QA_REFERENCES + json.dumps(references)
255+
yield DOC_QA_REFERENCES + json.dumps(references)
256256

257257
if document_url_list:
258-
yield KUBE_CHAT_DOCUMENT_URLS + json.dumps(document_url_list)
258+
yield DOCUMENT_URLS + json.dumps(document_url_list)
259259

0 commit comments

Comments
 (0)