From 8a08ebdbe700a1026f29999ae89d4cebaabe3d3b Mon Sep 17 00:00:00 2001 From: Gustavo Schaedler Date: Fri, 9 Jun 2023 20:09:25 +0100 Subject: [PATCH] Remove some commented out code + add condition for the execution of make publish --- Makefile | 23 +++++++++++++++++-- src/backend/langflow/config.yaml | 1 - src/backend/langflow/graph/vertex/base.py | 2 +- src/backend/langflow/interface/chains/base.py | 6 ----- 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index baf4220ff..4ff5030c6 100644 --- a/Makefile +++ b/Makefile @@ -46,6 +46,11 @@ backend: make install_backend poetry run uvicorn langflow.main:app --port 7860 --reload --log-level debug +build_and_run: + echo 'Removing dist folder' + rm -rf dist + make build && poetry run pip install dist/*.tar.gz && poetry run langflow + build_frontend: cd src/frontend && CI='' npm run build cp -r src/frontend/build src/backend/langflow/frontend @@ -78,8 +83,22 @@ else endif publish: - make build - poetry publish + @while true; do \ + read -p "Do you want to build and publish LangFlow? [y/n]: " yn; \ + case "$$yn" in \ + y|Y ) \ + echo "Building..."; \ + make build; \ + echo "Publishing..."; \ + poetry publish; \ + break ;; \ + n|N ) \ + echo "Bye!!!"; \ + break ;; \ + * ) \ + echo "Invalid response, please enter 'y' or 'n'.\n" ;; \ + esac \ + done help: @echo '----' diff --git a/src/backend/langflow/config.yaml b/src/backend/langflow/config.yaml index e253ed8e4..96841ba0a 100644 --- a/src/backend/langflow/config.yaml +++ b/src/backend/langflow/config.yaml @@ -18,7 +18,6 @@ chains: - SQLDatabaseChain - RetrievalQA - RetrievalQAWithSourcesChain - - QAWithSourcesChain - ConversationalRetrievalChain - CombineDocsChain documentloaders: diff --git a/src/backend/langflow/graph/vertex/base.py b/src/backend/langflow/graph/vertex/base.py index 31cc11968..bb6ff34dc 100644 --- a/src/backend/langflow/graph/vertex/base.py +++ b/src/backend/langflow/graph/vertex/base.py @@ -53,7 +53,7 @@ class Vertex: if "Tool" not in self.output or template_dict["_type"].islower() else template_dict["_type"] ) - # self.vertex_type = template_dict["_type"] + if self.base_type is None: for base_type, value in ALL_TYPES_DICT.items(): if self.vertex_type in value: diff --git a/src/backend/langflow/interface/chains/base.py b/src/backend/langflow/interface/chains/base.py index 054ca2775..63840cf13 100644 --- a/src/backend/langflow/interface/chains/base.py +++ b/src/backend/langflow/interface/chains/base.py @@ -60,12 +60,6 @@ class ChainCreator(LangChainTypeCreator): logger.error(f"Chain {name} not loaded: {exc}") return None - # def to_list(self) -> List[str]: - # custom_chains = list(get_custom_nodes("chains").keys()) - # default_chains = list(self.type_to_loader_dict.keys()) - - # return default_chains + custom_chains - def to_list(self) -> List[str]: names = [] for _, chain in self.type_to_loader_dict.items():