Skip to content

Commit

Permalink
community[patch]: Release 0.0.2 (#14610)
Browse files Browse the repository at this point in the history
  • Loading branch information
baskaryan committed Dec 12, 2023
1 parent 5d1dedd commit d388863
Show file tree
Hide file tree
Showing 6 changed files with 85 additions and 45 deletions.
40 changes: 37 additions & 3 deletions libs/community/langchain_community/tools/convert_to_openai.py
Original file line number Diff line number Diff line change
@@ -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}
33 changes: 0 additions & 33 deletions libs/community/langchain_community/tools/render.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand All @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions libs/community/poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions libs/community/pyproject.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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"
Expand Down
47 changes: 43 additions & 4 deletions libs/langchain/langchain/tools/render.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,52 @@
from langchain_community.tools.render import (
"""Different methods for rendering Tools to be passed to LLMs.
Depending on the LLM you are using and the prompting strategy you are using,
you may want Tools to be rendered in a different way.
This module contains various ways to render tools.
"""
from typing import List

# For backwards compatibility
from langchain_community.tools.convert_to_openai import (
format_tool_to_openai_function,
format_tool_to_openai_tool,
render_text_description,
render_text_description_and_args,
)
from langchain_core.tools import BaseTool

__all__ = [
"render_text_description",
"render_text_description_and_args",
"format_tool_to_openai_function",
"format_tool_to_openai_tool",
"format_tool_to_openai_function",
]


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)
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import pytest
from langchain_core.tools import BaseTool, tool

from langchain_community.tools.render import (
from langchain.tools.render import (
render_text_description,
render_text_description_and_args,
)
Expand Down

0 comments on commit d388863

Please sign in to comment.