8000 Move every function in globals.py to utils.py for better organization… · DataSolveProblems/pyqt-openai@b2457b7 · GitHub
[go: up one dir, main page]
Skip to content

Commit b2457b7

Browse files
yjg30737yjg30737
committed
Move every function in globals.py to utils.py for better organization and readability.
1 parent daedd48 commit b2457b7

File tree

9 files changed

+560
-544
lines changed

9 files changed

+560
-544
lines changed

‎pyqt_openai/chat_widget/center/aiChatUnit.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
from pyqt_openai.chat_widget.center.chatUnit import ChatUnit
77
from pyqt_openai.chat_widget.center.responseInfoDialog import ResponseInfoDialog
88
from pyqt_openai.models import ChatMessageContainer
9-
from pyqt_openai.globals import DB, stream_to_speakers
9+
from pyqt_openai.globals import DB
10+
from pyqt_openai.util.script import stream_to_speakers
1011
from pyqt_openai.widgets.button import Button
1112

1213

‎pyqt_openai/chat_widget/center/chatWidget.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
from pyqt_openai.chat_widget.center.prompt import Prompt
1111
from pyqt_openai.chat_widget.llamaOpenAIThread import LlamaOpenAIThread
1212
from pyqt_openai.config_loader import CONFIG_MANAGER
13-
from pyqt_openai.globals import LLAMAINDEX_WRAPPER, DB, get_argument, ChatThread
13+
from pyqt_openai.globals import LLAMAINDEX_WRAPPER, DB
14+
from pyqt_openai.util.script import get_argument, ChatThread
1415
from pyqt_openai.lang.translations import LangClass
1516
from pyqt_openai.models import ChatMessageContainer
1617
from pyqt_openai.widgets.notifier import NotifierWidget

‎pyqt_openai/chat_widget/center/prompt.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
IMAGE_FILE_EXT_LIST, \
1212
TEXT_FILE_EXT_LIST, QFILEDIALOG_DEFAULT_DIRECTORY, DEFAULT_SHORTCUT_SEND, DEFAULT_SHORTCUT_RECORD, ICON_RECORD
1313
from pyqt_openai.config_loader import CONFIG_MANAGER
14-
from pyqt_openai.globals import DB, STTThread, RecorderThread
14+
from pyqt_openai.globals import DB
1515
from pyqt_openai.chat_widget.center.commandSuggestionWidget import CommandSuggestionWidget
1616
from pyqt_openai.chat_widget.center.textEditPromptGroup import TextEditPromptGroup
1717
from pyqt_openai.chat_widget.center.uploadedImageFileWidget import UploadedImageFileWidget
1818
from pyqt_openai.lang.translations import LangClass
19-
from pyqt_openai.util.script import get_content_of_text_file_for_send
19+
from pyqt_openai.util.script import get_content_of_text_file_for_send, RecorderThread, STTThread
2020
from pyqt_openai.widgets.button import Button
2121
from pyqt_openai.widgets.toolButton import ToolButton
2222

‎pyqt_openai/chat_widget/llamaOpenAIThread.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
from llama_index.core.base.response.schema import StreamingResponse
22
from PySide6.QtCore import QThread, Signal
33

4+
import pyqt_openai.util.script
45
from pyqt_openai.models import ChatMessageContainer
56

67

@@ -26,7 +27,7 @@ def stop(self):
2627

2728
def run(self):
2829
try:
29-
resp = self.__wrapper.get_response(self.__query_text)
30+
resp = pyqt_openai.util.script.get_response(self.__query_text)
3031
f = isinstance(resp, StreamingResponse)
3132
if f:
3233
for response_text in resp.response_gen:

‎pyqt_openai/chat_widget/right_sidebar/apiWidget.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from pyqt_openai import HOW_TO_GET_OPENAI_API_KEY_URL, HOW_TO_GET_CLAUDE_API_KEY_URL, HOW_TO_GET_GEMINI_API_KEY_URL, \
66
HOW_TO_GET_LLAMA_API_KEY_URL, DEFAULT_API_CONFIGS
77
from pyqt_openai.config_loader import CONFIG_MANAGER
8-
from pyqt_openai.globals import set_api_key
8+
from pyqt_openai.util.script import set_api_key
99
from pyqt_openai.widgets.linkLabel import LinkLabel
1010

1111

‎pyqt_openai/chat_widget/right_sidebar/usingAPIPage.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
from pyqt_openai.chat_widget.right_sidebar.apiWidget import ApiWidget
99
from pyqt_openai.config_loader import CONFIG_MANAGER
1010
from pyqt_openai.lang.translations import LangClass
11-
from pyqt_openai.globals import init_llama, get_openai_chat_model
12-
from pyqt_openai.util.script import getSeparator, get_chat_model
11+
from pyqt_openai.util.script import getSeparator, get_chat_model, get_openai_chat_model, init_llama
1312
from pyqt_openai.widgets.linkLabel import LinkLabel
1413

1514

0 commit comments

Comments
 (0)
0