Deploy emergent2api

emergent2api/app.py

@@ -124,10 +124,18 @@ async def health():
     return {"status": "ok", "accounts": count}
 
 
-# Legacy import endpoint (backward compat for CI push)
+# Legacy import endpoint (backward compat for CI push, requires API key)
 @app.post("/admin/accounts/import-jsonl")
 async def admin_import_jsonl(request: Request):
-    """Import accounts from JSONL text. Body: {jsonl: "..."} or raw JSONL body."""
+    """Import accounts from JSONL text. Body: {jsonl: "..."} or raw JSONL body.
+    Requires API key via Authorization header or x-api-key header.
+    """
+    auth_header = request.headers.get("authorization", "")
+    api_key = request.headers.get("x-api-key", "")
+    token = auth_header[7:] if auth_header.startswith("Bearer ") else api_key
+    if token != settings.api_key:
+        return JSONResponse(status_code=401, content={"error": "Invalid API key"})
+
     content_type = request.headers.get("content-type", "")
     if "application/json" in content_type:
         body = await request.json()
@@ -153,6 +161,7 @@ async def admin_import_jsonl(request: Request):
             errors.append({"line": i + 1, "error": "invalid JSON"})
         except Exception as e:
             errors.append({"line": i + 1, "error": str(e)})
+    logger.info(f"Legacy import: {imported} accounts imported, {len(errors)} errors")
     return {"imported": imported, "total_lines": len(lines), "errors": errors}
 
 

emergent2api/models.py

@@ -129,7 +129,22 @@ class AnthropicRequest(BaseModel):
     stream: bool = False
     temperature: Optional[float] = None
     top_p: Optional[float] = None
-    system: Optional[str] = None
+    system: Optional[Union[str, list[Any]]] = None
+
+    @property
+    def system_text(self) -> str:
+        """Normalize system to plain string (handles list-of-blocks format)."""
+        if self.system is None:
+            return ""
+        if isinstance(self.system, str):
+            return self.system
+        parts = []
+        for block in self.system:
+            if isinstance(block, dict):
+                parts.append(block.get("text", ""))
+            elif isinstance(block, str):
+                parts.append(block)
+        return "\n".join(parts)
 
 
 class AnthropicContentBlock(BaseModel):

emergent2api/routes/anthropic.py

@@ -45,8 +45,9 @@ async def messages(request: Request):
 
     # Build messages list (prepend system if present)
     messages = []
-    if req.system:
-        messages.append({"role": "system", "content": req.system})
+    system_text = req.system_text
+    if system_text:
+        messages.append({"role": "system", "content": system_text})
     for m in req.messages:
         messages.append({"role": m.role, "content": m.content})
 

emergent2api/static/admin/index.html

