From c390a4750494699ac844d284639abb531030182d Mon Sep 17 00:00:00 2001 From: Gabriel Almeida Date: Mon, 20 Mar 2023 20:54:05 -0300 Subject: [PATCH 01/24] feat: added constants file to support model types and others --- src/backend/langflow/utils/constants.py | 8 ++++++++ src/backend/langflow/utils/util.py | 6 ++++-- 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 src/backend/langflow/utils/constants.py diff --git a/src/backend/langflow/utils/constants.py b/src/backend/langflow/utils/constants.py new file mode 100644 index 000000000000..73a50ce4017b --- /dev/null +++ b/src/backend/langflow/utils/constants.py @@ -0,0 +1,8 @@ +OPENAI_MODELS = [ + "text-davinci-003", + "text-davinci-002", + "text-curie-001", + "text-babbage-001", + "text-ada-001", +] +CHAT_OPENAI_MODELS = ["gpt-3.5-turbo", "gpt-4", "gpt-4-32k"] diff --git a/src/backend/langflow/utils/util.py b/src/backend/langflow/utils/util.py index 5d13e931dc8d..18fdf658d427 100644 --- a/src/backend/langflow/utils/util.py +++ b/src/backend/langflow/utils/util.py @@ -11,6 +11,8 @@ ) from typing import Optional, Dict +from backend.langflow.utils.constants import CHAT_OPENAI_MODELS, OPENAI_MODELS + def build_template_from_function(name: str, type_to_loader_dict: Dict): classes = [ @@ -296,9 +298,9 @@ def format_dict(d, name: Optional[str] = None): # Add options to openai if name == "OpenAI" and key == "model_name": - value["options"] = ["text-davinci-003", "text-davinci-002"] + value["options"] = OPENAI_MODELS elif name == "OpenAIChat" and key == "model_name": - value["options"] = ["gpt-3.5-turbo", "gpt-4"] + value["options"] = CHAT_OPENAI_MODELS return d From 049ab2b39beabbd4adff9a4719f685ea3712d426 Mon Sep 17 00:00:00 2001 From: Gabriel Almeida Date: Mon, 20 Mar 2023 20:56:15 -0300 Subject: [PATCH 02/24] fix: changed import and linting --- src/backend/langflow/__main__.py | 1 - src/backend/langflow/utils/util.py | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/backend/langflow/__main__.py b/src/backend/langflow/__main__.py index 6f848dca640a..3da26667db9e 100644 --- a/src/backend/langflow/__main__.py +++ b/src/backend/langflow/__main__.py @@ -1,6 +1,5 @@ import multiprocessing import platform -import re from langflow.main import create_app diff --git a/src/backend/langflow/utils/util.py b/src/backend/langflow/utils/util.py index 18fdf658d427..dae450f0c5ee 100644 --- a/src/backend/langflow/utils/util.py +++ b/src/backend/langflow/utils/util.py @@ -11,7 +11,7 @@ ) from typing import Optional, Dict -from backend.langflow.utils.constants import CHAT_OPENAI_MODELS, OPENAI_MODELS +from langflow.utils import constants def build_template_from_function(name: str, type_to_loader_dict: Dict): @@ -298,9 +298,9 @@ def format_dict(d, name: Optional[str] = None): # Add options to openai if name == "OpenAI" and key == "model_name": - value["options"] = OPENAI_MODELS + value["options"] = constants.OPENAI_MODELS elif name == "OpenAIChat" and key == "model_name": - value["options"] = CHAT_OPENAI_MODELS + value["options"] = constants.CHAT_OPENAI_MODELS return d From 08d8fffb8fea9ad2a0a1274c4a3eaa92eb15aba8 Mon Sep 17 00:00:00 2001 From: Gabriel Almeida Date: Mon, 20 Mar 2023 21:08:57 -0300 Subject: [PATCH 03/24] fix: adding maintainers and other configs --- pyproject.toml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 615caf12dc98..8f4395abe464 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,12 +3,19 @@ name = "langflow" version = "0.0.45" description = "A Python package with a built-in web application" authors = ["Logspace "] -packages = [ - { include = "langflow", from = "src/backend" }, +maintainers = [ + "Gabriel Almeida ", + "Ibis Prevedello ", + "Lucas Eduoli ", + "Otávio Anovazzi ", ] -include = ["src/backend/langflow/*", "src/backend/langflow/**/*"] +repository = "https://github.com/logspace-ai/langflow" license = "MIT" readme = "README.md" +keywords = ["nlp", "langchain", "openai", "gpt", "gui"] +packages = [{ include = "langflow", from = "src/backend" }] +include = ["src/backend/langflow/*", "src/backend/langflow/**/*"] + [tool.poetry.scripts] langflow = "langflow.__main__:main" From c8ef7ba54564409535d26c725e84de050ca6bf2c Mon Sep 17 00:00:00 2001 From: anovazzi1 Date: Tue, 21 Mar 2023 17:05:12 -0300 Subject: [PATCH 04/24] some ui updates --- src/frontend/public/index.html | 3 --- src/frontend/src/contexts/tabsContext.tsx | 2 +- .../pages/FlowPage/components/tabsManagerComponent/index.tsx | 4 ++-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/frontend/public/index.html b/src/frontend/public/index.html index 1aa066669716..57757fb21dfe 100644 --- a/src/frontend/public/index.html +++ b/src/frontend/public/index.html @@ -5,9 +5,6 @@ LangFLow - diff --git a/src/frontend/src/contexts/tabsContext.tsx b/src/frontend/src/contexts/tabsContext.tsx index 3f6cbbf0b5be..1bab447b83be 100644 --- a/src/frontend/src/contexts/tabsContext.tsx +++ b/src/frontend/src/contexts/tabsContext.tsx @@ -131,7 +131,7 @@ export function TabsProvider({ children }: { children: ReactNode }) { // Create a new flow with a default name if no flow is provided. let newFlow: FlowType = { - name: flow ? flow.name : "New Flow " + (flows.length===0?"":flows.length), + name: "New Flow", id: id.toString(), data, chat: flow ? flow.chat : [], diff --git a/src/frontend/src/pages/FlowPage/components/tabsManagerComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/tabsManagerComponent/index.tsx index 6396b753f725..79240f720857 100644 --- a/src/frontend/src/pages/FlowPage/components/tabsManagerComponent/index.tsx +++ b/src/frontend/src/pages/FlowPage/components/tabsManagerComponent/index.tsx @@ -50,10 +50,10 @@ export default function TabsManagerComponent() { flow={null} />
- - ))} - +
- +
- + {children} From f7cf8b162215d3a6897a1aa847797a1de11b4e60 Mon Sep 17 00:00:00 2001 From: Ibis Prevedello Date: Thu, 23 Mar 2023 18:30:56 -0300 Subject: [PATCH 07/24] feat: add settings --- poetry.lock | 14 +++++- pyproject.toml | 1 + src/backend/langflow/__main__.py | 8 +-- src/backend/langflow/api/endpoints.py | 7 +-- src/backend/langflow/config.yaml | 27 ++++++++++ src/backend/langflow/interface/listing.py | 47 +++++++++++++----- src/backend/langflow/interface/loading.py | 20 ++++---- src/backend/langflow/interface/run.py | 1 + src/backend/langflow/interface/signature.py | 19 +++++-- src/backend/langflow/interface/types.py | 5 ++ src/backend/langflow/main.py | 3 +- src/backend/langflow/settings.py | 49 +++++++++++++++++++ .../langflow/utils/allowed_components.py | 9 ---- src/backend/langflow/utils/util.py | 6 +-- tests/test_loading.py | 1 + 15 files changed, 170 insertions(+), 47 deletions(-) create mode 100644 src/backend/langflow/config.yaml create mode 100644 src/backend/langflow/settings.py delete mode 100644 src/backend/langflow/utils/allowed_components.py diff --git a/poetry.lock b/poetry.lock index b989234e1d15..46aa8b702db3 100644 --- a/poetry.lock +++ b/poetry.lock @@ -2212,6 +2212,18 @@ dev = ["autoflake (>=1.3.1,<2.0.0)", "flake8 (>=3.8.3,<4.0.0)", "pre-commit (>=2 doc = ["cairosvg (>=2.5.2,<3.0.0)", "mdx-include (>=1.4.1,<2.0.0)", "mkdocs (>=1.1.2,<2.0.0)", "mkdocs-material (>=8.1.4,<9.0.0)", "pillow (>=9.3.0,<10.0.0)"] test = ["black (>=22.3.0,<23.0.0)", "coverage (>=6.2,<7.0)", "isort (>=5.0.6,<6.0.0)", "mypy (==0.910)", "pytest (>=4.4.0,<8.0.0)", "pytest-cov (>=2.10.0,<5.0.0)", "pytest-sugar (>=0.9.4,<0.10.0)", "pytest-xdist (>=1.32.0,<4.0.0)", "rich (>=10.11.0,<13.0.0)", "shellingham (>=1.3.0,<2.0.0)"] +[[package]] +name = "types-pyyaml" +version = "6.0.12.8" +description = "Typing stubs for PyYAML" +category = "main" +optional = false +python-versions = "*" +files = [ + {file = "types-PyYAML-6.0.12.8.tar.gz", hash = "sha256:19304869a89d49af00be681e7b267414df213f4eb89634c4495fa62e8f942b9f"}, + {file = "types_PyYAML-6.0.12.8-py3-none-any.whl", hash = "sha256:5314a4b2580999b2ea06b2e5f9a7763d860d6e09cdf21c0e9561daa9cbd60178"}, +] + [[package]] name = "typing-extensions" version = "4.5.0" @@ -2407,4 +2419,4 @@ testing = ["big-O", "flake8 (<5)", "jaraco.functools", "jaraco.itertools", "more [metadata] lock-version = "2.0" python-versions = "^3.9" -content-hash = "ebc0a8ca9ea284d8e986306a10f13ff91e7e8aae18341c83329f5b1e1bcc66bd" +content-hash = "9acd2b7396be651321ac517873a398d1631a76918fefdb003f7f587f031d9ba1" diff --git a/pyproject.toml b/pyproject.toml index 239ab37a5028..9d5d13d01181 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,6 +24,7 @@ typer = "^0.7.0" gunicorn = "^20.1.0" langchain = "^0.0.113" openai = "^0.27.2" +types-pyyaml = "^6.0.12.8" [tool.poetry.group.dev.dependencies] black = "^23.1.0" diff --git a/src/backend/langflow/__main__.py b/src/backend/langflow/__main__.py index cf2a2f8a0655..fd047996183b 100644 --- a/src/backend/langflow/__main__.py +++ b/src/backend/langflow/__main__.py @@ -1,13 +1,13 @@ +import logging import multiprocessing import platform import re - -from langflow.main import create_app +from pathlib import Path import typer from fastapi.staticfiles import StaticFiles -from pathlib import Path -import logging + +from langflow.main import create_app logger = logging.getLogger(__name__) diff --git a/src/backend/langflow/api/endpoints.py b/src/backend/langflow/api/endpoints.py index 68238013cd2e..7214ec6a680d 100644 --- a/src/backend/langflow/api/endpoints.py +++ b/src/backend/langflow/api/endpoints.py @@ -1,8 +1,9 @@ -from fastapi import APIRouter, HTTPException -from langflow.interface.types import build_langchain_types_dict -from langflow.interface.run import process_data_graph from typing import Any, Dict +from fastapi import APIRouter, HTTPException + +from langflow.interface.run import process_data_graph +from langflow.interface.types import build_langchain_types_dict # build router router = APIRouter() diff --git a/src/backend/langflow/config.yaml b/src/backend/langflow/config.yaml new file mode 100644 index 000000000000..9b03aaeb1d39 --- /dev/null +++ b/src/backend/langflow/config.yaml @@ -0,0 +1,27 @@ +chains: + - LLMChain + - LLMMathChain + - LLMChecker + # - ConversationChain + +agents: + - ZeroShotAgent + +prompts: + - PromptTemplate + - FewShotPromptTemplate + +llms: + - OpenAI + - OpenAIChat + +tools: + - Search + - PAL-MATH + - Calculator + - Serper Search + +memories: + # - ConversationBufferMemory + +dev: false diff --git a/src/backend/langflow/interface/listing.py b/src/backend/langflow/interface/listing.py index 1df2d25e7e48..d8e4b087dc53 100644 --- a/src/backend/langflow/interface/listing.py +++ b/src/backend/langflow/interface/listing.py @@ -1,9 +1,13 @@ -from langchain import chains, agents, prompts -from langflow.interface.custom_lists import llm_type_to_cls_dict -from langflow.custom import customs -from langflow.utils import util, allowed_components +from langchain import agents, chains, prompts from langchain.agents.load_tools import get_all_tool_names -from langchain.chains.conversation import memory as memories + +from langflow.custom import customs +from langflow.interface.custom_lists import ( + llm_type_to_cls_dict, + memory_type_to_cls_dict, +) +from langflow.settings import settings +from langflow.utils import util def list_type(object_type: str): @@ -13,18 +17,19 @@ def list_type(object_type: str): "agents": list_agents, "prompts": list_prompts, "llms": list_llms, - "tools": list_tools, "memories": list_memories, + "tools": list_tools, }.get(object_type, lambda: "Invalid type")() def list_agents(): """List all agent types""" - # return list(agents.loading.AGENT_TO_CLASS.keys()) + AGENT_BUG = ["ChatAgent"] return [ agent.__name__ for agent in agents.loading.AGENT_TO_CLASS.values() - if agent.__name__ in allowed_components.AGENTS + if (agent.__name__ in settings.agents or settings.dev) + and agent.__name__ not in AGENT_BUG ] @@ -34,19 +39,24 @@ def list_prompts(): library_prompts = [ prompt.__annotations__["return"].__name__ for prompt in prompts.loading.type_to_loader_dict.values() - if prompt.__annotations__["return"].__name__ in allowed_components.PROMPTS + if prompt.__annotations__["return"].__name__ in settings.prompts or settings.dev ] return library_prompts + list(custom_prompts.keys()) def list_tools(): """List all load tools""" + TOOL_BUG = [] tools = [] for tool in get_all_tool_names(): tool_params = util.get_tool_params(util.get_tools_dict(tool)) - if tool_params and tool_params["name"] in allowed_components.TOOLS: + if ( + tool_params + and (tool_params["name"] in settings.tools or settings.dev) + and tool_params["name"] not in TOOL_BUG + ): tools.append(tool_params["name"]) return tools @@ -57,7 +67,7 @@ def list_llms(): return [ llm.__name__ for llm in llm_type_to_cls_dict.values() - if llm.__name__ in allowed_components.LLMS + if llm.__name__ in settings.llms or settings.dev ] @@ -66,10 +76,21 @@ def list_chain_types(): return [ chain.__annotations__["return"].__name__ for chain in chains.loading.type_to_loader_dict.values() - if chain.__annotations__["return"].__name__ in allowed_components.CHAINS + if chain.__annotations__["return"].__name__ in settings.chains or settings.dev ] def list_memories(): """List all memory types""" - return [memory.__name__ for memory in memories.type_to_cls_dict.values()] + MEMORY_BUG = [ + "ChatMessageHistory", + "ConversationSummaryBufferMemory", + "ConversationKGMemory", + "ConversationSummaryMemory", + ] + return [ + memory.__name__ + for memory in memory_type_to_cls_dict.values() + if (memory.__name__ in settings.memories or settings.dev) + and memory.__name__ not in MEMORY_BUG + ] diff --git a/src/backend/langflow/interface/loading.py b/src/backend/langflow/interface/loading.py index a8ffe42dfe1b..619264988091 100644 --- a/src/backend/langflow/interface/loading.py +++ b/src/backend/langflow/interface/loading.py @@ -1,22 +1,22 @@ import json from typing import Any, Dict, Optional -from langflow.interface.types import get_type_list -from langchain.agents.loading import load_agent_from_config -from langchain.chains.loading import load_chain_from_config -from langchain.llms.loading import load_llm_from_config -from langflow.utils import payload -from langflow.utils import util -from langchain.llms.base import BaseLLM from langchain.agents.agent import AgentExecutor -from langchain.callbacks.base import BaseCallbackManager -from langchain.agents.tools import Tool from langchain.agents.load_tools import ( _BASE_TOOLS, - _LLM_TOOLS, _EXTRA_LLM_TOOLS, _EXTRA_OPTIONAL_TOOLS, + _LLM_TOOLS, ) +from langchain.agents.loading import load_agent_from_config +from langchain.agents.tools import Tool +from langchain.callbacks.base import BaseCallbackManager +from langchain.chains.loading import load_chain_from_config +from langchain.llms.base import BaseLLM +from langchain.llms.loading import load_llm_from_config + +from langflow.interface.types import get_type_list +from langflow.utils import payload, util def load_flow_from_json(path: str): diff --git a/src/backend/langflow/interface/run.py b/src/backend/langflow/interface/run.py index 76813a98f2fe..0844e2073f5d 100644 --- a/src/backend/langflow/interface/run.py +++ b/src/backend/langflow/interface/run.py @@ -2,6 +2,7 @@ import io import re from typing import Any, Dict + from langflow.interface import loading diff --git a/src/backend/langflow/interface/signature.py b/src/backend/langflow/interface/signature.py index baa2956dce38..69e83fad6524 100644 --- a/src/backend/langflow/interface/signature.py +++ b/src/backend/langflow/interface/signature.py @@ -1,6 +1,6 @@ -from typing import Dict, Any # noqa: F401 +from typing import Any, Dict # noqa: F401 + from langchain import agents, chains, prompts -from langflow.interface.custom_lists import llm_type_to_cls_dict from langchain.agents.load_tools import ( _BASE_TOOLS, _EXTRA_LLM_TOOLS, @@ -9,8 +9,12 @@ get_all_tool_names, ) -from langflow.utils import util from langflow.custom import customs +from langflow.interface.custom_lists import ( + llm_type_to_cls_dict, + memory_type_to_cls_dict, +) +from langflow.utils import util def get_signature(name: str, object_type: str): @@ -20,6 +24,7 @@ def get_signature(name: str, object_type: str): "agents": get_agent_signature, "prompts": get_prompt_signature, "llms": get_llm_signature, + "memories": get_memory_signature, "tools": get_tool_signature, }.get(object_type, lambda name: f"Invalid type: {name}")(name) @@ -62,6 +67,14 @@ def get_llm_signature(name: str): raise ValueError("LLM not found") from exc +def get_memory_signature(name: str): + """Get the signature of a memory.""" + try: + return util.build_template_from_class(name, memory_type_to_cls_dict) + except ValueError as exc: + raise ValueError("Memory not found") from exc + + def get_tool_signature(name: str): """Get the signature of a tool.""" diff --git a/src/backend/langflow/interface/types.py b/src/backend/langflow/interface/types.py index 424089584ac4..57f3a2578512 100644 --- a/src/backend/langflow/interface/types.py +++ b/src/backend/langflow/interface/types.py @@ -16,6 +16,7 @@ def get_type_list(): def build_langchain_types_dict(): """Build a dictionary of all langchain types""" + return { "chains": { chain: get_signature(chain, "chains") for chain in list_type("chains") @@ -27,5 +28,9 @@ def build_langchain_types_dict(): prompt: get_signature(prompt, "prompts") for prompt in list_type("prompts") }, "llms": {llm: get_signature(llm, "llms") for llm in list_type("llms")}, + "memories": { + memory: get_signature(memory, "memories") + for memory in list_type("memories") + }, "tools": {tool: get_signature(tool, "tools") for tool in list_type("tools")}, } diff --git a/src/backend/langflow/main.py b/src/backend/langflow/main.py index 198cdd1e153a..a2a02465ec55 100644 --- a/src/backend/langflow/main.py +++ b/src/backend/langflow/main.py @@ -1,8 +1,9 @@ from fastapi import FastAPI +from fastapi.middleware.cors import CORSMiddleware + from langflow.api.endpoints import router as endpoints_router from langflow.api.list_endpoints import router as list_router from langflow.api.signature import router as signatures_router -from fastapi.middleware.cors import CORSMiddleware def create_app(): diff --git a/src/backend/langflow/settings.py b/src/backend/langflow/settings.py new file mode 100644 index 000000000000..f4dd4ae30ef0 --- /dev/null +++ b/src/backend/langflow/settings.py @@ -0,0 +1,49 @@ +import os +from typing import List, Optional + +import yaml +from pydantic import BaseSettings, Field, root_validator + + +class Settings(BaseSettings): + chains: Optional[List[str]] = Field(...) + agents: Optional[List[str]] = Field(...) + prompts: Optional[List[str]] = Field(...) + llms: Optional[List[str]] = Field(...) + tools: Optional[List[str]] = Field(...) + memories: Optional[List[str]] = Field(...) + dev: bool = Field(...) + + class Config: + validate_assignment = True + + @root_validator + def validate_lists(cls, values): + for key, value in values.items(): + if key != "dev" and not value: + values[key] = [] + return values + + +def save_settings_to_yaml(settings: Settings, file_path: str): + with open(file_path, "w") as f: + settings_dict = settings.dict() + yaml.dump(settings_dict, f) + + +def load_settings_from_yaml(file_path: str) -> Settings: + # Check if a string is a valid path or a file name + if "/" not in file_path: + # Get current path + current_path = os.path.dirname(os.path.abspath(__file__)) + + file_path = os.path.join(current_path, file_path) + + with open(file_path, "r") as f: + settings_dict = yaml.safe_load(f) + a = Settings.parse_obj(settings_dict) + + return a + + +settings = load_settings_from_yaml("config.yaml") diff --git a/src/backend/langflow/utils/allowed_components.py b/src/backend/langflow/utils/allowed_components.py deleted file mode 100644 index f304a3d15a71..000000000000 --- a/src/backend/langflow/utils/allowed_components.py +++ /dev/null @@ -1,9 +0,0 @@ -CHAINS = ["LLMChain", "LLMMathChain", "LLMChecker"] - -AGENTS = ["ZeroShotAgent"] - -PROMPTS = ["PromptTemplate", "FewShotPromptTemplate"] - -LLMS = ["OpenAI", "OpenAIChat"] - -TOOLS = ["Search", "PAL-MATH", "Calculator", "Serper Search"] diff --git a/src/backend/langflow/utils/util.py b/src/backend/langflow/utils/util.py index 5d13e931dc8d..d15aefe0ce9d 100644 --- a/src/backend/langflow/utils/util.py +++ b/src/backend/langflow/utils/util.py @@ -1,15 +1,15 @@ import ast +import importlib import inspect import re -import importlib +from typing import Dict, Optional from langchain.agents.load_tools import ( _BASE_TOOLS, - _LLM_TOOLS, _EXTRA_LLM_TOOLS, _EXTRA_OPTIONAL_TOOLS, + _LLM_TOOLS, ) -from typing import Optional, Dict def build_template_from_function(name: str, type_to_loader_dict: Dict): diff --git a/tests/test_loading.py b/tests/test_loading.py index 6ad3e72d9e86..9478e9be14bb 100644 --- a/tests/test_loading.py +++ b/tests/test_loading.py @@ -1,4 +1,5 @@ from pathlib import Path + from langflow import load_flow_from_json From 16c64f668a0dd39fec6495d52672c971207ce5fd Mon Sep 17 00:00:00 2001 From: Ibis Prevedello Date: Thu, 23 Mar 2023 18:49:15 -0300 Subject: [PATCH 08/24] refac: fix custom_lists --- .../langflow/interface/custom_lists.py | 39 ++++++++++++++++++- src/frontend/package.json | 2 +- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/src/backend/langflow/interface/custom_lists.py b/src/backend/langflow/interface/custom_lists.py index 10f0e9e535c5..3e8a800f9f5f 100644 --- a/src/backend/langflow/interface/custom_lists.py +++ b/src/backend/langflow/interface/custom_lists.py @@ -1,6 +1,43 @@ +## LLM +from typing import Any + from langchain import llms from langchain.llms.openai import OpenAIChat - llm_type_to_cls_dict = llms.type_to_cls_dict llm_type_to_cls_dict["openai-chat"] = OpenAIChat + + +## Memory + +# from langchain.memory.buffer_window import ConversationBufferWindowMemory +# from langchain.memory.chat_memory import ChatMessageHistory +# from langchain.memory.combined import CombinedMemory +# from langchain.memory.entity import ConversationEntityMemory +# from langchain.memory.kg import ConversationKGMemory +# from langchain.memory.readonly import ReadOnlySharedMemory +# from langchain.memory.simple import SimpleMemory +# from langchain.memory.summary import ConversationSummaryMemory +# from langchain.memory.summary_buffer import ConversationSummaryBufferMemory + +memory_type_to_cls_dict: dict[str, Any] = { + # "CombinedMemory": CombinedMemory, + # "ConversationBufferWindowMemory": ConversationBufferWindowMemory, + # "ConversationBufferMemory": ConversationBufferMemory, + # "SimpleMemory": SimpleMemory, + # "ConversationSummaryBufferMemory": ConversationSummaryBufferMemory, + # "ConversationKGMemory": ConversationKGMemory, + # "ConversationEntityMemory": ConversationEntityMemory, + # "ConversationSummaryMemory": ConversationSummaryMemory, + # "ChatMessageHistory": ChatMessageHistory, + # "ConversationStringBufferMemory": ConversationStringBufferMemory, + # "ReadOnlySharedMemory": ReadOnlySharedMemory, +} + + +## Chain +# from langchain.chains.loading import type_to_loader_dict +# from langchain.chains.conversation.base import ConversationChain + +# chain_type_to_cls_dict = type_to_loader_dict +# chain_type_to_cls_dict["conversation_chain"] = ConversationChain diff --git a/src/frontend/package.json b/src/frontend/package.json index 9afe85ebca15..01be611671f0 100644 --- a/src/frontend/package.json +++ b/src/frontend/package.json @@ -54,5 +54,5 @@ "last 1 safari version" ] }, - "proxy": "http://backend:7860" + "proxy": "http://localhost:7860" } \ No newline at end of file From 250d3a1064bbc760d7a476d55905315ee7929e91 Mon Sep 17 00:00:00 2001 From: Ibis Prevedello Date: Fri, 24 Mar 2023 13:38:51 -0300 Subject: [PATCH 09/24] refac: fix bug reading docstring --- src/backend/langflow/interface/listing.py | 20 +++----------------- src/backend/langflow/utils/util.py | 16 +++++++++++----- 2 files changed, 14 insertions(+), 22 deletions(-) diff --git a/src/backend/langflow/interface/listing.py b/src/backend/langflow/interface/listing.py index d8e4b087dc53..21e763de42fd 100644 --- a/src/backend/langflow/interface/listing.py +++ b/src/backend/langflow/interface/listing.py @@ -24,12 +24,10 @@ def list_type(object_type: str): def list_agents(): """List all agent types""" - AGENT_BUG = ["ChatAgent"] return [ agent.__name__ for agent in agents.loading.AGENT_TO_CLASS.values() - if (agent.__name__ in settings.agents or settings.dev) - and agent.__name__ not in AGENT_BUG + if agent.__name__ in settings.agents or settings.dev ] @@ -46,17 +44,12 @@ def list_prompts(): def list_tools(): """List all load tools""" - TOOL_BUG = [] tools = [] for tool in get_all_tool_names(): tool_params = util.get_tool_params(util.get_tools_dict(tool)) - if ( - tool_params - and (tool_params["name"] in settings.tools or settings.dev) - and tool_params["name"] not in TOOL_BUG - ): + if tool_params and tool_params["name"] in settings.tools or settings.dev: tools.append(tool_params["name"]) return tools @@ -82,15 +75,8 @@ def list_chain_types(): def list_memories(): """List all memory types""" - MEMORY_BUG = [ - "ChatMessageHistory", - "ConversationSummaryBufferMemory", - "ConversationKGMemory", - "ConversationSummaryMemory", - ] return [ memory.__name__ for memory in memory_type_to_cls_dict.values() - if (memory.__name__ in settings.memories or settings.dev) - and memory.__name__ not in MEMORY_BUG + if memory.__name__ in settings.memories or settings.dev ] diff --git a/src/backend/langflow/utils/util.py b/src/backend/langflow/utils/util.py index 45f992e0498c..4710114ed50e 100644 --- a/src/backend/langflow/utils/util.py +++ b/src/backend/langflow/utils/util.py @@ -71,6 +71,7 @@ def build_template_from_class(name: str, type_to_cls_dict: Dict): if v.__name__ == name: _class = v + # Get the docstring docs = get_class_doc(_class) variables = {"_type": _type} @@ -192,11 +193,7 @@ def get_class_doc(class_name): A dictionary containing the extracted information, with keys for 'Description', 'Parameters', 'Attributes', and 'Returns'. """ - # Get the class docstring - docstring = class_name.__doc__ - - # Parse the docstring to extract information - lines = docstring.split("\n") + # Template data = { "Description": "", "Parameters": {}, @@ -205,6 +202,15 @@ def get_class_doc(class_name): "Returns": {}, } + # Get the class docstring + docstring = class_name.__doc__ + + if not docstring: + return data + + # Parse the docstring to extract information + lines = docstring.split("\n") + current_section = "Description" for line in lines: From 1dea005599e0e8625dce859e31163299e93ad339 Mon Sep 17 00:00:00 2001 From: anovazzi1 Date: Fri, 24 Mar 2023 14:24:49 -0300 Subject: [PATCH 10/24] import modal created --- .../modals/importModal/buttonBox/index.tsx | 45 +++++++ src/frontend/src/modals/importModal/index.tsx | 118 ++++++++++++++++++ .../components/tabsManagerComponent/index.tsx | 19 ++- src/frontend/src/utils.ts | 1 + 4 files changed, 180 insertions(+), 3 deletions(-) create mode 100644 src/frontend/src/modals/importModal/buttonBox/index.tsx create mode 100644 src/frontend/src/modals/importModal/index.tsx diff --git a/src/frontend/src/modals/importModal/buttonBox/index.tsx b/src/frontend/src/modals/importModal/buttonBox/index.tsx new file mode 100644 index 000000000000..38d2e84bfb5a --- /dev/null +++ b/src/frontend/src/modals/importModal/buttonBox/index.tsx @@ -0,0 +1,45 @@ +import React, { ReactNode } from "react"; +import { DocumentDuplicateIcon } from "@heroicons/react/solid"; +import { classNames } from "../../../utils"; + +export default function ButtonBox({ + onClick, + title, + description, + icon, + bgColor, + textColor, +}: { + onClick: () => void; + title: string; + description: string; + icon: ReactNode; + bgColor: string; + textColor: string; +}) { + return ( + + ); +} diff --git a/src/frontend/src/modals/importModal/index.tsx b/src/frontend/src/modals/importModal/index.tsx new file mode 100644 index 000000000000..70f65dd6c6b7 --- /dev/null +++ b/src/frontend/src/modals/importModal/index.tsx @@ -0,0 +1,118 @@ +import { Dialog, Transition } from "@headlessui/react"; +import { + XMarkIcon, + ArrowDownTrayIcon, + DocumentDuplicateIcon, + ComputerDesktopIcon, +} from "@heroicons/react/24/outline"; +import { Fragment, useContext, useRef, useState } from "react"; +import { PopUpContext } from "../../contexts/popUpContext"; +import ButtonBox from "./buttonBox"; + +export default function ImportModal() { + const [open, setOpen] = useState(true); + const { closePopUp } = useContext(PopUpContext); + const ref = useRef(); + function setModalOpen(x: boolean) { + setOpen(x); + if (x === false) { + setTimeout(() => { + closePopUp(); + }, 300); + } + } + return ( + + + +
+ + +
+
+ + +
+ +
+
+
+
+
+
+ + Import from + +
+
+
+
+ + } + onClick={() => console.log("sdsds")} + textColor="text-blue-500" + title="Examples" + > + + } + onClick={() => console.log("sdsds")} + textColor="text-blue-500" + title="Local file" + > +
+
+ +
+ + +
+
+
+ + ); +} diff --git a/src/frontend/src/pages/FlowPage/components/tabsManagerComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/tabsManagerComponent/index.tsx index 79240f720857..f40184d93b9b 100644 --- a/src/frontend/src/pages/FlowPage/components/tabsManagerComponent/index.tsx +++ b/src/frontend/src/pages/FlowPage/components/tabsManagerComponent/index.tsx @@ -14,9 +14,11 @@ import { import { PopUpContext } from "../../../../contexts/popUpContext"; import AlertDropdown from "../../../../alerts/alertDropDown"; import { alertContext } from "../../../../contexts/alertContext"; +import ImportModal from "../../../../modals/importModal"; export default function TabsManagerComponent() { - const { flows, addFlow, tabIndex, setTabIndex, uploadFlow, downloadFlow } = useContext(TabsContext); + const { flows, addFlow, tabIndex, setTabIndex, uploadFlow, downloadFlow } = + useContext(TabsContext); const { openPopUp } = useContext(PopUpContext); const AlertWidth = 256; const { dark, setDark } = useContext(darkContext); @@ -50,10 +52,21 @@ export default function TabsManagerComponent() { flow={null} />
- - +
+
+
+
+
+
+ + Export as + +
+
+
+
+ + { + let newFlow = flows[tabIndex]; + newFlow.name = event.target.value; + updateFlow(newFlow); + }} + type="text" + name="name" + value={flows[tabIndex].name ?? null} + placeholder="File name" + id="name" + className="focus:border focus:border-blue block w-full px-3 py-2 border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500 dark:bg-gray-800 dark:border-gray-600 dark:focus:border-blue-500 dark:focus:ring-blue-500" + /> +
+
+ + +
+
+ +
+
+ +
+
+
+ + + + + + + ); +} diff --git a/src/frontend/src/modals/importModal/index.tsx b/src/frontend/src/modals/importModal/index.tsx index c069a437503e..f4c09df1b023 100644 --- a/src/frontend/src/modals/importModal/index.tsx +++ b/src/frontend/src/modals/importModal/index.tsx @@ -4,6 +4,7 @@ import { ArrowDownTrayIcon, DocumentDuplicateIcon, ComputerDesktopIcon, + ArrowUpTrayIcon, } from "@heroicons/react/24/outline"; import { Fragment, useContext, useRef, useState } from "react"; import { PopUpContext } from "../../contexts/popUpContext"; @@ -70,7 +71,7 @@ export default function ImportModal() {
-