Upload 2 files

Dockerfile

@@ -1,11 +1,26 @@
 FROM ghcr.io/open-webui/open-webui:main
 
+# 安装Redis
+RUN apt-get update && apt-get install -y redis-server
+
+# 修改Redis配置和权限
+RUN mkdir -p /var/run/redis && \
+   chown -R 1000:1000 /var/run/redis && \
+   chown -R 1000:1000 /var/lib/redis && \
+   chmod 777 /var/run/redis
+
+# 创建启动Redis的脚本
+RUN echo "#!/bin/bash" > redis-start.sh && \
+   echo "redis-server --daemonize yes --save '' --appendonly no" >> redis-start.sh && \
+   echo "sleep 2" >> redis-start.sh && \
+   echo "echo 'Redis status:'" >> redis-start.sh && \
+   echo "redis-cli ping" >> redis-start.sh
+
 ENV TZ=Asia/Shanghai
 #ENV UID=1000
 #ENV GID=1000
 ENV ENABLE_AUTH=True
 ENV WEBUI_AUTH=True
-ENV ENABLE_SIGNUP=false
 
 ENV DEFAULT_MODELS=gpt-4o-mini
 ENV RAG_EMBEDDING_ENGINE=openai
@@ -26,28 +41,12 @@ ENV ENABLE_REALTIME_CHAT_SAVE=false
 
 # 数据同步相关
 ENV SYNC_INTERVAL=600
-ENV DATASET_ID=deeme/ui
-
-RUN apt-get update && apt-get install -y python3 python3-pip redis-server
-RUN pip3 install --no-cache-dir huggingface_hub
-
-# 修改Redis配置和权限
-RUN mkdir -p /var/run/redis && \
-   chown -R 1000:1000 /var/run/redis && \
-   chown -R 1000:1000 /var/lib/redis && \
-   chmod 777 /var/run/redis
-
-# 创建启动Redis的脚本
-RUN echo "#!/bin/bash" > redis-start.sh && \
-   echo "redis-server --daemonize yes --save '' --appendonly no" >> redis-start.sh && \
-   echo "sleep 2" >> redis-start.sh && \
-   echo "echo 'Redis status:'" >> redis-start.sh && \
-   echo "redis-cli ping" >> redis-start.sh
 
 COPY sync_data.sh sync_data.sh
 
 RUN chmod -R 777 ./data && \
+    chmod -R 777 ./open_webui && \
     chmod -R 777 /app/backend/open_webui/static && \
     chmod +x sync_data.sh && \
     sed -i "1r sync_data.sh" ./start.sh && \
-    sed -i "1r redis-start.sh" ./start.sh
+    sed -i "1r redis-start.sh" ./start.sh

sync_data.sh

@@ -1,111 +1,110 @@
-# 检查环境变量
-if [ -z "$HF_TOKEN" ] || [ -z "$DATASET_ID" ]; then
-    echo "缺少必要的环境变量 HF_TOKEN 或 DATASET_ID"
+# 检查必要的环境变量
+if [ -z "$G_NAME" ] || [ -z "$G_TOKEN" ]; then
+    echo "缺少必要的环境变量 G_NAME 或 G_TOKEN"
     exit 1
 fi
 
-# 上传备份
-cat > /tmp/hf_sync.py << 'EOL'
-from huggingface_hub import HfApi
-import sys
-import os
+# 解析仓库名和用户名
+IFS='/' read -r GITHUB_USER GITHUB_REPO <<< "$G_NAME"
 
-def manage_backups(api, repo_id, max_files=50):
-    files = api.list_repo_files(repo_id=repo_id, repo_type="dataset")
-    backup_files = [f for f in files if f.startswith('webui_backup_') and f.endswith('.db')]
-    backup_files.sort()
-    
-    if len(backup_files) >= max_files:
-        files_to_delete = backup_files[:(len(backup_files) - max_files + 1)]
-        for file_to_delete in files_to_delete:
-            try:
-                api.delete_file(path_in_repo=file_to_delete, repo_id=repo_id, repo_type="dataset")
-                print(f'已删除旧备份: {file_to_delete}')
-            except Exception as e:
-                print(f'删除 {file_to_delete} 时出错: {str(e)}')
+# 构建 GitHub 仓库的克隆 URL，包含令牌
+REPO_URL="https://${G_TOKEN}@github.com/${G_NAME}.git"
+mkdir -p  ./data/github_data
+# 克隆仓库
+echo "正在克隆仓库……"
+git clone "$REPO_URL" ./data/github_data || {
+    echo "克隆失败，请检查 G_NAME 和 G_TOKEN 是否正确。"
+    exit 1
+}
 
-def upload_backup(file_path, file_name, token, repo_id):
-    api = HfApi(token=token)
-    try:
-        api.upload_file(
-            path_or_fileobj=file_path,
-            path_in_repo=file_name,
-            repo_id=repo_id,
-            repo_type="dataset"
-        )
-        print(f"成功上传 {file_name}")
-        
-        manage_backups(api, repo_id)
-    except Exception as e:
-        print(f"文件上传出错: {str(e)}")
+if [ -f ./data/github_data/webui.db ]; then
+    cp ./data/github_data/webui.db ./data/webui.db
+    echo "从 GitHub 仓库中拉取成功"
+else
+    echo "GitHub 仓库中未找到 webui.db，将在同步时推送"
+fi
 
