Update app.py

app.py

@@ -6,8 +6,7 @@ import numpy as np
 import onnxruntime as rt
 import pandas as pd
 from PIL import Image
-from huggingface_hub import whoami, get_space_runtime, HfApi
-from huggingface_hub.hf_api import SpaceRuntime
+from huggingface_hub import whoami, get_space_runtime
 
 from translator import translate_texts
 
@@ -19,6 +18,8 @@ MODEL_FILENAME = "model.onnx"
 LABEL_FILENAME = "selected_tags.csv"
 
 HF_TOKEN = os.environ.get("HF_TOKEN")
+# 新增：从环境变量读取访问密码
+ACCESS_PASSWORD = os.environ.get("ACCESS_PASSWORD")
 
 # ------------------------------------------------------------------
 # Tagger 类 (全局实例化)
@@ -89,7 +90,6 @@ class Tagger:
                         tag_name = self.tag_names[idx].replace("_", " ")
                         sub_res[tag_name] = float(outputs[idx])
 
-            # Use the correct key for 'character'
             res_key = "characters" if cat_key == "character" else cat_key
             res[res_key] = dict(sorted(sub_res.items(), key=lambda kv: kv[1], reverse=True))
             tag_categories_for_translation[res_key] = list(res[res_key].keys())
@@ -146,15 +146,13 @@ with gr.Blocks(theme=gr.themes.Soft(), title="AI 图像标签分析器", css=cus
     gr.Markdown("# 🖼️ AI 图像标签分析器")
     gr.Markdown("上传图片自动识别标签，支持中英文显示和一键复制。[NovelAI在线绘画](https://nai.idlecloud.cc/)")
     
-    with gr.Row():
-        with gr.Column(scale=1):
-            login_button = gr.LoginButton(value="🤗 通过 Hugging Face 登录")
-            user_status_md = gr.Markdown("ℹ️ 正在检查登录状态...")
+    # 登录状态显示
+    user_status_md = gr.Markdown("ℹ️ 正在检查登录状态...")
     
     state_res = gr.State({})
     state_translations_dict = gr.State({})
 
-    with gr.Row():
+    with gr.Row(visible=False) as main_interface: # 默认隐藏主界面
         with gr.Column(scale=1):
             img_in = gr.Image(type="pil", label="上传图片", height=300)
             btn = gr.Button("🚀 开始分析", variant="primary", elem_classes=["btn-analyze-container"])
@@ -164,8 +162,9 @@ with gr.Blocks(theme=gr.themes.Soft(), title="AI 图像标签分析器", css=cus
                 char_slider = gr.Slider(0, 1, value=0.85, step=0.01, label="角色标签阈值")
                 show_tag_scores = gr.Checkbox(True, label="在列表中显示标签置信度")
 
-            with gr.Accordion("🔑 自定义翻译密钥 (可选)", open=False, visible=False) as api_key_accordion:
-                gr.Markdown("如果你不是空间所有者，需要在这里提供自己的API密钥才能使用翻译功能。")
+            with gr.Accordion("🔑 翻译密钥设置", open=True):
+                gr.Markdown("输入访问密码可使用空间配置的密钥，否则请提供您自己的密钥。")
+                access_password_in = gr.Textbox(label="访问密码 (可选)", type="password", lines=1)
                 tencent_id_in = gr.Textbox(label="腾讯云 Secret ID", lines=1)
                 tencent_key_in = gr.Textbox(label="腾讯云 Secret Key", lines=1, type="password")
                 baidu_json_in = gr.Textbox(label="百度翻译凭证 (JSON 格式)", lines=3, placeholder='[{"app_id": "...", "secret_key": "..."}]')
@@ -192,37 +191,20 @@ with gr.Blocks(theme=gr.themes.Soft(), title="AI 图像标签分析器", css=cus
             return auth_header.split(" ")[1]
         return None
 
-    def check_user_is_owner(user_info: dict | None, space_runtime: SpaceRuntime | None) -> bool:
-        """检查用户是否是空间的所有者（处理个人和组织空间）。"""
-        if not user_info or not space_runtime:
-            return False
-        
-        # 情况1：空间由用户直接拥有
-        if user_info.get("name") == space_runtime.owner:
-            return True
-            
-        # 情况2：空间由用户所属的组织拥有
-        user_orgs = user_info.get("orgs", [])
-        if any(org.get("name") == space_runtime.owner for org in user_orgs):
-            return True
-            
-        return False
-
     def check_user_status(request: gr.Request):
         token = get_token_from_request(request)
         if token:
             try:
                 user_info = whoami(token=token)
-                space_runtime = get_space_runtime()
-                
-                if check_user_is_owner(user_info, space_runtime):
-                    return f"✅ 以所有者 **{user_info.get('fullname', user_info.get('name'))}** 身份登录，将使用空间配置的密钥。", gr.update(visible=False)
-                else:
-                    return f"👋 你好, **{user_info.get('fullname', '用户')}**！请在下方提供你自己的翻译 API 密钥。", gr.update(visible=True, open=True)
+                welcome_msg = f"✅ 您好, **{user_info.get('fullname', user_info.get('name'))}**！欢迎使用本应用。"
+                return welcome_msg, gr.update(visible=True) # 显示主界面
             except Exception as e:
-                print(f"��取用户信息时出错: {e}")
-                return "⚠️ 无法验证您的登录状态。请提供 API 密钥。", gr.update(visible=True, open=True)
-        return "ℹ️ **访客模式**。如需使用翻译功能，请<a href='/login?redirect=/'>登录</a>或提供 API 密钥。", gr.update(visible=True, open=True)
+                print(f"Token 无效或已过期: {e}")
+        
+        # 未登录或Token无效
+        login_url = "/login?redirect=/"
+        msg = f"**<p style='color:red; text-align:center;'>🚫 检测到您尚未登录，请先 <a href='{login_url}' target='_top'>[点击此处登录]</a> 后刷新页面。</p>**"
+        return msg, gr.update(visible=False) # 隐藏主界面
         
     def format_tags_html(tags_dict, translations_list, show_scores):
         if not tags_dict: return "<p>暂无标签</p>"
@@ -253,10 +235,12 @@ with gr.Blocks(theme=gr.themes.Soft(), title="AI 图像标签分析器", css=cus
     # ----------------- 主要处理回调 -----------------
     def process_image_and_generate_outputs(
         img, g_th, c_th, s_scores,
-        user_tencent_id, user_tencent_key, user_baidu_json,
+        access_pwd, user_tencent_id, user_tencent_key, user_baidu_json,
         sum_cats, s_sep, s_zh_in_sum,
         request: gr.Request
     ):
+        if get_token_from_request(request) is None:
+            raise gr.Error("错误：您的登录会话已失效，请刷新页面后重试。")
         if img is None:
             raise gr.Error("请先上传图片。")
         if tagger_instance is None:
@@ -264,19 +248,12 @@ with gr.Blocks(theme=gr.themes.Soft(), title="AI 图像标签分析器", css=cus
 
         yield gr.update(interactive=False, value="🔄 处理中..."), gr.update(visible=True, value="🔄 正在分析..."), *["<p>分析中...</p>"]*3, "分析中...", {}, {}
 
-        token = get_token_from_request(request)
-        is_owner = False
-        if token:
-            try:
-                user_info = whoami(token=token)
-                space_runtime = get_space_runtime()
-                if check_user_is_owner(user_info, space_runtime):
-                    is_owner = True
-            except Exception: pass
+        # 密钥决策逻辑
+        use_space_keys = bool(ACCESS_PASSWORD and access_pwd == ACCESS_PASSWORD)
         
         final_tencent_id, final_tencent_key, baidu_json_str = (
             (os.environ.get("TENCENT_SECRET_ID"), os.environ.get("TENCENT_SECRET_KEY"), os.environ.get("BAIDU_CREDENTIALS_JSON", "[]"))
-            if is_owner else (user_tencent_id, user_tencent_key, user_baidu_json)
+            if use_space_keys else (user_tencent_id, user_tencent_key, user_baidu_json)
         )
         
         final_baidu_creds_list = []
@@ -305,7 +282,7 @@ with gr.Blocks(theme=gr.themes.Soft(), title="AI 图像标签分析器", css=cus
             outputs_html = {k: format_tags_html(res.get(k, {}), translations.get(k, []), s_scores) for k in ["general", "characters", "ratings"]}
             summary = generate_summary_text_content(res, translations, sum_cats, s_sep, s_zh_in_sum)
 
-            yield gr.update(interactive=True, value="🚀 开始分析"), gr.update(visible=True, value="✅ 分析完成!"), outputs_html["general"], outputs_html["characters"], outputs_html["ratings"], summary, res, translations
+            yield gr.update(interactive=True, value="🚀 开始分析"), gr.update(visible=True, value="✅ 分析完成! " + ("(使用空间密钥)" if use_space_keys else "(使用自定义密钥)")), outputs_html["general"], outputs_html["characters"], outputs_html["ratings"], summary, res, translations
             
         except Exception as e:
             import traceback
@@ -313,13 +290,13 @@ with gr.Blocks(theme=gr.themes.Soft(), title="AI 图像标签分析器", css=cus
             raise gr.Error(f"处理时发生错误: {e}")
 
     # ----------------- 绑定事件 -----------------
-    demo.load(fn=check_user_status, inputs=None, outputs=[user_status_md, api_key_accordion], queue=False)
+    demo.load(fn=check_user_status, inputs=None, outputs=[user_status_md, main_interface], queue=False)
     
     btn.click(
         process_image_and_generate_outputs,
         inputs=[
             img_in, gen_slider, char_slider, show_tag_scores,
-            tencent_id_in, tencent_key_in, baidu_json_in,
+            access_password_in, tencent_id_in, tencent_key_in, baidu_json_in,
             sum_cats, sum_sep, sum_show_zh
         ],
         outputs=[
@@ -341,5 +318,4 @@ with gr.Blocks(theme=gr.themes.Soft(), title="AI 图像标签分析器", css=cus
 if __name__ == "__main__":
     if tagger_instance is None:
         print("CRITICAL: Tagger 未能初始化，应用功能将受限。")
-    demo.launch(server_name="0.0.0.0", server_port=7860)
-
+    demo.launch(server_name="0.0.0.0", server_port=7860)