From 36aa7f30e4294a9ca8db1293e38a89409930a5ef Mon Sep 17 00:00:00 2001 From: dev2049 <130488702+dev2049@users.noreply.github.com> Date: Sat, 15 Apr 2023 10:50:25 -0700 Subject: [PATCH] Move PythonRepl -> langchain.utilities (#2917) --- langchain/chains/llm_math/base.py | 2 +- langchain/chains/pal/base.py | 2 +- langchain/python.py | 28 +++------------------------- langchain/tools/python/tool.py | 2 +- langchain/utilities/__init__.py | 4 ++-- langchain/utilities/python.py | 25 +++++++++++++++++++++++++ tests/unit_tests/test_python.py | 2 +- 7 files changed, 34 insertions(+), 31 deletions(-) create mode 100644 langchain/utilities/python.py diff --git a/langchain/chains/llm_math/base.py b/langchain/chains/llm_math/base.py index 65a8adf494..5c7ef09efc 100644 --- a/langchain/chains/llm_math/base.py +++ b/langchain/chains/llm_math/base.py @@ -7,8 +7,8 @@ from langchain.chains.base import Chain from langchain.chains.llm import LLMChain from langchain.chains.llm_math.prompt import PROMPT from langchain.prompts.base import BasePromptTemplate -from langchain.python import PythonREPL from langchain.schema import BaseLanguageModel +from langchain.utilities import PythonREPL class LLMMathChain(Chain): diff --git a/langchain/chains/pal/base.py b/langchain/chains/pal/base.py index 1bcdef3ae7..0d15b90be7 100644 --- a/langchain/chains/pal/base.py +++ b/langchain/chains/pal/base.py @@ -13,8 +13,8 @@ from langchain.chains.llm import LLMChain from langchain.chains.pal.colored_object_prompt import COLORED_OBJECT_PROMPT from langchain.chains.pal.math_prompt import MATH_PROMPT from langchain.prompts.base import BasePromptTemplate -from langchain.python import PythonREPL from langchain.schema import BaseLanguageModel +from langchain.utilities import PythonREPL class PALChain(Chain): diff --git a/langchain/python.py b/langchain/python.py index a14bc2e13e..28b9c30696 100644 --- a/langchain/python.py +++ b/langchain/python.py @@ -1,26 +1,4 @@ -"""Mock Python REPL.""" -import sys -from io import StringIO -from typing import Dict, Optional +"""For backwards compatibility.""" +from langchain.utilities.python import PythonREPL -from pydantic import BaseModel, Field - - -class PythonREPL(BaseModel): - """Simulates a standalone Python REPL.""" - - globals: Optional[Dict] = Field(default_factory=dict, alias="_globals") - locals: Optional[Dict] = Field(default_factory=dict, alias="_locals") - - def run(self, command: str) -> str: - """Run command with own globals/locals and returns anything printed.""" - old_stdout = sys.stdout - sys.stdout = mystdout = StringIO() - try: - exec(command, self.globals, self.locals) - sys.stdout = old_stdout - output = mystdout.getvalue() - except Exception as e: - sys.stdout = old_stdout - output = str(e) - return output +__all__ = ["PythonREPL"] diff --git a/langchain/tools/python/tool.py b/langchain/tools/python/tool.py index 8f32643d40..81339cedc3 100644 --- a/langchain/tools/python/tool.py +++ b/langchain/tools/python/tool.py @@ -7,8 +7,8 @@ from typing import Dict, Optional from pydantic import Field, root_validator -from langchain.python import PythonREPL from langchain.tools.base import BaseTool +from langchain.utilities import PythonREPL def _get_default_python_repl() -> PythonREPL: diff --git a/langchain/utilities/__init__.py b/langchain/utilities/__init__.py index 1d83373b5d..5b82f2a9dc 100644 --- a/langchain/utilities/__init__.py +++ b/langchain/utilities/__init__.py @@ -1,5 +1,4 @@ """General utilities.""" -from langchain.python import PythonREPL from langchain.requests import TextRequestsWrapper from langchain.utilities.apify import ApifyWrapper from langchain.utilities.bash import BashProcess @@ -7,6 +6,7 @@ from langchain.utilities.bing_search import BingSearchAPIWrapper from langchain.utilities.google_search import GoogleSearchAPIWrapper from langchain.utilities.google_serper import GoogleSerperAPIWrapper from langchain.utilities.openweathermap import OpenWeatherMapAPIWrapper +from langchain.utilities.python import PythonREPL from langchain.utilities.searx_search import SearxSearchWrapper from langchain.utilities.serpapi import SerpAPIWrapper from langchain.utilities.wikipedia import WikipediaAPIWrapper @@ -16,7 +16,6 @@ __all__ = [ "ApifyWrapper", "BashProcess", "TextRequestsWrapper", - "PythonREPL", "GoogleSearchAPIWrapper", "GoogleSerperAPIWrapper", "WolframAlphaAPIWrapper", @@ -25,4 +24,5 @@ __all__ = [ "BingSearchAPIWrapper", "WikipediaAPIWrapper", "OpenWeatherMapAPIWrapper", + "PythonREPL", ] diff --git a/langchain/utilities/python.py b/langchain/utilities/python.py new file mode 100644 index 0000000000..4abb22a1eb --- /dev/null +++ b/langchain/utilities/python.py @@ -0,0 +1,25 @@ +import sys +from io import StringIO +from typing import Dict, Optional + +from pydantic import BaseModel, Field + + +class PythonREPL(BaseModel): + """Simulates a standalone Python REPL.""" + + globals: Optional[Dict] = Field(default_factory=dict, alias="_globals") + locals: Optional[Dict] = Field(default_factory=dict, alias="_locals") + + def run(self, command: str) -> str: + """Run command with own globals/locals and returns anything printed.""" + old_stdout = sys.stdout + sys.stdout = mystdout = StringIO() + try: + exec(command, self.globals, self.locals) + sys.stdout = old_stdout + output = mystdout.getvalue() + except Exception as e: + sys.stdout = old_stdout + output = str(e) + return output diff --git a/tests/unit_tests/test_python.py b/tests/unit_tests/test_python.py index e048bcb2dc..2831954272 100644 --- a/tests/unit_tests/test_python.py +++ b/tests/unit_tests/test_python.py @@ -3,8 +3,8 @@ import sys import pytest -from langchain.python import PythonREPL from langchain.tools.python.tool import PythonAstREPLTool, PythonREPLTool +from langchain.utilities import PythonREPL _SAMPLE_CODE = """ ```