-# 下载最新备份
-def download_latest_backup(token, repo_id):
-    try:
-        api = HfApi(token=token)
-        files = api.list_repo_files(repo_id=repo_id, repo_type="dataset")
-        backup_files = [f for f in files if f.startswith('webui_backup_') and f.endswith('.db')]
-        
-        if not backup_files:
-            print("未找到备份文件")
-            return
-            
-        latest_backup = sorted(backup_files)[-1]
+# 定义同步函数
+sync_data() {
+    while true; do
+        # 1. 同步到 GitHub
+        echo "正在开始同步"
+        # 进入仓库目录
+        cd ./data/github_data
+        # 配置 Git 用户信息
+        git config user.name "AutoSync Bot"
+        git config user.email "autosync@bot.com"
+
+        # 确保在正确的分支
+        git checkout main || git checkout master
+
+        # 复制最新的数据库文件
+        # cp ../webui.db ./webui.db
         
-        filepath = api.hf_hub_download(
-            repo_id=repo_id,
-            filename=latest_backup,
-            repo_type="dataset"
-        )
+        if [ -f "../webui.db" ]; then  
+            cp ../webui.db ./webui.db  
+        else  
+            echo "数据库尚未初始化"  
+        fi 
         
-        if filepath and os.path.exists(filepath):
-            os.makedirs('./data', exist_ok=True)
-            os.system(f'cp "{filepath}" ./data/webui.db')
-            print(f"成功从 {latest_backup} 恢复备份")
-                
-    except Exception as e:
-        print(f"下载备份时出错: {str(e)}")
+        # 检查是否有变化
+        if [[ -n $(git status -s) ]]; then
+            # 添加所有变更
+            git add webui.db
 
-if __name__ == "__main__":
-    action = sys.argv[1]
-    token = sys.argv[2]
-    repo_id = sys.argv[3]
-    
-    if action == "upload":
-        file_path = sys.argv[4]
-        file_name = sys.argv[5]
-        upload_backup(file_path, file_name, token, repo_id)
-    elif action == "download":
-        download_latest_backup(token, repo_id)
-EOL
+            # 提交变更
+            git commit -m "Auto sync webui.db $(date '+%Y-%m-%d %H:%M:%S')"
+
+            # 推送到远程仓库
+            git push origin HEAD && {
+                echo "GitHub推送成功"
+            }|| {
+                echo "推送失败，等待重试..."
+                sleep 10
+                git push origin HEAD || {
+                    echo "重试失败，放弃推送到Github。"
+                }
+            }
+            # 返回上级目录
+            cd ..
+            cd ..
+
+            # 2. 同步到 WebDAV
+            if [ -z "$WEBDAV_URL" ] || [ -z "$WEBDAV_USERNAME" ] || [ -z "$WEBDAV_PASSWORD" ]; then
+                echo "WebDAV 环境变量缺失，跳过 WebDAV 同步。"
+            else
+                echo "同步到 WebDAV..."
+                FILENAME="webui_$(date +'%m_%d').db"
+                # 检查是否存在要上传的文件
+                if [ -f ./data/webui.db ]; then
+                    # 使用 curl 进行文件上传
+                    curl -T ./data/webui.db --user "$WEBDAV_USERNAME:$WEBDAV_PASSWORD" "$WEBDAV_URL/$FILENAME" && {
+                        echo "WebDAV 上传成功"
+                    } || {
+                        echo "WebDAV 上传失败，等待重试..."
+                        sleep 10
+                        curl -T ./data/webui.db --user "$WEBDAV_USERNAME:$WEBDAV_PASSWORD" "$WEBDAV_URL/$FILENAME" || {
+                            echo "重试失败，放弃webdav上传。"
+                        }
+                    }
+                else
+                    echo "未找到 webui.db 文件，跳过 WebDAV 同步"
+                fi
+            fi
 
-# 首次启动时下载最新备份
-echo "正在从 HuggingFace 下载最新备份..."
-python3 /tmp/hf_sync.py download "${HF_TOKEN}" "${DATASET_ID}"
 
-# 同步函数
-sync_data() {
-    while true; do
-        echo "开始同步进程 $(date)"
-        
-        if [ -f "./data/webui.db" ]; then
-            timestamp=$(date +%Y%m%d_%H%M%S)
-            backup_file="webui_backup_${timestamp}.db"
-            
-            # 复制数据库文件
-            cp ./data/webui.db "/tmp/${backup_file}"
-            
-            echo "正在上传备份到 HuggingFace..."
-            python3 /tmp/hf_sync.py upload "${HF_TOKEN}" "${DATASET_ID}" "/tmp/${backup_file}" "${backup_file}"
-            
-            rm -f "/tmp/${backup_file}"
         else
-            echo "数据库文件不存在，等待下次同步..."
+            # 返回上级目录
+            cd ..
+            cd ..
+            echo "GitHub: 没有检测到数据库变化"
         fi
-        
-        SYNC_INTERVAL=${SYNC_INTERVAL:-7200}
-        echo "下次同步将在 ${SYNC_INTERVAL} 秒后进行..."
+        # 3. 等待统一的时间间隔
+        SYNC_INTERVAL=${SYNC_INTERVAL:-7200}  # 默认间隔时间为 7200 秒
+        echo "当前时间 $(date '+%Y-%m-%d %H:%M:%S')"
+        echo "等待 ${SYNC_INTERVAL} 秒后进行下一次同步..."
         sleep $SYNC_INTERVAL
+
     done
 }