From 5eac3c1027b579070287320ec8ff31c8b89b6f1d Mon Sep 17 00:00:00 2001
From: Liang Jiaqing <l.j.q.light@gmail.com>
Date: Sat, 7 Mar 2026 23:33:13 +0800
Subject: [PATCH] refactor: unified mykeys dict, support mykey.py and
 mykey.json dual format

---
 sidercall.py | 22 +++++++++-------------
 tgapp.py     |  8 ++++----
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/sidercall.py b/sidercall.py
index 5aa3ae0..94ede5e 100644
--- a/sidercall.py
+++ b/sidercall.py
@@ -2,10 +2,15 @@ import os, json, re, time, requests, sys, threading, urllib3
 from datetime import datetime
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 
-try: import mykey
-except: raise Exception('[ERROR] mykey.py not found, please copy mykey_template.py to mykey.py and fill your LLM backend.')
+def _load_mykeys():
+    try:
+        import mykey; return {k: v for k, v in vars(mykey).items() if not k.startswith('_')}
+    except ImportError: pass
+    p = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'mykey.json')
+    if not os.path.exists(p): raise Exception('[ERROR] mykey.py or mykey.json not found, please create one from mykey_template.')
+    with open(p, encoding='utf-8') as f: return json.load(f)
 
-mykeys = vars(mykey)
+mykeys = _load_mykeys()
 proxy = mykeys.get("proxy", 'http://127.0.0.1:2082')
 proxies = {"http": proxy, "https": proxy} if proxy else None
 
@@ -506,18 +511,9 @@ def tryparse(json_str):
     return json.loads(json_str)
 
 if __name__ == "__main__":
-    import sys, os
-    sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-    try:
-        import mykey
-    except ImportError:
-        class MockMyKey: pass
-        mykey = MockMyKey()
-    
-    mykeys = vars(mykey)
     sider_cookie = mykeys.get("sider_cookie")
     oai_configs = {
-        k: v for k, v in vars(mykey).items() if k.startswith("oai_config") and v
+        k: v for k, v in mykeys.items() if k.startswith("oai_config") and v
     }
     google_api_key = mykeys.get("google_api_key")
     cfg = oai_configs.get("oai_config")
diff --git a/tgapp.py b/tgapp.py
index 0560128..8ccb75d 100644
--- a/tgapp.py
+++ b/tgapp.py
@@ -8,11 +8,11 @@ try:
 except:
     print("Please ask the agent install python-telegram-bot to use telegram module.")
     sys.exit(1)
-import mykey
+from sidercall import mykeys
 
 agent = GeneraticAgent()
 agent.verbose = False
-ALLOWED = set(getattr(mykey, 'tg_allowed_users', []))
+ALLOWED = set(mykeys.get('tg_allowed_users', []))
 
 _TAG_PATS = [r'<' + t + r'>.*?</' + t + r'>' for t in ('thinking', 'summary', 'tool_use')]
 _TAG_PATS.append(r'<file_content>.*?</file_content>')
@@ -124,7 +124,7 @@ if __name__ == '__main__':
     sys.stdout = sys.stderr = _logf
     print('[NEW] New process starting, the above are history infos ...')
     threading.Thread(target=agent.run, daemon=True).start()
-    proxy = vars(mykey).get('proxy', 'http://127.0.0.1:2082')
+    proxy = mykeys.get('proxy', 'http://127.0.0.1:2082')
     print('proxy:', proxy)
 
     async def _error_handler(update, context: ContextTypes.DEFAULT_TYPE):
@@ -136,7 +136,7 @@ if __name__ == '__main__':
             # Recreate request and app objects on each restart to avoid stale connections
             request = HTTPXRequest(proxy=proxy, read_timeout=30, write_timeout=30, connect_timeout=30, pool_timeout=30)
             app = (ApplicationBuilder()
-                   .token(mykey.tg_bot_token)
+                   .token(mykeys['tg_bot_token'])
                    .request(request)
                    .get_updates_request(request)
                    .build())