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

🔨 refactor(loading.py): reorganize code and remove duplicate import_by_type function

Browse source 
🐛 fix(loading.py): fix instantiation of custom components and handle single document input in instantiate_textsplitter function
The code in loading.py has been reorganized to improve readability and remove duplicate import_by_type function. The instantiation of custom components has been fixed to correctly build the class object. Additionally, the instantiate_textsplitter function now handles single document input by converting it to a list before processing.
This commit is contained in:
Gabriel Luiz Freitas Almeida 2023-07-07 01:34:26 -03:00
commit 92217155e4
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/backend/langflow/interface/initialize/loading.py
View file

@ -15,8 +15,8 @@ from pydantic import ValidationError
from langflow.interface.importing.utils import ( from langflow.interface.importing.utils import (
get_function, get_function,
import_by_type,
get_function_custom, get_function_custom,
import_by_type,
) )
from langflow.interface.custom_lists import CUSTOM_NODES from langflow.interface.custom_lists import CUSTOM_NODES
from langflow.interface.toolkits.base import toolkits_creator from langflow.interface.toolkits.base import toolkits_creator
@ -92,10 +92,17 @@ def instantiate_based_on_type(class_object, base_type, node_type, params):
return instantiate_retriever(node_type, class_object, params) return instantiate_retriever(node_type, class_object, params)
elif base_type == "memory": elif base_type == "memory":
return instantiate_memory(node_type, class_object, params) return instantiate_memory(node_type, class_object, params)
elif base_type == "custom_components":
return instantiate_custom_component(node_type, class_object, params)
else: else:
return class_object(**params) return class_object(**params)
def instantiate_custom_component(node_type, class_object, params):
class_object = get_function_custom(params.pop("code"))
return class_object().build(**params)
def instantiate_output_parser(node_type, class_object, params): def instantiate_output_parser(node_type, class_object, params):
if node_type in output_parser_creator.from_method_nodes: if node_type in output_parser_creator.from_method_nodes:
method = output_parser_creator.from_method_nodes[node_type] method = output_parser_creator.from_method_nodes[node_type]
@ -229,9 +236,6 @@ def instantiate_tool(node_type, class_object: Type[BaseTool], params: Dict):
elif node_type == "PythonFunctionTool": elif node_type == "PythonFunctionTool":
params["func"] = get_function(params.get("code")) params["func"] = get_function(params.get("code"))
return class_object(**params) return class_object(**params)
elif node_type == "CustomComponent":
class_object = get_function_custom(params.pop("code"))
return class_object().build(**params)
# For backward compatibility # For backward compatibility
elif node_type == "PythonFunction": elif node_type == "PythonFunction":
function_string = params["code"] function_string = params["code"]
@ -322,6 +326,8 @@ def instantiate_textsplitter(
): ):
try: try:
documents = params.pop("documents") documents = params.pop("documents")
if not isinstance(documents, list):
documents = [documents]
except KeyError as exc: except KeyError as exc:
raise ValueError( raise ValueError(
"The source you provided did not load correctly or was empty." "The source you provided did not load correctly or was empty."