]> git.ipfire.org Git - thirdparty/paperless-ngx.git/commitdiff
Merge branch 'dev' into feature-ai feature-ai 10319/head
authorshamoon <4887959+shamoon@users.noreply.github.com>
Thu, 2 Oct 2025 02:24:31 +0000 (19:24 -0700)
committerGitHub <noreply@github.com>
Thu, 2 Oct 2025 02:24:31 +0000 (19:24 -0700)
1  2 
docs/usage.md
pyproject.toml
src/documents/tests/test_views.py
src/documents/views.py
uv.lock

diff --cc docs/usage.md
Simple merge
diff --cc pyproject.toml
index 4274178dfcfe4a631723084118a9a858189f0b10,2577ee2883d09bbdc12378a4639b035fa67bef3a..037936f302b5b361f2064088f945cf7c2883f275
@@@ -51,18 -50,10 +51,17 @@@ dependencies = 
    "inotifyrecursive~=0.3",
    "jinja2~=3.1.5",
    "langdetect~=1.0.9",
 +  "llama-index-core>=0.12.33.post1",
 +  "llama-index-embeddings-huggingface>=0.5.3",
 +  "llama-index-embeddings-openai>=0.3.1",
 +  "llama-index-llms-ollama>=0.5.4",
 +  "llama-index-llms-openai>=0.3.38",
 +  "llama-index-vector-stores-faiss>=0.3",
    "nltk~=3.9.1",
    "ocrmypdf~=16.11.0",
 +  "openai>=1.76",
    "pathvalidate~=3.3.1",
    "pdf2image~=1.17.0",
-   "psycopg-pool",
    "python-dateutil~=2.9.0",
    "python-dotenv~=1.1.0",
    "python-gnupg~=0.5.4",
Simple merge
Simple merge
diff --cc uv.lock
index 633227bb7aa0287345bf4d20b4519b661b94ed2b,d43b81e53dfe1233631a84ef4676979c7d66b9d6..93672de0e6c53ee8126a09f5beed4d6628b169c9
+++ b/uv.lock
@@@ -2962,18 -2152,10 +2962,17 @@@ dependencies = 
      { name = "inotifyrecursive", marker = "sys_platform == 'darwin' or sys_platform == 'linux'" },
      { name = "jinja2", marker = "sys_platform == 'darwin' or sys_platform == 'linux'" },
      { name = "langdetect", marker = "sys_platform == 'darwin' or sys_platform == 'linux'" },
 +    { name = "llama-index-core", marker = "sys_platform == 'darwin' or sys_platform == 'linux'" },
 +    { name = "llama-index-embeddings-huggingface", marker = "sys_platform == 'darwin' or sys_platform == 'linux'" },
 +    { name = "llama-index-embeddings-openai", marker = "sys_platform == 'darwin' or sys_platform == 'linux'" },
 +    { name = "llama-index-llms-ollama", marker = "sys_platform == 'darwin' or sys_platform == 'linux'" },
 +    { name = "llama-index-llms-openai", marker = "sys_platform == 'darwin' or sys_platform == 'linux'" },
 +    { name = "llama-index-vector-stores-faiss", marker = "sys_platform == 'darwin' or sys_platform == 'linux'" },
      { name = "nltk", marker = "sys_platform == 'darwin' or sys_platform == 'linux'" },
      { name = "ocrmypdf", marker = "sys_platform == 'darwin' or sys_platform == 'linux'" },
 +    { name = "openai", marker = "sys_platform == 'darwin' or sys_platform == 'linux'" },
      { name = "pathvalidate", marker = "sys_platform == 'darwin' or sys_platform == 'linux'" },
      { name = "pdf2image", marker = "sys_platform == 'darwin' or sys_platform == 'linux'" },
-     { name = "psycopg-pool", marker = "sys_platform == 'darwin' or sys_platform == 'linux'" },
      { name = "python-dateutil", marker = "sys_platform == 'darwin' or sys_platform == 'linux'" },
      { name = "python-dotenv", marker = "sys_platform == 'darwin' or sys_platform == 'linux'" },
      { name = "python-gnupg", marker = "sys_platform == 'darwin' or sys_platform == 'linux'" },