Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: revert docarray explicit transitive dependencies and use extras instead #5015

Merged
merged 4 commits into from
May 22, 2023
Merged

fix: revert docarray explicit transitive dependencies and use extras instead #5015

merged 4 commits into from
May 22, 2023

Commits on May 20, 2023

  1. fix: use docarray extras instead of specifying separate deps

    The docarray [integration
    PR](#4483) introduced a
    pinned dependency to protobuf.
    
    As library developers, we should avoid pinned dependencies as this
    quickly leads to incompatibilities with application code. Much less
    with a heavily used library like protobuf.
    
    As we see in the [docarray
    integration](https://github.com/hwchase17/langchain/pull/4483/files#diff-50c86b7ed8ac2cf95bd48334961bf0530cdc77b5a56f852c5c61b89d735fd711R81-R83),
    the transitive dependencies of docarray were also listed as langchain
    dependencies. This is unnecessary as the docarray project has an
    [extras
    install](https://github.com/docarray/docarray/blob/a01a05542d17264b8a164bec783633658deeedb8/pyproject.toml#L70)
    that lists these.
    
    This PR reverts the explicit hnswlib and protobuf dependencies and
    adds the hnswlib extras install for docarray (which installs hnswlib
    and protobuf). Because version 0.32.0
    of the docarray hnswlib extras added protobuf, we bump the docarray
    dependency from `^0.31.0` to `^0.32.0`.
    malandis committed May 20, 2023
    Configuration menu
    Copy the full SHA
    ffa1803 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'master' into fix/remove-protobuf-dependency

    Also fix merge conflicts in pyproject.toml and poetry.lock.
    malandis committed May 20, 2023
    Configuration menu
    Copy the full SHA
    ffb7b3f View commit details
    Browse the repository at this point in the history
  3. chore: clarify docarray extras name

    An extra was previously introduced for "hnswlib" which only installed
    "docarray". While "hnswlib" is a dependency of docarray, docarray is a
    separate integration, so this is misleading to users.
    
    There was also a separate extras for "in_memory_store". This is again
    misleading since there are various in memory stores in the system that
    are very specific.
    malandis committed May 20, 2023
    Configuration menu
    Copy the full SHA
    07a4ded View commit details
    Browse the repository at this point in the history

Commits on May 22, 2023

  1. merge

    dev2049 committed May 22, 2023
    Configuration menu
    Copy the full SHA
    ca261df View commit details
    Browse the repository at this point in the history