Merge branch 'master' into nc/docker-image

.devcontainer/README.md

@@ -5,10 +5,10 @@ This project includes a [dev container](https://containers.dev/), which lets you
 You can use the dev container configuration in this folder to build and run the app without needing to install any of its tools locally! You can use it in [GitHub Codespaces](https://github.com/features/codespaces) or the [VS Code Dev Containers extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers).
 
 ## GitHub Codespaces
-[![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/hwchase17/langchain)
+[![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/langchain-ai/langchain)
 
 You may use the button above, or follow these steps to open this repo in a Codespace:
-1. Click the **Code** drop-down menu at the top of https://github.com/hwchase17/langchain.
+1. Click the **Code** drop-down menu at the top of https://github.com/langchain-ai/langchain.
 1. Click on the **Codespaces** tab.
 1. Click **Create codespace on master** .
 

.github/CONTRIBUTING.md

@@ -14,8 +14,8 @@ Please do not try to push directly to this repo unless you are a maintainer.
 Please follow the checked-in pull request template when opening pull requests. Note related issues and tag relevant
 maintainers.
 
-Pull requests cannot land without passing the formatting, linting and testing checks first. See
-[Common Tasks](#-common-tasks) for how to run these checks locally.
+Pull requests cannot land without passing the formatting, linting and testing checks first. See [Testing](#testing) and
+[Formatting and Linting](#formatting-and-linting) for how to run these checks locally.
 
 It's essential that we maintain great documentation and testing. If you:
 - Fix a bug
@@ -32,7 +32,7 @@ best way to get our attention.
 
 ### 🚩GitHub Issues
 
-Our [issues](https://github.com/hwchase17/langchain/issues) page is kept up to date
+Our [issues](https://github.com/langchain-ai/langchain/issues) page is kept up to date
 with bugs, improvements, and feature requests.
 
 There is a taxonomy of labels to help with sorting and discovery of issues of interest. Please use these to help
@@ -59,43 +59,85 @@ we do not want these to get in the way of getting good code into the codebase.
 
 ## 🚀 Quick Start
 
-> **Note:** You can run this repository locally (which is described below) or in a [development container](https://containers.dev/) (which is described in the [.devcontainer folder](https://github.com/hwchase17/langchain/tree/master/.devcontainer)).
+This quick start describes running the repository locally.
+For a [development container](https://containers.dev/), see the [.devcontainer folder](https://github.com/langchain-ai/langchain/tree/master/.devcontainer).
 
-This project uses [Poetry](https://python-poetry.org/) v1.5.1 as a dependency manager. Check out Poetry's [documentation on how to install it](https://python-poetry.org/docs/#installation) on your system before proceeding.
+### Dependency Management: Poetry and other env/dependency managers
 
-❗Note: If you use `Conda` or `Pyenv` as your environment/package manager, avoid dependency conflicts by doing the following first:
-1. *Before installing Poetry*, create and activate a new Conda env (e.g. `conda create -n langchain python=3.9`)
-2. Install Poetry v1.5.1 (see above)
-3. Tell Poetry to use the virtualenv python environment (`poetry config virtualenvs.prefer-active-python true`)
-4. Continue with the following steps.
+This project uses [Poetry](https://python-poetry.org/) v1.5.1+ as a dependency manager.
+
+❗Note: *Before installing Poetry*, if you use `Conda`, create and activate a new Conda env (e.g. `conda create -n langchain python=3.9`)
+
+Install Poetry: **[documentation on how to install it](https://python-poetry.org/docs/#installation)**.
+
+❗Note: If you use `Conda` or `Pyenv` as your environment/package manager, after installing Poetry,
+tell Poetry to use the virtualenv python environment (`poetry config virtualenvs.prefer-active-python true`)
+
+### Core vs. Experimental
 
 There are two separate projects in this repository:
 - `langchain`: core langchain code, abstractions, and use cases
-- `langchain.experimental`: more experimental code
+- `langchain.experimental`: see the [Experimental README](../libs/experimental/README.md) for more information.
+
+Each of these has their own development environment. Docs are run from the top-level makefile, but development
+is split across separate test & release flows.
 
-Each of these has their OWN development environment.
-In order to run any of the commands below, please move into their respective directories.
-For example, to contribute to `langchain` run `cd libs/langchain` before getting started with the below.
+For this quickstart, start with langchain core:
 
-To install requirements:
+```bash
+cd libs/langchain
+```
+
+### Local Development Dependencies
+
+Install langchain development requirements (for running langchain, running examples, linting, formatting, tests, and coverage):
 
 ```bash
 poetry install --with test
 ```
 
-This will install all requirements for running the package, examples, linting, formatting, tests, and coverage.
+Then verify dependency installation:
 
-❗Note: If during installation you receive a `WheelFileValidationError` for `debugpy`, please make sure you are running Poetry v1.5.1. This bug was present in older versions of Poetry (e.g. 1.4.1) and has been resolved in newer releases. If you are still seeing this bug on v1.5.1, you may also try disabling "modern installation" (`poetry config installer.modern-installation false`) and re-installing requirements. See [this `debugpy` issue](https://github.com/microsoft/debugpy/issues/1246) for more details.
+```bash
+make test
+```
 
-Now assuming `make` and `pytest` are installed, you should be able to run the common tasks in the following section. To double check, run `make test` under `libs/langchain`, all tests should pass. If they don't, you may need to pip install additional dependencies, such as `numexpr` and `openapi_schema_pydantic`.
+If the tests don't pass, you may need to pip install additional dependencies, such as `numexpr` and `openapi_schema_pydantic`.
 
-## ✅ Common Tasks
+If during installation you receive a `WheelFileValidationError` for `debugpy`, please make sure you are running
+Poetry v1.5.1+. This bug was present in older versions of Poetry (e.g. 1.4.1) and has been resolved in newer releases.
+If you are still seeing this bug on v1.5.1, you may also try disabling "modern installation"
+(`poetry config installer.modern-installation false`) and re-installing requirements.
+See [this `debugpy` issue](https://github.com/microsoft/debugpy/issues/1246) for more details.
 
-Type `make` for a list of common tasks.
+### Testing
 
-### Code Formatting
+_some test dependencies are optional; see section about optional dependencies_.
 
-Formatting for this project is done via a combination of [Black](https://black.readthedocs.io/en/stable/) and [isort](https://pycqa.github.io/isort/).
+Unit tests cover modular logic that does not require calls to outside APIs.
+If you add new logic, please add a unit test.
+
+To run unit tests:
+
+```bash
+make test
+```
+
+To run unit tests in Docker:
+
+```bash
+make docker_tests
+```
+
+There are also [integration tests and code-coverage](../libs/langchain/tests/README.md) available.
+
+### Formatting and Linting
+
+Run these locally before submitting a PR; the CI system will check also.
+
+#### Code Formatting
+
+Formatting for this project is done via a combination of [Black](https://black.readthedocs.io/en/stable/) and [ruff](https://docs.astral.sh/ruff/rules/).
 
 To run formatting for this project:
 
@@ -111,9 +153,9 @@ make format_diff
 
 This is especially useful when you have made changes to a subset of the project and want to ensure your changes are properly formatted without affecting the rest of the codebase.
 
-### Linting
+#### Linting
 
-Linting for this project is done via a combination of [Black](https://black.readthedocs.io/en/stable/), [isort](https://pycqa.github.io/isort/), [flake8](https://flake8.pycqa.org/en/latest/), and [mypy](http://mypy-lang.org/).
+Linting for this project is done via a combination of [Black](https://black.readthedocs.io/en/stable/), [ruff](https://docs.astral.sh/ruff/rules/), and [mypy](http://mypy-lang.org/).
 
 To run linting for this project:
 
@@ -131,7 +173,7 @@ This can be very helpful when you've made changes to only certain parts of the p
 
 We recognize linting can be annoying - if you do not want to do it, please contact a project maintainer, and they can help you with it. We do not want this to be a blocker for good code getting contributed.
 
-### Spellcheck
+#### Spellcheck
 
 Spellchecking for this project is done via [codespell](https://github.com/codespell-project/codespell).
 Note that `codespell` finds common typos, so it could have false-positive (correctly spelled but rarely used) and false-negatives (not finding misspelled) words.
@@ -157,17 +199,7 @@ If codespell is incorrectly flagging a word, you can skip spellcheck for that wo
 ignore-words-list = 'momento,collison,ned,foor,reworkd,parth,whats,aapply,mysogyny,unsecure'
 ```
 
-### Coverage
-
-Code coverage (i.e. the amount of code that is covered by unit tests) helps identify areas of the code that are potentially more or less brittle.
-
-To get a report of current coverage, run the following:
-
-```bash
-make coverage
-```
-
-### Working with Optional Dependencies
+## Working with Optional Dependencies
 
 Langchain relies heavily on optional dependencies to keep the Langchain package lightweight.
 
@@ -192,51 +224,7 @@ To introduce the dependency to the pyproject.toml file correctly, please do the
 test makes use of lightweight fixtures to test the logic of the code.
 5. Please use the `@pytest.mark.requires(package_name)` decorator for any tests that require the dependency.
 
-### Testing
-
-See section about optional dependencies.
-
-#### Unit Tests
-
-Unit tests cover modular logic that does not require calls to outside APIs.
-
-To run unit tests:
-
-```bash
-make test
-```
-
-To run unit tests in Docker:
-
-```bash
-make docker_tests
-```
-
-If you add new logic, please add a unit test.
-
-
-
-#### Integration Tests
-
-Integration tests cover logic that requires making calls to outside APIs (often integration with other services).
-
-**warning** Almost no tests should be integration tests.
-
- Tests that require making network connections make it difficult for other
- developers to test the code.
-
- Instead favor relying on `responses` library and/or mock.patch to mock
- requests using small fixtures.
-
-To run integration tests:
-
-```bash
-make integration_tests
-```
-
-If you add support for a new external API, please add a new integration test.
-
-### Adding a Jupyter Notebook
+## Adding a Jupyter Notebook
 
 If you are adding a Jupyter Notebook example, you'll want to install the optional `dev` dependencies.
 
@@ -259,6 +247,12 @@ When you run `poetry install`, the `langchain` package is installed as editable
 While the code is split between `langchain` and `langchain.experimental`, the documentation is one holistic thing.
 This covers how to get started contributing to documentation.
 
+From the top-level of this repo, install documentation dependencies:
+
+```bash
+poetry install
+```
+
 ### Contribute Documentation
 
 The docs directory contains Documentation and API Reference.

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -27,4 +27,4 @@ body:
  attributes:
  label: Your contribution
  description: |
- Is there any way that you could help, e.g. by submitting a PR? Make sure to read the CONTRIBUTING.MD [readme](https://github.com/hwchase17/langchain/blob/master/.github/CONTRIBUTING.md)
+ Is there any way that you could help, e.g. by submitting a PR? Make sure to read the CONTRIBUTING.MD [readme](https://github.com/langchain-ai/langchain/blob/master/.github/CONTRIBUTING.md)

.github/PULL_REQUEST_TEMPLATE.md

@@ -10,7 +10,7 @@ Replace this entire comment with:
 Please make sure your PR is passing linting and testing before submitting. Run `make format`, `make lint` and `make test` to check this locally.
 
 See contribution guidelines for more information on how to write/run tests, lint, etc: 
-https://github.com/hwchase17/langchain/blob/master/.github/CONTRIBUTING.md
+https://github.com/langchain-ai/langchain/blob/master/.github/CONTRIBUTING.md
 
 If you're adding a new integration, please include:
  1. a test for the integration, preferably unit tests that do not rely on network access,

.github/workflows/codespell.yml

@@ -22,3 +22,4 @@ jobs:
  uses: codespell-project/actions-codespell@v2
  with:
  skip: guide_imports.json
+ ignore_words_list: aadd

.github/workflows/langserve_ci.yml

@@ -0,0 +1,82 @@
+---
+name: libs/langserve CI
+
+on:
+ push:
+ branches: [ master ]
+ pull_request:
+ paths:
+ - '.github/actions/poetry_setup/action.yml'
+ - '.github/tools/**'
+ - '.github/workflows/_lint.yml'
+ - '.github/workflows/_test.yml'
+ - '.github/workflows/langserve_ci.yml'
+ - 'libs/langserve/**'
+ workflow_dispatch: # Allows to trigger the workflow manually in GitHub UI
+
+# If another push to the same PR or branch happens while this workflow is still running,
+# cancel the earlier run in favor of the next run.
+#
+# There's no point in testing an outdated version of the code. GitHub only allows
+# a limited number of job runners to be active at the same time, so it's better to cancel
+# pointless jobs early so that more useful jobs can run sooner.
+concurrency:
+ group: ${{ github.workflow }}-${{ github.ref }}
+ cancel-in-progress: true
+
+env:
+ POETRY_VERSION: "1.5.1"
+ WORKDIR: "libs/langserve"
+
+jobs:
+ lint:
+ uses:
+ ./.github/workflows/_lint.yml
+ with:
+ working-directory: libs/langserve
+ secrets: inherit
+
+ test:
+ runs-on: ubuntu-latest
+ defaults:
+ run:
+ working-directory: ${{ env.WORKDIR }}
+ strategy:
+ matrix:
+ python-version:
+ - "3.8"
+ - "3.9"
+ - "3.10"
+ - "3.11"
+ name: Python ${{ matrix.python-version }} extended tests
+ steps:
+ - uses: actions/checkout@v3
+
+ - name: Set up Python ${{ matrix.python-version }} + Poetry ${{ env.POETRY_VERSION }}
+ uses: "./.github/actions/poetry_setup"
+ with:
+ python-version: ${{ matrix.python-version }}
+ poetry-version: ${{ env.POETRY_VERSION }}
+ working-directory: libs/langserve
+ cache-key: langserve-all
+
+ - name: Install dependencies
+ shell: bash
+ run: |
+ echo "Running extended tests, installing dependencies with poetry..."
+ poetry install --with test,lint --extras all
+
+ - name: Run tests
+ run: make test
+
+ - name: Ensure the tests did not create any additional files
+ shell: bash
+ run: |
+ set -eu
+
+ STATUS="$(git status)"
+ echo "$STATUS"
+
+ # grep will exit non-zero if the target message isn't found,
+ # and `set -e` above will cause the step to fail.
+ echo "$STATUS" | grep 'nothing to commit, working tree clean'

.github/workflows/langserve_release.yml

@@ -0,0 +1,13 @@
+---
+name: libs/langserve Release
+
+on:
+ workflow_dispatch: # Allows to trigger the workflow manually in GitHub UI
+
+jobs:
+ release:
+ uses:
+ ./.github/workflows/_release.yml
+ with:
+ working-directory: libs/langserve
+ secrets: inherit

.github/workflows/scheduled_test.yml

@@ -34,28 +34,24 @@ jobs:
  working-directory: libs/langchain
  cache-key: scheduled
 
+ - name: 'Authenticate to Google Cloud'
+ id: 'auth'
+ uses: 'google-github-actions/auth@v1'
+ with:
+ credentials_json: '${{ secrets.GOOGLE_CREDENTIALS }}'
+
  - name: Install dependencies
  working-directory: libs/langchain
  shell: bash
  run: |
  echo "Running scheduled tests, installing dependencies with poetry..."
  poetry install --with=test_integration
+ poetry run pip install google-cloud-aiplatform
 
  - name: Run tests
  shell: bash
  env:
  OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
+ ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
  run: |
  make scheduled_tests
-
- - name: Ensure the tests did not create any additional files
- shell: bash
- run: |
- set -eu
-
- STATUS="$(git status)"
- echo "$STATUS"
-
- # grep will exit non-zero if the target message isn't found,
- # and `set -e` above will cause the step to fail.
- echo "$STATUS" | grep 'nothing to commit, working tree clean'