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

Merge upstream #48

Merged
merged 104 commits into from
Nov 22, 2023
Merged

Merge upstream #48

merged 104 commits into from
Nov 22, 2023

Conversation

Mikelarg
Copy link
Collaborator

No description provided.

manuel-soria and others added 30 commits November 14, 2023 07:47
Including pvector template, adapting what is covered in the
[cookbook](https://github.com/langchain-ai/langchain/blob/master/cookbook/retrieval_in_sql.ipynb).

---------

Co-authored-by: Lance Martin <[email protected]>
Co-authored-by: Erick Friis <[email protected]>
There is a bug which caused the earliest message rather than the latest
message being sent
Will implement more later
It is a temporary solution before major documents refactoring.
Related to langchain-ai#13070 (not solving it)
…3363)

Bumps [pyarrow](https://github.com/apache/arrow) from 13.0.0 to 14.0.1.
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/apache/arrow/commit/ba537483618196f50c67a90a473039e4d5dc35e0"><code>ba53748</code></a>
MINOR: [Release] Update versions for 14.0.1</li>
<li><a
href="https://github.com/apache/arrow/commit/529f3768fa4fce80781cd1a3cbdcf3a826281b14"><code>529f376</code></a>
MINOR: [Release] Update .deb/.rpm changelogs for 14.0.1</li>
<li><a
href="https://github.com/apache/arrow/commit/b84bbcac64e184a2b58661385506cff23006cc10"><code>b84bbca</code></a>
MINOR: [Release] Update CHANGELOG.md for 14.0.1</li>
<li><a
href="https://github.com/apache/arrow/commit/f14170976372436ec1d03a724d8d3f3925484ecf"><code>f141709</code></a>
<a
href="https://redirect.github.com/apache/arrow/issues/38607">GH-38607</a>:
[Python] Disable PyExtensionType autoload (<a
href="https://redirect.github.com/apache/arrow/issues/38608">#38608</a>)</li>
<li><a
href="https://github.com/apache/arrow/commit/5a37e741987e4cba41dfdad2331a308c95b62083"><code>5a37e74</code></a>
<a
href="https://redirect.github.com/apache/arrow/issues/38431">GH-38431</a>:
[Python][CI] Update fs.type_name checks for s3fs tests (<a
href="https://redirect.github.com/apache/arrow/issues/38455">#38455</a>)</li>
<li><a
href="https://github.com/apache/arrow/commit/2dcee3f82c6cf54b53a64729fd81840efa583244"><code>2dcee3f</code></a>
MINOR: [Release] Update versions for 14.0.0</li>
<li><a
href="https://github.com/apache/arrow/commit/297428cbf2fc84a224654eb0b336614e6543d1aa"><code>297428c</code></a>
MINOR: [Release] Update .deb/.rpm changelogs for 14.0.0</li>
<li><a
href="https://github.com/apache/arrow/commit/3e9734f8830797fe09b883f00d349116d95c51f9"><code>3e9734f</code></a>
MINOR: [Release] Update CHANGELOG.md for 14.0.0</li>
<li><a
href="https://github.com/apache/arrow/commit/9f90995c8cee0d9906349f421f2445ab9adcb7ac"><code>9f90995</code></a>
<a
href="https://redirect.github.com/apache/arrow/issues/38332">GH-38332</a>:
[CI][Release] Resolve symlinks in RAT lint (<a
href="https://redirect.github.com/apache/arrow/issues/38337">#38337</a>)</li>
<li><a
href="https://github.com/apache/arrow/commit/bd61239a32c94e37b9510071c0ffacad455798c0"><code>bd61239</code></a>
<a
href="https://redirect.github.com/apache/arrow/issues/35531">GH-35531</a>:
[Python] C Data Interface PyCapsule Protocol (<a
href="https://redirect.github.com/apache/arrow/issues/37797">#37797</a>)</li>
<li>Additional commits viewable in <a
href="https://github.com/apache/arrow/compare/go/v13.0.0...go/v14.0.1">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=pyarrow&package-manager=pip&previous-version=13.0.0&new-version=14.0.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
You can disable automated security fix PRs for this repo from the
[Security Alerts
page](https://github.com/langchain-ai/langchain/network/alerts).

</details>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Predrag Gruevski <[email protected]>
…chain-ai#13231)

Hi,
this PR adds support for OpenAI API v1 for Azure OpenAI completion API.
@baskaryan @hwchase17

---------

Co-authored-by: Bagatur <[email protected]>
The new ruff version fixed the blocking bugs, and I was able to fairly
easily us to a passing state: ruff fixed some issues on its own, I fixed
a handful by hand, and I added a list of narrowly-targeted exclusions
for files that are currently failing ruff rules that we probably should
look into eventually.

I went pretty lenient on the docs / cookbooks rules, allowing dead code
and such things. Perhaps in the future we may want to tighten the rules
further, but this is already a good set of checks that found real issues
and will prevent them going forward.
This version of `ruff` is the one we'll be using to lint the docs and
cookbooks (langchain-ai#12677), so I'm making it used everywhere else too.
My thought is that the ==version would prevent pip from finding the
package on regular [pypi.org](http://pypi.org/), so it would look at
[test.pypi.org](http://test.pypi.org/) for that. Otherwise it'll pull
package from [pypi.org](http://pypi.org/) (e.g. sub deps)

Right now, the cli release is failing because it's going to
test.pypi.org by default, so it finds this incorrect FASTAPI package
instead of the real one: https://test.pypi.org/project/FASTAPI/
Added an example with new soa `Yi` model to `HuggingFace-hub` notebook
…ngchain-ai#13364)

Just `poetry lock` and moving `langchain` to the latest version, in case
folks copy this template.

This resolves some vulnerable dependency alerts GitHub code scanning was
flagging.
…s. (langchain-ai#13362)

The `langchain` repo was being flagged for using vulnerable
dependencies, some of which were in this template's lockfile. Updating
to newer versions should fix that.
- **Description:** Adds `limit_to_domains` param to the APIChain based
tools (open_meteo, TMDB, podcast_docs, and news_api)
- **Issue:** I didn't open an issue, but after upgrading to 0.0.328
using these tools would throw an error.
  - **Dependencies:** N/A
  - **Tag maintainer:** @baskaryan 
  
  
**Note**: I included the trailing / simply because the docs here did
https://github.com/langchain-ai/langchain/blob/fc886cc3039c2479bb13287f48fcbdb097a44c70/docs/docs/use_cases/apis.ipynb#L246
, but I checked the code and it is using `urlparse`. SoI followed the
docs since it comes down to stylee.
The `Integrations` site is hidden now.
I've added it into the `More` menu.
The name is `Integration Cards` otherwise, it is confused with the
`Integrations` menu.

---------

Co-authored-by: Erick Friis <[email protected]>
<!-- Thank you for contributing to LangChain!

Replace this entire comment with:
  - **Description:** a description of the change, 
  - **Issue:** the issue # it fixes (if applicable),
  - **Dependencies:** any dependencies required for this change,
- **Tag maintainer:** for a quicker response, tag the relevant
maintainer (see below),
- **Twitter handle:** we announce bigger features on Twitter. If your PR
gets announced, and you'd like a mention, we'll gladly shout you out!

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/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,
2. an example notebook showing its use. It lives in `docs/extras`
directory.

If no one reviews your PR within a few days, please @-mention one of
@baskaryan, @eyurtsev, @hwchase17.
 -->

fix langchain-ai#13356

Add supports following properties for metadata to NotionDBLoader.

- `checkbox`
- `email`
- `number`
- `select`

There are no relevant tests for this code to be updated.
…#13312)

<!-- Thank you for contributing to LangChain!

Replace this entire comment with:
  - **Description:** a description of the change, 
  - **Issue:** the issue # it fixes (if applicable),
  - **Dependencies:** any dependencies required for this change,
- **Tag maintainer:** for a quicker response, tag the relevant
maintainer (see below),
- **Twitter handle:** we announce bigger features on Twitter. If your PR
gets announced, and you'd like a mention, we'll gladly shout you out!

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/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,
2. an example notebook showing its use. It lives in `docs/extras`
directory.

If no one reviews your PR within a few days, please @-mention one of
@baskaryan, @eyurtsev, @hwchase17.
 -->

---------

Co-authored-by: Harrison Chase <[email protected]>
<!-- Thank you for contributing to LangChain!

Replace this entire comment with:
  - **Description:** a description of the change, 
  - **Issue:** the issue # it fixes (if applicable),
  - **Dependencies:** any dependencies required for this change,
- **Tag maintainer:** for a quicker response, tag the relevant
maintainer (see below),
- **Twitter handle:** we announce bigger features on Twitter. If your PR
gets announced, and you'd like a mention, we'll gladly shout you out!

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/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,
2. an example notebook showing its use. It lives in `docs/extras`
directory.

If no one reviews your PR within a few days, please @-mention one of
@baskaryan, @eyurtsev, @hwchase17.
 -->
- **Description:** adding cohere embedding support to bedrock embedding
class
  - **Issue:** N/A
  - **Dependencies:** None
  - **Tag maintainer:** @3coins 
  - **Twitter handle:** celmore25

---------

Co-authored-by: Erick Friis <[email protected]>
<!-- Thank you for contributing to LangChain!

Replace this entire comment with:
  - **Description:** a description of the change, 
  - **Issue:** the issue # it fixes (if applicable),
  - **Dependencies:** any dependencies required for this change,
- **Tag maintainer:** for a quicker response, tag the relevant
maintainer (see below),
- **Twitter handle:** we announce bigger features on Twitter. If your PR
gets announced, and you'd like a mention, we'll gladly shout you out!

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/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,
2. an example notebook showing its use. It lives in `docs/extras`
directory.

If no one reviews your PR within a few days, please @-mention one of
@baskaryan, @eyurtsev, @hwchase17.
 -->
* PGVector needs to close its connection if its garbage collected
Otherwise, you get an error when using async functions.


h/t to Chris Ruppelt
- Make javelin_ai_gateway_api_key a SecretStr

---------

Co-authored-by: Hiroshi Tashiro <[email protected]>
baskaryan and others added 27 commits November 18, 2023 15:12
added disclaimer

---------

Co-authored-by: Erick Friis <[email protected]>
…hain-ai#13583)

**Description:**
Enhance the functionality of YoutubeLoader to enable the translation of
available transcripts by refining the existing logic.

**Issue:**
Encountering a problem with YoutubeLoader (langchain-ai#13523) where the translation
feature is not functioning as expected.

Tag maintainers/contributors who might be interested:
@eyurtsev

---------

Co-authored-by: Bagatur <[email protected]>
**Description:**

This commit adds embedchain retriever along with tests and docs.
Embedchain is a RAG framework to create data pipelines.

**Twitter handle:**
- [Taranjeet's twitter](https://twitter.com/taranjeetio) and
[Embedchain's twitter](https://twitter.com/embedchain)

**Reviewer**
@hwchase17

---------

Co-authored-by: Bagatur <[email protected]>
- **Description:** This change allows for the `MWDumpLoader` to load all
namespaces including custom by default instead of only loading the
[default
namespaces](https://www.mediawiki.org/wiki/Help:Namespaces#Localisation).
  - **Tag maintainer:** @hwchase17
…angchain-ai#13545)

- **Description:** In this pull request, we address an issue related to
assigning a schema to the SQLDatabase class when utilizing an Oracle
database. The current implementation encounters a bug where, upon
attempting to execute a query, the alter session parse is not
appropriately defined for Oracle, leading to an error,
  - **Issue:** langchain-ai#7928,
  - **Dependencies:** No dependencies,
  - **Tag maintainer:** @baskaryan,

---------

Co-authored-by: Bagatur <[email protected]>
…ey' (langchain-ai#13517)

The issue was accuring because of `openai` update in Completions. its
not accepting `api_key` and 'api_base' args.

The fix is we check for the openai version and if ats v1 then remove
these keys from args before passing them to `Compilation.create(...)`
when sending from `VLLMOpenAI`

Fixed: langchain-ai#13507 

@eyu
@efriis 
@hwchase17

---------

Co-authored-by: Erick Friis <[email protected]>
- **Description:** Fix Astra integration tests that are failing. The
`delete` always return True as the deletion is successful if no errors
are thrown. I aligned the test to verify this behaviour
  - **Tag maintainer:** @hemidactylus 
  - **Twitter handle:** nicoloboschi

---------

Co-authored-by: Bagatur <[email protected]>
…langchain-ai#13525)

Added a `search_kwargs` field to BingSearchAPIWrapper in
`bing_search.py,` enabling users to include extra keyword arguments in
Bing search queries. This update, like specifying language preferences,
adds more customization to searches. The `search_kwargs` seamlessly
merge with standard parameters in `_bing_search_results` method.

---------

Co-authored-by: Erick Friis <[email protected]>
…in-ai#13512)

- **Description:** AstraDB is going to deprecate the `$similarity`
projection property in favor of the ´includeSimilarity´ option flag. I
moved all the queries to the new format.
- **Tag maintainer:** @hemidactylus 
- **Twitter handle:** nicoloboschi
- Added/updated descriptions and links

---------

Co-authored-by: Erick Friis <[email protected]>
- **Description: fix hunyuan appid type
- **Issue:
langchain-ai#12022 (comment)
…chain-ai#13502)

- **Description:** There are several mistakes in the sample code in the
doc-string of `DashVector` class, and this pull request aims to correct
them.
The correction code has been tested against latest version (at the time
of creation of this pull request) of: `langchain==0.0.336`
`dashvector==1.0.6` .
- **Issue:** No issue is created for this.
- **Dependencies:** No dependency is required for this change,
<!-- - **Tag maintainer:** for a quicker response, tag the relevant
maintainer (see below), -->
- **Twitter handle:** `zeyanglin`

<!-- 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/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,
2. an example notebook showing its use. It lives in `docs/extras`
directory.

If no one reviews your PR within a few days, please @-mention one of
@baskaryan, @eyurtsev, @hwchase17.
-->
Hi! 
This short PR aims at:
* Fixing `OpenAIEmbeddings`' check on `chunk_size` when used with Azure
OpenAI (thus with openai < 1.0). Azure OpenAI embeddings support at most
16 chunks per batch, I believe we are supposed to take the min between
the passed value/default value and 16, not the max - which, I suppose,
was introduced by accident while refactoring the previous version of
this check from this other PR of mine: langchain-ai#10707
* Porting this fix to the newest class (`AzureOpenAIEmbeddings`) for
openai >= 1.0

This fixes langchain-ai#13539 (closed but the issue persists).  

@baskaryan @hwchase17
- **Description:** This change adds an agent to the Azure Cognitive
Services toolkit for identifying healthcare entities
  - **Dependencies:** azure-ai-textanalytics (Optional)

---------

Co-authored-by: James Beck <[email protected]>
Co-authored-by: Bagatur <[email protected]>
…n-ai#13403)

Hi 👋 We are working with Llama2 on Bedrock, and would like to add it to
Langchain. We saw a [pull
request](langchain-ai#13322) to add it
to the `llm.Bedrock` class, but since it concerns a chat model, we would
like to add it to `BedrockChat` as well.

- **Description:** Add support for Llama2 to `BedrockChat` in
`chat_models`
- **Issue:** the issue # it fixes (if applicable)
[langchain-ai#13316](langchain-ai#13316)
  - **Dependencies:** any dependencies required for this change `None`
  - **Tag maintainer:** /
  - **Twitter handle:** `@SimonBockaert @WouterDurnez`

---------

Co-authored-by: wouter.durnez <[email protected]>
Co-authored-by: Simon Bockaert <[email protected]>
)

In the `FORMAT_INSTRUCTIONS` template, 4 curly braces (escaping) are
used to get single curly brace after formatting:

```
"{{{ ... }}}}" -> format_instructions.format() ->  "{{ ... }}" -> template.format() -> "{ ... }".
```

Tool's `args_schema` string contains single braces `{ ... }`, and is
also transformed to `{{{{ ... }}}}` form. But this is not really correct
since there is only one `format()` call:

```
"{{{{ ... }}}}" -> template.format() -> "{{ ... }}".
```

As a result we get double curly braces in the prompt:
````
Respond to the human as helpfully and accurately as possible. You have access to the following tools:

foo: Test tool FOO, args: {{'tool_input': {{'type': 'string'}}}}    # <--- !!!
...
Provide only ONE action per $JSON_BLOB, as shown:

```
{
  "action": $TOOL_NAME,
  "action_input": $INPUT
}
```
````

This PR fixes curly braces escaping in the `args_schema` to have single
braces in the final prompt:
````
Respond to the human as helpfully and accurately as possible. You have access to the following tools:

foo: Test tool FOO, args: {'tool_input': {'type': 'string'}}    # <--- !!!
...
Provide only ONE action per $JSON_BLOB, as shown:

```
{
  "action": $TOOL_NAME,
  "action_input": $INPUT
}
```
````

---------

Co-authored-by: Sergey Kozlov <[email protected]>
- **Description:** Fix typo in MongoDB memory docs
  - **Tag maintainer:** @eyurtsev

<!-- Thank you for contributing to LangChain!

  - **Description:** Fix typo in MongoDB memory docs
  - **Issue:** the issue # it fixes (if applicable),
  - **Dependencies:** any dependencies required for this change,
  - **Tag maintainer:** @baskaryan
- **Twitter handle:** we announce bigger features on Twitter. If your PR
gets announced, and you'd like a mention, we'll gladly shout you out!

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/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,
2. an example notebook showing its use. It lives in `docs/extras`
directory.

If no one reviews your PR within a few days, please @-mention one of
@baskaryan, @eyurtsev, @hwchase17.
 -->
- **Description:**
- Fixes a `key_prefix` bug where passing it in on
`Redis.from_existing(...)` did not work properly. Updates doc strings
accordingly.
- Updates Redis filter classes logic with best practices on typing,
string formatting, and handling "empty" filters.
- Fixes a bug that would prevent multiple tag filters from being applied
together in some scenarios.
- Added a whole new filter unit testing module. Also updated code
formatting for a number of modules that were failing the `make`
commands.
  - **Issue:** N/A
  - **Dependencies:** N/A
  - **Tag maintainer:** @baskaryan 
  - **Twitter handle:** @tchutch94
- **Description:** during search with DeepLake some people are facing
backwards compatibility issues, this PR fixes it by making search
accessible for the older datasets

---------

Co-authored-by: adolkhan <[email protected]>
- **Description:** ERNIE-Bot-Chat-4 Large Language Model adds the
ability of `Function Calling` by passing parameters through the
`functions` parameter in the request. To simplify function calling for
ERNIE-Bot-Chat-4, the `create_ernie_fn_chain()` function has been added.
The definition and usage of the `create_ernie_fn_chain()` function is
similar to that of the `create_openai_fn_chain()` function.

Examples as the follows:

```
import json

from langchain.chains.ernie_functions import (
    create_ernie_fn_chain,
)
from langchain.chat_models import ErnieBotChat
from langchain.prompts import ChatPromptTemplate

def get_current_news(location: str) -> str:
    """Get the current news based on the location.'

    Args:
        location (str): The location to query.
    
    Returs:
        str: Current news based on the location.
    """

    news_info = {
        "location": location,
        "news": [
            "I have a Book.",
            "It's a nice day, today."
        ]
    }

    return json.dumps(news_info)

def get_current_weather(location: str, unit: str="celsius") -> str:
    """Get the current weather in a given location

    Args:
        location (str): location of the weather.
        unit (str): unit of the tempuature.
    
    Returns:
        str: weather in the given location.
    """

    weather_info = {
        "location": location,
        "temperature": "27",
        "unit": unit,
        "forecast": ["sunny", "windy"],
    }
    return json.dumps(weather_info)

llm = ErnieBotChat(model_name="ERNIE-Bot-4")
prompt = ChatPromptTemplate.from_messages(
    [
        ("human", "{query}"),
    ]
)

chain = create_ernie_fn_chain([get_current_weather, get_current_news], llm, prompt, verbose=True)
res = chain.run("北京今天的新闻是什么?")
print(res)
```

The running results of the above program are shown below:
```
> Entering new LLMChain chain...
Prompt after formatting:
Human: 北京今天的新闻是什么?



> Finished chain.
{'name': 'get_current_news', 'thoughts': '用户想要知道北京今天的新闻。我可以使用get_current_news工具来获取这些信息。', 'arguments': {'location': '北京'}}
```
# Conflicts:
#	cookbook/autogpt/autogpt.ipynb
#	cookbook/camel_role_playing.ipynb
#	docs/docs/get_started/installation.mdx
#	docs/docs/guides/local_llms.ipynb
#	docs/docs/integrations/document_loaders/youtube_transcript.ipynb
#	docs/docs/integrations/llms/fireworks.ipynb
#	docs/docs/integrations/llms/titan_takeoff.ipynb
#	docs/docs/integrations/providers/aim_tracking.ipynb
#	docs/docs/integrations/toolkits/google_drive.ipynb
#	docs/docs/integrations/vectorstores/activeloop_deeplake.ipynb
#	docs/docs/modules/agents/agent_types/self_ask_with_search.ipynb
#	docs/docs/modules/agents/how_to/add_memory_openai_functions.ipynb
#	docs/docs/modules/data_connection/index.mdx
#	docs/docs/modules/model_io/llms/async_llm.ipynb
#	libs/cli/langchain_cli/project_template/pyproject.toml
#	libs/cli/poetry.lock
#	libs/cli/pyproject.toml
#	libs/experimental/poetry.lock
#	libs/experimental/pyproject.toml
#	libs/langchain/langchain/agents/agent.py
#	libs/langchain/langchain/callbacks/manager.py
#	libs/langchain/langchain/chains/graph_qa/prompts.py
#	libs/langchain/poetry.lock
#	libs/langchain/pyproject.toml
#	poetry.lock
#	templates/basic-critique-revise/poetry.lock
#	templates/basic-critique-revise/pyproject.toml
#	templates/cassandra-entomology-rag/poetry.lock
#	templates/cassandra-entomology-rag/pyproject.toml
#	templates/cassandra-synonym-caching/poetry.lock
#	templates/cassandra-synonym-caching/pyproject.toml
#	templates/chat-bot-feedback/poetry.lock
#	templates/chat-bot-feedback/pyproject.toml
#	templates/csv-agent/poetry.lock
#	templates/csv-agent/pyproject.toml
#	templates/elastic-query-generator/poetry.lock
#	templates/extraction-openai-functions/poetry.lock
#	templates/extraction-openai-functions/pyproject.toml
#	templates/guardrails-output-parser/poetry.lock
#	templates/guardrails-output-parser/pyproject.toml
#	templates/hybrid-search-weaviate/poetry.lock
#	templates/hybrid-search-weaviate/pyproject.toml
#	templates/hyde/poetry.lock
#	templates/hyde/pyproject.toml
#	templates/mongo-parent-document-retrieval/poetry.lock
#	templates/mongo-parent-document-retrieval/pyproject.toml
#	templates/neo4j-advanced-rag/poetry.lock
#	templates/neo4j-cypher-ft/poetry.lock
#	templates/neo4j-cypher-memory/poetry.lock
#	templates/neo4j-cypher/poetry.lock
#	templates/neo4j-generation/poetry.lock
#	templates/neo4j-generation/pyproject.toml
#	templates/neo4j-parent/poetry.lock
#	templates/neo4j-vector-memory/poetry.lock
#	templates/openai-functions-agent/poetry.lock
#	templates/openai-functions-agent/pyproject.toml
#	templates/openai-functions-tool-retrieval-agent/poetry.lock
#	templates/openai-functions-tool-retrieval-agent/pyproject.toml
#	templates/pii-protected-chatbot/poetry.lock
#	templates/pii-protected-chatbot/pyproject.toml
#	templates/pirate-speak-configurable/poetry.lock
#	templates/pirate-speak-configurable/pyproject.toml
#	templates/pirate-speak/poetry.lock
#	templates/pirate-speak/pyproject.toml
#	templates/plate-chain/poetry.lock
#	templates/plate-chain/pyproject.toml
#	templates/rag-astradb/poetry.lock
#	templates/rag-astradb/pyproject.toml
#	templates/rag-chroma/poetry.lock
#	templates/rag-chroma/pyproject.toml
#	templates/rag-conversation-zep/poetry.lock
#	templates/rag-conversation-zep/pyproject.toml
#	templates/rag-conversation/poetry.lock
#	templates/rag-conversation/pyproject.toml
#	templates/rag-elasticsearch/poetry.lock
#	templates/rag-elasticsearch/pyproject.toml
#	templates/rag-fusion/poetry.lock
#	templates/rag-fusion/pyproject.toml
#	templates/rag-momento-vector-index/poetry.lock
#	templates/rag-mongo/poetry.lock
#	templates/rag-mongo/pyproject.toml
#	templates/rag-pinecone-multi-query/poetry.lock
#	templates/rag-pinecone-multi-query/pyproject.toml
#	templates/rag-pinecone-rerank/poetry.lock
#	templates/rag-pinecone-rerank/pyproject.toml
#	templates/rag-pinecone/poetry.lock
#	templates/rag-pinecone/pyproject.toml
#	templates/rag-redis/poetry.lock
#	templates/rag-self-query/poetry.lock
#	templates/rag-self-query/pyproject.toml
#	templates/rag-semi-structured/poetry.lock
#	templates/rag-singlestoredb/poetry.lock
#	templates/rag-singlestoredb/pyproject.toml
#	templates/rag-supabase/poetry.lock
#	templates/rag-supabase/pyproject.toml
#	templates/rag-timescale-conversation/poetry.lock
#	templates/rag-timescale-conversation/pyproject.toml
#	templates/rag-timescale-hybrid-search-time/poetry.lock
#	templates/rag-timescale-hybrid-search-time/pyproject.toml
#	templates/rag-vectara-multiquery/poetry.lock
#	templates/rag-vectara-multiquery/pyproject.toml
#	templates/rag-vectara/poetry.lock
#	templates/rag-vectara/pyproject.toml
#	templates/rag-weaviate/poetry.lock
#	templates/rag-weaviate/pyproject.toml
#	templates/research-assistant/poetry.lock
#	templates/research-assistant/pyproject.toml
#	templates/retrieval-agent/poetry.lock
#	templates/retrieval-agent/pyproject.toml
#	templates/rewrite-retrieve-read/poetry.lock
#	templates/self-query-qdrant/poetry.lock
#	templates/self-query-qdrant/pyproject.toml
#	templates/self-query-supabase/poetry.lock
#	templates/self-query-supabase/pyproject.toml
#	templates/solo-performance-prompting-agent/poetry.lock
#	templates/solo-performance-prompting-agent/pyproject.toml
#	templates/stepback-qa-prompting/poetry.lock
…/up_20.11

# Conflicts:
#	libs/langchain/langchain/agents/agent.py
#	libs/langchain/langchain/callbacks/manager.py
…/up_20.11

# Conflicts:
#	libs/langchain/langchain/agents/agent.py
#	libs/langchain/langchain/callbacks/manager.py
@Mikelarg Mikelarg merged commit 3797594 into master Nov 22, 2023
Rai220 pushed a commit that referenced this pull request Dec 4, 2023
@Rai220 Rai220 deleted the feature/up_20.11 branch December 28, 2023 10:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.