TeLLMgramBot 3.13.4__tar.gz → 3.13.5__tar.gz

{tellmgrambot-3.13.4 → tellmgrambot-3.13.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: TeLLMgramBot
-Version: 3.13.4
+Version: 3.13.5
 Summary: LLM-powered Telegram bot (OpenAI + Anthropic)
 Home-page: https://github.com/Digital-Heresy/TeLLMgramBot
 Author: Digital Heresy
@@ -101,7 +101,7 @@ Override default directory locations by setting these environment variables (use
 If unset, all paths default to subdirectories of the execution directory (the directory containing your entry-point script).
 
 ## API Keys
-TeLLMgramBot supports four API keys. OpenAI, Anthropic, and VirusTotal keys load from environment variables or `.key` files. The Telegram key loads from its env var or the bot config field `telegram_api_key` (no `.key` file):
+TeLLMgramBot supports four API keys. OpenAI, Anthropic, and VirusTotal keys load from environment variables or `.key` files. The Telegram key loads from the bot config field `telegram_api_key` or its env var (no `.key` file); config wins when explicitly set:
 
 | Key | Env Var | File/Config | When required |
 |-----|---------|-------------|---------------|
@@ -150,7 +150,7 @@ When the bot is triggered in a group and about to respond (not deferring to anot
    - `bot_owner`: Telegram username(s) with admin access (required, no `@`). Accepts a single string or a YAML list of usernames.
    - `chat_model`: LLM model for conversation (e.g. `gpt-4o-mini` or `claude-sonnet-4-6`)
    - `url_model`: LLM model for URL analysis (e.g. `gpt-4o` or `claude-haiku-4-5`)
-   - `telegram_api_key`: Telegram bot API key (required). Lookup order: (1) `TELLMGRAMBOT_TELEGRAM_API_KEY` env var, (2) `telegram_api_key` in `config.yaml`. Exits on placeholder, missing, or malformed key.
+   - `telegram_api_key`: Telegram bot API key (required). Lookup order: (1) `telegram_api_key` in `config.yaml`, (2) `TELLMGRAMBOT_TELEGRAM_API_KEY` env var. Config wins when explicitly set. Exits on placeholder, missing, or malformed key.
    - `bot_nickname` / `bot_initials`: Names the bot responds to in groups
    - `instance_name`: Optional label for console prefix, log filename, and database name (e.g. `MyBot` produces `[MyBot] INFO: ...` on console, `MyBot_{timestamp}.log` logs, and `MyBot.db` database); omit to use bot's Telegram username for logging and `conversations.db` for database. Use distinct names when running multiple bot instances in the same directory.
    - `token_limit`: Max tokens (optional; defaults to model's maximum)

{tellmgrambot-3.13.4 → tellmgrambot-3.13.5}/README.md

@@ -69,7 +69,7 @@ Override default directory locations by setting these environment variables (use
 If unset, all paths default to subdirectories of the execution directory (the directory containing your entry-point script).
 
 ## API Keys
-TeLLMgramBot supports four API keys. OpenAI, Anthropic, and VirusTotal keys load from environment variables or `.key` files. The Telegram key loads from its env var or the bot config field `telegram_api_key` (no `.key` file):
+TeLLMgramBot supports four API keys. OpenAI, Anthropic, and VirusTotal keys load from environment variables or `.key` files. The Telegram key loads from the bot config field `telegram_api_key` or its env var (no `.key` file); config wins when explicitly set:
 
 | Key | Env Var | File/Config | When required |
 |-----|---------|-------------|---------------|
@@ -118,7 +118,7 @@ When the bot is triggered in a group and about to respond (not deferring to anot
    - `bot_owner`: Telegram username(s) with admin access (required, no `@`). Accepts a single string or a YAML list of usernames.
    - `chat_model`: LLM model for conversation (e.g. `gpt-4o-mini` or `claude-sonnet-4-6`)
    - `url_model`: LLM model for URL analysis (e.g. `gpt-4o` or `claude-haiku-4-5`)
-   - `telegram_api_key`: Telegram bot API key (required). Lookup order: (1) `TELLMGRAMBOT_TELEGRAM_API_KEY` env var, (2) `telegram_api_key` in `config.yaml`. Exits on placeholder, missing, or malformed key.
+   - `telegram_api_key`: Telegram bot API key (required). Lookup order: (1) `telegram_api_key` in `config.yaml`, (2) `TELLMGRAMBOT_TELEGRAM_API_KEY` env var. Config wins when explicitly set. Exits on placeholder, missing, or malformed key.
    - `bot_nickname` / `bot_initials`: Names the bot responds to in groups
    - `instance_name`: Optional label for console prefix, log filename, and database name (e.g. `MyBot` produces `[MyBot] INFO: ...` on console, `MyBot_{timestamp}.log` logs, and `MyBot.db` database); omit to use bot's Telegram username for logging and `conversations.db` for database. Use distinct names when running multiple bot instances in the same directory.
    - `token_limit`: Max tokens (optional; defaults to model's maximum)

{tellmgrambot-3.13.4 → tellmgrambot-3.13.5}/TeLLMgramBot/initialize.py

@@ -271,19 +271,22 @@ def _model_provider(model: str) -> str | None:
 def _load_telegram_key(config: dict):
     """
     Load and validate the Telegram API key into TELLMGRAMBOT_TELEGRAM_API_KEY.
-    Lookup order: (1) TELLMGRAMBOT_TELEGRAM_API_KEY env var, (2) bot config
-    telegram_api_key. Exits on placeholder, missing, or malformed key.
+    Lookup order: (1) bot config telegram_api_key, (2) TELLMGRAMBOT_TELEGRAM_API_KEY
+    env var. Config wins when explicitly set so each bot instance uses its own key
+    rather than being silently overridden by a global env var. Exits if the key is
+    missing, malformed, or still unresolved because the config value is a placeholder
+    and no env var fallback is set.
 
     Args:
         config: Parsed bot configuration dict from init_bot_config().
     """
     env_var = 'TELLMGRAMBOT_TELEGRAM_API_KEY'
-    if not os.environ.get(env_var):
-        config_val = (config.get('telegram_api_key') or '').strip()
-        is_placeholder = config_val.startswith('<') and config_val.endswith('>')
-        if config_val and not is_placeholder:
-            os.environ[env_var] = config_val
-        elif is_placeholder:
+    config_val = (config.get('telegram_api_key') or '').strip()
+    is_placeholder = config_val.startswith('<') and config_val.endswith('>')
+    if config_val and not is_placeholder:
+        os.environ[env_var] = config_val
+    elif not os.environ.get(env_var):
+        if is_placeholder:
             sys.exit("telegram_api_key in bot config is still a placeholder. Replace it with your Telegram bot API key. Exiting...")
         else:
             sys.exit(
@@ -416,7 +419,7 @@ def init_bot_config(file: str = 'config.yaml') -> dict:
         for parameter, value in INIT_BOT_CONFIG.items():
             if parameter != 'persona_prompt' and parameter not in config:
                 config[parameter] = value
-                if value is not None:
+                if value is not None and parameter != 'telegram_api_key':
                     logger.warning(f"Configuration '{parameter}' not defined, set to '{value}'")
         return config
     except KeyError:

{tellmgrambot-3.13.4 → tellmgrambot-3.13.5}/TeLLMgramBot.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: TeLLMgramBot
-Version: 3.13.4
+Version: 3.13.5
 Summary: LLM-powered Telegram bot (OpenAI + Anthropic)
 Home-page: https://github.com/Digital-Heresy/TeLLMgramBot
 Author: Digital Heresy
@@ -101,7 +101,7 @@ Override default directory locations by setting these environment variables (use
 If unset, all paths default to subdirectories of the execution directory (the directory containing your entry-point script).
 
 ## API Keys
-TeLLMgramBot supports four API keys. OpenAI, Anthropic, and VirusTotal keys load from environment variables or `.key` files. The Telegram key loads from its env var or the bot config field `telegram_api_key` (no `.key` file):
+TeLLMgramBot supports four API keys. OpenAI, Anthropic, and VirusTotal keys load from environment variables or `.key` files. The Telegram key loads from the bot config field `telegram_api_key` or its env var (no `.key` file); config wins when explicitly set:
 
 | Key | Env Var | File/Config | When required |
 |-----|---------|-------------|---------------|
@@ -150,7 +150,7 @@ When the bot is triggered in a group and about to respond (not deferring to anot
    - `bot_owner`: Telegram username(s) with admin access (required, no `@`). Accepts a single string or a YAML list of usernames.
    - `chat_model`: LLM model for conversation (e.g. `gpt-4o-mini` or `claude-sonnet-4-6`)
    - `url_model`: LLM model for URL analysis (e.g. `gpt-4o` or `claude-haiku-4-5`)
-   - `telegram_api_key`: Telegram bot API key (required). Lookup order: (1) `TELLMGRAMBOT_TELEGRAM_API_KEY` env var, (2) `telegram_api_key` in `config.yaml`. Exits on placeholder, missing, or malformed key.
+   - `telegram_api_key`: Telegram bot API key (required). Lookup order: (1) `telegram_api_key` in `config.yaml`, (2) `TELLMGRAMBOT_TELEGRAM_API_KEY` env var. Config wins when explicitly set. Exits on placeholder, missing, or malformed key.
    - `bot_nickname` / `bot_initials`: Names the bot responds to in groups
    - `instance_name`: Optional label for console prefix, log filename, and database name (e.g. `MyBot` produces `[MyBot] INFO: ...` on console, `MyBot_{timestamp}.log` logs, and `MyBot.db` database); omit to use bot's Telegram username for logging and `conversations.db` for database. Use distinct names when running multiple bot instances in the same directory.
    - `token_limit`: Max tokens (optional; defaults to model's maximum)

{tellmgrambot-3.13.4 → tellmgrambot-3.13.5}/setup.py

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