From ead42063f40c8d4806d159114016158fd7242aea Mon Sep 17 00:00:00 2001 From: Liang Jiaqing Date: Sun, 1 Feb 2026 09:45:14 +0800 Subject: [PATCH] Auto-commit: sync local changes --- agentapp.py | 12 ++++++++---- gmail_utils.py | 0 mykey_template.py | 7 +++++++ sidercall.py | 13 ++++++------- 4 files changed, 21 insertions(+), 11 deletions(-) delete mode 100644 gmail_utils.py create mode 100644 mykey_template.py diff --git a/agentapp.py b/agentapp.py index ffc7bbe..add16f3 100644 --- a/agentapp.py +++ b/agentapp.py @@ -18,10 +18,14 @@ from agent_loop import agent_runner_loop, StepOutcome, BaseHandler @st.cache_resource def init(): if not os.path.exists('temp'): os.makedirs('temp') - llm_sessions = [SiderLLMSession(default_model="gemini-3.0-flash"), - SiderLLMSession(default_model="gpt-5-mini"), - SiderLLMSession(default_model="claude-4.5-haiku"), - LLMSession()] + from sidercall import sider_cookie, oai_apikey, oai_apibase + llm_sessions = [] + if sider_cookie: llm_sessions += [SiderLLMSession(default_model=x) for x in \ + ["gemini-3.0-flash", "claude-4.5-haiku", "gpt-5-mini"]] + if oai_apikey: llm_sessions += [LLMSession(api_key=oai_apikey, api_base=oai_apibase)] + if len(llm_sessions) == 0: + st.error("⚠️ 未配置任何可用的 LLM 接口,请在 mykey.py 中添加 sider_cookie 或 oai_apikey+oai_apibase 等信息后重启。") + st.stop() llmclient = ToolClient([x.ask for x in llm_sessions], auto_save_tokens=True) return llmclient diff --git a/gmail_utils.py b/gmail_utils.py deleted file mode 100644 index e69de29..0000000 diff --git a/mykey_template.py b/mykey_template.py new file mode 100644 index 0000000..a5b1d5e --- /dev/null +++ b/mykey_template.py @@ -0,0 +1,7 @@ + +oai_apikey = 'sk-uklUR...' +oai_apibase = "http://113.345.339.347:3001/v1" + +# or + +sider_cookie = 'token=Bearer%20eyJhbGciOiJIUz...' diff --git a/sidercall.py b/sidercall.py index 6c78a1d..ee7b572 100644 --- a/sidercall.py +++ b/sidercall.py @@ -1,14 +1,13 @@ import os, json, re, time, requests from sider_ai_api import Session -try: - from mykey import sider_cookie, capikey -except ImportError: - sider_cookie = "" - capikey = "" +try: from mykey import sider_cookie +except ImportError: sider_cookie = "" +try: from mykey import oai_apikey, oai_apibase +except ImportError: oai_apikey = oai_apibase = "" class SiderLLMSession: - def __init__(self, multiturns=6, default_model="gemini-3.0-flash"): + def __init__(self, default_model="gemini-3.0-flash"): self._core = Session(cookie=sider_cookie, proxies={'https':'127.0.0.1:2082'}) self.default_model = default_model def ask(self, prompt, model=None): @@ -19,7 +18,7 @@ class SiderLLMSession: return ''.join(self._core.chat(prompt, model)) class LLMSession: - def __init__(self, api_key=capikey, api_base="http://113.45.39.247:3001/v1", multiturns=6, context_win=32000): + def __init__(self, api_key=oai_apikey, api_base=oai_apibase, context_win=32000): self.api_key = api_key self.api_base = api_base self.raw_msgs = []