From 63b70f0e432fa8dbef5de6ad06d1dc2ac72f6c16 Mon Sep 17 00:00:00 2001 From: ogabrielluiz Date: Tue, 7 Mar 2023 15:29:35 -0300 Subject: [PATCH] refac: cli implementation --- langflow/backend/{src => langflow_backend}/__init__.py | 0 langflow/backend/{src => langflow_backend}/api/__init__.py | 0 langflow/backend/{src => langflow_backend}/api/endpoints.py | 6 +++--- .../backend/{src => langflow_backend}/api/list_endpoints.py | 4 ++-- langflow/backend/{src => langflow_backend}/api/signature.py | 4 ++-- .../backend/{src => langflow_backend}/custom/__init__.py | 0 .../backend/{src => langflow_backend}/custom/customs.py | 0 langflow/backend/{src => langflow_backend}/main.py | 6 +++--- .../backend/{src => langflow_backend}/utils/__init__.py | 0 .../{src => langflow_backend}/utils/allowed_components.py | 0 langflow/backend/{src => langflow_backend}/utils/payload.py | 0 langflow/backend/{src => langflow_backend}/utils/util.py | 0 langflow/backend/pyproject.toml | 4 ++-- langflow/cli.py | 2 +- pyproject.toml | 2 +- 15 files changed, 14 insertions(+), 14 deletions(-) rename langflow/backend/{src => langflow_backend}/__init__.py (100%) rename langflow/backend/{src => langflow_backend}/api/__init__.py (100%) rename langflow/backend/{src => langflow_backend}/api/endpoints.py (97%) rename langflow/backend/{src => langflow_backend}/api/list_endpoints.py (96%) rename langflow/backend/{src => langflow_backend}/api/signature.py (98%) rename langflow/backend/{src => langflow_backend}/custom/__init__.py (100%) rename langflow/backend/{src => langflow_backend}/custom/customs.py (100%) rename langflow/backend/{src => langflow_backend}/main.py (75%) rename langflow/backend/{src => langflow_backend}/utils/__init__.py (100%) rename langflow/backend/{src => langflow_backend}/utils/allowed_components.py (100%) rename langflow/backend/{src => langflow_backend}/utils/payload.py (100%) rename langflow/backend/{src => langflow_backend}/utils/util.py (100%) diff --git a/langflow/backend/src/__init__.py b/langflow/backend/langflow_backend/__init__.py similarity index 100% rename from langflow/backend/src/__init__.py rename to langflow/backend/langflow_backend/__init__.py diff --git a/langflow/backend/src/api/__init__.py b/langflow/backend/langflow_backend/api/__init__.py similarity index 100% rename from langflow/backend/src/api/__init__.py rename to langflow/backend/langflow_backend/api/__init__.py diff --git a/langflow/backend/src/api/endpoints.py b/langflow/backend/langflow_backend/api/endpoints.py similarity index 97% rename from langflow/backend/src/api/endpoints.py rename to langflow/backend/langflow_backend/api/endpoints.py index 931a91997..807298a9e 100644 --- a/langflow/backend/src/api/endpoints.py +++ b/langflow/backend/langflow_backend/api/endpoints.py @@ -1,7 +1,7 @@ from fastapi import APIRouter -from api import signature -from api import list_endpoints -from utils import payload +from langflow_backend.api import signature +from langflow_backend.api import list_endpoints +from langflow_backend.utils import payload from langchain.agents.loading import load_agent_executor_from_config from langchain.chains.loading import load_chain_from_config from langchain.llms.loading import load_llm_from_config diff --git a/langflow/backend/src/api/list_endpoints.py b/langflow/backend/langflow_backend/api/list_endpoints.py similarity index 96% rename from langflow/backend/src/api/list_endpoints.py rename to langflow/backend/langflow_backend/api/list_endpoints.py index cee8ee59e..f01c5b35f 100644 --- a/langflow/backend/src/api/list_endpoints.py +++ b/langflow/backend/langflow_backend/api/list_endpoints.py @@ -6,8 +6,8 @@ from langchain import prompts from langchain import llms from langchain.chains.conversation import memory as memories from langchain.agents.load_tools import get_all_tool_names -from utils import util, allowed_components -from custom import customs +from langflow_backend.utils import util, allowed_components +from langflow_backend.custom import customs # build router diff --git a/langflow/backend/src/api/signature.py b/langflow/backend/langflow_backend/api/signature.py similarity index 98% rename from langflow/backend/src/api/signature.py rename to langflow/backend/langflow_backend/api/signature.py index 5de7b0e76..68c133cf7 100644 --- a/langflow/backend/src/api/signature.py +++ b/langflow/backend/langflow_backend/api/signature.py @@ -10,8 +10,8 @@ from langchain.agents.load_tools import ( ) from langchain.chains.conversation import memory as memories -from utils import util -from custom import customs +from langflow_backend.utils import util +from langflow_backend.custom import customs # build router router = APIRouter( diff --git a/langflow/backend/src/custom/__init__.py b/langflow/backend/langflow_backend/custom/__init__.py similarity index 100% rename from langflow/backend/src/custom/__init__.py rename to langflow/backend/langflow_backend/custom/__init__.py diff --git a/langflow/backend/src/custom/customs.py b/langflow/backend/langflow_backend/custom/customs.py similarity index 100% rename from langflow/backend/src/custom/customs.py rename to langflow/backend/langflow_backend/custom/customs.py diff --git a/langflow/backend/src/main.py b/langflow/backend/langflow_backend/main.py similarity index 75% rename from langflow/backend/src/main.py rename to langflow/backend/langflow_backend/main.py index 0b1959766..1ae9b449f 100644 --- a/langflow/backend/src/main.py +++ b/langflow/backend/langflow_backend/main.py @@ -1,7 +1,7 @@ from fastapi import FastAPI -from api.endpoints import router as endpoints_router -from api.list_endpoints import router as list_router -from api.signature import router as signatures_router +from langflow_backend.api.endpoints import router as endpoints_router +from langflow_backend.api.list_endpoints import router as list_router +from langflow_backend.api.signature import router as signatures_router from fastapi.middleware.cors import CORSMiddleware diff --git a/langflow/backend/src/utils/__init__.py b/langflow/backend/langflow_backend/utils/__init__.py similarity index 100% rename from langflow/backend/src/utils/__init__.py rename to langflow/backend/langflow_backend/utils/__init__.py diff --git a/langflow/backend/src/utils/allowed_components.py b/langflow/backend/langflow_backend/utils/allowed_components.py similarity index 100% rename from langflow/backend/src/utils/allowed_components.py rename to langflow/backend/langflow_backend/utils/allowed_components.py diff --git a/langflow/backend/src/utils/payload.py b/langflow/backend/langflow_backend/utils/payload.py similarity index 100% rename from langflow/backend/src/utils/payload.py rename to langflow/backend/langflow_backend/utils/payload.py diff --git a/langflow/backend/src/utils/util.py b/langflow/backend/langflow_backend/utils/util.py similarity index 100% rename from langflow/backend/src/utils/util.py rename to langflow/backend/langflow_backend/utils/util.py diff --git a/langflow/backend/pyproject.toml b/langflow/backend/pyproject.toml index e09fc391f..24c4cbbbd 100644 --- a/langflow/backend/pyproject.toml +++ b/langflow/backend/pyproject.toml @@ -4,7 +4,7 @@ version = "0.0.21" description = "Backend for Langflow" authors = ["Ibis Prevedello ", "Gabriel Almeida "] packages = [ - { include = "src" } + { include = "langflow_backend" }, ] @@ -16,7 +16,7 @@ uvicorn = "^0.20.0" beautifulsoup4 = "^4.11.2" google-search-results = "^2.4.1" google-api-python-client = "^2.79.0" -langchain = {path = "../../../langchain", develop = true} +langchain = {git = "https://github.com/ibiscp/langchain.git", rev = "ibis"} [tool.poetry.group.dev.dependencies] black = "^23.1.0" diff --git a/langflow/cli.py b/langflow/cli.py index 99805b3e5..041cb7c9f 100644 --- a/langflow/cli.py +++ b/langflow/cli.py @@ -1,4 +1,4 @@ -from langflow.backend.app import create_app +from langflow_backend.main import create_app import typer import uvicorn diff --git a/pyproject.toml b/pyproject.toml index 5478f2db4..3cd5013c3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,7 +2,7 @@ name = "langflow" version = "0.0.1" description = "A Python package with a built-in web application" -authors = ["Ibis Prevedello ", "Gabriel Almeida "] +authors = ["Ibis Prevedello ", "Gabriel Almeida ","Otávio Anovazzi "] packages = [ { include = "langflow"} ]