Update models_manager_v8.4.py

models_manager_v8.4.py

@@ -317,6 +317,9 @@ class ModelsManager(tk.Tk):
         # 3. 管理全局 KV
         ttk.Button(top, text="🔧 管理全局 KV", command=self.open_fields_manager).pack(side="left", padx=6)
 
+        # 🌟 新增：删除选中条目
+        ttk.Button(top, text="❌ 删除选中", command=self.delete_selected_item).pack(side="left", padx=6)
+
         # 4. 加载本地
         ttk.Button(top, text="📂 加载本地 models.json", command=self.load_local).pack(side="left", padx=6)
         
@@ -471,6 +474,25 @@ class ModelsManager(tk.Tk):
 
         ttk.Label(win, text="注意：操作会直接修改内存中的数据，完成后再去点【保存本地】", foreground="red").pack(pady=10)
 
+    def delete_selected_item(self):
+        """从内存中删除选中的条目"""
+        sel = self.tree.focus()
+        if not sel or sel not in self.items:
+            messagebox.showwarning("提示", "请先在表格中选中要删除的条目！")
+            return
+            
+        if not messagebox.askyesno("确认删除", f"确定要删除这条记录吗？\n\n{sel}\n\n注意：这只会从本地 JSON 中移除，不会删除云端实际的模型文件。"):
+            return
+            
+        # 从内存中移除
+        self.items.pop(sel, None)
+        
+        # 如果它恰好是新增的，也从 new_paths 里移除
+        if sel in self.new_paths:
+            self.new_paths.remove(sel)
+            
+        self.log_json(f"🗑️ 已在本地删除条目: {sel}")
+        self.refresh_tree()
     def open_dataset_repo(self):
         import webbrowser
         webbrowser.open(f"https://huggingface.co/datasets/{DATASET_REPO_ID}/tree/main")
@@ -626,7 +648,17 @@ class ModelsManager(tk.Tk):
                 meta.get("showcase", "")
             ]
             for col in dynamic_cols:
-                row_values.append(meta.get(col, ""))
+                val = meta.get(col, "")
+                # 🌟 新增：如果列名是 update_time，把毫秒时间戳转成可读日期展示
+                if col == "update_time" and val:
+                    try:
+                        # 转换成本地时间的 YYYY-MM-DD 格式
+                        import datetime
+                        dt = datetime.datetime.fromtimestamp(int(val) / 1000.0)
+                        val = dt.strftime('%Y-%m-%d')
+                    except Exception:
+                        pass
+                row_values.append(val)
 
             self.tree.insert("", "end", iid=path, text=path, values=row_values, tags=tags)
 
@@ -747,19 +779,32 @@ class ModelsManager(tk.Tk):
         
         # 🌟 核心修改：深拷贝一份用于上传
         upload_items = copy.deepcopy(sorted_items)
+
+        # 🌟 精准时间戳策略：只为从未有过时间戳的新文件打上当前时间，老文件保留原本时间
+        import time
+        current_ts = int(time.time() * 1000)
         
         for path, meta in upload_items.items():
             if not isinstance(meta, dict): continue
             
-            if meta.get("dataset"):
-                meta["dataset"] = meta["dataset"].replace(f"{DATASET_BASE}/", "").replace(DATASET_BASE, "")
+            # 只给全新文件（没有 update_time）打时间戳，绝不覆盖历史时间
+            if not meta.get("update_time"):
+                meta["update_time"] = current_ts
+            
+            # 剥离前缀
+            if meta.get("dataset") and meta["dataset"].startswith(DATASET_BASE):
+                stripped = meta["dataset"][len(DATASET_BASE):].lstrip("/")
+                if stripped: meta["dataset"] = stripped
             
             if meta.get("showcase"):
-                prefix = f"{MODEL_BASE}/tree/main/{SHOWCASE_DIR}/"
-                meta["showcase"] = meta["showcase"].replace(prefix, "")
+                prefix = f"{MODEL_BASE}/tree/main/{SHOWCASE_DIR}"
+                if meta["showcase"].startswith(prefix):
+                    stripped = meta["showcase"][len(prefix):].lstrip("/")
+                    if stripped: meta["showcase"] = stripped
                 
-            if meta.get("guide"):
-                meta["guide"] = meta["guide"].replace(f"{GUIDE_BASE}/", "").replace(GUIDE_BASE, "")
+            if meta.get("guide") and meta["guide"].startswith(GUIDE_BASE):
+                stripped = meta["guide"][len(GUIDE_BASE):].lstrip("/")
+                if stripped: meta["guide"] = stripped
 
         tmp = TEMP_UPLOAD_JSON
         with open(tmp, "w", encoding="utf-8") as f:
@@ -1150,15 +1195,13 @@ class ModelsManager(tk.Tk):
             try:
                 from huggingface_hub import CommitOperationAdd
                 
-                # 🌟 开始上传，禁用按钮，重置进度条
                 self.after(0, lambda: self.btn_upload.configure(state="disabled"))
                 self.after(0, lambda: self.progress_var.set(0))
-                self.after(0, lambda: self.status_model_var.set("正在打包并上传..."))
+                self.after(0, lambda: self.status_model_var.set("正在上传模型文件..."))
 
-                # 1. 准备操作列表
+                # ========== 步骤 1：上传物理文件 ==========
                 operations = []
                 for local_file, remote_path in to_upload:
-                    # 极度关键：防止 Windows 反斜杠导致远端多建文件夹
                     safe_remote_path = remote_path.replace("\\", "/")
                     operations.append(
                         CommitOperationAdd(
@@ -1167,55 +1210,141 @@ class ModelsManager(tk.Tk):
                         )
                     )
                 
-                # 2. 准备 commit message
                 remote_dir = self.remote_dir_var.get().strip().replace("\\", "/").strip("/")
                 commit_msg = f"Upload files to {remote_dir}" if remote_dir else "Upload files to root"
-                
-                self.log_model(f"开始打包 {len(operations)} 个文件，一次性 Commit...")
-                self.log_model(f"Commit message: {commit_msg}")
 
-                # 🌟 3. 假进度条控制变量
                 is_uploading = [True]
                 def update_progress():
-                    if not is_uploading[0]: return # 如果上传结束，停止动画
+                    if not is_uploading[0]: return
                     current = self.progress_var.get()
-                    # 慢慢爬升到 95%，最后留 5% 给真正完成时冲刺
                     if current < 95: 
                         self.progress_var.set(current + 2)
                         self.after(300, update_progress)
-                
-                self.after(100, update_progress) # 启动动画
+                self.after(100, update_progress)
 
-                # 4. 一次性提交多个文件 (同步阻塞操作)
+                self.log_model(f"开始打包 {len(operations)} 个文件，一次性 Commit...")
                 api.create_commit(
                     repo_id=MODEL_REPO_ID,
                     repo_type="model",
                     operations=operations,
                     commit_message=commit_msg
                 )
+                self.log_model("模型文件上传成功！正在同步 models.json...")
 
