From 9ee097b6dd3256adbb5307014e6973e43c6a4bff Mon Sep 17 00:00:00 2001 From: mahaloz Date: Wed, 29 Jan 2025 22:20:41 -0700 Subject: [PATCH] Delay import --- dailalib/api/litellm/config_dialog.py | 2 +- dailalib/api/litellm/configuration.py | 31 --------------------------- dailalib/api/litellm/litellm_api.py | 7 +++--- dailalib/configuration.py | 8 +++---- setup.cfg | 2 ++ 5 files changed, 11 insertions(+), 39 deletions(-) delete mode 100644 dailalib/api/litellm/configuration.py diff --git a/dailalib/api/litellm/config_dialog.py b/dailalib/api/litellm/config_dialog.py index 3498707..19a2830 100644 --- a/dailalib/api/litellm/config_dialog.py +++ b/dailalib/api/litellm/config_dialog.py @@ -1,7 +1,7 @@ import logging from typing import Optional -from .configuration import DAILAConfig +from dailalib.configuration import DAILAConfig from .prompt_type import ALL_STYLES from . import MODEL_TO_TOKENS diff --git a/dailalib/api/litellm/configuration.py b/dailalib/api/litellm/configuration.py deleted file mode 100644 index 228cc92..0000000 --- a/dailalib/api/litellm/configuration.py +++ /dev/null @@ -1,31 +0,0 @@ -from libbs.configuration import BSConfig -from typing import Optional, Dict -from platformdirs import user_config_dir -import logging - -_l = logging.getLogger(__name__) - - -class DAILAConfig(BSConfig): - """ - Configuration class for LLM API, model, prompt style, and probably other things in the future. - """ - __slots__ = ( - "save_location", - "_config_lock", - "model", # LLM Model selected by user, - "api_key", # API keys for selected model, - "prompt_style", # Prompt style selected by user, - "custom_endpoint", # Custom OpenAI endpoint - "custom_model" # Custom OpenAI model - ) - - def __init__(self, save_location: Optional[str] = None): - save_location = user_config_dir("daila") - super().__init__(save_location) - self.save_location = self.save_location / f"{self.__class__.__name__}.toml" - self.model = "gpt-4o" - self.api_key = "THISISAFAKEAPIKEY" - self.prompt_style = "few-shot" - self.custom_endpoint = "" - self.custom_model = "" diff --git a/dailalib/api/litellm/litellm_api.py b/dailalib/api/litellm/litellm_api.py index 2325ee1..7c0075d 100644 --- a/dailalib/api/litellm/litellm_api.py +++ b/dailalib/api/litellm/litellm_api.py @@ -7,8 +7,7 @@ from . import DEFAULT_MODEL, LLM_COST, OPENAI_MODELS from ..ai_api import AIAPI -from .configuration import DAILAConfig -from .config_dialog import DAILAConfigDialog +from dailalib.configuration import DAILAConfig active_model = None active_prompt_style = None @@ -266,7 +265,9 @@ def get_model(self): # single function to ask for all the settings def ask_settings(self, *args, **kwargs): - # attempts to ask for all the configurations by the user. + # delay import + from .config_dialog import DAILAConfigDialog + # attempts to ask for all the configurations by the user. dialog = DAILAConfigDialog(self.config) new_config = dialog.config_dialog_exec() if new_config: diff --git a/dailalib/configuration.py b/dailalib/configuration.py index 31a1924..228cc92 100644 --- a/dailalib/configuration.py +++ b/dailalib/configuration.py @@ -2,14 +2,14 @@ from typing import Optional, Dict from platformdirs import user_config_dir import logging -import os _l = logging.getLogger(__name__) -class DAILAConfig(BSConfig): - ''' + +class DAILAConfig(BSConfig): + """ Configuration class for LLM API, model, prompt style, and probably other things in the future. - ''' + """ __slots__ = ( "save_location", "_config_lock", diff --git a/setup.cfg b/setup.cfg index cfd89e9..77309bb 100644 --- a/setup.cfg +++ b/setup.cfg @@ -30,3 +30,5 @@ console_scripts = [options.extras_require] full = varbert>=2.3.0 + "PySide6-Essentials>=6.4.2,!=6.7.0" +