Merge fcf0ee619b into d53437d169

back/config/util.ts

@@ -535,12 +535,43 @@ export async function setSystemTimezone(timezone: string): Promise<boolean> {
   }
 }
 
+// Helper function to check if a name is a GitHub URL
+function isGitHubUrl(name: string): boolean {
+  // Support git+https://, git+http://, https://, and http:// URLs
+  // This covers GitHub URLs and other git-compatible repositories
+  return !!name.match(/^(git\+https?:\/\/|https?:\/\/)/i);
+}
+
+// Helper function to check if a name is a requirements file
+function isRequirementsFile(name: string): boolean {
+  return !!name.match(/requirements.*\.(txt|in)$/i);
+}
+
+// Helper function to check if a name is a pyproject.toml file
+function isPyprojectToml(name: string): boolean {
+  return name.endsWith('pyproject.toml');
+}
+
 export function getGetCommand(type: DependenceTypes, name: string): string {
+  const trimmedName = name.trim();
+  
+  // For Python dependencies installed from GitHub or requirements files,
+  // we can't reliably check if they're installed, so skip the check
+  if (type === DependenceTypes.python3) {
+    if (isGitHubUrl(trimmedName) || 
+        isRequirementsFile(trimmedName) || 
+        isPyprojectToml(trimmedName)) {
+      // Return a command that will always indicate not installed
+      // This ensures GitHub URLs and requirements files are always installed
+      return 'echo ""';
+    }
+  }
+  
   const baseCommands = {
-    [DependenceTypes.nodejs]: `pnpm ls -g  | grep "${name}" | head -1`,
+    [DependenceTypes.nodejs]: `pnpm ls -g  | grep "${trimmedName}" | head -1`,
     [DependenceTypes.python3]: `
     python3 -c "exec('''
-name='${name}'
+name='${trimmedName}'
 try:
     from importlib.metadata import version
     print(version(name))
@@ -550,7 +581,7 @@ except:
     spec=u.find_spec(name)
     print(name if spec else '')
 ''')"`,
-    [DependenceTypes.linux]: `apk info -es ${name}`,
+    [DependenceTypes.linux]: `apk info -es ${trimmedName}`,
   };
 
   return baseCommands[type];
@@ -570,7 +601,33 @@ export function getInstallCommand(type: DependenceTypes, name: string): string {
     command = `${command} --prefix=${PYTHON_INSTALL_DIR}`;
   }
 
-  return `${command} ${name.trim()}`;
+  const trimmedName = name.trim();
+  
+  // Handle different installation methods for Python
+  if (type === DependenceTypes.python3) {
+    // Check if it's a GitHub URL (support both git+ and direct URLs)
+    if (isGitHubUrl(trimmedName)) {
+      return `${command} ${trimmedName}`;
+    }
+    // Check if it's a requirements file path
+    if (isRequirementsFile(trimmedName)) {
+      return `${command} -r ${trimmedName}`;
+    }
+    // Check if it's a pyproject.toml file
+    if (isPyprojectToml(trimmedName)) {
+      // For pyproject.toml, install from the directory containing it
+      const pathMatch = trimmedName.match(/^(.+)\/pyproject\.toml$/);
+      if (pathMatch) {
+        // Has a path prefix, use the directory
+        return `${command} ${pathMatch[1]}`;
+      } else {
+        // Just "pyproject.toml", install current directory
+        return `${command} .`;
+      }
+    }
+  }
+
+  return `${command} ${trimmedName}`;
 }
 
 export function getUninstallCommand(

shell/update.sh

@@ -111,6 +111,76 @@ add_cron() {
   notify_api "$path 新增任务" "$detail"
 }
 
+## 自动安装订阅仓库中的Python依赖
+auto_install_python_deps() {
+  local repo_path="$1"
+  local uniq_path="$2"
+  
+  echo -e "\n检测订阅仓库中的Python依赖文件...\n"
+  
+  get_token
+  
+  # 检查 requirements.txt
+  if [[ -f "${repo_path}/requirements.txt" ]]; then
+    echo -e "发现 requirements.txt，开始自动安装依赖...\n"
+    local req_file="${dir_scripts}/${uniq_path}/requirements.txt"
+    
+    # 确保目标目录存在
+    make_dir "${dir_scripts}/${uniq_path}"
+    
+    # 复制文件并检查结果
+    if cp -f "${repo_path}/requirements.txt" "${req_file}" 2>/dev/null; then
+      # 调用API添加依赖安装任务
+      local dep_name="${uniq_path}/requirements.txt"
+      local currentTimeStamp=$(date +%s)
+      local result=$(curl -s --noproxy "*" "http://127.0.0.1:${ql_port}/open/dependencies?t=$currentTimeStamp" \
+        -X POST \
+        -H "Content-Type: application/json;charset=UTF-8" \
+        -H "Authorization: Bearer ${__ql_token__}" \
+        --data-raw "[{\"name\":\"${dep_name}\",\"type\":1,\"remark\":\"自动检测：${uniq_path} 订阅依赖\"}]" 2>/dev/null)
+      
+      local code=$(echo "$result" | jq -r '.code' 2>/dev/null)
+      if [[ "$code" == "200" ]]; then
+        echo -e "已添加 requirements.txt 依赖安装任务\n"
+      else
+        echo -e "添加 requirements.txt 依赖失败，请手动添加\n"
+      fi
+    else
+      echo -e "复制 requirements.txt 失败，跳过自动安装\n"
+    fi
+  fi
+  
+  # 检查 pyproject.toml
+  if [[ -f "${repo_path}/pyproject.toml" ]]; then
+    echo -e "发现 pyproject.toml，开始自动安装依赖...\n"
+    local pyproject_file="${dir_scripts}/${uniq_path}/pyproject.toml"
+    
+    # 确保目标目录存在
+    make_dir "${dir_scripts}/${uniq_path}"
+    
+    # 复制文件并检查结果
+    if cp -f "${repo_path}/pyproject.toml" "${pyproject_file}" 2>/dev/null; then
+      # 调用API添加依赖安装任务
+      local dep_name="${uniq_path}/pyproject.toml"
+      local currentTimeStamp=$(date +%s)
+      local result=$(curl -s --noproxy "*" "http://127.0.0.1:${ql_port}/open/dependencies?t=$currentTimeStamp" \
+        -X POST \
+        -H "Content-Type: application/json;charset=UTF-8" \
+        -H "Authorization: Bearer ${__ql_token__}" \
+        --data-raw "[{\"name\":\"${dep_name}\",\"type\":1,\"remark\":\"自动检测：${uniq_path} 订阅依赖\"}]" 2>/dev/null)
+      
+      local code=$(echo "$result" | jq -r '.code' 2>/dev/null)
+      if [[ "$code" == "200" ]]; then
+        echo -e "已添加 pyproject.toml 依赖安装任务\n"
+      else
+        echo -e "添加 pyproject.toml 依赖失败，请手动添加\n"
+      fi
+    else
+      echo -e "复制 pyproject.toml 失败，跳过自动安装\n"
+    fi
+  fi
+}
+
 ## 更新仓库
 update_repo() {
   local url="$1"
@@ -137,6 +207,10 @@ update_repo() {
 
   if [[ $exit_status -eq 0 ]]; then
     echo -e "拉取 ${uniq_path} 成功...\n"
+    
+    # 自动检测并安装Python依赖
+    auto_install_python_deps "${repo_path}" "${uniq_path}"
+    
     diff_scripts "$repo_path" "$author" "$path" "$blackword" "$dependence" "$extensions" "$autoAddCron" "$autoDelCron"
   else
     echo -e "拉取 ${uniq_path} 失败，请检查日志...\n"

src/pages/dependence/modal.tsx

@@ -22,6 +22,9 @@ const DependenceModal = ({
 }) => {
   const [form] = Form.useForm();
   const [loading, setLoading] = useState(false);
+  const [selectedType, setSelectedType] = useState(
+    DependenceTypes[defaultType as any],
+  );
 
   const handleOk = async (values: any) => {
     setLoading(true);
@@ -90,7 +93,7 @@ const DependenceModal = ({
           label={intl.get('依赖类型')}
           initialValue={DependenceTypes[defaultType as any]}
         >
-          <Select>
+          <Select onChange={(value) => setSelectedType(value)}>
             {config.dependenceTypes.map((x, i) => (
               <Option key={i} value={i}>
                 {x}
@@ -121,11 +124,24 @@ const DependenceModal = ({
               whitespace: true,
             },
           ]}
+          tooltip={
+            selectedType === DependenceTypes.python3
+              ? intl.get(
+                  'Python支持多种安装方式：\n1. 包名（如：requests）\n2. GitHub链接（如：git+https://github.com/user/repo.git）\n3. requirements文件路径（如：path/to/requirements.txt）\n4. pyproject.toml文件路径',
+                )
+              : undefined
+          }
         >
           <Input.TextArea
             rows={4}
             autoSize={{ minRows: 1, maxRows: 5 }}
-            placeholder={intl.get('请输入依赖名称')}
+            placeholder={
+              selectedType === DependenceTypes.python3
+                ? intl.get(
+                    '支持包名、GitHub链接、requirements.txt或pyproject.toml路径',
+                  )
+                : intl.get('请输入依赖名称')
+            }
           />
         </Form.Item>
         <Form.Item name="remark" label={intl.get('备注')}>