Skip to content

Commit

Permalink
dev -> main (#106)
Browse files Browse the repository at this point in the history
* fix: include coach in tooltip (#101)

* fix: bumping a range of packages to resolve vulnerabiltiies (#102)

* Bump starlette from 0.38.1 to 0.40.0 (#103)

Bumps [starlette](https://github.com/encode/starlette) from 0.38.1 to 0.40.0.
- [Release notes](https://github.com/encode/starlette/releases)
- [Changelog](https://github.com/encode/starlette/blob/master/docs/release-notes.md)
- [Commits](encode/starlette@0.38.1...0.40.0)

---
updated-dependencies:
- dependency-name: starlette
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* bump: starlette==0.40.0 fastapi==0.115.2 (#105)

* fix: broken docker build (#107)

* fix: resolve issues with incompatible faststream version (#108)

* fix: resolve issues with incompatible faststream version

* performing the same updates for core api module

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
nboyse and dependabot[bot] authored Oct 21, 2024
1 parent d781685 commit 92fdb42
Show file tree
Hide file tree
Showing 15 changed files with 10,571 additions and 10,206 deletions.
2 changes: 1 addition & 1 deletion core-api/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.12-bookworm as builder
FROM python:3.12-bookworm AS builder

RUN apt-get update && apt-get install --yes build-essential curl > /dev/null

Expand Down
3,430 changes: 1,737 additions & 1,693 deletions core-api/poetry.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions core-api/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ pydantic = "^2.7.1"
langchain = "^0.2.6"
tiktoken = "^0.7.0"
boto3 = "^1.34.139"
faststream = {extras = ["redis"], version = "<0.5.0"}
fastapi = "^0.111.0"
faststream = {extras = ["redis", "cli"], version = "^0.5.28"}
fastapi = "^0.115.2"
uvicorn = "^0.30.1"
python-multipart = "^0.0.9"
python-jose = "^3.3.0"
Expand Down
8 changes: 4 additions & 4 deletions django_app/poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions django_app/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ websockets = "^12.0"
django-import-export = "^4.0"
dataclasses-json = ">=0.6.7"
django-staff-sso-client = "^4.3.0"
twisted = "24.7.0rc1"

[tool.poetry.group.dev.dependencies]
pytest = "^8.1.1"
Expand Down
5 changes: 4 additions & 1 deletion django_app/redbox_app/templates/macros/chat-macros.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@ <h3 class="iai-chat-bubble__route-heading">
do Q&amp;A on them, extract information, summarise and more!</li>
<li class="iai-chat-bubble__route-list-item">I can help you <strong>@search</strong> over selected documents and
do Q&amp;A on them, with citations</li>
</ul>
<li class="iai-chat-bubble__route-list-item">I can help you <strong>@coach</strong> by analysing your current chat window and
giving targeted advice on how to use Redbox most effectively. I can see how you are using tools like <strong>@summarise</strong>,
<strong>@search</strong>, and <strong>@chat</strong> and give feedback to help you get more out of Redbox.</li>
</ul>
</div>
</tool-tip>
</div>
Expand Down
4 changes: 2 additions & 2 deletions mlflow/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
mlflow==2.14.3
pydantic==1.10.15
starlette==0.38.1
starlette==0.40.0
limits==3.13.0
watchfiles==0.22.0
fastapi==0.111.1
slowapi==0.1.9
uvicorn==0.30.3
aiohttp===3.9.5
aiohttp===3.10.2
gunicorn==22.0.0
boto3==1.34.148
6,609 changes: 3,258 additions & 3,351 deletions notebooks/poetry.lock

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions notebooks/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ redbox = {path="../redbox-core", develop=true}
worker = {path="../worker", develop=true}
core_api = {path="../core-api", develop=true}
redbox_app = {path="../django_app", develop=true}
jupyterlab = "4.2.5"
notebook = "7.2.2"
nltk = "3.9"
cryptography = "43.0.1"

[tool.poetry.group.dev.dependencies]
pytest = "^8.2.2"
Expand Down
6,584 changes: 3,361 additions & 3,223 deletions poetry.lock

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ langchain = "^0.2.6"
tiktoken = "^0.7.0"
boto3 = "^1.34.137"
pydantic-settings = "^2.3.4"
sentence-transformers = "<3.0"
sentence-transformers = "<=3.0.1"
unstructured = {version = "<0.14.9", extras = ["all-docs"]}
torch = "2.2.2"
semantic-router = "^0.0.48"
Expand All @@ -34,8 +34,9 @@ wordcloud = "^1.9.3"
bertopic = "^0.16.2"
streamlit = "^1.37.0"
django-environ = "^0.11.2"
cryptography = "43.0.1"
[tool.poetry.group.api.dependencies]
fastapi = "^0.111.0"
fastapi = "^0.115.2"
uvicorn = "^0.30.1"
python-multipart = "^0.0.9"
python-jose = "^3.3.0"
Expand Down
246 changes: 133 additions & 113 deletions redbox-core/poetry.lock

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions redbox-core/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ pytest-dotenv = "^0.5.2"
kneed = "^0.8.5"
sentence-transformers = "^3.0.1"
langchain-community = "^0.2.12"
cryptography = "43.0.1"
aiohttp = "3.10.2"


[tool.poetry.group.dev.dependencies]
Expand Down
3,868 changes: 2,056 additions & 1,812 deletions worker/poetry.lock

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions worker/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@ langchain-elasticsearch = "^0.2.2"
elasticsearch = "^8.14.0"
opencv-python-headless = "^4.10.0.84"
pillow-heif = "^0.16.0"
faststream = {extras = ["redis"], version = "<0.5.0"}
nltk = "3.8.1"
faststream = {extras = ["redis", "cli"], version = "^0.5.28"}
nltk = "3.9.1"
pikepdf = "<9.0.0"
torch = "2.2.2"
unstructured = {version = "<0.14.9", extras = ["all-docs"]}
unstructured-inference = "^0.7.36"
cryptography = "43.0.1"


[tool.poetry.group.dev.dependencies]
Expand Down

0 comments on commit 92fdb42

Please sign in to comment.