From 7ecb0b6ec4bfa47b7cfff5b099d4b7dca3d7644b Mon Sep 17 00:00:00 2001 From: carlosrcoelho Date: Tue, 9 Jan 2024 19:23:02 -0300 Subject: [PATCH 01/10] Update DirectoryLoaderComponent configuration --- .../documentloaders/DirectoryLoader.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/backend/langflow/components/documentloaders/DirectoryLoader.py b/src/backend/langflow/components/documentloaders/DirectoryLoader.py index 3e27458f8..41ff19b7b 100644 --- a/src/backend/langflow/components/documentloaders/DirectoryLoader.py +++ b/src/backend/langflow/components/documentloaders/DirectoryLoader.py @@ -1,6 +1,6 @@ from langflow import CustomComponent -from langchain.data_connections import Document +from langchain.docstore.document import Document from typing import Optional, Dict, Any class DirectoryLoaderComponent(CustomComponent): @@ -9,14 +9,14 @@ class DirectoryLoaderComponent(CustomComponent): def build_config(self) -> Dict[str, Any]: return { - "glob": {"display_name": "Glob Pattern", "default": "**/*.txt"}, - "load_hidden": {"display_name": "Load Hidden Files", "default": False, "advanced": True}, - "max_concurrency": {"display_name": "Max Concurrency", "default": 10, "advanced": True}, - "metadata": {"display_name": "Metadata", "default": {}}, + "glob": {"display_name": "Glob Pattern", "value": "**/*.txt"}, + "load_hidden": {"display_name": "Load Hidden Files", "value": False, "advanced": True}, + "max_concurrency": {"display_name": "Max Concurrency", "value": 10, "advanced": True}, + "metadata": {"display_name": "Metadata", "value": {}}, "path": {"display_name": "Local Directory"}, - "recursive": {"display_name": "Recursive", "default": True, "advanced": True}, - "silent_errors": {"display_name": "Silent Errors", "default": False, "advanced": True}, - "use_multithreading": {"display_name": "Use Multithreading", "default": True, "advanced": True}, + "recursive": {"display_name": "Recursive", "value": True, "advanced": True}, + "silent_errors": {"display_name": "Silent Errors", "value": False, "advanced": True}, + "use_multithreading": {"display_name": "Use Multithreading", "value": True, "advanced": True}, } def build( @@ -25,7 +25,7 @@ class DirectoryLoaderComponent(CustomComponent): path: str, load_hidden: Optional[bool] = False, max_concurrency: Optional[int] = 10, - metadata: Optional[Dict[str, Any]] = None, + metadata: Optional[dict] = {}, recursive: Optional[bool] = True, silent_errors: Optional[bool] = False, use_multithreading: Optional[bool] = True, From 1b3fa78ac70ec332f8117355b78e8a526634c80a Mon Sep 17 00:00:00 2001 From: carlosrcoelho Date: Tue, 9 Jan 2024 19:27:53 -0300 Subject: [PATCH 02/10] Update metadata field type in AZLyricsLoader.py --- .../langflow/components/documentloaders/AZLyricsLoader.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/backend/langflow/components/documentloaders/AZLyricsLoader.py b/src/backend/langflow/components/documentloaders/AZLyricsLoader.py index 4f2d8e7a3..66e8e86d9 100644 --- a/src/backend/langflow/components/documentloaders/AZLyricsLoader.py +++ b/src/backend/langflow/components/documentloaders/AZLyricsLoader.py @@ -10,7 +10,7 @@ class AZLyricsLoaderComponent(CustomComponent): def build_config(self): return { - "metadata": {"display_name": "Metadata", "type": "dict", "default": {}, "show": True}, + "metadata": {"display_name": "Metadata", "field_type": "dict", "value": {}, "show": True}, "web_path": {"display_name": "Web Page", "type": "str", "required": True, "show": True}, } From 069cbd7dcca96a9e10b6e472b80dbf5094353ec1 Mon Sep 17 00:00:00 2001 From: carlosrcoelho Date: Tue, 9 Jan 2024 19:31:55 -0300 Subject: [PATCH 03/10] Update AirbyteJSONLoaderComponent configuration --- .../langflow/components/documentloaders/AirbyteJSONLoader.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/backend/langflow/components/documentloaders/AirbyteJSONLoader.py b/src/backend/langflow/components/documentloaders/AirbyteJSONLoader.py index 954638926..f1f22e45c 100644 --- a/src/backend/langflow/components/documentloaders/AirbyteJSONLoader.py +++ b/src/backend/langflow/components/documentloaders/AirbyteJSONLoader.py @@ -17,10 +17,11 @@ class AirbyteJSONLoaderComponent(CustomComponent): "type": "file", "fileTypes": ["json"], "required": True, + "field_type": "file", }, "metadata": { "display_name": "Metadata", - "type": "dict", + "field_type": "dict", "required": False, }, } From 5087a503f21213ca4f3d113b93a1621ccfa40a40 Mon Sep 17 00:00:00 2001 From: carlosrcoelho Date: Tue, 9 Jan 2024 19:34:30 -0300 Subject: [PATCH 04/10] Refactor BSHTMLLoaderComponent class in BSHTMLLoader.py --- .../langflow/components/documentloaders/BSHTMLLoader.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/backend/langflow/components/documentloaders/BSHTMLLoader.py b/src/backend/langflow/components/documentloaders/BSHTMLLoader.py index ffbc45d74..672e1e24d 100644 --- a/src/backend/langflow/components/documentloaders/BSHTMLLoader.py +++ b/src/backend/langflow/components/documentloaders/BSHTMLLoader.py @@ -17,12 +17,13 @@ class BSHTMLLoaderComponent(CustomComponent): "type": "file", "suffixes": [".html"], "file_types": ["html"], + "field_type": "file", }, "metadata": { "display_name": "Metadata", "required": False, "show": True, - "type": "dict", + "field_type": "dict", }, } From 2d2fd9a2aef1c9df70157bb0996c17d6fa5a859b Mon Sep 17 00:00:00 2001 From: carlosrcoelho Date: Tue, 9 Jan 2024 19:36:49 -0300 Subject: [PATCH 05/10] Update CSVLoader imports and metadata parameter --- .../langflow/components/documentloaders/CSVLoader.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/backend/langflow/components/documentloaders/CSVLoader.py b/src/backend/langflow/components/documentloaders/CSVLoader.py index 64f1f5527..dce3f5708 100644 --- a/src/backend/langflow/components/documentloaders/CSVLoader.py +++ b/src/backend/langflow/components/documentloaders/CSVLoader.py @@ -1,8 +1,8 @@ -from langchain import CustomComponent +from langflow import CustomComponent from typing import Optional, Dict, List -from langchain.loaders import CSVLoader -from langchain.documents import Document +from langchain_community.document_loaders.csv_loader import CSVLoader +from langchain.docstore.document import Document class CSVLoaderComponent(CustomComponent): display_name = "CSVLoader" @@ -15,6 +15,7 @@ class CSVLoaderComponent(CustomComponent): "required": True, "suffixes": [".csv"], "file_types": ["csv"], + "field_type": "file", }, "metadata": { "display_name": "Metadata", @@ -25,6 +26,6 @@ class CSVLoaderComponent(CustomComponent): def build( self, file_path: str, - metadata: Optional[Dict[str, str]] = None, + metadata: dict ) -> List[Document]: return CSVLoader(file_path=file_path, metadata=metadata).load() From cbacf559555835da901dc63f887cf89a88d8e925 Mon Sep 17 00:00:00 2001 From: carlosrcoelho Date: Tue, 9 Jan 2024 19:38:16 -0300 Subject: [PATCH 06/10] Update CoNLLULoaderComponent configuration --- .../components/documentloaders/CoNLLULoader.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/backend/langflow/components/documentloaders/CoNLLULoader.py b/src/backend/langflow/components/documentloaders/CoNLLULoader.py index 34151efe7..653919bd7 100644 --- a/src/backend/langflow/components/documentloaders/CoNLLULoader.py +++ b/src/backend/langflow/components/documentloaders/CoNLLULoader.py @@ -1,5 +1,5 @@ from langflow import CustomComponent -from langchain.documents import Document +from langchain.docstore.document import Document from typing import Optional, Dict from langflow.field_typing import TemplateField @@ -11,13 +11,13 @@ class CoNLLULoaderComponent(CustomComponent): def build_config(self): return { - "file_path": TemplateField( - display_name="File Path", - required=True, - type="file", - file_types=["conllu"], - suffixes=[".conllu"], - ), + "file_path": { + "display_name": "File Path", + "required": True, + "suffixes": [".conllu"], + "file_types": ["conllu"], + "field_type": "file", + }, "metadata": TemplateField( display_name="Metadata", required=False, @@ -25,7 +25,7 @@ class CoNLLULoaderComponent(CustomComponent): ), } - def build(self, file_path: str, metadata: Optional[Dict[str, str]] = None) -> Document: + def build(self, file_path: str, metadata: dict) -> Document: # Here, you would use the actual class that loads CoNLL-U files. # As I don't have the specific class, I'm returning an instance of Document. # In a real scenario, you should replace the below Document with the actual loader class. From 920f092ea1b1f59af508d39a45d420631577a5c9 Mon Sep 17 00:00:00 2001 From: carlosrcoelho Date: Tue, 9 Jan 2024 19:40:27 -0300 Subject: [PATCH 07/10] Update CollegeConfidentialLoader.py --- .../components/documentloaders/CollegeConfidentialLoader.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/backend/langflow/components/documentloaders/CollegeConfidentialLoader.py b/src/backend/langflow/components/documentloaders/CollegeConfidentialLoader.py index 163e43afa..9c2b2cfaf 100644 --- a/src/backend/langflow/components/documentloaders/CollegeConfidentialLoader.py +++ b/src/backend/langflow/components/documentloaders/CollegeConfidentialLoader.py @@ -1,6 +1,6 @@ from langflow import CustomComponent -from langchain.document_loaders import Document +from langchain.docstore.document import Document from typing import Optional, Dict class CollegeConfidentialLoaderComponent(CustomComponent): @@ -10,14 +10,14 @@ class CollegeConfidentialLoaderComponent(CustomComponent): def build_config(self): return { - "metadata": {"display_name": "Metadata", "default": {}}, + "metadata": {"display_name": "Metadata", "values": {}}, "web_path": {"display_name": "Web Page", "required": True}, } def build( self, web_path: str, - metadata: Optional[Dict] = None, + metadata: Optional[dict] = {} ) -> Document: # Assuming there is a loader class `CollegeConfidentialLoader` that takes `metadata` and `web_path` as arguments # Replace `CollegeConfidentialLoader` with the actual class name if different From 94eaaed95dea7a230b9c6338e03f6fad290a4a99 Mon Sep 17 00:00:00 2001 From: carlosrcoelho Date: Tue, 9 Jan 2024 19:49:24 -0300 Subject: [PATCH 08/10] Update EverNoteLoader.py: Added "field_type" attribute to "file" and "dict" types --- .../langflow/components/documentloaders/EverNoteLoader.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/backend/langflow/components/documentloaders/EverNoteLoader.py b/src/backend/langflow/components/documentloaders/EverNoteLoader.py index fb9460a04..1d8c95b34 100644 --- a/src/backend/langflow/components/documentloaders/EverNoteLoader.py +++ b/src/backend/langflow/components/documentloaders/EverNoteLoader.py @@ -17,12 +17,13 @@ class EverNoteLoaderComponent(CustomComponent): "show": True, "type": "file", "file_types": ["xml"], + "field_type": "file", }, "metadata": { "display_name": "Metadata", "required": False, "show": True, - "type": "dict", + "field_type": "dict", }, } From aa2aa1da517f7f595d00a634400ff11601fb4e9e Mon Sep 17 00:00:00 2001 From: carlosrcoelho Date: Tue, 9 Jan 2024 19:52:23 -0300 Subject: [PATCH 09/10] Update imports and field types in FacebookChatLoader.py --- .../components/documentloaders/FacebookChatLoader.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/backend/langflow/components/documentloaders/FacebookChatLoader.py b/src/backend/langflow/components/documentloaders/FacebookChatLoader.py index cf0ea2380..d5b3c1dd1 100644 --- a/src/backend/langflow/components/documentloaders/FacebookChatLoader.py +++ b/src/backend/langflow/components/documentloaders/FacebookChatLoader.py @@ -1,6 +1,6 @@ from langflow import CustomComponent -from langchain.documents import Document +from langchain.docstore.document import Document from typing import Optional, Dict class FacebookChatLoaderComponent(CustomComponent): @@ -15,10 +15,12 @@ class FacebookChatLoaderComponent(CustomComponent): "required": True, "suffixes": [".json"], "file_types": ["json"], + "field_type": "file", }, "metadata": { "display_name": "Metadata", "required": False, + "field_type": "dict", }, } @@ -27,4 +29,4 @@ class FacebookChatLoaderComponent(CustomComponent): # and returns a Document object. Replace 'FacebookChatLoader' with the actual class name. # As per the JSON, the output type is 'Document', which is part of langchain.documents. # Therefore, the 'FacebookChatLoader' should be imported or defined elsewhere in the codebase. - return FacebookChatLoader(file_path=file_path, metadata=metadata) + return FacebookChatLoader(file_path=file_path, metadata=metadata) \ No newline at end of file From 2fb287525a23d4a930ab72fb8b0a9ba5f875d3b4 Mon Sep 17 00:00:00 2001 From: carlosrcoelho Date: Tue, 9 Jan 2024 20:13:53 -0300 Subject: [PATCH 10/10] Update VertexAIEmbeddingsComponent configuration --- .../embeddings/VertexAIEmbeddings.py | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/backend/langflow/components/embeddings/VertexAIEmbeddings.py b/src/backend/langflow/components/embeddings/VertexAIEmbeddings.py index d0e4cc811..a736e063b 100644 --- a/src/backend/langflow/components/embeddings/VertexAIEmbeddings.py +++ b/src/backend/langflow/components/embeddings/VertexAIEmbeddings.py @@ -9,25 +9,25 @@ class VertexAIEmbeddingsComponent(CustomComponent): def build_config(self): return { - "client": {"display_name": "Client", "advanced": True}, - "credentials": {"display_name": "Credentials", "default": '', "file_types": ['json']}, - "location": {"display_name": "Location", "default": 'us-central1', "advanced": True}, - "max_output_tokens": {"display_name": "Max Output Tokens", "default": 128}, - "max_retries": {"display_name": "Max Retries", "default": 6, "advanced": True}, - "model_name": {"display_name": "Model Name", "default": 'textembedding-gecko'}, - "n": {"display_name": "N", "default": 1, "advanced": True}, + "credentials": {"display_name": "Credentials", "value": '', "file_types": ['json'],"field_type": "file"}, + "instance": {"display_name": "instance", "advanced": True, "field_type": "dict"}, + "location": {"display_name": "Location", "value": 'us-central1', "advanced": True}, + "max_output_tokens": {"display_name": "Max Output Tokens", "value": 128}, + "max_retries": {"display_name": "Max Retries", "value": 6, "advanced": True}, + "model_name": {"display_name": "Model Name", "value": 'textembedding-gecko'}, + "n": {"display_name": "N", "value": 1, "advanced": True}, "project": {"display_name": "Project", "advanced": True}, - "request_parallelism": {"display_name": "Request Parallelism", "default": 5, "advanced": True}, + "request_parallelism": {"display_name": "Request Parallelism", "value": 5, "advanced": True}, "stop": {"display_name": "Stop", "advanced": True}, - "streaming": {"display_name": "Streaming", "default": False, "advanced": True}, - "temperature": {"display_name": "Temperature", "default": 0.0}, - "top_k": {"display_name": "Top K", "default": 40, "advanced": True}, - "top_p": {"display_name": "Top P", "default": 0.95, "advanced": True}, + "streaming": {"display_name": "Streaming", "value": False, "advanced": True}, + "temperature": {"display_name": "Temperature", "value": 0.0}, + "top_k": {"display_name": "Top K", "value": 40, "advanced": True}, + "top_p": {"display_name": "Top P", "value": 0.95, "advanced": True}, } def build( self, - client: Optional[str] = None, + instance: Optional[str] = None, credentials: Optional[str] = None, location: str = 'us-central1', max_output_tokens: int = 128, @@ -43,7 +43,7 @@ class VertexAIEmbeddingsComponent(CustomComponent): top_p: float = 0.95, ) -> VertexAIEmbeddings: return VertexAIEmbeddings( - client=client, + instance=instance, credentials=credentials, location=location, max_output_tokens=max_output_tokens,