Skip to content

Commit

Permalink
Revert "merge master (#25997)" (#25998)
Browse files Browse the repository at this point in the history
  • Loading branch information
@baskaryan
baskaryan authored Sep 3, 2024
1 parent 91e09ff commit 241b6d2
Show file tree
Hide file tree
Showing 29 changed files with 3,122 additions and 3,267 deletions.
4 changes: 4 additions & 0 deletions .github/scripts/check_diff.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@
# specifically in huggingface jobs
# https://github.com/langchain-ai/langchain/issues/25558
"huggingface",
# remove ai21 because of breaking changes in sdk version 2.14.0
# that have not been fixed yet
"ai21",
]


Expand Down Expand Up @@ -202,6 +205,7 @@ def _get_configs_for_multi_dirs(
dirs_to_run["test"].add("libs/partners/mistralai")
dirs_to_run["test"].add("libs/partners/openai")
dirs_to_run["test"].add("libs/partners/anthropic")
dirs_to_run["test"].add("libs/partners/ai21")
dirs_to_run["test"].add("libs/partners/fireworks")
dirs_to_run["test"].add("libs/partners/groq")

Expand Down
4 changes: 0 additions & 4 deletions libs/community/langchain_community/chat_models/openai.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -403,8 +403,6 @@ def _stream(
if len(chunk["choices"]) == 0:
continue
choice = chunk["choices"][0]
if choice["delta"] is None:
continue
chunk = _convert_delta_to_message_chunk(
choice["delta"], default_chunk_class
)
Expand Down Expand Up @@ -497,8 +495,6 @@ async def _astream(
if len(chunk["choices"]) == 0:
continue
choice = chunk["choices"][0]
if choice["delta"] is None:
continue
chunk = _convert_delta_to_message_chunk(
choice["delta"], default_chunk_class
)
Expand Down
23 changes: 7 additions & 16 deletions libs/community/langchain_community/graphs/neo4j_graph.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -346,27 +346,18 @@ def __init__(
)

url = get_from_dict_or_env({"url": url}, "url", "NEO4J_URI")
# if username and password are "", assume Neo4j auth is disabled
if username == "" and password == "":
auth = None
else:
username = get_from_dict_or_env(
{"username": username},
"username",
"NEO4J_USERNAME",
)
password = get_from_dict_or_env(
{"password": password},
"password",
"NEO4J_PASSWORD",
)
auth = (username, password)
username = get_from_dict_or_env(
{"username": username}, "username", "NEO4J_USERNAME"
)
password = get_from_dict_or_env(
{"password": password}, "password", "NEO4J_PASSWORD"
)
database = get_from_dict_or_env(
{"database": database}, "database", "NEO4J_DATABASE", "neo4j"
)

self._driver = neo4j.GraphDatabase.driver(
url, auth=auth, **(driver_config or {})
url, auth=(username, password), **(driver_config or {})
)
self._database = database
self.timeout = timeout
Expand Down
276 changes: 161 additions & 115 deletions libs/community/poetry.lock
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions libs/community/pyproject.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"

[tool.poetry]
name = "langchain-community"
version = "0.2.16"
version = "0.2.15"
description = "Community contributed LangChain integrations."
authors = []
license = "MIT"
Expand All @@ -30,8 +30,8 @@ ignore-words-list = "momento,collison,ned,foor,reworkd,parth,whats,aapply,mysogy

[tool.poetry.dependencies]
python = ">=3.8.1,<4.0"
langchain-core = "^0.2.38"
langchain = "^0.2.16"
langchain-core = "^0.2.37"
langchain = "^0.2.15"
SQLAlchemy = ">=1.4,<3"
requests = "^2"
PyYAML = ">=5.3"
Expand Down
2,089 changes: 1,000 additions & 1,089 deletions libs/experimental/poetry.lock
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions libs/experimental/pyproject.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"

[tool.poetry]
name = "langchain-experimental"
version = "0.0.65"
version = "0.0.64"
description = "Building applications with LLMs through composability"
authors = []
license = "MIT"
Expand All @@ -22,8 +22,8 @@ exclude = [ "notebooks", "examples", "example_data",]

[tool.poetry.dependencies]
python = ">=3.8.1,<4.0"
langchain-core = "^0.2.38"
langchain-community = "^0.2.16"
langchain-core = "^0.2.27"
langchain-community = "^0.2.10"

[tool.ruff.lint]
select = [ "E", "F", "I", "T201",]
Expand Down
365 changes: 227 additions & 138 deletions libs/langchain/poetry.lock
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions libs/langchain/pyproject.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"

[tool.poetry]
name = "langchain"
version = "0.2.16"
version = "0.2.15"
description = "Building applications with LLMs through composability"
authors = []
license = "MIT"
Expand Down Expand Up @@ -33,7 +33,7 @@ langchain-server = "langchain.server:main"

[tool.poetry.dependencies]
python = ">=3.8.1,<4.0"
langchain-core = "^0.2.38"
langchain-core = "^0.2.35"
langchain-text-splitters = "^0.2.0"
langsmith = "^0.1.17"
pydantic = ">=1,<3"
Expand Down
565 changes: 231 additions & 334 deletions libs/partners/milvus/poetry.lock
View file

Large diffs are not rendered by default.

103 changes: 59 additions & 44 deletions libs/partners/milvus/pyproject.toml
View file
Original file line number Diff line number Diff line change
@@ -1,33 +1,21 @@
[build-system]
requires = [ "poetry-core>=1.0.0",]
build-backend = "poetry.core.masonry.api"

[tool.poetry]
name = "langchain-milvus"
version = "0.1.5"
version = "0.1.4"
description = "An integration package connecting Milvus and LangChain"
authors = []
readme = "README.md"
repository = "https://github.com/langchain-ai/langchain"
license = "MIT"

[tool.ruff]
select = [ "E", "F", "I", "T201",]

[tool.mypy]
disallow_untyped_defs = "True"
[[tool.mypy.overrides]]
module = [ "pymilvus",]
ignore_missing_imports = "True"

[tool.poetry.urls]
"Source Code" = "https://github.com/langchain-ai/langchain/tree/master/libs/partners/milvus"
"Release Notes" = "https://github.com/langchain-ai/langchain/releases?q=tag%3A%22langchain-milvus%3D%3D0%22&expanded=true"

[tool.poetry.dependencies]
python = ">=3.8.1,<4.0"
langchain-core = "^0.2.38"
langchain-core = "^0.2.20"
pymilvus = "^2.4.3"

[[tool.poetry.dependencies.scipy]]
version = "^1.7"
python = "<3.12"
Expand All @@ -36,58 +24,85 @@ python = "<3.12"
version = "^1.9"
python = ">=3.12"

[tool.coverage.run]
omit = [ "tests/*",]

[tool.pytest.ini_options]
addopts = "--snapshot-warn-unused --strict-markers --strict-config --durations=5"
markers = [ "requires: mark tests as requiring a specific library", "asyncio: mark tests as requiring asyncio", "compile: mark placeholder test used to compile integration tests without running them",]
asyncio_mode = "auto"

[tool.poetry.group.test]
optional = true

[tool.poetry.group.codespell]
optional = true

[tool.poetry.group.test_integration]
optional = true

[tool.poetry.group.lint]
optional = true

[tool.poetry.group.dev]
optional = true

[tool.poetry.group.test.dependencies]
pytest = "^7.3.0"
freezegun = "^1.2.2"
pytest-mock = "^3.10.0"
syrupy = "^4.0.2"
pytest-watcher = "^0.3.4"
pytest-asyncio = "^0.21.1"
langchain-core = { path = "../../core", develop = true }

[tool.poetry.group.codespell]
optional = true

[tool.poetry.group.codespell.dependencies]
codespell = "^2.2.0"

[tool.poetry.group.test_integration]
optional = true

[tool.poetry.group.test_integration.dependencies]

[tool.poetry.group.lint]
optional = true

[tool.poetry.group.lint.dependencies]
ruff = "^0.1.5"

[tool.poetry.group.typing.dependencies]
mypy = "^0.991"
langchain-core = { path = "../../core", develop = true }
types-requests = "^2"
simsimd = "^5.0.0"

[tool.poetry.group.test.dependencies.langchain-core]
path = "../../core"
develop = true
[tool.poetry.group.dev]
optional = true

[tool.poetry.group.dev.dependencies]
langchain-core = { path = "../../core", develop = true }

[tool.ruff]
select = [
"E", # pycodestyle
"F", # pyflakes
"I", # isort
"T201", # print
]

[tool.mypy]
disallow_untyped_defs = "True"

[[tool.mypy.overrides]]
module = ["pymilvus"]
ignore_missing_imports = "True"

[tool.poetry.group.typing.dependencies.langchain-core]
path = "../../core"
develop = true
[tool.coverage.run]
omit = ["tests/*"]

[build-system]
requires = ["poetry-core>=1.0.0"]
build-backend = "poetry.core.masonry.api"

[tool.poetry.group.dev.dependencies.langchain-core]
path = "../../core"
develop = true
[tool.pytest.ini_options]
# --strict-markers will raise errors on unknown marks.
# https://docs.pytest.org/en/7.1.x/how-to/mark.html#raising-errors-on-unknown-marks
#
# https://docs.pytest.org/en/7.1.x/reference/reference.html
# --strict-config any warnings encountered while parsing the `pytest`
# section of the configuration file raise errors.
#
# https://github.com/tophat/syrupy
# --snapshot-warn-unused Prints a warning on unused snapshots rather than fail the test suite.
addopts = "--snapshot-warn-unused --strict-markers --strict-config --durations=5"
# Registering custom markers.
# https://docs.pytest.org/en/7.1.x/example/markers.html#registering-markers
markers = [
"requires: mark tests as requiring a specific library",
"asyncio: mark tests as requiring asyncio",
"compile: mark placeholder test used to compile integration tests without running them",
]
asyncio_mode = "auto"
Loading

0 comments on commit 241b6d2

Please sign in to comment.