Update app.py

app.py

@@ -15,44 +15,49 @@ REPO_ID = "huzpsb/heru"
 FILENAME = "qwq_q4k.gguf"
 
 def setup_server():
-    """下载并启动 llama-server，处理动态链接库"""
-    # 1. 下载模型
+    """下载并启动 llama-server，处理动态链接库及符号链接"""
     print(f"[*] Downloading model: {FILENAME}...")
     model_path = hf_hub_download(repo_id=REPO_ID, filename=FILENAME)
 
-    # 2. 下载并完整解压 llama.cpp binary
     if not os.path.exists(BINARY_NAME):
         print("[*] Downloading llama.cpp binary package...")
         response = requests.get(LLAMA_CPP_RELEASE_URL, stream=True)
         with open("llama.tar.gz", "wb") as f:
             f.write(response.content)
-        
-        print("[*] Extracting all files from package...")
+
+        print("[*] Extracting files and handling symlinks...")
         with tarfile.open("llama.tar.gz", "r:gz") as tar:
-            # 找到包含二进制文件的目录（通常在 build/bin/ 下）
-            # 我们直接把所有文件提取到当前目录，简化路径处理
             for member in tar.getmembers():
+                base_name = os.path.basename(member.name)
+                if not base_name: continue # 跳过目录本身
+
                 if member.isfile():
-                    # 只提取 bin 目录下的东西，或者根据你的 release 包结构调整
-                    # 这里的逻辑是：如果是文件，就去掉路径直接放在根目录
-                    member.name = os.path.basename(member.name)
+                    # 提取普通文件并去除路径前缀
+                    member.name = base_name
                     tar.extract(member, path=".")
-        
-        # 赋予主程序执行权限
+                elif member.issym():
+                    # 处理符号链接
+                    link_target = os.path.basename(member.linkname)
+                    # 如果链接已存在，先删除
+                    if os.path.lexists(base_name):
+                        os.remove(base_name)
+                    try:
+                        os.symlink(link_target, base_name)
+                        print(f"[*] Created symlink: {base_name} -> {link_target}")
+                    except OSError as e:
+                        print(f"[!] Failed to create symlink {base_name}: {e}")
+
         if os.path.exists(BINARY_NAME):
             os.chmod(BINARY_NAME, 0o755)
         else:
             raise Exception(f"Could not find {BINARY_NAME} in the extracted files.")
 
-    # 3. 启动后台进程
     print("[*] Starting llama-server with LD_LIBRARY_PATH...")
-    
-    # 关键修改：设置环境变量，让系统在当前目录 (.) 查找 .so 库文件
     new_env = os.environ.copy()
     current_dir = os.getcwd()
-    # 将当前目录加入动态库搜索路径
+    # 确保 LD_LIBRARY_PATH 包含当前目录，以便加载 .so 文件
     new_env["LD_LIBRARY_PATH"] = f"{current_dir}:{new_env.get('LD_LIBRARY_PATH', '')}"
-
+    
     cmd = [
         f"./{BINARY_NAME}",
         "-m", model_path,
@@ -62,18 +67,16 @@ def setup_server():
         "--host", "127.0.0.1"
     ]
     
-    # 传入 env=new_env
     proc = subprocess.Popen(
         cmd,
         stdout=sys.stdout,
         stderr=sys.stderr,
         env=new_env
     )
-    
-    # 4. 健康检查
+
     print("[*] Waiting for server to respond...")
     retries = 0
-    while retries < 60: # 稍微延长等待时间，因为加载库可能变慢
+    while retries < 60:
         try:
             r = requests.get(f"http://127.0.0.1:{SERVER_PORT}/health")
             if r.status_code == 200:
@@ -82,10 +85,8 @@ def setup_server():
         except:
             time.sleep(2)
             retries += 1
-            if retries % 5 == 0:
-                print(f"[*] Still waiting... ({retries}/60)")
     
-    raise Exception("Server failed to start. Check logs above for missing .so files.")
+    raise Exception("Server failed to start. Check logs for missing .so files.")
 
 # 初始化
 server_process = setup_server()