diff --git a/py/compose.full.yaml b/py/compose.full.yaml index 23d7065f8..2711c62a0 100644 --- a/py/compose.full.yaml +++ b/py/compose.full.yaml @@ -300,6 +300,7 @@ services: - R2R_CONFIG_NAME=${R2R_CONFIG_NAME:-} - R2R_CONFIG_PATH=${R2R_CONFIG_PATH:-} - R2R_PROJECT_NAME=${R2R_PROJECT_NAME:-r2r_default} + - R2R_SECRET_KEY=${R2R_SECRET_KEY:-} # Postgres - R2R_POSTGRES_USER=${R2R_POSTGRES_USER:-postgres} diff --git a/py/compose.full_with_replicas.yaml b/py/compose.full_with_replicas.yaml index 03145a509..1df3361ef 100644 --- a/py/compose.full_with_replicas.yaml +++ b/py/compose.full_with_replicas.yaml @@ -298,6 +298,7 @@ services: - R2R_CONFIG_NAME=${R2R_CONFIG_NAME:-} - R2R_CONFIG_PATH=${R2R_CONFIG_PATH:-} - R2R_PROJECT_NAME=${R2R_PROJECT_NAME:-r2r_default} + - R2R_SECRET_KEY=${R2R_SECRET_KEY:-} # Postgres - R2R_POSTGRES_USER=${R2R_POSTGRES_USER:-postgres} diff --git a/py/compose.yaml b/py/compose.yaml index d6d8ccb51..746bb13c5 100644 --- a/py/compose.yaml +++ b/py/compose.yaml @@ -56,6 +56,7 @@ services: - R2R_CONFIG_NAME=${R2R_CONFIG_NAME:-} - R2R_CONFIG_PATH=${R2R_CONFIG_PATH:-} - R2R_PROJECT_NAME=${R2R_PROJECT_NAME:-r2r_default} + - R2R_SECRET_KEY=${R2R_SECRET_KEY:-} # Postgres - R2R_POSTGRES_USER=${R2R_POSTGRES_USER:-postgres} diff --git a/py/poetry.lock b/py/poetry.lock index 3bfebc3cf..f90097fa6 100644 --- a/py/poetry.lock +++ b/py/poetry.lock @@ -1,10 +1,10 @@ -# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.8.4 and should not be changed by hand. [[package]] name = "aiofiles" version = "24.1.0" description = "File support for asyncio." -optional = true +optional = false python-versions = ">=3.8" files = [ {file = "aiofiles-24.1.0-py3-none-any.whl", hash = "sha256:b4ec55f4195e3eb5d7abd1bf7e061763e864dd4954231fb8539a0ef8bb8260e5"}, @@ -5599,6 +5599,7 @@ files = [ {file = "tiktoken-0.8.0-cp310-cp310-win_amd64.whl", hash = "sha256:d8c2d0e5ba6453a290b86cd65fc51fedf247e1ba170191715b049dac1f628005"}, {file = "tiktoken-0.8.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:d622d8011e6d6f239297efa42a2657043aaed06c4f68833550cac9e9bc723ef1"}, {file = "tiktoken-0.8.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:2efaf6199717b4485031b4d6edb94075e4d79177a172f38dd934d911b588d54a"}, + {file = "tiktoken-0.8.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5637e425ce1fc49cf716d88df3092048359a4b3bbb7da762840426e937ada06d"}, {file = "tiktoken-0.8.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9fb0e352d1dbe15aba082883058b3cce9e48d33101bdaac1eccf66424feb5b47"}, {file = "tiktoken-0.8.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:56edfefe896c8f10aba372ab5706b9e3558e78db39dd497c940b47bf228bc419"}, {file = "tiktoken-0.8.0-cp311-cp311-win_amd64.whl", hash = "sha256:326624128590def898775b722ccc327e90b073714227175ea8febbc920ac0a99"}, @@ -6384,9 +6385,9 @@ type = ["pytest-mypy"] [extras] core = ["aiohttp", "aiosqlite", "apscheduler", "asyncpg", "bcrypt", "boto3", "colorlog", "deepdiff", "fire", "fsspec", "future", "graspologic", "gunicorn", "hatchet-sdk", "litellm", "networkx", "ollama", "passlib", "psutil", "pydantic", "pyjwt", "pynacl", "python-multipart", "pyyaml", "sendgrid", "sqlalchemy", "supabase", "tokenizers", "unstructured-client", "uvicorn", "vecs"] -ingestion-bundle = ["aiofiles", "aioshutil", "beautifulsoup4", "bs4", "docutils", "epub", "extract-msg", "markdown", "numpy", "olefile", "openpyxl", "orgparse", "pdf2image", "pillow-heif", "pypdf", "pypdf2", "python-docx", "python-pptx", "striprtf", "xlrd"] +ingestion-bundle = ["aioshutil", "beautifulsoup4", "bs4", "docutils", "epub", "extract-msg", "markdown", "numpy", "olefile", "openpyxl", "orgparse", "pdf2image", "pillow-heif", "pypdf", "pypdf2", "python-docx", "python-pptx", "striprtf", "xlrd"] [metadata] lock-version = "2.0" python-versions = ">=3.10,<3.13" -content-hash = "a2e47e0e9468d729110a02ae05dba175e7956ae405f0d4ddacc399e4754f8619" +content-hash = "58307d1a2e239cbfff063ed226e38916ee346d7bb7b6f4a81774a0018727dd8e" diff --git a/py/pyproject.toml b/py/pyproject.toml index 5b19d9ecb..43f473d72 100644 --- a/py/pyproject.toml +++ b/py/pyproject.toml @@ -5,7 +5,7 @@ build-backend = "poetry.core.masonry.api" [tool.poetry] name = "r2r" readme = "README.md" -version = "3.3.21" +version = "3.3.22" description = "SciPhi R2R" authors = ["Owen Colegrove "] @@ -30,6 +30,7 @@ packages = [ # Python Versions python = ">=3.10,<3.13" +aiofiles = "^24.1.0" alembic = "^1.13.3" asyncclick = "^8.1.7.2" click = "^8.0.0" @@ -79,7 +80,6 @@ uvicorn = { version = "^0.27.0.post1", optional = true } vecs = { version = "^0.4.0", optional = true } # R2R Ingestion -aiofiles = { version = "^24.1.0", optional = true } aioshutil = { version = "^1.5", optional = true } beautifulsoup4 = { version = "^4.12.3", optional = true } bs4 = { version = "^0.0.2", optional = true } @@ -137,7 +137,6 @@ core = [ "pynacl" ] ingestion-bundle = [ - "aiofiles", "aioshutil", "beautifulsoup4", "bs4",