Skip to content

Commit fe36847

Browse files
committed
Reorganise dependencies
1 parent 45fdaf6 commit fe36847

File tree

7 files changed

+1054
-1196
lines changed

7 files changed

+1054
-1196
lines changed

.github/workflows/pr-e2e-tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
key: ${{ runner.os }}-venv-${{ matrix.python-version }}-${{ hashFiles('**/poetry.lock') }}
8080
- name: Install dependencies
8181
if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
82-
run: poetry install --no-interaction --no-cache --with dev
82+
run: poetry install --no-interaction --no-cache --with dev --all-extras
8383
- name: Clear Poetry cache
8484
run: poetry cache clear --all .
8585
- name: Show disk usage after Poetry installation

.github/workflows/pr.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
key: venv-${{ runner.os }}-${{ matrix.python-version }}-${{ hashFiles('**/poetry.lock') }}
3333
- name: Install dependencies
3434
if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
35-
run: poetry install --no-interaction
35+
run: poetry install --no-interaction --all-extras
3636
- name: Check format and linting
3737
run: |
3838
poetry run ruff check .

.github/workflows/scheduled-e2e-tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ jobs:
8686
key: ${{ runner.os }}-venv-${{ matrix.python-version }}-${{ hashFiles('**/poetry.lock') }}
8787
- name: Install dependencies
8888
if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
89-
run: poetry install --no-interaction --no-cache --with dev
89+
run: poetry install --no-interaction --no-cache --with dev --all-extras
9090
- name: Clear Poetry cache
9191
run: poetry cache clear --all .
9292
- name: Show disk usage after Poetry installation

docs/source/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ Install dependencies
194194

195195
.. code:: bash
196196
197-
poetry install
197+
poetry install --all-extras
198198
199199
***************
200200
Getting started

poetry.lock

Lines changed: 1022 additions & 1147 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 27 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -31,63 +31,49 @@ from = "src"
3131
python = "^3.9.0"
3232
neo4j = "^5.17.0"
3333
pydantic = "^2.6.3"
34-
urllib3 = "<2"
35-
weaviate-client = {version = "^4.6.1", optional = true}
36-
pinecone-client = {version = "^4.1.0", optional = true}
37-
types-mock = "^5.1.0.20240425"
38-
eval-type-backport = "^0.2.0"
39-
pypdf = "^4.3.1"
40-
fsspec = "^2024.9.0"
34+
fsspec = {version = "^2024.9.0", optional = true}
35+
langchain-text-splitters = {version = "^0.3.0", optional = true }
36+
pypdf = {version = "^4.3.1", optional = true}
4137
pygraphviz = [
4238
{version = "^1.13.0", python = ">=3.10,<4.0.0", optional = true},
4339
{version = "^1.0.0", python = "<3.10", optional = true}
4440
]
45-
google-cloud-aiplatform = {version = "^1.66.0", optional = true}
41+
weaviate-client = {version = "^4.6.1", optional = true }
42+
pinecone-client = {version = "^4.1.0", optional = true }
43+
google-cloud-aiplatform = {version = "^1.66.0", optional = true }
4644
cohere = {version = "^5.9.0", optional = true}
47-
anthropic = { version = "^0.34.2", optional = true}
4845
mistralai = {version = "^1.0.3", optional = true}
4946
qdrant-client = {version = "^1.11.3", optional = true}
47+
llama-index = {version = "^0.10.55", optional = true }
48+
openai = {version = "^1.51.1", optional = true }
49+
anthropic = { version = "^0.36.0", optional = true}
50+
sentence-transformers = {version = "^3.0.0", optional = true }
5051

5152
[tool.poetry.group.dev.dependencies]
52-
pylint = "^3.1.0"
53+
urllib3 = "<2"
54+
ruff = "^0.3.0"
5355
mypy = "^1.10.0"
5456
pytest = "^8.0.2"
55-
pytest-mock = "^3.12.0"
56-
pre-commit = { version = "^3.6.2", python = "^3.9" }
5757
coverage = "^7.4.3"
58-
ruff = "^0.3.0"
59-
langchain-openai = "^0.1.1"
60-
weaviate-client = "^4.6.1"
61-
sentence-transformers = "^3.0.0"
62-
pinecone-client = "^4.1.0"
63-
langchain-community = "^0.2.0"
64-
requests = "^2.32.0"
65-
sphinx = { version = "^7.2.6", python = "^3.9" }
66-
langchain-huggingface = "^0.0.3"
67-
tox = "^4.15.1"
68-
numpy = [
69-
{version = "^1.24.0", python = "<3.12"},
70-
{version = "^1.26.0", python = ">=3.12"}
71-
]
72-
scipy = [
73-
{version = "^1", python = "<3.12"},
74-
{version = "^1.7.0", python = ">=3.12"}
75-
]
76-
llama-index = "^0.10.55"
7758
pytest-asyncio = "^0.23.8"
78-
pygraphviz = [
79-
{version = "^1.13.0", python = ">=3.10,<4.0.0"},
80-
{version = "^1.0.0", python = "<3.10"}
81-
]
82-
google-cloud-aiplatform = {version = "^1.66.0"}
83-
cohere = {version = "^5.9.0"}
84-
anthropic = { version = "^0.34.2"}
85-
mistralai = {version = "^1.0.3"}
86-
qdrant-client = {version = "^1.11.3"}
59+
pre-commit = { version = "^3.6.2", python = "^3.9" }
60+
sphinx = { version = "^7.2.6", python = "^3.9" }
61+
langchain-openai = {version = "^0.2.2", optional = true }
62+
langchain-huggingface = {version = "^0.1.0", optional = true }
8763

8864
[tool.poetry.extras]
89-
external_clients = ["weaviate-client", "pinecone-client", "google-cloud-aiplatform", "cohere", "anthropic", "mistralai", "qdrant-client"]
65+
weaviate = ["weaviate-client"]
66+
pinecone = ["pinecone-client"]
67+
google = ["google-cloud-aiplatform"]
68+
cohere = ["cohere"]
69+
anthropic = ["anthropic"]
70+
openai = ["openai"]
71+
mistralai = ["mistralai"]
72+
llama-index = ["llama-index"]
9073
kg_creation_tools = ["pygraphviz"]
74+
sentence-transformers = ["sentence-transformers"]
75+
experimental = ["pypdf", "fsspec", "langchain-text-splitters", "pygraphviz"]
76+
examples = ["langchain-openai", "langchain-huggingface"]
9177

9278
[build-system]
9379
requires = ["poetry-core>=1.0.0"]
@@ -102,9 +88,6 @@ filterwarnings = [
10288
[tool.coverage.paths]
10389
source = ["src"]
10490

105-
[tool.pylint."MESSAGES CONTROL"]
106-
disable="C0114,C0115"
107-
10891
[tool.mypy]
10992
strict = true
11093
ignore_missing_imports = true

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ envlist = py39, py310, py311, py312
66
skip_install = true
77
allowlist_externals = poetry
88
commands_pre =
9-
poetry install
9+
poetry install --all-extras
1010
commands =
1111
poetry run coverage run -m pytest tests/unit

0 commit comments

Comments
 (0)