chore: use underscore in filename to split word (#99)

basilisk/__main__.py

@@ -3,9 +3,9 @@
 import psutil
 import sys
 from basilisk.consts import APP_NAME, TMP_DIR, FILE_LOCK_PATH
-from basilisk.filewatcher import send_focus_signal
-from basilisk import globalvars
-from basilisk.singletoninstance import SingletonInstance
+from basilisk.file_watcher import send_focus_signal
+from basilisk import global_vars
+from basilisk.singleton_instance import SingletonInstance
 
 
 def parse_args():
@@ -37,7 +37,7 @@ def parse_args():
 
 if __name__ == '__main__':
 	os.makedirs(TMP_DIR, exist_ok=True)
-	globalvars.args = parse_args()
+	global_vars.args = parse_args()
 	singleton_instance = SingletonInstance(FILE_LOCK_PATH)
 	if not singleton_instance.acquire():
 		existing_pid = singleton_instance.get_existing_pid()
@@ -58,7 +58,7 @@ def parse_args():
 				sys.exit(0)
 			except psutil.NoSuchProcess:
 				singleton_instance.acquire()
-	from basilisk.mainapp import MainApp
+	from basilisk.main_app import MainApp
 
 	app = MainApp()
 	app.MainLoop()

basilisk/account.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-import basilisk.globalvars as globalvars
+import basilisk.global_vars as global_vars
 from enum import Enum
 from functools import cached_property
 from logging import getLogger
@@ -135,7 +135,7 @@ class AccountManager(RootModel[list[Account]]):
 
 	def model_post_init(self, __context: Any) -> None:
 		"""Load accounts from environment variables"""
-		if globalvars.args.no_env_account:
+		if global_vars.args.no_env_account:
 			return
 		for provider in providers:
 			organizations = []

basilisk/config.py

@@ -1,6 +1,6 @@
 import logging
 import yaml
-import basilisk.globalvars as globalvars
+import basilisk.global_vars as global_vars
 from datetime import datetime
 from enum import Enum
 from pathlib import Path
@@ -41,8 +41,8 @@ class AutomaticUpdateModeEnum(Enum):
 
 config_file_path = Path("config.yml")
 search_config_paths = []
-if globalvars.user_data_path:
-	search_config_paths.append(globalvars.user_data_path / config_file_path)
+if global_vars.user_data_path:
+	search_config_paths.append(global_vars.user_data_path / config_file_path)
 search_config_paths.append(
 	user_config_path(
 		"basilisk", "basilisk_llm", roaming=True, ensure_exists=True

basilisk/conversation.py

@@ -2,7 +2,7 @@
 from enum import Enum
 from typing import Literal
 from pydantic import BaseModel, Field
-from .provideraimodel import ProviderAIModel
+from .provider_ai_model import ProviderAIModel
 
 
 class MessageRoleEnum(Enum):

basilisk/gui/conversationtab.py → basilisk/gui/conversation_tab.py

@@ -15,13 +15,13 @@
 	MessageBlock,
 	MessageRoleEnum,
 )
-from basilisk import globalvars
-from basilisk.imagefile import ImageFile, URL_PATTERN, get_image_dimensions
-from basilisk.provideraimodel import ProviderAIModel
-from basilisk.providercapability import ProviderCapability
-from basilisk.providerengine import BaseEngine
-from basilisk.recordingthread import RecordingThread
-from basilisk.soundmanager import play_sound, stop_sound
+from basilisk import global_vars
+from basilisk.image_file import ImageFile, URL_PATTERN, get_image_dimensions
+from basilisk.provider_ai_model import ProviderAIModel
+from basilisk.provider_capability import ProviderCapability
+from basilisk.provider_engine import BaseEngine
+from basilisk.recording_thread import RecordingThread
+from basilisk.sound_manager import play_sound, stop_sound
 
 log = logging.getLogger(__name__)
 
@@ -808,7 +808,7 @@ def _handle_completion(self, engine: BaseEngine, **kwargs):
 			for chunk in self.current_engine.completion_response_with_stream(
 				response
 			):
-				if self._stop_completion or globalvars.app_should_exit:
+				if self._stop_completion or global_vars.app_should_exit:
 					log.debug("Stopping completion")
 					break
 				new_block.response.content += chunk

basilisk/gui/mainframe.py → basilisk/gui/main_frame.py

@@ -9,15 +9,15 @@
 if sys.platform == 'win32':
 	import win32con
 import basilisk.config as config
-from basilisk import globalvars
+from basilisk import global_vars
 from basilisk.consts import APP_NAME, APP_SOURCE_URL, HotkeyAction
-from basilisk.imagefile import ImageFile
+from basilisk.image_file import ImageFile
 from basilisk.logger import get_log_file_path
-from basilisk.screencapturethread import ScreenCaptureThread, CaptureMode
+from basilisk.screen_capture_thread import ScreenCaptureThread, CaptureMode
 from basilisk.updater import BaseUpdater
-from .conversationtab import ConversationTab
-from .taskbaricon import TaskBarIcon
-from .updatedialog import UpdateDialog, DownloadUpdateDialog
+from .conversation_tab import ConversationTab
+from .taskbar_icon import TaskBarIcon
+from .update_dialog import UpdateDialog, DownloadUpdateDialog
 
 log = logging.getLogger(__name__)
 
@@ -329,7 +329,7 @@ def on_restore(self, event):
 
 	def on_quit(self, event):
 		log.info("Closing application")
-		globalvars.app_should_exit = True
+		global_vars.app_should_exit = True
 		for tmp_file in self.tmp_files:
 			log.debug(f"Removing temporary file: {tmp_file}")
 			os.remove(tmp_file)
@@ -422,7 +422,7 @@ def refresh_tabs(self):
 			tab.on_config_change()
 
 	def on_manage_accounts(self, event):
-		from .accountdialog import AccountDialog
+		from .account_dialog import AccountDialog
 
 		account_dialog = AccountDialog(self, _("Manage accounts"))
 		if account_dialog.ShowModal() == wx.ID_OK:
@@ -431,7 +431,7 @@ def on_manage_accounts(self, event):
 
 	def on_preferences(self, event):
 		log.debug("Opening preferences dialog")
-		from .preferencesdialog import PreferencesDialog
+		from .preferences_dialog import PreferencesDialog
 
 		preferences_dialog = PreferencesDialog(self, title=_("Settings"))
 		if preferences_dialog.ShowModal() == wx.ID_OK:
@@ -442,7 +442,7 @@ def on_install_nvda_addon(self, event):
 		import zipfile
 
 		res_nvda_addon_path = os.path.join(
-			globalvars.resource_path, "connectors", "nvda"
+			global_vars.resource_path, "connectors", "nvda"
 		)
 		try:
 			if not os.path.isdir(res_nvda_addon_path):
@@ -483,7 +483,7 @@ def on_roko_basilisk(self, event):
 		)
 
 	def on_about(self, event):
-		from .aboutdialog import display_about_dialog
+		from .about_dialog import display_about_dialog
 
 		display_about_dialog(self)
 

basilisk/imagefile.py → basilisk/image_file.py

@@ -6,7 +6,7 @@
 import re
 import tempfile
 import time
-from .imagehelper import get_image_dimensions, encode_image, resize_image
+from .image_helper import get_image_dimensions, encode_image, resize_image
 
 log = logging.getLogger(__name__)
 

basilisk/localization.py

@@ -6,7 +6,7 @@
 from pathlib import Path
 from babel import Locale
 from .consts import APP_NAME, DEFAULT_LANG
-from .globalvars import resource_path
+from .global_vars import resource_path
 
 log = logging.getLogger(__name__)
 

basilisk/logger.py

@@ -1,6 +1,6 @@
 import sys
 import logging
-import basilisk.globalvars as globalvars
+import basilisk.global_vars as global_vars
 from pathlib import Path
 from types import TracebackType
 from typing import Type
@@ -10,8 +10,8 @@
 def get_log_file_path() -> Path:
 	"""Get log file path"""
 	log_file_path = Path("basilisk.log")
-	if globalvars.user_data_path:
-		log_file_path = globalvars.user_data_path / log_file_path
+	if global_vars.user_data_path:
+		log_file_path = global_vars.user_data_path / log_file_path
 	else:
 		log_file_path = (
 			user_log_path("basilisk", "basilisk_llm", ensure_exists=True)

basilisk/mainapp.py → basilisk/main_app.py

@@ -3,20 +3,20 @@
 import sys
 import threading
 import wx
-import basilisk.globalvars as globalvars
+import basilisk.global_vars as global_vars
 import basilisk.config as config
 
 # don't use relative import here, CxFreeze will fail to find the module
 from basilisk.consts import APP_NAME, TMP_DIR
-from basilisk.filewatcher import init_file_watcher
+from basilisk.file_watcher import init_file_watcher
 from basilisk.localization import init_translation
 from basilisk.logger import (
 	setup_logging,
 	logging_uncaught_exceptions,
 	get_log_file_path,
 )
-from basilisk.serverthread import ServerThread
-from basilisk.soundmanager import initialize_sound_manager
+from basilisk.server_thread import ServerThread
+from basilisk.sound_manager import initialize_sound_manager
 from basilisk.updater import automatic_update_check, automatic_update_download
 
 log = logging.getLogger(__name__)
@@ -28,22 +28,22 @@ def OnInit(self) -> bool:
 
 		self.conf = config.initialize_config()
 		log_level = (
-			globalvars.args.log_level or self.conf.general.log_level.name
+			global_vars.args.log_level or self.conf.general.log_level.name
 		)
-		log.debug(f"args: {globalvars.args}")
+		log.debug(f"args: {global_vars.args}")
 		setup_logging(log_level)
 		log.debug(f"config: {self.conf}")
 		if getattr(sys, "frozen", False):
 			log.info(
 				"running frozen application: redirecting stdio to log file"
 			)
 			self.RedirectStdio(str(get_log_file_path()))
-		language = globalvars.args.language or self.conf.general.language
+		language = global_vars.args.language or self.conf.general.language
 		self.locale = init_translation(language)
 		log.info("translation initialized")
 		initialize_sound_manager()
 		log.info("sound manager initialized")
-		from basilisk.gui.mainframe import MainFrame
+		from basilisk.gui.main_frame import MainFrame
 
 		self.frame = MainFrame(None, title=APP_NAME, conf=self.conf)
 		self.SetTopWindow(self.frame)

basilisk/provider.py

@@ -2,7 +2,7 @@
 from typing import Optional, Iterable, Any, Type
 from pydantic import BaseModel, HttpUrl, Field
 from logging import getLogger
-from .providerengine import (
+from .provider_engine import (
 	BaseEngine,
 	AnthropicAIEngine,
 	MistralAIEngine,

basilisk/provider_engine/__init__.py

@@ -0,0 +1,5 @@
+from .base_engine import BaseEngine as BaseEngine
+from .anthropic_engine import AnthropicAIEngine as AnthropicAIEngine
+from .mistralai_engine import MistralAIEngine as MistralAIEngine
+from .openai_engine import OpenAIEngine as OpenAIEngine
+from .openrouter_engine import OpenRouterEngine as OpenRouterEngine

basilisk/providerengine/anthropicengine.py → basilisk/provider_engine/anthropic_engine.py

@@ -15,7 +15,7 @@
 	from anthropic.types import Message as AnthropicMessage
 	from anthropic.types.message_stream_event import MessageStreamEvent
 	from account import Account
-from .baseengine import BaseEngine, ProviderAIModel, ProviderCapability
+from .base_engine import BaseEngine, ProviderAIModel, ProviderCapability
 
 log = logging.getLogger(__name__)
 

basilisk/providerengine/baseengine.py → basilisk/provider_engine/base_engine.py

@@ -5,8 +5,8 @@
 from functools import cached_property
 from basilisk.consts import APP_NAME, APP_SOURCE_URL
 from basilisk.conversation import Conversation, MessageBlock, Message
-from basilisk.provideraimodel import ProviderAIModel
-from basilisk.providercapability import ProviderCapability
+from basilisk.provider_ai_model import ProviderAIModel
+from basilisk.provider_capability import ProviderCapability
 
 if TYPE_CHECKING:
 	from basilisk.account import Account

basilisk/providerengine/mistralaiengine.py → basilisk/provider_engine/mistralai_engine.py

@@ -1,7 +1,7 @@
 import logging
 from functools import cached_property
-from .baseengine import ProviderAIModel
-from .openaiengine import OpenAIEngine, ProviderCapability
+from .base_engine import ProviderAIModel
+from .openai_engine import OpenAIEngine, ProviderCapability
 
 log = logging.getLogger(__name__)
 

basilisk/providerengine/openaiengine.py → basilisk/provider_engine/openai_engine.py

@@ -13,7 +13,7 @@
 
 if TYPE_CHECKING:
 	from account import Account
-from .baseengine import BaseEngine, ProviderAIModel, ProviderCapability
+from .base_engine import BaseEngine, ProviderAIModel, ProviderCapability
 
 log = logging.getLogger(__name__)
 

basilisk/providerengine/openrouterengine.py → basilisk/provider_engine/openrouter_engine.py

@@ -2,8 +2,8 @@
 import time
 import httpx
 from functools import cached_property
-from .baseengine import ProviderAIModel
-from .openaiengine import OpenAIEngine, ProviderCapability
+from .base_engine import ProviderAIModel
+from .openai_engine import OpenAIEngine, ProviderCapability
 
 log = logging.getLogger(__name__)
 

basilisk/recordingthread.py → basilisk/recording_thread.py

@@ -10,7 +10,7 @@
 import wx
 
 if TYPE_CHECKING:
-	from .providerengine.baseengine import BaseEngine
+	from .provider_engine.base_engine import BaseEngine
 	from basilisk.config import RecordingsSettings
 	from basilisk.conversation import ConversationTab
 

basilisk/screencapturethread.py → basilisk/screen_capture_thread.py

@@ -5,10 +5,10 @@
 import typing
 from PIL import ImageGrab
 import wx
-from .imagefile import ImageFile
+from .image_file import ImageFile
 
 if typing.TYPE_CHECKING:
-	from gui.mainframe import MainFrame
+	from basilisk.gui.main_frame import MainFrame
 
 
 class CaptureMode(Enum):

basilisk/serverthread.py → basilisk/server_thread.py

@@ -3,8 +3,8 @@
 import socket
 import threading
 import wx
-from basilisk.imagefile import ImageFile
-from basilisk.screencapturethread import CaptureMode
+from basilisk.image_file import ImageFile
+from basilisk.screen_capture_thread import CaptureMode
 
 log = logging.getLogger(__name__)
 

basilisk/soundmanager.py → basilisk/sound_manager.py

@@ -4,7 +4,7 @@
 import wx.adv
 import threading
 from pathlib import Path
-from .globalvars import resource_path
+from .global_vars import resource_path
 
 log = logging.getLogger(__name__)
 

basilisk/updater.py

@@ -14,7 +14,7 @@
 from xml.etree import ElementTree as ET
 from .config import ReleaseChannelEnum, BasiliskConfig
 from .consts import APP_REPO, WORKFLOW_NAME, UNINSTALL_FILE_NAME
-from .globalvars import base_path
+from .global_vars import base_path
 
 log = getLogger(__name__)