If return type is str set it to Text
This commit is contained in:
parent
8a8f27f5dc
commit
0b0b7d3c66
1 changed files with 51 additions and 17 deletions
|
|
@ -27,18 +27,24 @@ from langflow.utils import validate
|
||||||
from langflow.utils.util import get_base_classes
|
from langflow.utils.util import get_base_classes
|
||||||
|
|
||||||
|
|
||||||
def add_output_types(frontend_node: CustomComponentFrontendNode, return_types: List[str]):
|
def add_output_types(
|
||||||
|
frontend_node: CustomComponentFrontendNode, return_types: List[str]
|
||||||
|
):
|
||||||
"""Add output types to the frontend node"""
|
"""Add output types to the frontend node"""
|
||||||
for return_type in return_types:
|
for return_type in return_types:
|
||||||
if return_type is None:
|
if return_type is None:
|
||||||
raise HTTPException(
|
raise HTTPException(
|
||||||
status_code=400,
|
status_code=400,
|
||||||
detail={
|
detail={
|
||||||
"error": ("Invalid return type. Please check your code and try again."),
|
"error": (
|
||||||
|
"Invalid return type. Please check your code and try again."
|
||||||
|
),
|
||||||
"traceback": traceback.format_exc(),
|
"traceback": traceback.format_exc(),
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
if hasattr(return_type, "__name__"):
|
if return_type == str:
|
||||||
|
return_type = "Text"
|
||||||
|
elif hasattr(return_type, "__name__"):
|
||||||
return_type = return_type.__name__
|
return_type = return_type.__name__
|
||||||
elif hasattr(return_type, "__class__"):
|
elif hasattr(return_type, "__class__"):
|
||||||
return_type = return_type.__class__.__name__
|
return_type = return_type.__class__.__name__
|
||||||
|
|
@ -63,14 +69,18 @@ def reorder_fields(frontend_node: CustomComponentFrontendNode, field_order: List
|
||||||
frontend_node.template.fields = reordered_fields
|
frontend_node.template.fields = reordered_fields
|
||||||
|
|
||||||
|
|
||||||
def add_base_classes(frontend_node: CustomComponentFrontendNode, return_types: List[str]):
|
def add_base_classes(
|
||||||
|
frontend_node: CustomComponentFrontendNode, return_types: List[str]
|
||||||
|
):
|
||||||
"""Add base classes to the frontend node"""
|
"""Add base classes to the frontend node"""
|
||||||
for return_type_instance in return_types:
|
for return_type_instance in return_types:
|
||||||
if return_type_instance is None:
|
if return_type_instance is None:
|
||||||
raise HTTPException(
|
raise HTTPException(
|
||||||
status_code=400,
|
status_code=400,
|
||||||
detail={
|
detail={
|
||||||
"error": ("Invalid return type. Please check your code and try again."),
|
"error": (
|
||||||
|
"Invalid return type. Please check your code and try again."
|
||||||
|
),
|
||||||
"traceback": traceback.format_exc(),
|
"traceback": traceback.format_exc(),
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
@ -145,10 +155,14 @@ def add_new_custom_field(
|
||||||
# If options is a list, then it's a dropdown
|
# If options is a list, then it's a dropdown
|
||||||
# If options is None, then it's a list of strings
|
# If options is None, then it's a list of strings
|
||||||
is_list = isinstance(field_config.get("options"), list)
|
is_list = isinstance(field_config.get("options"), list)
|
||||||
field_config["is_list"] = is_list or field_config.get("is_list", False) or field_contains_list
|
field_config["is_list"] = (
|
||||||
|
is_list or field_config.get("is_list", False) or field_contains_list
|
||||||
|
)
|
||||||
|
|
||||||
if "name" in field_config:
|
if "name" in field_config:
|
||||||
warnings.warn("The 'name' key in field_config is used to build the object and can't be changed.")
|
warnings.warn(
|
||||||
|
"The 'name' key in field_config is used to build the object and can't be changed."
|
||||||
|
)
|
||||||
required = field_config.pop("required", field_required)
|
required = field_config.pop("required", field_required)
|
||||||
placeholder = field_config.pop("placeholder", "")
|
placeholder = field_config.pop("placeholder", "")
|
||||||
|
|
||||||
|
|
@ -179,7 +193,9 @@ def add_extra_fields(frontend_node, field_config, function_args):
|
||||||
if "name" not in extra_field or extra_field["name"] == "self":
|
if "name" not in extra_field or extra_field["name"] == "self":
|
||||||
continue
|
continue
|
||||||
|
|
||||||
field_name, field_type, field_value, field_required = get_field_properties(extra_field)
|
field_name, field_type, field_value, field_required = get_field_properties(
|
||||||
|
extra_field
|
||||||
|
)
|
||||||
config = field_config.get(field_name, {})
|
config = field_config.get(field_name, {})
|
||||||
frontend_node = add_new_custom_field(
|
frontend_node = add_new_custom_field(
|
||||||
frontend_node,
|
frontend_node,
|
||||||
|
|
@ -217,7 +233,9 @@ def run_build_config(
|
||||||
raise HTTPException(
|
raise HTTPException(
|
||||||
status_code=400,
|
status_code=400,
|
||||||
detail={
|
detail={
|
||||||
"error": ("Invalid type convertion. Please check your code and try again."),
|
"error": (
|
||||||
|
"Invalid type convertion. Please check your code and try again."
|
||||||
|
),
|
||||||
"traceback": traceback.format_exc(),
|
"traceback": traceback.format_exc(),
|
||||||
},
|
},
|
||||||
) from exc
|
) from exc
|
||||||
|
|
@ -245,7 +263,9 @@ def run_build_config(
|
||||||
raise HTTPException(
|
raise HTTPException(
|
||||||
status_code=400,
|
status_code=400,
|
||||||
detail={
|
detail={
|
||||||
"error": ("Invalid type convertion. Please check your code and try again."),
|
"error": (
|
||||||
|
"Invalid type convertion. Please check your code and try again."
|
||||||
|
),
|
||||||
"traceback": traceback.format_exc(),
|
"traceback": traceback.format_exc(),
|
||||||
},
|
},
|
||||||
) from exc
|
) from exc
|
||||||
|
|
@ -298,16 +318,24 @@ def build_custom_component_template(
|
||||||
try:
|
try:
|
||||||
frontend_node = build_frontend_node(custom_component.template_config)
|
frontend_node = build_frontend_node(custom_component.template_config)
|
||||||
|
|
||||||
field_config, custom_instance = run_build_config(custom_component, user_id=user_id, update_field=update_field)
|
field_config, custom_instance = run_build_config(
|
||||||
|
custom_component, user_id=user_id, update_field=update_field
|
||||||
|
)
|
||||||
|
|
||||||
entrypoint_args = custom_component.get_function_entrypoint_args
|
entrypoint_args = custom_component.get_function_entrypoint_args
|
||||||
|
|
||||||
add_extra_fields(frontend_node, field_config, entrypoint_args)
|
add_extra_fields(frontend_node, field_config, entrypoint_args)
|
||||||
|
|
||||||
frontend_node = add_code_field(frontend_node, custom_component.code, field_config.get("code", {}))
|
frontend_node = add_code_field(
|
||||||
|
frontend_node, custom_component.code, field_config.get("code", {})
|
||||||
|
)
|
||||||
|
|
||||||
add_base_classes(frontend_node, custom_component.get_function_entrypoint_return_type)
|
add_base_classes(
|
||||||
add_output_types(frontend_node, custom_component.get_function_entrypoint_return_type)
|
frontend_node, custom_component.get_function_entrypoint_return_type
|
||||||
|
)
|
||||||
|
add_output_types(
|
||||||
|
frontend_node, custom_component.get_function_entrypoint_return_type
|
||||||
|
)
|
||||||
|
|
||||||
reorder_fields(frontend_node, custom_instance._get_field_order())
|
reorder_fields(frontend_node, custom_instance._get_field_order())
|
||||||
|
|
||||||
|
|
@ -318,7 +346,9 @@ def build_custom_component_template(
|
||||||
raise HTTPException(
|
raise HTTPException(
|
||||||
status_code=400,
|
status_code=400,
|
||||||
detail={
|
detail={
|
||||||
"error": ("Invalid type convertion. Please check your code and try again."),
|
"error": (
|
||||||
|
"Invalid type convertion. Please check your code and try again."
|
||||||
|
),
|
||||||
"traceback": traceback.format_exc(),
|
"traceback": traceback.format_exc(),
|
||||||
},
|
},
|
||||||
) from exc
|
) from exc
|
||||||
|
|
@ -342,7 +372,9 @@ def build_custom_components(settings_service):
|
||||||
if not settings_service.settings.COMPONENTS_PATH:
|
if not settings_service.settings.COMPONENTS_PATH:
|
||||||
return {}
|
return {}
|
||||||
|
|
||||||
logger.info(f"Building custom components from {settings_service.settings.COMPONENTS_PATH}")
|
logger.info(
|
||||||
|
f"Building custom components from {settings_service.settings.COMPONENTS_PATH}"
|
||||||
|
)
|
||||||
custom_components_from_file = {}
|
custom_components_from_file = {}
|
||||||
processed_paths = set()
|
processed_paths = set()
|
||||||
for path in settings_service.settings.COMPONENTS_PATH:
|
for path in settings_service.settings.COMPONENTS_PATH:
|
||||||
|
|
@ -353,7 +385,9 @@ def build_custom_components(settings_service):
|
||||||
custom_component_dict = build_custom_component_list_from_path(path_str)
|
custom_component_dict = build_custom_component_list_from_path(path_str)
|
||||||
if custom_component_dict:
|
if custom_component_dict:
|
||||||
category = next(iter(custom_component_dict))
|
category = next(iter(custom_component_dict))
|
||||||
logger.info(f"Loading {len(custom_component_dict[category])} component(s) from category {category}")
|
logger.info(
|
||||||
|
f"Loading {len(custom_component_dict[category])} component(s) from category {category}"
|
||||||
|
)
|
||||||
custom_components_from_file = merge_nested_dicts_with_renaming(
|
custom_components_from_file = merge_nested_dicts_with_renaming(
|
||||||
custom_components_from_file, custom_component_dict
|
custom_components_from_file, custom_component_dict
|
||||||
)
|
)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue