jyapayne/langflow
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

refactor: Reorganize imports and enhance type checks in PythonCodeStructuredTool.py (#3266)

Browse source 
refactor: Reorganize imports and enhance type checks in PythonCodeStructuredTool.py for better clarity and robustness
This commit is contained in:
Gabriel Luiz Freitas Almeida 2024-08-09 13:00:10 -03:00 • committed by GitHub
commit 0eb694f1d7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 25 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/backend/base/langflow/components/tools/PythonCodeStructuredTool.py
View file

@ -3,17 +3,16 @@ import json
from typing import Any from typing import Any
from langchain.agents import Tool from langchain.agents import Tool
from langflow.base.langchain_utilities.model import LCToolComponent
from langflow.inputs.inputs import MultilineInput, MessageTextInput, BoolInput, DropdownInput, HandleInput, FieldTypes
from langchain_core.tools import StructuredTool from langchain_core.tools import StructuredTool
from langflow.io import Output
from langflow.schema.dotdict import dotdict
from langflow.schema import Data
from pydantic.v1 import Field, create_model from pydantic.v1 import Field, create_model
from pydantic.v1.fields import Undefined from pydantic.v1.fields import Undefined
from langflow.base.langchain_utilities.model import LCToolComponent
from langflow.inputs.inputs import BoolInput, DropdownInput, FieldTypes, HandleInput, MessageTextInput, MultilineInput
from langflow.io import Output
from langflow.schema import Data
from langflow.schema.dotdict import dotdict
class PythonCodeStructuredTool(LCToolComponent): class PythonCodeStructuredTool(LCToolComponent):
DEFAULT_KEYS = [ DEFAULT_KEYS = [
@ -260,10 +259,22 @@ class PythonCodeStructuredTool(LCToolComponent):
for default in node.args.defaults: for default in node.args.defaults:
if ( if (
arg.lineno > default.lineno (arg.lineno is not None and default.lineno is not None and arg.lineno > default.lineno)
or arg.col_offset > default.col_offset or (
or arg.end_lineno < default.end_lineno arg.col_offset is not None
or arg.end_col_offset < default.end_col_offset and default.col_offset is not None
and arg.col_offset > default.col_offset
)
or (
arg.end_lineno is not None
and default.end_lineno is not None
and arg.end_lineno < default.end_lineno
)
or (
arg.end_col_offset is not None
and default.end_col_offset is not None
and arg.end_col_offset < default.end_col_offset
)
): ):
continue continue
@ -277,9 +288,9 @@ class PythonCodeStructuredTool(LCToolComponent):
annotation_line = annotation_line[: arg.annotation.end_col_offset] annotation_line = annotation_line[: arg.annotation.end_col_offset]
annotation_line = annotation_line[arg.annotation.col_offset :] annotation_line = annotation_line[arg.annotation.col_offset :]
func_arg["annotation"] = annotation_line func_arg["annotation"] = annotation_line
if func_arg["annotation"].count("=") > 0: if isinstance(func_arg["annotation"], str) and func_arg["annotation"].count("=") > 0:
func_arg["annotation"] = "=".join(func_arg["annotation"].split("=")[:-1]).strip() func_arg["annotation"] = "=".join(func_arg["annotation"].split("=")[:-1]).strip()
if isinstance(func["args"], list):
func["args"].append(func_arg) func["args"].append(func_arg)
functions.append(func) functions.append(func)
@ -295,7 +306,7 @@ class PythonCodeStructuredTool(LCToolComponent):
imports.append(alias.name) imports.append(alias.name)
elif isinstance(node, ast.ImportFrom): elif isinstance(node, ast.ImportFrom):
from_imports.append(node) from_imports.append(node)
return {"imports": imports, "from_imports": from_imports} return dotdict({"imports": imports, "from_imports": from_imports})
def _get_value(self, value: Any, annotation: Any) -> Any: def _get_value(self, value: Any, annotation: Any) -> Any:
return value if isinstance(value, annotation) else value["value"] return value if isinstance(value, annotation) else value["value"]