From f01d8cf04676374dfadb81fde37250f350b525da Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Wed, 7 Feb 2024 14:23:21 -0300 Subject: [PATCH] Refactor component name determination logic in directory_reader.py --- .../custom/directory_reader/directory_reader.py | 2 +- .../interface/custom/directory_reader/utils.py | 14 ++++++++------ src/backend/langflow/interface/custom/utils.py | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/backend/langflow/interface/custom/directory_reader/directory_reader.py b/src/backend/langflow/interface/custom/directory_reader/directory_reader.py index 7bf55bec8..0987f699d 100644 --- a/src/backend/langflow/interface/custom/directory_reader/directory_reader.py +++ b/src/backend/langflow/interface/custom/directory_reader/directory_reader.py @@ -256,7 +256,7 @@ class DirectoryReader: output_types = [component_name_camelcase] component_info = { - "name": "CustomComponent", + "name": component_name_camelcase, "output_types": output_types, "file": filename, "code": result_content if validation_result else "", diff --git a/src/backend/langflow/interface/custom/directory_reader/utils.py b/src/backend/langflow/interface/custom/directory_reader/utils.py index f1771b2d7..f7378b8d0 100644 --- a/src/backend/langflow/interface/custom/directory_reader/utils.py +++ b/src/backend/langflow/interface/custom/directory_reader/utils.py @@ -124,12 +124,13 @@ def get_new_key(dictionary, original_key): def determine_component_name(component): """Determine the name of the component.""" - component_output_types = component["output_types"] - if len(component_output_types) == 1: - return component_output_types[0] - else: - file_name = component.get("file").split(".")[0] - return "".join(word.capitalize() for word in file_name.split("_")) if "_" in file_name else file_name + # component_output_types = component["output_types"] + # if len(component_output_types) == 1: + # return component_output_types[0] + # else: + # file_name = component.get("file").split(".")[0] + # return "".join(word.capitalize() for word in file_name.split("_")) if "_" in file_name else file_name + return component["name"] def build_menu_items(menu_item): @@ -143,3 +144,4 @@ def build_menu_items(menu_item): logger.error(f"Error loading Component: {component['output_types']}") logger.exception(f"Error while building custom component {component['output_types']}: {exc}") return menu_items + return menu_items diff --git a/src/backend/langflow/interface/custom/utils.py b/src/backend/langflow/interface/custom/utils.py index e6125b515..5f901bedf 100644 --- a/src/backend/langflow/interface/custom/utils.py +++ b/src/backend/langflow/interface/custom/utils.py @@ -366,7 +366,7 @@ def sanitize_field_config(field_config: Dict): def build_component(component): """Build a single component.""" - logger.debug(f"Building component: {component.get('name'), component.get('output_types')}") component_name = determine_component_name(component) component_template = create_component_template(component) + logger.debug(f"Building component: {component_name, component.get('output_types')}") return component_name, component_template