Update app.py
Browse files
app.py
CHANGED
|
@@ -30,6 +30,7 @@ CONFIG_FILE = os.path.join(LOCAL_DIR, "openclaw.json")
|
|
| 30 |
AGENT_DIR = os.path.join(LOCAL_DIR, "agents", "main", "agent")
|
| 31 |
SESSION_DIR = os.path.join(LOCAL_DIR, "agents", "main", "sessions")
|
| 32 |
CREDENTIALS_DIR = os.path.join(LOCAL_DIR, "credentials")
|
|
|
|
| 33 |
|
| 34 |
SYNC_INTERVAL = 300
|
| 35 |
|
|
@@ -94,8 +95,9 @@ def check_secrets():
|
|
| 94 |
|
| 95 |
def restore_memory():
|
| 96 |
if not DATASET_REPO: return
|
| 97 |
-
logger.info(f"📥 [System] 正在恢复记忆...")
|
| 98 |
try:
|
|
|
|
| 99 |
snapshot_download(repo_id=DATASET_REPO, repo_type="dataset", local_dir=LOCAL_DIR, ignore_patterns=["openclaw.json", "auth-profiles.json", "agents/*/auth-profiles.json"])
|
| 100 |
logger.info("✅ [System] 记忆恢复成功")
|
| 101 |
except Exception as e:
|
|
@@ -146,17 +148,17 @@ def generate_config():
|
|
| 146 |
|
| 147 |
user_id_val = str(TELEGRAM_USER_ID)
|
| 148 |
|
| 149 |
-
# 【核心配置】
|
| 150 |
config = {
|
|
|
|
| 151 |
"env": {
|
| 152 |
-
"
|
| 153 |
-
"
|
| 154 |
},
|
| 155 |
"models": {
|
| 156 |
"providers": {
|
| 157 |
-
"
|
| 158 |
-
|
| 159 |
-
"api": "openai-completions",
|
| 160 |
"baseUrl": "https://generativelanguage.googleapis.com/v1beta/openai/",
|
| 161 |
"apiKey": GOOGLE_API_KEY,
|
| 162 |
"models": [
|
|
@@ -172,7 +174,8 @@ def generate_config():
|
|
| 172 |
"agents": {
|
| 173 |
"defaults": {
|
| 174 |
"model": {
|
| 175 |
-
|
|
|
|
| 176 |
}
|
| 177 |
}
|
| 178 |
},
|
|
@@ -192,7 +195,7 @@ def generate_config():
|
|
| 192 |
|
| 193 |
with open(CONFIG_FILE, "w") as f:
|
| 194 |
json.dump(config, f, indent=2)
|
| 195 |
-
logger.info(f"✅ [System] 主配置文件已生成 (
|
| 196 |
try:
|
| 197 |
os.chmod(CONFIG_FILE, 0o600)
|
| 198 |
os.chmod(LOCAL_DIR, 0o700)
|
|
|
|
| 30 |
AGENT_DIR = os.path.join(LOCAL_DIR, "agents", "main", "agent")
|
| 31 |
SESSION_DIR = os.path.join(LOCAL_DIR, "agents", "main", "sessions")
|
| 32 |
CREDENTIALS_DIR = os.path.join(LOCAL_DIR, "credentials")
|
| 33 |
+
AGENT_AUTH_FILE = os.path.join(AGENT_DIR, "auth-profiles.json")
|
| 34 |
|
| 35 |
SYNC_INTERVAL = 300
|
| 36 |
|
|
|
|
| 95 |
|
| 96 |
def restore_memory():
|
| 97 |
if not DATASET_REPO: return
|
| 98 |
+
logger.info(f"📥 [System] 正在恢复记忆到 {LOCAL_DIR}...")
|
| 99 |
try:
|
| 100 |
+
# 排除配置
|
| 101 |
snapshot_download(repo_id=DATASET_REPO, repo_type="dataset", local_dir=LOCAL_DIR, ignore_patterns=["openclaw.json", "auth-profiles.json", "agents/*/auth-profiles.json"])
|
| 102 |
logger.info("✅ [System] 记忆恢复成功")
|
| 103 |
except Exception as e:
|
|
|
|
| 148 |
|
| 149 |
user_id_val = str(TELEGRAM_USER_ID)
|
| 150 |
|
| 151 |
+
# 【核心配置】劫持内置 OpenAI Provider
|
| 152 |
config = {
|
| 153 |
+
# 环境变量注入标准 OpenAI Key 变量名,防止它去读别的
|
| 154 |
"env": {
|
| 155 |
+
"OPENAI_API_KEY": GOOGLE_API_KEY,
|
| 156 |
+
"GOOGLE_API_KEY": GOOGLE_API_KEY
|
| 157 |
},
|
| 158 |
"models": {
|
| 159 |
"providers": {
|
| 160 |
+
# 直接覆盖 "openai" 这个 ID,它是 OpenClaw 的一等公民
|
| 161 |
+
"openai": {
|
|
|
|
| 162 |
"baseUrl": "https://generativelanguage.googleapis.com/v1beta/openai/",
|
| 163 |
"apiKey": GOOGLE_API_KEY,
|
| 164 |
"models": [
|
|
|
|
| 174 |
"agents": {
|
| 175 |
"defaults": {
|
| 176 |
"model": {
|
| 177 |
+
# 引用我们劫持后的 provider
|
| 178 |
+
"primary": "openai/gemini-1.5-flash"
|
| 179 |
}
|
| 180 |
}
|
| 181 |
},
|
|
|
|
| 195 |
|
| 196 |
with open(CONFIG_FILE, "w") as f:
|
| 197 |
json.dump(config, f, indent=2)
|
| 198 |
+
logger.info(f"✅ [System] 主配置文件已生成 (Hijacked OpenAI Provider)")
|
| 199 |
try:
|
| 200 |
os.chmod(CONFIG_FILE, 0o600)
|
| 201 |
os.chmod(LOCAL_DIR, 0o700)
|