resolve conflict

Co-authored-by: QuantumGhost <obelisk.reg+git@gmail.com>
Co-authored-by: Yunlu Wen <yunlu.wen@dify.ai>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

.github/workflows/api-tests.yml

@@ -25,6 +25,7 @@ jobs:
     strategy:
       matrix:
         python-version:
+          - "3.11"
           - "3.12"
 
     steps:

api/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "dify-api"
 version = "1.13.3"
-requires-python = "~=3.12.0"
+requires-python = ">=3.11,<3.13"
 
 dependencies = [
     "aliyun-log-python-sdk~=0.9.37",
@@ -10,7 +10,7 @@ dependencies = [
     "beautifulsoup4==4.14.3",
     "boto3==1.42.73",
     "bs4~=0.0.1",
-    "cachetools~=6.2.4",
+    "cachetools~=5.3.0",
     "celery~=5.6.2",
     "charset-normalizer>=3.4.4",
     "flask~=3.1.2",
@@ -40,7 +40,7 @@ dependencies = [
     "numpy~=1.26.4",
     "openpyxl~=3.1.5",
     "opik~=1.10.37",
-    "litellm==1.83.0",                                    # Pinned to avoid madoka dependency issue
+    "litellm==1.82.6",                                    # Pinned to avoid madoka dependency issue
     "opentelemetry-api==1.28.0",
     "opentelemetry-distro==0.49b0",
     "opentelemetry-exporter-otlp==1.28.0",
@@ -88,9 +88,9 @@ dependencies = [
     "flask-restx~=1.3.2",
     "packaging~=23.2",
     "croniter>=6.0.0",
-    "weaviate-client==4.20.5",
+    "weaviate-client==4.20.4",
     "apscheduler>=3.11.0",
-    "weave>=0.52.36",
+    "weave>=0.52.16",
     "fastopenapi[flask]>=0.7.0",
     "bleach~=6.3.0",
 ]
@@ -224,7 +224,7 @@ vdb = [
     "tidb-vector==0.0.15",
     "upstash-vector==0.8.0",
     "volcengine-compat~=1.0.0",
-    "weaviate-client==4.20.5",
+    "weaviate-client==4.20.4",
     "xinference-client~=2.3.1",
     "mo-vector~=0.1.13",
     "mysql-connector-python>=9.3.0",
@@ -255,5 +255,5 @@ ignore_errors = true
 project-includes = ["."]
 project-excludes = [".venv", "migrations/"]
 python-platform = "linux"
-python-version = "3.12.0"
+python-version = "3.11.0"
 infer-with-first-use = false

api/pyrightconfig.json

@@ -50,6 +50,6 @@
   "reportUntypedFunctionDecorator": "hint",
   "reportUnnecessaryTypeIgnoreComment": "hint",
   "reportAttributeAccessIssue": "hint",
-  "pythonVersion": "3.12",
+  "pythonVersion": "3.11",
   "pythonPlatform": "All"
 }

web/package.json

@@ -125,15 +125,15 @@
     "mime": "4.1.0",
     "mitt": "3.0.1",
     "negotiator": "1.0.0",
-    "next": "16.2.3",
+    "next": "16.2.1",
     "next-themes": "0.4.6",
     "nuqs": "2.8.9",
     "pinyin-pro": "3.28.0",
     "qrcode.react": "4.2.0",
     "qs": "6.15.0",
-    "react": "19.2.5",
+    "react": "19.2.4",
     "react-18-input-autosize": "3.0.0",
-    "react-dom": "19.2.5",
+    "react-dom": "19.2.4",
     "react-easy-crop": "5.5.6",
     "react-hotkeys-hook": "5.2.4",
     "react-i18next": "16.6.1",
@@ -173,8 +173,8 @@
     "@mdx-js/loader": "3.1.1",
     "@mdx-js/react": "3.1.1",
     "@mdx-js/rollup": "3.1.1",
-    "@next/eslint-plugin-next": "16.2.3",
-    "@next/mdx": "16.2.3",
+    "@next/eslint-plugin-next": "16.2.1",
+    "@next/mdx": "16.2.1",
     "@rgrove/parse-xml": "4.2.0",
     "@storybook/addon-docs": "10.3.1",
     "@storybook/addon-links": "10.3.1",
@@ -231,7 +231,7 @@
     "nock": "14.0.11",
     "postcss": "8.5.8",
     "postcss-js": "5.1.0",
-    "react-server-dom-webpack": "19.2.5",
+    "react-server-dom-webpack": "19.2.4",
     "sass": "1.98.0",
     "storybook": "10.3.1",
     "tailwindcss": "3.4.19",
@@ -258,11 +258,9 @@
       "array.prototype.flatmap": "npm:@nolyfill/array.prototype.flatmap@^1.0.44",
       "array.prototype.tosorted": "npm:@nolyfill/array.prototype.tosorted@^1.0.44",
       "assert": "npm:@nolyfill/assert@^1.0.26",
-      "brace-expansion@<2.0.3": "2.0.3",
-      "brace-expansion@>=5.0.0 <5.0.5": "5.0.5",
+      "brace-expansion@<2.0.2": "2.0.2",
       "canvas": "^3.2.2",
       "devalue@<5.3.2": "5.3.2",
-      "diff@>=5.0.0 <5.2.2": "5.2.2",
       "dompurify@>=3.1.3 <=3.3.1": "3.3.2",
       "es-iterator-helpers": "npm:@nolyfill/es-iterator-helpers@^1.0.21",
       "esbuild@<0.27.2": "0.27.2",
@@ -273,7 +271,6 @@
       "is-generator-function": "npm:@nolyfill/is-generator-function@^1.0.44",
       "is-typed-array": "npm:@nolyfill/is-typed-array@^1.0.44",
       "isarray": "npm:@nolyfill/isarray@^1.0.44",
-      "minimatch@>=9.0.0 <10.0.0": "10.2.4",
       "object.assign": "npm:@nolyfill/object.assign@^1.0.44",
       "object.entries": "npm:@nolyfill/object.entries@^1.0.44",
       "object.fromentries": "npm:@nolyfill/object.fromentries@^1.0.44",
@@ -281,9 +278,6 @@
       "object.values": "npm:@nolyfill/object.values@^1.0.44",
       "pbkdf2": "~3.1.5",
       "pbkdf2@<3.1.3": "3.1.3",
-      "picomatch@>=2.0.0 <2.3.2": "2.3.2",
-      "picomatch@>=3.0.0 <3.0.2": "3.0.2",
-      "picomatch@>=4.0.0 <4.0.4": "4.0.4",
       "prismjs": "~1.30",
       "prismjs@<1.30.0": "1.30.0",
       "rollup@>=4.0.0 <4.59.0": "4.59.0",