refactor: update PromptComponent and add DefaultPromptField (#3133)
* refactor: update code references to use _code instead of code * refactor: add backwards compatible attributes to Component class * refactor: update Component constructor to pass config params with underscore Refactored the `Component` class in `component.py` to handle inputs and outputs. Added a new method `map_outputs` to map a list of outputs to the component. Also updated the `__init__` method to properly initialize the inputs, outputs, and other attributes. This change improves the flexibility and extensibility of the `Component` class. Co-authored-by: Gabriel Luiz Freitas Almeida <gabriel@langflow.org> * refactor: change attribute to use underscore * refactor: update CustomComponent initialization parameters Refactored the `instantiate_class` function in `loading.py` to update the initialization parameters for the `CustomComponent` class. Changed the parameter names from `user_id`, `parameters`, `vertex`, and `tracing_service` to `_user_id`, `_parameters`, `_vertex`, and `_tracing_service` respectively. This change ensures consistency and improves code readability. Co-authored-by: Gabriel Luiz Freitas Almeida <gabriel@langflow.org> * refactor: update BaseComponent to accept UUID for _user_id Updated the `BaseComponent` class in `base_component.py` to accept a `UUID` type for the `_user_id` attribute. This change improves the type safety and ensures consistency with the usage of `_user_id` throughout the codebase. * refactor: import nanoid with type annotation The `nanoid` import in `component.py` has been updated to include a type annotation `# type: ignore`. This change ensures that the type checker ignores any errors related to the `nanoid` import. * fix(custom_component.py): convert _user_id to string before passing to functions to ensure compatibility with function signatures * feat(component.py): add method to set output types based on method return type to improve type checking and validation in custom components * refactor: extract method to get method return type in CustomComponent * refactor(utils.py): refactor code to use _user_id instead of user_id for consistency and clarity perf(utils.py): optimize code by reusing cc_instance instead of calling get_component_instance multiple times * refactor(utils.py, base.py): change parameter name 'add_name' to 'keep_name' for clarity and consistency in codebase * [autofix.ci] apply automated fixes * refactor: update schema.py to include Edge related typres The `schema.py` file in the `src/backend/base/langflow/graph/edge` directory has been updated to include the `TargetHandle` and `SourceHandle` models. These models define the structure and attributes of the target and source handles used in the edge data. This change improves the clarity and consistency of the codebase. * refactor: update BaseInputMixin to handle invalid field types gracefully The `BaseInputMixin` class in `input_mixin.py` has been updated to handle invalid field types gracefully. Instead of raising an exception, it now returns `FieldTypes.OTHER` for any invalid field type. This change improves the robustness and reliability of the codebase. * refactor: update file_types field alias in FileMixin The `file_types` field in the `FileMixin` class of `input_mixin.py` has been updated to use the `alias` parameter instead of `serialization_alias`. This change ensures consistency and improves the clarity of the codebase. * refactor(inputs): update field_type declarations in various input classes to use SerializableFieldTypes enum for better type safety and clarity * refactor(inputs): convert dict to Message object in _validate_value method * refactor(inputs): convert dict to Message object in _validate_value method * refactor(inputs): update model_config in BaseInputMixin to enable populating by name The `model_config` attribute in the `BaseInputMixin` class of `input_mixin.py` has been updated to include the `populate_by_name=True` parameter. This change allows the model configuration to be populated by name, improving the flexibility and usability of the codebase. * refactor: update _extract_return_type method in CustomComponent to accept Any type The _extract_return_type method in CustomComponent has been updated to accept the Any type as the return_type parameter. This change improves the flexibility and compatibility of the method, allowing it to handle a wider range of return types. * refactor(component): add get_input and get_output methods for easier access to input and output values The `Component` class in `component.py` has been updated to include the `get_input` and `get_output` methods. These methods allow for easier retrieval of input and output values by name, improving the usability and readability of the codebase. * refactor(vertex): add get_input and get_output methods for easier access to input and output values * refactor(component): add set_output_value method for easier modification of output values The `Component` class in `component.py` has been updated to include the `set_output_value` method. This method allows for easier modification of output values by name, improving the usability and flexibility of the codebase. * feat: add run_until_complete and run_in_thread functions for handling asyncio tasks The `async_helpers.py` file in the `src/backend/base/langflow/utils` directory has been added. This file includes the `run_until_complete` and `run_in_thread` functions, which provide a way to handle asyncio tasks in different scenarios. The `run_until_complete` function checks if an event loop is already running and either runs the coroutine in a separate event loop in a new thread or creates a new event loop and runs the coroutine. The `run_in_thread` function runs the coroutine in a separate thread and returns the result or raises an exception if one occurs. These functions improve the flexibility and usability of the codebase. * refactor(component): add _edges attribute to Component class for managing edges The `Component` class in `component.py` has been updated to include the `_edges` attribute. This attribute is a list of `EdgeData` objects and is used for managing edges in the component. This change improves the functionality and organization of the codebase. * fix(component.py): fix conditional statement to check if self._vertex is not None before accessing its attributes * refactor(component): add _get_fallback_input method for handling fallback input The `Component` class in `component.py` has been updated to include the `_get_fallback_input` method. This method returns an `Input` object with the provided keyword arguments, which is used as a fallback input when needed. This change improves the flexibility and readability of the codebase. * refactor(component): add TYPE_CHECKING import for Vertex in component.py * refactor(component): add _map_parameters_on_frontend_node and _map_parameters_on_template and other methods The `Component` class in `component.py` has been refactored to include the `_map_parameters_on_frontend_node` and `_map_parameters_on_template` methods. These methods are responsible for mapping the parameters of the component onto the frontend node and template, respectively. This change improves the organization and maintainability of the codebase. * refactor(component): Add map_inputs and map_outputs methods for mapping inputs and outputs The `Component` class in `component.py` has been updated to include the `map_inputs` and `map_outputs` methods. These methods allow for mapping the given inputs and outputs to the component, improving the functionality and organization of the codebase. * refactor(component): Add Input, Output, and ComponentFrontendNode imports and run_until_complete function This commit refactors the `component.py` file in the `src/backend/base/langflow/custom/custom_component` directory. It adds the `Input`, `Output`, and `ComponentFrontendNode` imports, as well as the `run_until_complete` function from the `async_helpers.py` file. These changes improve the functionality and organization of the codebase. * refactor(component): Add map_inputs and map_outputs methods for mapping inputs and outputs * refactor(component): Add _process_connection_or_parameter method for handling connections and parameters The `Component` class in `component.py` has been updated to include the `_process_connection_or_parameter` method. This method is responsible for handling connections and parameters based on the provided key and value. It checks if the value is callable and connects it to the component, otherwise it sets the parameter or attribute. This change improves the functionality and organization of the codebase. * refactor(frontend_node): Add set_field_value_in_template method for updating field values The `FrontendNode` class in `base.py` has been updated to include the `set_field_value_in_template` method. This method allows for updating the value of a specific field in the template of the frontend node. It iterates through the fields and sets the value of the field with the provided name. This change improves the flexibility and functionality of the codebase. * refactor(inputs): Add DefaultPromptField class for default prompt inputs The `inputs.py` file in the `src/backend/base/langflow/inputs` directory has been refactored to include the `DefaultPromptField` class. This class represents a default prompt input with customizable properties such as name, display name, field type, advanced flag, multiline flag, input types, and value. This change improves the flexibility and functionality of the codebase. * feat: Add Template.from_dict method for creating Template objects from dictionaries This commit adds the `from_dict` class method to the `Template` class in `base.py`. This method allows for creating `Template` objects from dictionaries by converting the dictionary keys and values into the appropriate `Template` attributes. This change improves the flexibility and functionality of the codebase. * refactor(frontend_node): Add from_dict method for creating FrontendNode objects from dictionaries * refactor: update BaseComponent to use get_template_config method Refactored the `BaseComponent` class in `base_component.py` to use the `get_template_config` method instead of duplicating the code. This change improves code readability and reduces redundancy. * refactor(graph): Add EdgeData import and update add_nodes_and_edges method signature The `Graph` class in `base.py` has been updated to include the `EdgeData` import and modify the signature of the `add_nodes_and_edges` method. The `add_nodes_and_edges` method now accepts a list of dictionaries representing `EdgeData` objects instead of a list of dictionaries with string keys and values. This change improves the type safety and clarity of the codebase. * refactor(graph): Add first_layer property to Graph class The `Graph` class in `base.py` has been updated to include the `first_layer` property. This property returns the first layer of the graph and throws a `ValueError` if the graph is not prepared. This change improves the functionality and organization of the codebase. * refactor(graph): Update Graph class instantiation in base.py The `Graph` class in `base.py` has been updated to use keyword arguments when instantiating the class. This change improves the readability and maintainability of the codebase. * refactor(graph): Add prepare method to Graph class The `Graph` class in `base.py` has been updated to include the `prepare` method. This method prepares the graph for execution by validating the stream, building edges, and sorting vertices. It also adds the first layer of vertices to the run manager and sets the run queue. This change improves the functionality and organization of the codebase. * refactor(graph): Improve graph preparation in retrieve_vertices_order function The `retrieve_vertices_order` function in `chat.py` has been updated to improve the graph preparation process. Instead of manually sorting vertices and adding them to the run manager, the function now calls the `prepare` method of the `Graph` class. This method validates the stream, builds edges, and sets the first layer of vertices. This change improves the functionality and organization of the codebase. * refactor: Add GetCache and SetCache protocols for caching functionality * refactor(graph): Add VertexBuildResult class for representing vertex build results * refactor(chat.py, base.py): update build_vertex method in chat.py and base.py * refactor(graph): Update Edge and ContractEdge constructors to use EdgeData type The constructors of the `Edge` and `ContractEdge` classes in `base.py` have been updated to use the `EdgeData` type for the `edge` and `raw_edge` parameters, respectively. This change improves the type safety and clarity of the codebase. * feat: add BaseModel class with model_config attribute A new `BaseModel` class has been added to the `base_model.py` file. This class extends the `PydanticBaseModel` and includes a `model_config` attribute of type `ConfigDict`. This change improves the codebase by providing a base model with a configuration dictionary for models. Co-authored-by: Gabriel Luiz Freitas Almeida <gabriel@langflow.org> * refactor: update langflow.graph.edge.schema.py Refactor the `langflow.graph.edge.schema.py` file to include the `TargetHandle` and `SourceHandle` models. This change improves the clarity and consistency of the codebase. Co-authored-by: Gabriel Luiz Freitas Almeida <gabriel@langflow.org> * refactor(base): Update target_param assignment in Edge class The `target_param` assignment in the `Edge` class of `base.py` has been updated to use the `cast` function for type hinting. This change improves the type safety and clarity of the codebase. * refactor(base): Add check for existing type in add_types method * refactor: update build_custom_component_template to use add_name instead of keep_name Refactor the `build_custom_component_template` function in `utils.py` to use the `add_name` parameter instead of the deprecated `keep_name` parameter. This change ensures consistency with the updated method signature and improves code clarity. * feat(component.py): add method to set output types based on method return type to improve type checking and validation in custom components (#3115) * feat(component.py): add method to set output types based on method return type to improve type checking and validation in custom components * refactor: extract method to get method return type in CustomComponent * refactor: update _extract_return_type method in CustomComponent to accept Any type The _extract_return_type method in CustomComponent has been updated to accept the Any type as the return_type parameter. This change improves the flexibility and compatibility of the method, allowing it to handle a wider range of return types. * refactor: add _template_config property to BaseComponent Add a new `_template_config` property to the `BaseComponent` class in `base_component.py`. This property is used to store the template configuration for the custom component. If the `_template_config` property is empty, it is populated by calling the `build_template_config` method. This change improves the efficiency of accessing the template configuration and ensures that it is only built when needed. * refactor: add type checking for Output types in add_types method Improve type checking in the `add_types` method of the `Output` class in `base.py`. Check if the `type_` already exists in the `types` list before adding it. This change ensures that duplicate types are not added to the list. * update starter projects * refactor: optimize imports in base.py Optimize imports in the `base.py` file by removing unused imports and organizing the remaining imports. This change improves code readability and reduces unnecessary clutter. * fix(base.py): fix condition to check if self.types is not None before checking if type_ is in self.types * refactor: update build_custom_component_template to use add_name instead of keep_name * refactor(prompts): Update PromptComponent to support custom fields and template updates The `PromptComponent` class in `Prompt.py` has been updated to support custom fields and template updates. The `_update_template` method has been added to update the prompt template with custom fields. The `post_code_processing` method has been modified to update the template and improve backwards compatibility. The `_get_fallback_input` method has been added to provide a default prompt field. These changes improve the functionality and flexibility of the codebase. * refactor(base): Add DefaultPromptField to langflow.io The `DefaultPromptField` class has been added to the `langflow.io` module. This class provides a default prompt field for the `TableInput` class. This change improves the functionality and flexibility of the codebase. * refactor(prompts): Update PromptComponent to support custom fields and template updates * refactor(base): Update langflow.template.field.prompt.py for backwards compatibility * refactor(base): Update langflow.components.__init__.py to import the prompts module This change adds the prompts module to the list of imports in the __init__.py file of the langflow.components package. This ensures that the prompts module is available for use in the codebase. * refactor(base): Update langflow.template.field.prompt.py for backwards compatibility * refactor(graph): update ContractEdge to use EdgeData for raw_edge parameter, enhancing type consistency across edges * refactor(graph): update add_edge method to use EdgeData type, improving type safety and consistency in graph edges * chore(dependencies): bump mypy version from 1.10.0 to 1.11.0 for improved type checking capabilities * refactor: update Edge class to use EdgeData type for raw_edge parameter The Edge class in base.py has been updated to use the EdgeData type for the raw_edge parameter in the __init__ method. This change improves type safety and consistency in graph edges. * refactor: update follow_imports to "skip" in mypy configuration * fix: add type ignore comment for return data in SelfQueryRetriever.py to resolve mypy warning * chore: update mypy configuration to include namespace_packages and ignore missing imports in pyproject.toml files * fix: add type ignore comment for target_param in base.py to resolve mypy warning about split method usage * fix: add type ignore comments for various classes to resolve mypy warnings in input_mixin, database models, and cache service files * refactor: add first layer attribute to Graph class The Graph class in base.py has been updated to include a new attribute called `_first_layer`. This attribute is a list of strings and is initialized as an empty list. This change enhances the functionality of the Graph class by providing a way to store and access the first layer of vertices in the graph. * refactor: store first layer in Graph class with _first_layer attribute for improved access to vertices being run * fix: add type ignore comments to database model classes to resolve mypy type checking warnings * fix: update build_vertex call to include cache methods from chat_service for improved functionality * fix(graph): update build_vertex to handle optional cache methods for better stability and error handling * fix(graph): handle optional caching in build_vertex to prevent unnecessary cache calls and improve stability * fix(graph): refine cache handling in build_vertex to ensure checks for optional caching are properly evaluated * fix(graph): streamline build_vertex result handling in chat.py for improved clarity and maintainability * fix(graph): remove redundant cached_result assignment in build_vertex for cleaner cache handling and improved performance --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
This commit is contained in:
Gabriel Luiz Freitas Almeida
GitHub
parent
49d51d3617
commit
a9fec06992
5 changed files with 46 additions and 16 deletions
|
|
@ -1,9 +1,31 @@
|
|||
from . import (
|
||||
agents,
|
||||
chains,
|
||||
documentloaders,
|
||||
embeddings,
|
||||
helpers,
|
||||
inputs,
|
||||
memories,
|
||||
models,
|
||||
outputs,
|
||||
prompts,
|
||||
prototypes,
|
||||
retrievers,
|
||||
textsplitters,
|
||||
toolkits,
|
||||
tools,
|
||||
vectorstores,
|
||||
)
|
||||
|
||||
__all__ = [
|
||||
"agents",
|
||||
"chains",
|
||||
"documentloaders",
|
||||
"embeddings",
|
||||
"prompts",
|
||||
"prototypes",
|
||||
"models",
|
||||
"helpers",
|
||||
"inputs",
|
||||
"memories",
|
||||
"outputs",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
from langflow.base.prompts.api_utils import process_prompt_template
|
||||
from langflow.custom import Component
|
||||
from langflow.inputs.inputs import DefaultPromptField
|
||||
from langflow.io import Output, PromptInput
|
||||
from langflow.schema.message import Message
|
||||
from langflow.template.utils import update_template_values
|
||||
|
|
@ -27,12 +28,25 @@ class PromptComponent(Component):
|
|||
self.status = prompt.text
|
||||
return prompt
|
||||
|
||||
def _update_template(self, frontend_node: dict):
|
||||
prompt_template = frontend_node["template"]["template"]["value"]
|
||||
custom_fields = frontend_node["custom_fields"]
|
||||
frontend_node_template = frontend_node["template"]
|
||||
_ = process_prompt_template(
|
||||
template=prompt_template,
|
||||
name="template",
|
||||
custom_fields=custom_fields,
|
||||
frontend_node_template=frontend_node_template,
|
||||
)
|
||||
return frontend_node
|
||||
|
||||
def post_code_processing(self, new_frontend_node: dict, current_frontend_node: dict):
|
||||
"""
|
||||
This function is called after the code validation is done.
|
||||
"""
|
||||
frontend_node = super().post_code_processing(new_frontend_node, current_frontend_node)
|
||||
template = frontend_node["template"]["template"]["value"]
|
||||
# Kept it duplicated for backwards compatibility
|
||||
_ = process_prompt_template(
|
||||
template=template,
|
||||
name="template",
|
||||
|
|
@ -43,3 +57,6 @@ class PromptComponent(Component):
|
|||
# and update the frontend_node with those values
|
||||
update_template_values(new_template=frontend_node, previous_template=current_frontend_node["template"])
|
||||
return frontend_node
|
||||
|
||||
def _get_fallback_input(self, **kwargs):
|
||||
return DefaultPromptField(**kwargs)
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ from .inputs import (
|
|||
SecretStrInput,
|
||||
StrInput,
|
||||
TableInput,
|
||||
DefaultPromptField,
|
||||
)
|
||||
|
||||
__all__ = [
|
||||
|
|
@ -38,4 +39,5 @@ __all__ = [
|
|||
"StrInput",
|
||||
"MessageTextInput",
|
||||
"TableInput",
|
||||
"DefaultPromptField",
|
||||
]
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ from langflow.inputs import (
|
|||
SecretStrInput,
|
||||
StrInput,
|
||||
TableInput,
|
||||
DefaultPromptField,
|
||||
)
|
||||
from langflow.template import Output
|
||||
|
||||
|
|
@ -40,4 +41,5 @@ __all__ = [
|
|||
"MessageTextInput",
|
||||
"Output",
|
||||
"TableInput",
|
||||
"DefaultPromptField",
|
||||
]
|
||||
|
|
|
|||
|
|
@ -1,16 +1,3 @@
|
|||
from typing import Optional
|
||||
|
||||
from langflow.template.field.base import Input
|
||||
|
||||
DEFAULT_PROMPT_INTUT_TYPES = ["Message", "Text"]
|
||||
|
||||
|
||||
class DefaultPromptField(Input):
|
||||
name: str
|
||||
display_name: Optional[str] = None
|
||||
field_type: str = "str"
|
||||
|
||||
advanced: bool = False
|
||||
multiline: bool = True
|
||||
input_types: list[str] = DEFAULT_PROMPT_INTUT_TYPES
|
||||
value: str = "" # Set the value to empty string
|
||||
# This file is for backwards compatibility
|
||||
from langflow.inputs.inputs import DEFAULT_PROMPT_INTUT_TYPES # noqa
|
||||
from langflow.inputs import DefaultPromptField # noqa
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue