Update models_manager_v8.4.py

models_manager_v8.4.py

@@ -51,15 +51,30 @@ IMG_EXTS = {".jpg", ".jpeg", ".png", ".webp"}
 HTTP_TIMEOUT = 20
 # ==========================================
 
-TOP_ORDER = {"krea2": 1, "anima": 2, "flux1_dev": 3, "pony": 4, "sd15": 5}
-SUB_ORDER = {"CN": 1, "KR": 2, "JP": 3, "Fictional": 4, "WE": 5, "Heels": 6,}
+# 🌟 动态加载的排序规则
+TOP_ORDER = {}
+SUB_ORDER = {}
 IMG_EXTS = {".jpg", ".jpeg", ".png", ".webp"}
 
-def custom_sort_key(file_path):
+def custom_sort_key(item_tuple):
+    file_path, meta = item_tuple
     parts = file_path.split('/')
     top_dir = parts[0] if len(parts) > 0 else ""
     sub_dir = parts[1] if len(parts) > 1 else ""
-    return (TOP_ORDER.get(top_dir, 999), SUB_ORDER.get(sub_dir, 999), file_path)
+    
+    ts = 0
+    if isinstance(meta, dict):
+        try:
+            ts = int(meta.get("update_time", 0))
+        except (ValueError, TypeError):
+            ts = 0
+
+    return (
+        TOP_ORDER.get(top_dir, 999), 
+        SUB_ORDER.get(sub_dir, 999), 
+        -ts, 
+        file_path
+    )
 
 def expand_urls(items_dict):
     """自动为精简版数据补齐完整的 HF 前缀（仅对不包含 http 的相对路径生效）"""
@@ -513,12 +528,16 @@ class ModelsManager(tk.Tk):
             self.log_json(f"读取失败: {e}")
             return
 
-        self.items = data.get("items", {})
-        if not self.items and "titles" in data:
-            self.items = {k: {"title": v, "trigger": "", "dataset": ""} for k, v in data["titles"].items()}
+        items = data.get("items", {})
+        if not items and "titles" in data:
+            items = {k: {"title": v, "trigger": "", "dataset": ""} for k, v in data["titles"].items()}
         
         # 🌟 补齐前缀
-        expand_urls(self.items)
+        expand_urls(items)
+
+        # 🌟 核心修改：强制按分类 + 时间戳倒序重排
+        sorted_items = dict(sorted(items.items(), key=custom_sort_key))
+        self.items = sorted_items
 
         self.new_paths = set()
         self.stale_paths = set()
@@ -534,8 +553,33 @@ class ModelsManager(tk.Tk):
         threading.Thread(target=self._load_remote_worker, args=(token,), daemon=True).start()
 
     def _load_remote_worker(self, token):
+        global TOP_ORDER, SUB_ORDER
         try:
             api = HfApi(token=token) if token else HfApi()
+
+            # 🌟 核心新增：先拉取 site_config.json，动态生成排序规则
+            try:
+                self.log_json("正在拉取 site_config.json 以同步排序规则...")
+                config_path = api.hf_hub_download(repo_id=SPACE_ID, filename=SITE_CONFIG_FILE, repo_type="space")
+                with open(config_path, "r", encoding="utf-8") as f:
+                    site_config = json.load(f)
+                
+                # 根据数组顺序生成 { key: index } 的字典
+                top_list = site_config.get("models", [])
+                top_dict = {item["key"]: idx + 1 for idx, item in enumerate(top_list) if "key" in item}
+                
+                sub_list = site_config.get("categories", [])
+                sub_dict = {item["key"]: idx + 1 for idx, item in enumerate(sub_list) if "key" in item}
+                
+                if top_dict:
+                    TOP_ORDER = top_dict
+                if sub_dict:
+                    SUB_ORDER = sub_dict
+                    
+                self.log_json(f"✅ 排序规则已更新: Models有{len(top_dict)}个, Categories有{len(sub_dict)}个")
+            except Exception as e:
+                self.log_json(f"⚠️ 拉取 site_config 失败，将使用默认空排序: {e}")
+
             t0 = time.time()
             all_files = list(api.list_repo_files(repo_id=MODEL_REPO_ID, repo_type="model"))
             remote_files = [f for f in all_files if f.endswith(".safetensors")]
@@ -570,7 +614,7 @@ class ModelsManager(tk.Tk):
             for p in stale_paths:
                 merged[p] = existing_items[p]
             
-            items = {k: merged[k] for k in sorted(merged.keys(), key=custom_sort_key)}
+            items = dict(sorted(merged.items(), key=custom_sort_key))
             self.log_json(f"步骤3: 合并 {len(items)} 条，新增 {len(new_paths)}，失效 {len(stale_paths)}")
 
             self.after(0, lambda: self._apply_remote(items, remote_files, new_paths, stale_paths))
@@ -580,11 +624,24 @@ class ModelsManager(tk.Tk):
         finally:
             self.after(0, self._finish_loading)
 
+    # def _apply_remote(self, items, remote_files, new_paths, stale_paths):
+    #     # 补齐前缀
+    #     expand_urls(items) 
+
+    #     self.items = items
+    #     self.remote_files = remote_files
+    #     self.new_paths = new_paths
+    #     self.stale_paths = stale_paths
+    #     self.refresh_tree()
+
     def _apply_remote(self, items, remote_files, new_paths, stale_paths):
         # 补齐前缀
         expand_urls(items) 
 
-        self.items = items
+        # 🌟 核心修改：强制���分类 + 时间戳倒序重排
+        sorted_items = dict(sorted(items.items(), key=custom_sort_key))
+        self.items = sorted_items
+
         self.remote_files = remote_files
         self.new_paths = new_paths
         self.stale_paths = stale_paths
@@ -763,7 +820,7 @@ class ModelsManager(tk.Tk):
 
     def save_local(self):
         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)}
+        sorted_items = dict(sorted(data_items.items(), 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)} 条")
@@ -775,8 +832,7 @@ class ModelsManager(tk.Tk):
 
         import copy
         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)}
-        
+        sorted_items = dict(sorted(data_items.items(), key=custom_sort_key))
         # 🌟 核心修改：深拷贝一份用于上传
         upload_items = copy.deepcopy(sorted_items)
 
@@ -925,7 +981,7 @@ class ModelsManager(tk.Tk):
         """剥离绝对前缀，生成精简版，绝不污染内存"""
         import copy
         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)}
+        sorted_items = dict(sorted(data_items.items(), key=custom_sort_key))
         
         # 🌟 核心修改：深拷贝一份，只对拷贝体动手
         upload_items = copy.deepcopy(sorted_items)
@@ -1272,7 +1328,8 @@ class ModelsManager(tk.Tk):
                 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)}
+                # sorted_items = {k: latest_remote_items[k] for k in sorted(latest_remote_items.keys(), key=custom_sort_key)}
+                sorted_items = dict(sorted(latest_remote_items.items(), key=custom_sort_key))
 
                 # ========== 步骤 4：剥离前缀并推送 ==========
                 if added_count > 0:
@@ -1340,7 +1397,7 @@ class ModelsManager(tk.Tk):
     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)}
+        sorted_items = dict(sorted(data_items.items(), 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)} 条")