Skip to content

Commit

Permalink
Merge pull request #144 from aitomatic/deps/upgrade
Browse files Browse the repository at this point in the history
upgrade dependencies
  • Loading branch information
TheVinhLuong102 authored Mar 29, 2024
2 parents c5c3aba + 0a6787e commit 4f810e4
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 13 deletions.
10 changes: 6 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,15 @@ get-poetry-mac-sys:
# ============
install:
@poetry lock
@poetry install --extras=contrib --with=dev --with=docs --with=lint --with=test
@poetry install \
--extras=contrib --extras=llama-index-callbacks \
--with=dev --with=docs --with=lint --with=test

install-editable:
@python3 -m pip install -e ".[contrib]" --upgrade
@python3 -m pip install -e ".[contrib, llama-index-callbacks]" --upgrade

install-editable-mac-sys:
@python3 -m pip install -e ".[contrib]" --upgrade --user --break-system-packages
@python3 -m pip install -e ".[contrib, llama-index-callbacks]" --upgrade --user --break-system-packages


# LINTING
Expand All @@ -57,7 +59,7 @@ lint-flake8:

lint-pylint:
# pylint.readthedocs.io/en/latest/user_guide/usage/run.html
@poetry run pylint $(LIB_DIR) $(DOCS_DIR) $(EXAMPLES_DIR) $(TESTS_DIR)
@poetry run pylint $(LIB_DIR) $(DOCS_DIR) $(EXAMPLES_DIR) $(TESTS_DIR) --recursive=y

lint-ruff:
# docs.astral.sh/ruff/linter
Expand Down
8 changes: 5 additions & 3 deletions make.bat
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,13 @@ IF "%TARGET%"=="launch-solver" GOTO launch-solver
:: ============
:install
poetry lock
poetry install --extras=contrib --with=docs --with=lint --with=test
poetry install ^
--extras=contrib --extras=llama-index-callbacks ^
--with=docs --with=lint --with=test
GOTO end

:install-editable
python3 -m pip install -e ".[contrib]" --upgrade --user
python3 -m pip install -e ".[contrib, llama-index-callbacks]" --upgrade --user
GOTO end


Expand All @@ -75,7 +77,7 @@ IF "%TARGET%"=="launch-solver" GOTO launch-solver

:lint-pylint
:: pylint.readthedocs.io/en/latest/user_guide/usage/run.html
poetry run pylint %LIB_DIR% %DOCS_DIR% %EXAMPLES_DIR% %TESTS_DIR%
poetry run pylint %LIB_DIR% %DOCS_DIR% %EXAMPLES_DIR% %TESTS_DIR% --recursive=y
GOTO end

:lint-ruff
Expand Down
28 changes: 22 additions & 6 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "openssa"
version = "0.24.3.12"
version = "0.24.3.31"

authors = [
"Aitomatic, Inc. <[email protected]>",
Expand Down Expand Up @@ -50,24 +50,23 @@ ipykernel = ">=6.29"
[tool.poetry.group.docs.dependencies]
sphinx = ">=7.2"
sphinx-autobuild = ">=2024.2"
sphinx-press-theme = ">=0.8"
sphinx-press-theme = ">=0.9"
myst-parser = ">=2.0"

[tool.poetry.group.lint.dependencies]
flake8 = ">=7.0"
pylint = ">=3.1"
ruff = ">=0.3"
pydocstyle = ">=6.3"

[tool.poetry.group.test.dependencies]
pytest = ">=8.1"

[tool.poetry.dependencies]
python = ">=3.12,<3.13"
# OpenAI interface
openai = ">=1.13"
openai = ">=1.14"
# LlamaIndex & related
llama-index = ">=0.10.18" # should keep up-to-date with Llama-Index's minor releases (often backward-incompatible)
llama-index = ">=0.10"
llama-index-embeddings-azure-openai = ">=0.1"
llama-index-llms-azure-openai = ">=0.1"
llama-index-readers-web = ">=0.1"
Expand All @@ -81,14 +80,22 @@ gcsfs = ">=2024.2" # Google Cloud Storage
s3fs = ">=2024.2" # S3
# misc / other
click = ">=8.1"
google-api-python-client = ">=2.121"
google-api-python-client = ">=2.124"
httpx = ">=0.27"
loguru = ">=0.7"
pydantic = ">=2.6"
python-dotenv = ">=1.0"
tqdm = ">=4.66"

# optional dependencies required by extras
# llama-index-callbacks-argilla = {version = ">=0.1", optional = true}
llama-index-callbacks-arize-phoenix = {version = ">=0.1", optional = true}
llama-index-callbacks-deepeval = {version = ">=0.1", optional = true}
llama-index-callbacks-honeyhive = {version = ">=0.1", optional = true}
llama-index-callbacks-langfuse = {version = ">=0.1", optional = true}
llama-index-callbacks-openinference = {version = ">=0.1", optional = true}
llama-index-callbacks-promptlayer = {version = ">=0.1", optional = true}
llama-index-callbacks-wandb = {version = ">=0.1", optional = true}
streamlit = {version = ">=1.32", optional = true}
streamlit-mic-recorder = {version = ">=0.0.8", optional = true}

Expand All @@ -97,6 +104,15 @@ contrib = [
"streamlit",
"streamlit-mic-recorder",
]
llama-index-callbacks = [
"llama-index-callbacks-arize-phoenix",
"llama-index-callbacks-deepeval",
"llama-index-callbacks-honeyhive",
"llama-index-callbacks-langfuse",
"llama-index-callbacks-openinference",
"llama-index-callbacks-promptlayer",
"llama-index-callbacks-wandb",
]


[tool.poetry.scripts]
Expand Down

0 comments on commit 4f810e4

Please sign in to comment.