-                # 🌟 5. 上传成功：停止动画，进度条瞬间满格
+                # ========== 步骤 2：拉取云端最新 JSON ==========
+                self.after(0, lambda: self.status_model_var.set("正在拉取云端最新 JSON..."))
+                
+                space_subdomain = SPACE_ID.replace("/", "-").replace("_", "-").lower()
+                url = f"https://{space_subdomain}.static.hf.space/models.json"
+                
+                latest_remote_items = {}
+                try:
+                    req = urllib.request.Request(url, headers={'User-Agent': 'Mozilla/5.0'})
+                    with urllib.request.urlopen(req, timeout=HTTP_TIMEOUT) as response:
+                        remote_data = json.loads(response.read().decode())
+                        latest_remote_items = remote_data.get("items", {})
+                    self.log_model(f"成功拉取云端 JSON，包含 {len(latest_remote_items)} 条记录。")
+                except Exception as e:
+                    self.log_model(f"拉取云端 JSON 失败，放弃本次同步以防止覆盖: {e}")
+                    raise e # 如果拉取失败，直接中断，绝不用空数据覆盖！
+
+                # ========== 步骤 3：精准追加新条目 ==========
+                import time
+                current_ts = int(time.time() * 1000)
+                added_count = 0
+                
+                for local_file, remote_path in to_upload:
+                    safe_remote_path = remote_path.replace("\\", "/")
+                    
+                    # 🚨 绝对严格过滤：只有 .safetensors 才配进入 models.json
+                    if not safe_remote_path.endswith(".safetensors"):
+                        continue
+                        
+                    # 如果云端已经有这个模型了，更新它的时间；如果没有，则新增
+                    if safe_remote_path in latest_remote_items:
+                        latest_remote_items[safe_remote_path]["update_time"] = current_ts
+                    else:
+                        latest_remote_items[safe_remote_path] = {
+                            "title": "", "trigger": "", "dataset": "", "showcase": "", "update_time": current_ts
+                        }
+                    added_count += 1
+                
+                self.log_model(f"已为 {added_count} 个新增模型写入时间戳。")
+
+                # 按原有逻辑重新排序
+                sorted_items = {k: latest_remote_items[k] for k in sorted(latest_remote_items.keys(), key=custom_sort_key)}
+
+                # ========== 步骤 4：剥离前缀并推送 ==========
+                if added_count > 0:
+                    self.after(0, lambda: self.status_model_var.set("正在推送到云端..."))
+                    
+                    # 补全 URL 后存入本地（保持本地数据完整）
+                    self.items = sorted_items
+                    expand_urls(self.items)
+                    self.save_local_silent()
+                    self.after(0, self.refresh_tree)
+
+                    # 深拷贝用于剥离上传
+                    import copy
+                    upload_items = copy.deepcopy(sorted_items)
+                    for p, meta in upload_items.items():
+                        if not isinstance(meta, dict): continue
+                        
+                        if meta.get("dataset") and meta["dataset"].startswith(DATASET_BASE):
+                            stripped = meta["dataset"][len(DATASET_BASE):].lstrip("/")
+                            if stripped: meta["dataset"] = stripped
+                        if meta.get("showcase"):
+                            prefix = f"{MODEL_BASE}/tree/main/{SHOWCASE_DIR}"
+                            if meta["showcase"].startswith(prefix):
+                                stripped = meta["showcase"][len(prefix):].lstrip("/")
+                                if stripped: meta["showcase"] = stripped
+                        if meta.get("guide") and meta["guide"].startswith(GUIDE_BASE):
+                            stripped = meta["guide"][len(GUIDE_BASE):].lstrip("/")
+                            if stripped: meta["guide"] = stripped
+
+                    tmp_json = TEMP_UPLOAD_JSON
+                    with open(tmp_json, "w", encoding="utf-8") as f:
+                        json.dump({"items": upload_items}, f, indent=2, ensure_ascii=False)
+
+                    api.upload_file(
+                        path_or_fileobj=tmp_json,
+                        path_in_repo=OUTPUT_FILE,
+                        repo_id=SPACE_ID,
+                        repo_type="space",
+                        commit_message=f"Update JSON for new model(s)"
+                    )
+                    try: os.remove(tmp_json)
+                    except OSError: pass
+                    
+                    self.log_model("models.json 已同步更新到云端！")
+
+                # ========== 步骤 5：收尾 ==========
                 is_uploading[0] = False
                 self.after(0, lambda: self.progress_var.set(100))
                 self.after(0, lambda: self.status_model_var.set("上传完成 ✅"))
                 self.after(0, lambda: self.btn_upload.configure(state="normal"))
-
-                self.log_model("打包上传成功！")
-                self.after(0, lambda: messagebox.showinfo("完成", "上传成功！"))
-                self.after(0, self.load_remote) # 自动刷新 JSON
                 
+                self.after(0, lambda: messagebox.showinfo("完成", "模型与 JSON 均已安全同步！"))
+
             except Exception as e:
-                # 🌟 失败时：停止动画，重置进度条，恢复按钮
                 is_uploading[0] = False
                 self.after(0, lambda: self.progress_var.set(0))
                 self.after(0, lambda: self.btn_upload.configure(state="normal"))
-                self.after(0, lambda: self.status_model_var.set("上传失败 ❌"))
-                
-                self.log_exc("打包上传失败", is_model=True)
+                self.after(0, lambda: self.status_model_var.set("执行失败 ❌"))
+                self.log_exc("上传或同步失败", is_model=True)
                 self.after(0, lambda: messagebox.showerror("失败", "详见日志"))
 
         threading.Thread(target=upload_worker, daemon=True).start()
 
+
+    def save_local_silent(self):
+        """静默保存本地 JSON，不弹出提示框"""
+        data_items = {k: v for k, v in self.items.items() if k not in self.stale_paths}
+        sorted_items = {k: data_items[k] for k in sorted(data_items.keys(), key=custom_sort_key)}
+        with open(OUTPUT_FILE, "w", encoding="utf-8") as f:
+            json.dump({"items": sorted_items}, f, indent=2, ensure_ascii=False)
+        self.log_json(f"已静默保存本地 {OUTPUT_FILE}，{len(sorted_items)} 条")
+
     # ==========================================================
     # ==================== 区域 3: Dataset 上传 =================
     # ==========================================================