Update app.py

app.py

@@ -2,21 +2,9 @@ import gradio as gr
 import pandas as pd
 import json
 import os
-import tempfile
-from huggingface_hub import HfApi, upload_file, hf_hub_download
-import streamlit as st
 
 # --- Configuration & Helpers ---
-# 检查是否在 HF Spaces 环境中
-IS_HF_SPACE = os.getenv("SPACE_ID") is not None
-
-if IS_HF_SPACE:
-    # HF Spaces 环境：使用临时目录
-    DATA_DIR = tempfile.mkdtemp()
-    print(f"Running in HF Spaces. Using temp directory: {DATA_DIR}")
-else:
-    # 本地环境：使用当前目录
-    DATA_DIR = '.'
+DATA_DIR = '.' # Directory to scan for JSON files (current directory)
 
 def find_json_files(directory):
     """Finds all .json files in the specified directory."""
@@ -26,32 +14,12 @@ def find_json_files(directory):
     except FileNotFoundError:
         return []
 
-def create_sample_files():
-    """在 HF Spaces 环境中创建示例文件"""
-    if IS_HF_SPACE:
-        sample_data = [
-            {"Name": "Sample1", "Title": "Example Title 1", "Params": "param1=value1"},
-            {"Name": "Sample2", "Title": "Example Title 2", "Params": "param2=value2"}
-        ]
-        
-        sample_file = os.path.join(DATA_DIR, "sample.json")
-        try:
-            with open(sample_file, 'w', encoding='utf-8') as f:
-                json.dump(sample_data, f, indent=2, ensure_ascii=False)
-            print(f"Created sample file: {sample_file}")
-        except Exception as e:
-            print(f"Error creating sample file: {e}")
-
-def refresh_file_list():
-    """刷新文件列表，返回更新后的选择器"""
-    available_files = find_json_files(DATA_DIR)
-    return gr.Dropdown(choices=available_files)
-
 # --- Data Processing Functions ---
 
 def load_data(selected_file):
     """Loads data from the selected JSON file into a Pandas DataFrame."""
     if not selected_file:
+        # No file selected, return empty DataFrame and instructions
         df = pd.DataFrame(columns=['Name', 'Title', 'Params'])
         status = "Please select a JSON file from the dropdown to load."
         return df, status
@@ -59,21 +27,26 @@ def load_data(selected_file):
     file_path = os.path.join(DATA_DIR, selected_file)
 
     if not os.path.exists(file_path):
+        # Should not happen if dropdown is populated correctly, but handle anyway
         df = pd.DataFrame(columns=['Name', 'Title', 'Params'])
         status = f"Error: File '{selected_file}' not found in '{DATA_DIR}'."
         return df, status
     else:
         try:
+            # Handle empty file case
             if os.path.getsize(file_path) == 0:
                 df = pd.DataFrame(columns=['Name', 'Title', 'Params'])
                 status = f"'{selected_file}' is empty. Displaying empty table. You can add rows and save."
                 return df, status
 
-            df = pd.read_json(file_path, orient='records', dtype=str)
+            # Try reading JSON
+            df = pd.read_json(file_path, orient='records', dtype=str) # Read all as string initially
+            # Ensure required columns exist, fill missing with empty strings
             df = df.reindex(columns=['Name', 'Title', 'Params'], fill_value='')
+            # Fill any remaining NaN/None values just in case
             df = df.fillna('')
             status = f"Data loaded successfully from '{selected_file}'."
-        except ValueError as e:
+        except ValueError as e: # Handles JSON decoding errors or incorrect format
              print(f"Error loading JSON from {selected_file}: {e}")
              df = pd.DataFrame(columns=['Name', 'Title', 'Params'])
              status = f"Error loading '{selected_file}': Invalid JSON format or structure ({e}). Displaying empty table."
@@ -82,6 +55,7 @@ def load_data(selected_file):
             df = pd.DataFrame(columns=['Name', 'Title', 'Params'])
             status = f"Unexpected error loading '{selected_file}': {e}. Displaying empty table."
 
+    # Ensure consistent string type for display
     df['Name'] = df['Name'].astype(str)
     df['Title'] = df['Title'].astype(str)
     df['Params'] = df['Params'].astype(str)
