TeLLMgramBot 3.13.4__tar.gz → 3.13.6__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: TeLLMgramBot
-Version: 3.13.4
+Version: 3.13.6
 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.6}/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.6}/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.6}/TeLLMgramBot/tools.py

@@ -203,8 +203,8 @@ async def discover_mcp_tools(
     """
     Discover tools from MCP server(s) and return them ready to merge into the registry.
 
-    For each entry with an 'mcp_server:' key, calls POST /tools/list to fetch the
-    server's tool list, translates MCP inputSchema to provider-compatible parameters,
+    For each entry with an 'mcp_server:' key, sends a JSON-RPC 2.0 tools/list request
+    to the server base URL, translates MCP inputSchema to provider-compatible parameters,
     and returns (schemas, defs) for the discovered tools.
 
     Headers support $ENV_VAR expansion. Missing env vars disable the MCP source with a
@@ -215,7 +215,7 @@ async def discover_mcp_tools(
     it registers all tools. Name collisions with existing_names (or with each other across
     MCP sources) are skipped with a warning; first-registered wins.
 
-    SSRF guard applies to the tools/list call: loopback and link-local addresses are blocked
+    SSRF guard applies to the discovery call: loopback and link-local addresses are blocked
     unless allow_local is True.
 
     Args:
@@ -287,16 +287,25 @@ async def discover_mcp_tools(
                 continue
             include_set = set(include_filter)
 
-        list_url = f"{server_url}/tools/list"
         try:
             async with httpx.AsyncClient(timeout=15.0) as client:
-                resp = await client.post(list_url, headers=expanded_headers)
+                resp = await client.post(
+                    server_url,
+                    json={"jsonrpc": "2.0", "id": 1, "method": "tools/list", "params": {}},
+                    headers=expanded_headers,
+                )
             if not (200 <= resp.status_code < 300):
                 logger.warning(
                     f"MCP server '{log_url}': tools/list returned HTTP {resp.status_code}; skipping source."
                 )
                 continue
-            tools_data = resp.json().get('tools', [])
+            resp_data = resp.json()
+            if resp_data.get('error'):
+                err = resp_data['error']
+                err_summary = f"code={err.get('code')} {err.get('message', '')}" if isinstance(err, dict) else str(err)[:100]
+                logger.warning(f"MCP server '{log_url}': tools/list error {err_summary}; skipping source.")
+                continue
+            tools_data = resp_data.get('result', {}).get('tools', [])
         except httpx.TimeoutException:
             logger.warning(f"MCP server '{log_url}': tools/list timed out; skipping source.")
             continue
@@ -358,8 +367,8 @@ async def execute_mcp(tool_def: dict, arguments: dict) -> str:
     """
     Execute an MCP tool call and return a framed result string for LLM injection.
 
-    Posts to {mcp_server}/tools/call with the tool name and arguments dict, parses
-    the MCP content array from the response, and frames the result for LLM injection.
+    Sends a JSON-RPC 2.0 tools/call request to the server base URL, parses the MCP
+    content array from the result field, and frames the result for LLM injection.
 
     Applies the same SSRF guard as execute_webhook(). Request headers are never
     logged at any level. Response bodies are logged at DEBUG only, truncated to 200
@@ -390,15 +399,15 @@ async def execute_mcp(tool_def: dict, arguments: dict) -> str:
             f"Set allow_local_webhooks: true in bot config to permit local addresses.]"
         )
 
-    call_url = f"{server_url}/tools/call"
-    log_url = _safe_log_url(call_url)
+    log_url = _safe_log_url(server_url)
     logger.info(f"MCP '{name}': POST {log_url}")
 
     try:
         async with httpx.AsyncClient(timeout=15.0) as client:
             resp = await client.post(
-                call_url,
-                json={"name": name, "arguments": arguments},
+                server_url,
+                json={"jsonrpc": "2.0", "id": 1, "method": "tools/call",
+                      "params": {"name": name, "arguments": arguments}},
                 headers=headers,
             )
 
@@ -411,7 +420,12 @@ async def execute_mcp(tool_def: dict, arguments: dict) -> str:
 
         try:
             data = resp.json()
-            content_items = data.get('content', [])
+            if data.get('error'):
+                err = data['error']
+                err_summary = f"code={err.get('code')} {err.get('message', '')}" if isinstance(err, dict) else str(err)[:100]
+                logger.warning(f"MCP '{name}': JSON-RPC error {err_summary}")
+                return f"[Tool error: '{name}' returned error: {err.get('message', err)}]"
+            content_items = data.get('result', {}).get('content', [])
             body = '\n'.join(
                 item.get('text', '') for item in content_items
                 if isinstance(item, dict) and item.get('type') == 'text'

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: TeLLMgramBot
-Version: 3.13.4
+Version: 3.13.6
 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.6}/setup.py

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