TeLLMgramBot 2.4.1__tar.gz → 2.4.2__tar.gz

{tellmgrambot-2.4.1 → tellmgrambot-2.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: TeLLMgramBot
-Version: 2.4.1
+Version: 2.4.2
 Summary: LLM-powered Telegram bot (OpenAI + Anthropic)
 Home-page: https://github.com/Digital-Heresy/TeLLMgramBot
 Author: Digital Heresy

{tellmgrambot-2.4.1 → tellmgrambot-2.4.2}/TeLLMgramBot/initialize.py

@@ -4,9 +4,9 @@ import sys
 
 # Handle relative modules if running this script vs. elsewhere
 try:
-    from .utils import read_text, generate_file_path
+    from .utils import read_text, generate_file_path, read_yaml
 except ImportError:
-    from utils import read_text, generate_file_path
+    from utils import read_text, generate_file_path, read_yaml
 
 INIT_BOT_CONFIG = {
     'bot_owner': '<YOUR USERNAME>',
@@ -48,28 +48,67 @@ def init_directories():
             except Exception as e:
                 sys.exit(f"{type(e).__name__} on {env_var} directory '{os.environ[env_var]}': {e}\nExiting...")
 
+def _requires_provider(config_path: str) -> dict:
+    """
+    Read config.yaml and return which provider keys are required based on model prefixes.
+
+    Provider inference mirrors factory.py: models starting with 'claude-' require Anthropic,
+    all other non-empty models require OpenAI. If config.yaml is missing or unreadable,
+    both providers are marked as required to err on the side of caution.
+
+    Args:
+        config_path: Path to config.yaml file.
+
+    Returns:
+        Dict with keys 'openai' and 'anthropic', each a bool indicating if that provider key is needed.
+    """
+    needs = {'openai': False, 'anthropic': False}
+    try:
+        config = read_yaml(config_path) or {}
+        for field in ('chat_model', 'url_model'):
+            model = config.get(field, '')
+            if isinstance(model, str) and model.startswith('claude-'):
+                needs['anthropic'] = True
+            elif isinstance(model, str) and model:
+                needs['openai'] = True
+    except Exception:
+        # If config is missing or unreadable, require both providers to be safe
+        needs['openai'] = True
+        needs['anthropic'] = True
+    return needs
+
 def init_keys():
     """
     TeLLMgramBot utilizes the following API keys via environment variables:
-    - TELLMGRAMBOT_OPENAI_API_KEY     (currently required at startup regardless of configured model; Phase 3 will make this conditional)
+    - TELLMGRAMBOT_OPENAI_API_KEY     (required only when chat_model or url_model starts with 'gpt-' or other non-claude prefix)
+    - TELLMGRAMBOT_ANTHROPIC_API_KEY  (required only when chat_model or url_model starts with 'claude-')
     - TELLMGRAMBOT_TELEGRAM_API_KEY   (always required)
     - TELLMGRAMBOT_VIRUSTOTAL_API_KEY (always required)
 
-    The Anthropic key (TELLMGRAMBOT_ANTHROPIC_API_KEY) is read directly by
-    AnthropicProvider at call time and is required when using claude-* models.
-    Key file support (anthropic.key) is planned for Phase 3.
-
+    Provider requirement is inferred from the configured models in config.yaml.
     If an environment variable is not set, its key file is read from the base execution
     path or TELLMGRAMBOT_KEYS_PATH. If no file exists, a placeholder is created.
     - openai.key
     - telegram.key
     - virustotal.key
+    - anthropic.key
     """
-    keys = {
+    # Determine which provider keys are needed based on configured models
+    config_path = os.path.join(os.environ.get('TELLMGRAMBOT_CONFIGS_PATH', execution_dir()), 'config.yaml')
+    provider_needs = _requires_provider(config_path)
+
+    # Build the ordered set of keys to check: provider keys first (conditional), then always-required keys
+    provider_keys = {
         'openai': 'https://platform.openai.com/api-keys',
+        'anthropic': 'https://docs.anthropic.com/en/api/getting-started',
+    }
+    always_keys = {
         'telegram': 'https://core.telegram.org/api',
         'virustotal': 'https://developers.virustotal.com/reference/overview'
     }
+
+    keys = {k: v for k, v in provider_keys.items() if provider_needs.get(k)} | always_keys
+
     keys_need = 0
     for key, url in keys.items():
         env_var = f"TELLMGRAMBOT_{key.upper()}_API_KEY"

{tellmgrambot-2.4.1 → tellmgrambot-2.4.2}/TeLLMgramBot.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: TeLLMgramBot
-Version: 2.4.1
+Version: 2.4.2
 Summary: LLM-powered Telegram bot (OpenAI + Anthropic)
 Home-page: https://github.com/Digital-Heresy/TeLLMgramBot
 Author: Digital Heresy

{tellmgrambot-2.4.1 → tellmgrambot-2.4.2}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setup(
     name='TeLLMgramBot',
-    version='2.4.1',
+    version='2.4.2',
     packages=find_packages(),
     license='MIT',
     author='Digital Heresy',