@@ -91,17 +65,9 @@ def load_data(selected_file):
 def save_data_internal(data_list, file_path):
     """Writes a Python list to a specific JSON file path."""
     try:
-        # 确保目录存在
-        os.makedirs(os.path.dirname(file_path), exist_ok=True)
-        
         with open(file_path, 'w', encoding='utf-8') as f:
             json.dump(data_list, f, indent=2, ensure_ascii=False)
-        
-        # 验证文件是否成功写入
-        if os.path.exists(file_path) and os.path.getsize(file_path) > 0:
-            return True, f"Data saved successfully to '{os.path.basename(file_path)}'."
-        else:
-            return False, f"Failed to write data to '{os.path.basename(file_path)}'."
+        return True, f"Data saved successfully to '{os.path.basename(file_path)}'."
     except Exception as e:
         print(f"Error saving JSON to {file_path}: {e}")
         return False, f"Error saving data to '{os.path.basename(file_path)}': {e}"
@@ -116,108 +82,51 @@ def save_data(dataframe, selected_file):
     file_path = os.path.join(DATA_DIR, selected_file)
 
     try:
+        # Convert DataFrame to list of dictionaries
+        # Replace empty strings potentially introduced by editing back to None for cleaner JSON
+        # but keep actual 'Params' JSON strings even if empty {}
         data_list = dataframe.to_dict(orient='records')
-        
+
+        # Clean data: Remove None values, ensure required keys exist
         cleaned_data = []
         for item in data_list:
-            cleaned_item = {k: v for k, v in item.items() if v is not None or k == 'Params'}
+             # Only keep key if value is not None, unless it's 'Params' which can be an empty string '{}' etc.
+            cleaned_item = {k: v for k, v in item.items() if v is not None or k == 'Params'} # Keep params even if empty string
+            # Ensure standard keys exist, defaulting to empty string if missing after None removal
             cleaned_item.setdefault('Name', '')
             cleaned_item.setdefault('Title', '')
             cleaned_item.setdefault('Params', '')
             cleaned_data.append(cleaned_item)
 
-        success, status = save_data_internal(cleaned_data, file_path)
-        
-        if IS_HF_SPACE and success:
-            status += " (Note: Changes are temporary in HF Spaces and will be lost on restart)"
-        
+
+        _, status = save_data_internal(cleaned_data, file_path)
         return status
     except Exception as e:
         print(f"Error preparing data for saving to {selected_file}: {e}")
         return f"Error preparing data for saving to '{selected_file}': {e}"
 
-def create_new_file(filename):
-    """创建新的 JSON 文件"""
-    if not filename:
-        return "Error: Please enter a filename."
-    
-    if not filename.endswith('.json'):
-        filename += '.json'
-    
-    file_path = os.path.join(DATA_DIR, filename)
-    
-    if os.path.exists(file_path):
-        return f"Error: File '{filename}' already exists."
-    
-    try:
-        # 创建空的 JSON 文件
-        with open(file_path, 'w', encoding='utf-8') as f:
-            json.dump([], f)
-        
-        available_files = find_json_files(DATA_DIR)
-        return f"File '{filename}' created successfully.", gr.Dropdown(choices=available_files, value=filename)
-    except Exception as e:
-        return f"Error creating file '{filename}': {e}", gr.Dropdown()
-
-def save_and_refresh(dataframe, selected_file):
-    """保存数据并刷新文件列表"""
-    save_status = save_data(dataframe, selected_file)
-    available_files = find_json_files(DATA_DIR)
-    return save_status, gr.Dropdown(choices=available_files, value=selected_file)
-
-def refresh_files_and_reload(selected_file):
-    """刷新文件列表并重新加载当前选中的文件"""
-    available_files = find_json_files(DATA_DIR)
-    if selected_file and selected_file in available_files:
-        df, status = load_data(selected_file)
-        return gr.Dropdown(choices=available_files, value=selected_file), df, status
-    else:
-        df = pd.DataFrame(columns=['Name', 'Title', 'Params'])
-        status = "File list refreshed. Please select a file."
-        return gr.Dropdown(choices=available_files), df, status
-
-# --- 初始化 ---
-# 在 HF Spaces 环境中创建示例文件
-if IS_HF_SPACE:
-    create_sample_files()
+# --- Gradio Interface Definition ---
 
 # Find available JSON files at startup
 available_files = find_json_files(DATA_DIR)
 