@@ -320,7 +320,12 @@ for chunk in client.chat.completions.create(
 <div class="overlay" id="dlg-import">
 <div class="dialog">
   <h3>导入 Token</h3>
-  <div class="sub">粘贴 JSONL — 每行一个账号（email, password, jwt 必填）</div>
+  <div class="sub">粘贴 JSONL / 上传 .jsonl 文件 / 拖放文件 — 每行一个账号（email, password, jwt 必填）</div>
+  <div id="import-dropzone" style="border:2px dashed var(--border2);border-radius:8px;padding:20px;text-align:center;margin-bottom:12px;cursor:pointer;transition:border-color .2s,background .2s;color:var(--text3);font-size:13px">
+    <div style="margin-bottom:8px"><svg width="32" height="32" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"/><polyline points="17 8 12 3 7 8"/><line x1="12" y1="3" x2="12" y2="15"/></svg></div>
+    <div>拖放 .jsonl / .zip 文件到此处，或 <label style="color:var(--accent);cursor:pointer;text-decoration:underline">选择文件<input type="file" id="import-file" accept=".jsonl,.json,.txt,.zip" style="display:none" multiple></label></div>
+    <div id="import-file-info" style="margin-top:8px;color:var(--accent);font-weight:500;display:none"></div>
+  </div>
   <textarea id="import-text" placeholder='{"email":"...","password":"...","jwt":"..."}'></textarea>
   <div class="dialog-foot">
     <button class="tbtn" onclick="closeImport()">取消</button>
@@ -431,12 +436,68 @@ async function batchDeactivate(){
   if(r){const d=await r.json();toast(`已停用 ${d.updated} 个`)}sel.clear();load();
 }
 
-function openImport(){$('dlg-import').classList.add('open')}
-function closeImport(){$('dlg-import').classList.remove('open')}
+let _importFiles=[];
+function openImport(){_importFiles=[];$('import-text').value='';$('import-file').value='';$('import-file-info').style.display='none';$('dlg-import').classList.add('open')}
+function closeImport(){$('dlg-import').classList.remove('open');_importFiles=[]}
+
+// File drop zone
+(function(){
+  const dz=$('import-dropzone'),fi=$('import-file');
+  dz.addEventListener('dragover',e=>{e.preventDefault();dz.style.borderColor='var(--accent)';dz.style.background='rgba(201,122,71,.06)'});
+  dz.addEventListener('dragleave',()=>{dz.style.borderColor='';dz.style.background=''});
+  dz.addEventListener('drop',e=>{e.preventDefault();dz.style.borderColor='';dz.style.background='';handleImportFiles(e.dataTransfer.files)});
+  fi.addEventListener('change',()=>handleImportFiles(fi.files));
+  // Paste file support on the entire dialog
+  $('dlg-import').addEventListener('paste',e=>{
+    const items=e.clipboardData?.items;if(!items)return;
+    const files=[];
+    for(let i=0;i<items.length;i++){if(items[i].kind==='file'){files.push(items[i].getAsFile())}}
+    if(files.length)handleImportFiles(files);
+  });
+})();
+
+function handleImportFiles(fileList){
+  _importFiles=Array.from(fileList);
+  const info=$('import-file-info');
+  if(_importFiles.length){
+    info.textContent=_importFiles.map(f=>`${f.name} (${(f.size/1024).toFixed(1)} KB)`).join(', ');
+    info.style.display='block';
+    // Auto-read text files into textarea for preview
+    const textFiles=_importFiles.filter(f=>!f.name.endsWith('.zip'));
+    if(textFiles.length){
+      Promise.all(textFiles.map(f=>f.text())).then(texts=>{
+        const existing=$('import-text').value.trim();
+        const combined=[existing,...texts].filter(Boolean).join('\n');
+        $('import-text').value=combined;
+      });
+    }
+  }else{info.style.display='none'}
+}
+
 async function doImport(){
-  const t=$('import-text').value.trim();if(!t){toast('Paste JSONL data');return}
-  const r=await api('/tokens/import',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({jsonl:t})});
-  if(r){const d=await r.json();toast(`导入 ${d.imported} 个`+(d.errors.length?`，${d.errors.length} 个错误`:''));closeImport();load()}
+  const zipFiles=_importFiles.filter(f=>f.name.endsWith('.zip'));
+  const textContent=$('import-text').value.trim();
+  if(!textContent&&!zipFiles.length){toast('请粘贴 JSONL 数据或上传文件');return}
+
+  let totalImported=0,totalErrors=0;
+
+  // Import zip files via /tokens/import-zip
+  for(const zf of zipFiles){
+    try{
+      const buf=await zf.arrayBuffer();
+      const r=await api('/tokens/import-zip',{method:'POST',headers:{'Content-Type':'application/octet-stream'},body:buf});
+      if(r){const d=await r.json();totalImported+=d.imported||0;totalErrors+=(d.errors||[]).length}
+    }catch(e){toast('Zip 导入失败: '+e.message)}
+  }
+
+  // Import JSONL text
+  if(textContent){
+    const r=await api('/tokens/import',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({jsonl:textContent})});
+    if(r){const d=await r.json();totalImported+=d.imported||0;totalErrors+=(d.errors||[]).length}
+  }
+
+  toast(`导入 ${totalImported} 个`+(totalErrors?`，${totalErrors} 个错误`:''));
+  closeImport();load();
 }
 async function doExport(){const r=await api('/tokens/export');if(!r)return;const b=await r.blob();const a=document.createElement('a');a.href=URL.createObjectURL(b);a.download='emergent_tokens.zip';a.click()}