From 0e79b82fea1adb0bc0518caf42af0c8b5d3efec3 Mon Sep 17 00:00:00 2001 From: ogabrielluiz Date: Tue, 7 Mar 2023 15:05:39 -0300 Subject: [PATCH] refac: backend now is its own package --- langflow/backend/dev.py | 10 ---------- langflow/backend/pyproject.toml | 14 +++++++------- langflow/backend/{ => src}/__init__.py | 0 langflow/backend/src/api/__init__.py | 0 langflow/backend/{ => src/api}/endpoints.py | 6 +++--- langflow/backend/{ => src/api}/list_endpoints.py | 5 ++--- langflow/backend/{ => src/api}/signature.py | 4 ++-- langflow/backend/src/custom/__init__.py | 0 langflow/backend/{ => src/custom}/customs.py | 0 langflow/backend/{app.py => src/main.py} | 6 +++--- langflow/backend/src/utils/__init__.py | 0 .../backend/{ => src/utils}/allowed_components.py | 0 langflow/backend/{ => src/utils}/payload.py | 0 langflow/backend/{ => src/utils}/util.py | 0 pyproject.toml | 10 ++-------- 15 files changed, 19 insertions(+), 36 deletions(-) delete mode 100644 langflow/backend/dev.py rename langflow/backend/{ => src}/__init__.py (100%) create mode 100644 langflow/backend/src/api/__init__.py rename langflow/backend/{ => src/api}/endpoints.py (98%) rename langflow/backend/{ => src/api}/list_endpoints.py (96%) rename langflow/backend/{ => src/api}/signature.py (98%) create mode 100644 langflow/backend/src/custom/__init__.py rename langflow/backend/{ => src/custom}/customs.py (100%) rename langflow/backend/{app.py => src/main.py} (76%) create mode 100644 langflow/backend/src/utils/__init__.py rename langflow/backend/{ => src/utils}/allowed_components.py (100%) rename langflow/backend/{ => src/utils}/payload.py (100%) rename langflow/backend/{ => src/utils}/util.py (100%) diff --git a/langflow/backend/dev.py b/langflow/backend/dev.py deleted file mode 100644 index cec800f6e..000000000 --- a/langflow/backend/dev.py +++ /dev/null @@ -1,10 +0,0 @@ -import uvicorn -import sys -from pathlib import Path - -path = Path(__file__) -sys.path.append(str(path.parent.parent.parent)) - -from app import app - -uvicorn.run(app, host="0.0.0.0", port=5003) diff --git a/langflow/backend/pyproject.toml b/langflow/backend/pyproject.toml index b1e7a70eb..e09fc391f 100644 --- a/langflow/backend/pyproject.toml +++ b/langflow/backend/pyproject.toml @@ -1,15 +1,15 @@ [tool.poetry] -name = "langflow" +name = "langflow-backend" version = "0.0.21" description = "Backend for Langflow" -authors = ["Ibis Prevedello "] -# packages = [ -# { include = "*.py" } -# ] -# exclude = ['dev.py'] +authors = ["Ibis Prevedello ", "Gabriel Almeida "] +packages = [ + { include = "src" } +] + [tool.poetry.dependencies] -python = "^3.10" +python = "^3.9" openai = "^0.26.5" fastapi = "^0.91.0" uvicorn = "^0.20.0" diff --git a/langflow/backend/__init__.py b/langflow/backend/src/__init__.py similarity index 100% rename from langflow/backend/__init__.py rename to langflow/backend/src/__init__.py diff --git a/langflow/backend/src/api/__init__.py b/langflow/backend/src/api/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/langflow/backend/endpoints.py b/langflow/backend/src/api/endpoints.py similarity index 98% rename from langflow/backend/endpoints.py rename to langflow/backend/src/api/endpoints.py index 25d788fb3..931a91997 100644 --- a/langflow/backend/endpoints.py +++ b/langflow/backend/src/api/endpoints.py @@ -1,7 +1,7 @@ from fastapi import APIRouter -from langflow.backend import signature -from langflow.backend import list_endpoints -from langflow.backend import payload +from api import signature +from api import list_endpoints +from 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/list_endpoints.py b/langflow/backend/src/api/list_endpoints.py similarity index 96% rename from langflow/backend/list_endpoints.py rename to langflow/backend/src/api/list_endpoints.py index f10b96aaa..cee8ee59e 100644 --- a/langflow/backend/list_endpoints.py +++ b/langflow/backend/src/api/list_endpoints.py @@ -6,9 +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 langflow.backend import util -from langflow.backend import customs -from langflow.backend import allowed_components +from utils import util, allowed_components +from custom import customs # build router diff --git a/langflow/backend/signature.py b/langflow/backend/src/api/signature.py similarity index 98% rename from langflow/backend/signature.py rename to langflow/backend/src/api/signature.py index 768afa20d..5de7b0e76 100644 --- a/langflow/backend/signature.py +++ b/langflow/backend/src/api/signature.py @@ -10,8 +10,8 @@ from langchain.agents.load_tools import ( ) from langchain.chains.conversation import memory as memories -from langflow.backend import util -from langflow.backend import customs +from utils import util +from custom import customs # build router router = APIRouter( diff --git a/langflow/backend/src/custom/__init__.py b/langflow/backend/src/custom/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/langflow/backend/customs.py b/langflow/backend/src/custom/customs.py similarity index 100% rename from langflow/backend/customs.py rename to langflow/backend/src/custom/customs.py diff --git a/langflow/backend/app.py b/langflow/backend/src/main.py similarity index 76% rename from langflow/backend/app.py rename to langflow/backend/src/main.py index 7c30aaa3d..0b1959766 100644 --- a/langflow/backend/app.py +++ b/langflow/backend/src/main.py @@ -1,7 +1,7 @@ from fastapi import FastAPI -from langflow.backend.endpoints import router as endpoints_router -from langflow.backend.list_endpoints import router as list_router -from langflow.backend.signature import router as signatures_router +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 fastapi.middleware.cors import CORSMiddleware diff --git a/langflow/backend/src/utils/__init__.py b/langflow/backend/src/utils/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/langflow/backend/allowed_components.py b/langflow/backend/src/utils/allowed_components.py similarity index 100% rename from langflow/backend/allowed_components.py rename to langflow/backend/src/utils/allowed_components.py diff --git a/langflow/backend/payload.py b/langflow/backend/src/utils/payload.py similarity index 100% rename from langflow/backend/payload.py rename to langflow/backend/src/utils/payload.py diff --git a/langflow/backend/util.py b/langflow/backend/src/utils/util.py similarity index 100% rename from langflow/backend/util.py rename to langflow/backend/src/utils/util.py diff --git a/pyproject.toml b/pyproject.toml index 5df571d23..5478f2db4 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 "] +authors = ["Ibis Prevedello ", "Gabriel Almeida "] packages = [ { include = "langflow"} ] @@ -23,11 +23,5 @@ build-backend = "poetry.core.masonry.api" [tool.poetry.dependencies] python = "^3.9" -openai = "^0.26.5" -fastapi = "^0.91.0" -uvicorn = "^0.20.0" -beautifulsoup4 = "^4.11.2" -google-search-results = "^2.4.1" -google-api-python-client = "^2.79.0" -langchain = {git = "https://github.com/ibiscp/langchain.git", rev = "ibis"} +langflow_backend = {path = "langflow/backend"} typer = "^0.7.0" \ No newline at end of file