-# --- Gradio Interface Definition ---
-
 with gr.Blocks() as app:
-    if IS_HF_SPACE:
-        gr.Markdown("""
-        # Multi-JSON Data Editor (HF Spaces Demo)
-        ⚠️ **Note**: This is running on Hugging Face Spaces. Changes are temporary and will be lost when the space restarts.
-        For persistent storage, download your files or use a local installation.
-        """)
-    else:
-        gr.Markdown(f"""
-        # Multi-JSON Data Editor
-        Select a JSON file from the dropdown to load, view, edit, and save data.
-        Files are scanned from the directory: `{os.path.abspath(DATA_DIR)}`
-        """)
+    gr.Markdown(f"""
+    # Multi-JSON Data Editor
+    Select a JSON file from the dropdown to load, view, edit, and save data.
+    Files are scanned from the directory: `{os.path.abspath(DATA_DIR)}`
+    """)
 
     # Status Textbox
     status_text = gr.Textbox(label="Status", interactive=False, value="Select a file to begin.")
 
-    # File management section
-    with gr.Row():
-        with gr.Column(scale=3):
-            file_selector = gr.Dropdown(
-                choices=available_files,
-                label="Select JSON File",
-                info="Choose the JSON file you want to edit.",
-                interactive=True
-            )
-        with gr.Column(scale=1):
-            new_filename = gr.Textbox(
-                label="New File Name",
-                placeholder="Enter filename (without .json)",
-                interactive=True
-            )
+    # File Selector Dropdown
+    file_selector = gr.Dropdown(
+        choices=available_files,
+        label="Select JSON File",
+        info="Choose the JSON file you want to edit.",
+        interactive=True
+    )
 
     # DataFrame for Editing
     data_df = gr.DataFrame(
@@ -231,50 +140,34 @@ with gr.Blocks() as app:
 
     # Action Buttons
     with gr.Row():
-        refresh_button = gr.Button("🔄 Refresh File List")
-        load_button = gr.Button("📂 Reload Selected File")
-        save_button = gr.Button("💾 Save Changes")
-        create_button = gr.Button("📄 Create New File")
+        # Load button might be redundant if dropdown change triggers load, but can be useful for refresh
+        load_button = gr.Button("🔄 Reload Selected File")
+        save_button = gr.Button("💾 Save Changes to Selected File")
 
     # --- Event Handling ---
 
+    # When the dropdown selection changes, load the corresponding file
     file_selector.change(
         fn=load_data,
         inputs=file_selector,
         outputs=[data_df, status_text]
     )
 
-    refresh_button.click(
-        fn=refresh_files_and_reload,
-        inputs=file_selector,
-        outputs=[file_selector, data_df, status_text]
-    )
-
+    # Button click events - they use the currently selected file from the dropdown
     load_button.click(
         fn=load_data,
-        inputs=file_selector,
+        inputs=file_selector, # Pass the current dropdown value
         outputs=[data_df, status_text]
     )
-    
     save_button.click(
-        fn=save_and_refresh,
-        inputs=[data_df, file_selector],
-        outputs=[status_text, file_selector]
-    )
-
-    create_button.click(
-        fn=create_new_file,
-        inputs=new_filename,
-        outputs=[status_text, file_selector]
+        fn=save_data,
+        inputs=[data_df, file_selector], # Pass current DataFrame AND current dropdown value
+        outputs=status_text
     )
 
 # --- Launch the App ---
 if __name__ == "__main__":
-    if not available_files and not IS_HF_SPACE:
+    if not available_files:
         print(f"Warning: No .json files found in the directory '{os.path.abspath(DATA_DIR)}'.")
         print("Create some .json files in the directory and restart the application.")
-    
-    app.launch(
-        share=False if IS_HF_SPACE else True,
-        server_name="0.0.0.0" if IS_HF_SPACE else "127.0.0.1"
-    )
+    app.launch()