cr

langchain-ai · Dec 12, 2023 · 21aa8ec · 21aa8ec
2 parents e5d2ab6 + ca7da8f
commit 21aa8ec
Show file tree

Hide file tree

Showing 26 changed files with 2,492 additions and 129 deletions.
diff --git a/README.md b/README.md
@@ -3,8 +3,7 @@
 ⚡ Building applications with LLMs through composability ⚡
 
 [![Release Notes](https://img.shields.io/github/release/langchain-ai/langchain)](https://github.com/langchain-ai/langchain/releases)
-[![CI](https://github.com/langchain-ai/langchain/actions/workflows/langchain_ci.yml/badge.svg)](https://github.com/langchain-ai/langchain/actions/workflows/langchain_ci.yml)
-[![Experimental CI](https://github.com/langchain-ai/langchain/actions/workflows/langchain_experimental_ci.yml/badge.svg)](https://github.com/langchain-ai/langchain/actions/workflows/langchain_experimental_ci.yml)
+[![CI](https://github.com/langchain-ai/langchain/actions/workflows/check_diffs.yml/badge.svg)](https://github.com/langchain-ai/langchain/actions/workflows/check_diffs.yml)
 [![Downloads](https://static.pepy.tech/badge/langchain/month)](https://pepy.tech/project/langchain)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 [![Twitter](https://img.shields.io/twitter/url/https/twitter.com/langchainai.svg?style=social&label=Follow%20%40LangChainAI)](https://twitter.com/langchainai)

diff --git a/docs/static/img/langchain_stack.png b/docs/static/img/langchain_stack.png
diff --git a/libs/community/README.md b/libs/community/README.md
@@ -1 +1,30 @@
-# langchain-community
+# 🦜️🧑‍🤝‍🧑 LangChain Community
+
+[![Downloads](https://static.pepy.tech/badge/langchain_community/month)](https://pepy.tech/project/langchain_community)
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
+
+## Quick Install
+
+```bash
+pip install langchain-community
+```
+
+## What is it?
+
+LangChain Community contains third-party integrations that implement the base interfaces defined in LangChain Core, making them ready-to-use in any LangChain application.
+
+For full documentation see the [API reference](https://api.python.langchain.com/en/stable/community_api_reference.html).
+
+![LangChain Stack](../../docs/static/img/langchain_stack.png)
+
+## 📕 Releases & Versioning
+
+`langchain-community` is currently on version `0.0.x`
+
+All changes will be accompanied by a patch version increase.
+
+## 💁 Contributing
+
+As an open-source project in a rapidly developing field, we are extremely open to contributions, whether it be in the form of a new feature, improved infrastructure, or better documentation.
+
+For detailed information on how to contribute, see [here](../../.github/CONTRIBUTING.md).
diff --git a/libs/community/langchain_community/tools/convert_to_openai.py b/libs/community/langchain_community/tools/convert_to_openai.py
@@ -1,4 +1,38 @@
-from langchain_community.tools.render import format_tool_to_openai_function
+from langchain_core.tools import BaseTool
 
-# For backwards compatibility
-__all__ = ["format_tool_to_openai_function"]
+from langchain_community.utils.openai_functions import (
+    FunctionDescription,
+    ToolDescription,
+    convert_pydantic_to_openai_function,
+)
+
+
+def format_tool_to_openai_function(tool: BaseTool) -> FunctionDescription:
+    """Format tool into the OpenAI function API."""
+    if tool.args_schema:
+        return convert_pydantic_to_openai_function(
+            tool.args_schema, name=tool.name, description=tool.description
+        )
+    else:
+        return {
+            "name": tool.name,
+            "description": tool.description,
+            "parameters": {
+                # This is a hack to get around the fact that some tools
+                # do not expose an args_schema, and expect an argument
+                # which is a string.
+                # And Open AI does not support an array type for the
+                # parameters.
+                "properties": {
+                    "__arg1": {"title": "__arg1", "type": "string"},
+                },
+                "required": ["__arg1"],
+                "type": "object",
+            },
+        }
+
+
+def format_tool_to_openai_tool(tool: BaseTool) -> ToolDescription:
+    """Format tool into the OpenAI function API."""
+    function = format_tool_to_openai_function(tool)
+    return {"type": "function", "function": function}
diff --git a/libs/community/langchain_community/tools/render.py b/libs/community/langchain_community/tools/render.py
@@ -4,8 +4,6 @@
 you may want Tools to be rendered in a different way.
 This module contains various ways to render tools.
 """
-from typing import List
-
 from langchain_core.tools import BaseTool
 
 from langchain_community.utils.openai_functions import (
@@ -15,37 +13,6 @@
 )
 
 
-def render_text_description(tools: List[BaseTool]) -> str:
-    """Render the tool name and description in plain text.
-
-    Output will be in the format of:
-
-    .. code-block:: markdown
-
-        search: This tool is used for search
-        calculator: This tool is used for math
-    """
-    return "\n".join([f"{tool.name}: {tool.description}" for tool in tools])
-
-
-def render_text_description_and_args(tools: List[BaseTool]) -> str:
-    """Render the tool name, description, and args in plain text.
-
-    Output will be in the format of:
-
-    .. code-block:: markdown
-
-        search: This tool is used for search, args: {"query": {"type": "string"}}
-        calculator: This tool is used for math, \
-args: {"expression": {"type": "string"}}
-    """
-    tool_strings = []
-    for tool in tools:
-        args_schema = str(tool.args)
-        tool_strings.append(f"{tool.name}: {tool.description}, args: {args_schema}")
-    return "\n".join(tool_strings)
-
-
 def format_tool_to_openai_function(tool: BaseTool) -> FunctionDescription:
     """Format tool into the OpenAI function API."""
     if tool.args_schema:

diff --git a/libs/community/poetry.lock b/libs/community/poetry.lock
diff --git a/libs/community/pyproject.toml b/libs/community/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "langchain-community"
-version = "0.0.1"
+version = "0.0.2"
 description = "Community contributed LangChain integrations."
 authors = []
 license = "MIT"
@@ -9,7 +9,7 @@ repository = "https://github.com/langchain-ai/langchain"
 
 [tool.poetry.dependencies]
 python = ">=3.8.1,<4.0"
-langchain-core = ">=0.0.13,<0.1"
+langchain-core = "^0.1"
 SQLAlchemy = ">=1.4,<3"
 requests = "^2"
 PyYAML = ">=5.3"
@@ -83,6 +83,8 @@ msal = {version = "^1.25.0", optional = true}
 databricks-vectorsearch = {version = "^0.21", optional = true}
 dgml-utils = {version = "^0.3.0", optional = true}
 datasets = {version = "^2.15.0", optional = true}
+requests-aws4auth = {version = "^1.2.3", optional = true}
+opensearch-py = {version = "^2.4.2", optional = true}
 
 [tool.poetry.group.test]
 optional = true
@@ -241,6 +243,8 @@ extended_testing = [
  "databricks-vectorsearch",
  "dgml-utils",
  "cohere",
+ "opensearch-py",
+ "requests-aws4auth",
 ]
 
 [tool.ruff]

diff --git a/libs/core/README.md b/libs/core/README.md
@@ -1 +1,58 @@
-# langchain-core
+# 🦜🍎️ LangChain Core
+
+[![Downloads](https://static.pepy.tech/badge/langchain_core/month)](https://pepy.tech/project/langchain_core)
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
+
+## Quick Install
+
+```bash
+pip install langchain-core
+```
+
+## What is it?
+
+LangChain Core contains the base abstractions that power the rest of the LangChain ecosystem. 
+These abstractions are designed to be as modular and simple as possible. 
+Examples of these abstractions include those for language models, document loaders, embedding models, vectorstores, retrievers, and more. 
+The benefit of having these abstractions is that any provider can implement the required interface and then easily be used in the rest of the LangChain ecosystem.
+
+For full documentation see the [API reference](https://api.python.langchain.com/en/stable/core_api_reference.html).
+
+## What is LangChain Expression Language?
+
+LangChain Core also contains LangChain Expression Language, or LCEL, a runtime that allows users to compose arbitrary sequences together and get several benefits that are important when building LLM applications. 
+We call these sequences “runnables”.
+
+All runnables expose the same interface with single-invocation, batch, streaming and async methods. 
+This design is useful because it is not enough to have a single sync interface when building an LLM application.  
+Batch is needed for efficient processing of many inputs.
+Streaming (and streaming of intermediate steps) is needed to show the user that progress is being made. 
+Async interfaces are nice when moving into production. 
+Rather than having to write multiple implementations for all of those, LCEL allows you to write a runnable once and invoke it in many different ways.
+
+For more check out the [LCEL docs](https://python.langchain.com/docs/expression_language/).
+
+![LangChain Stack](../../docs/static/img/langchain_stack.png)
+
+## 📕 Releases & Versioning
+
+`langchain-core` is currently on version `0.1.x`.
+
+As `langchain-core` contains the base abstractions and runtime for the whole LangChain ecosystem, we will communicate any breaking changes with advance notice and version bumps. The exception for this is anything in `langchain_core.beta`. The reason for `langchain_core.beta` is that given the rate of change of the field, being able to move quickly is still a priority, and this module is our attempt to do so.
+
+Minor version increases will occur for:
+
+- Breaking changes for any public interfaces NOT in `langchain_core.beta`
+
+Patch version increases will occur for:
+
+- Bug fixes
+- New features
+- Any changes to private interfaces
+- Any changes to `langchain_core.beta`
+
+## 💁 Contributing
+
+As an open-source project in a rapidly developing field, we are extremely open to contributions, whether it be in the form of a new feature, improved infrastructure, or better documentation.
+
+For detailed information on how to contribute, see [here](../../.github/CONTRIBUTING.md).
diff --git a/libs/core/langchain_core/load/load.py b/libs/core/langchain_core/load/load.py
@@ -63,21 +63,27 @@ def __call__(self, value: Dict[str, Any]) -> Any:
             if len(namespace) == 1 and namespace[0] == "langchain":
                 raise ValueError(f"Invalid namespace: {value}")
 
-            # Get the importable path
-            key = tuple(namespace + [name])
-            if key not in SERIALIZABLE_MAPPING:
-                raise ValueError(
-                    "Trying to deserialize something that cannot "
-                    "be deserialized in current version of langchain-core: "
-                    f"{key}"
-                )
-            import_path = SERIALIZABLE_MAPPING[key]
-            # Split into module and name
-            import_dir, import_obj = import_path[:-1], import_path[-1]
-            # Import module
-            mod = importlib.import_module(".".join(import_dir))
-            # Import class
-            cls = getattr(mod, import_obj)
+            # If namespace is in known namespaces, try to use mapping
+            if namespace[0] in DEFAULT_NAMESPACES:
+                # Get the importable path
+                key = tuple(namespace + [name])
+                if key not in SERIALIZABLE_MAPPING:
+                    raise ValueError(
+                        "Trying to deserialize something that cannot "
+                        "be deserialized in current version of langchain-core: "
+                        f"{key}"
+                    )
+                import_path = SERIALIZABLE_MAPPING[key]
+                # Split into module and name
+                import_dir, import_obj = import_path[:-1], import_path[-1]
+                # Import module
+                mod = importlib.import_module(".".join(import_dir))
+                # Import class
+                cls = getattr(mod, import_obj)
+            # Otherwise, load by path
+            else:
+                mod = importlib.import_module(".".join(namespace))
+                cls = getattr(mod, name)
 
             # The class must be a subclass of Serializable.
             if not issubclass(cls, Serializable):

diff --git a/libs/core/pyproject.toml b/libs/core/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "langchain-core"
-version = "0.0.13"
+version = "0.1.0"
 description = "Building applications with LLMs through composability"
 authors = []
 license = "MIT"

diff --git a/libs/experimental/poetry.lock b/libs/experimental/poetry.lock
diff --git a/libs/experimental/pyproject.toml b/libs/experimental/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "langchain-experimental"
-version = "0.0.46"
+version = "0.0.47"
 description = "Building applications with LLMs through composability"
 authors = []
 license = "MIT"
@@ -10,8 +10,8 @@ repository = "https://github.com/langchain-ai/langchain"
 
 [tool.poetry.dependencies]
 python = ">=3.8.1,<4.0"
-langchain-core = ">=0.0.13,<0.1"
-langchain = ">=0.0.349,<0.1"
+langchain-core = "^0.1"
+langchain = ">=0.0.350,<0.1"
 presidio-anonymizer = {version = "^2.2.33", optional = true}
 presidio-analyzer = {version = "^2.2.33", optional = true}
 faker = {version = "^19.3.1", optional = true}