Skip to content

Commit

Permalink
feat: Add ruff rules to sort imports (I) (#3869)
Browse files Browse the repository at this point in the history
Add ruff rules to sort imports (I)
  • Loading branch information
cbornet authored Sep 25, 2024
1 parent f403c17 commit 3813484
Show file tree
Hide file tree
Showing 163 changed files with 371 additions and 319 deletions.
4 changes: 2 additions & 2 deletions src/backend/base/langflow/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@

import click
import httpx
from langflow.utils.version import get_version_info, fetch_latest_version
from langflow.utils.version import is_pre_release as langflow_is_pre_release
import typer
from dotenv import load_dotenv
from multiprocess import cpu_count # type: ignore
Expand All @@ -32,6 +30,8 @@
from langflow.services.settings.constants import DEFAULT_SUPERUSER
from langflow.services.utils import initialize_services
from langflow.utils.util import update_settings
from langflow.utils.version import fetch_latest_version, get_version_info
from langflow.utils.version import is_pre_release as langflow_is_pre_release

console = Console()

Expand Down
2 changes: 1 addition & 1 deletion src/backend/base/langflow/api/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from langflow.api.router import router
from langflow.api.health_check_router import health_check_router
from langflow.api.log_router import log_router
from langflow.api.router import router

__all__ = ["router", "health_check_router", "log_router"]
5 changes: 3 additions & 2 deletions src/backend/base/langflow/api/log_router.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import asyncio
import json
from http import HTTPStatus
from typing import Any

from fastapi import APIRouter, Query, HTTPException, Request
from fastapi import APIRouter, HTTPException, Query, Request
from fastapi.responses import JSONResponse, StreamingResponse
from http import HTTPStatus

from langflow.logging.logger import log_buffer

log_router = APIRouter(tags=["Log"])
Expand Down
4 changes: 2 additions & 2 deletions src/backend/base/langflow/api/router.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
endpoints_router,
files_router,
flows_router,
folders_router,
login_router,
monitor_router,
starter_projects_router,
store_router,
users_router,
validate_router,
variables_router,
folders_router,
starter_projects_router,
)

router = APIRouter(
Expand Down
4 changes: 2 additions & 2 deletions src/backend/base/langflow/api/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
from typing import TYPE_CHECKING, Any

from fastapi import HTTPException
from langflow.services.database.models.transactions.model import TransactionTable
from langflow.services.database.models.vertex_builds.model import VertexBuildTable
from sqlalchemy import delete
from sqlmodel import Session

from langflow.graph.graph.base import Graph
from langflow.services.chat.service import ChatService
from langflow.services.database.models.flow import Flow
from langflow.services.database.models.transactions.model import TransactionTable
from langflow.services.database.models.vertex_builds.model import VertexBuildTable
from langflow.services.store.schema import StoreComponentCreate
from langflow.services.store.utils import get_lf_version_from_pypi

Expand Down
4 changes: 2 additions & 2 deletions src/backend/base/langflow/api/v1/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
from langflow.api.v1.endpoints import router as endpoints_router
from langflow.api.v1.files import router as files_router
from langflow.api.v1.flows import router as flows_router
from langflow.api.v1.folders import router as folders_router
from langflow.api.v1.login import router as login_router
from langflow.api.v1.monitor import router as monitor_router
from langflow.api.v1.starter_projects import router as starter_projects_router
from langflow.api.v1.store import router as store_router
from langflow.api.v1.users import router as users_router
from langflow.api.v1.validate import router as validate_router
from langflow.api.v1.variable import router as variables_router
from langflow.api.v1.folders import router as folders_router
from langflow.api.v1.starter_projects import router as starter_projects_router

__all__ = [
"chat_router",
Expand Down
3 changes: 2 additions & 1 deletion src/backend/base/langflow/api/v1/callback.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
from typing import TYPE_CHECKING, Any
from uuid import UUID

from langchain_core.agents import AgentAction, AgentFinish
from langchain_core.callbacks.base import AsyncCallbackHandler
from loguru import logger

from langflow.api.v1.schemas import ChatResponse, PromptResponse
from langflow.services.deps import get_chat_service, get_socket_service
from langflow.utils.util import remove_ansi_escape_codes
from langchain_core.agents import AgentAction, AgentFinish

if TYPE_CHECKING:
from langflow.services.socket.service import SocketIOService
Expand Down
5 changes: 2 additions & 3 deletions src/backend/base/langflow/api/v1/files.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
from datetime import datetime
import hashlib
from datetime import datetime
from http import HTTPStatus
from io import BytesIO
from uuid import UUID
from pathlib import Path
from uuid import UUID

from fastapi import APIRouter, Depends, HTTPException, UploadFile
from fastapi.responses import StreamingResponse


from langflow.api.v1.schemas import UploadFileResponse
from langflow.services.auth.utils import get_current_active_user
from langflow.services.database.models.flow import Flow
Expand Down
2 changes: 1 addition & 1 deletion src/backend/base/langflow/api/v1/folders.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
from langflow.api.utils import cascade_delete_flow
import orjson
from fastapi import APIRouter, Depends, File, HTTPException, Response, UploadFile, status
from sqlalchemy import or_, update
from sqlmodel import Session, select

from langflow.api.utils import cascade_delete_flow
from langflow.api.v1.flows import create_flows
from langflow.api.v1.schemas import FlowListCreate, FlowListReadWithFolderName
from langflow.helpers.flow import generate_unique_flow_name
Expand Down
2 changes: 1 addition & 1 deletion src/backend/base/langflow/api/v1/login.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
from fastapi import APIRouter, Depends, HTTPException, Request, Response, status
from fastapi.security import OAuth2PasswordRequestForm
from langflow.services.database.models.user.crud import get_user_by_id
from sqlmodel import Session

from langflow.api.v1.schemas import Token
Expand All @@ -11,6 +10,7 @@
create_user_tokens,
)
from langflow.services.database.models.folder.utils import create_default_folder_if_it_doesnt_exist
from langflow.services.database.models.user.crud import get_user_by_id
from langflow.services.deps import get_session, get_settings_service, get_variable_service
from langflow.services.settings.service import SettingsService
from langflow.services.variable.service import VariableService
Expand Down
2 changes: 1 addition & 1 deletion src/backend/base/langflow/api/v1/monitor.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
from langflow.services.database.models.transactions.model import TransactionReadResponse
from langflow.services.database.models.user.model import User
from langflow.services.database.models.vertex_builds.crud import (
get_vertex_builds_by_flow_id,
delete_vertex_builds_by_flow_id,
get_vertex_builds_by_flow_id,
)
from langflow.services.database.models.vertex_builds.model import VertexBuildMapModel
from langflow.services.deps import get_session
Expand Down
5 changes: 3 additions & 2 deletions src/backend/base/langflow/base/memory/model.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
from abc import abstractmethod

from langchain.memory import ConversationBufferMemory

from langflow.custom import Component
from langflow.field_typing import BaseChatMessageHistory, BaseChatMemory
from langflow.field_typing import BaseChatMemory, BaseChatMessageHistory
from langflow.template import Output
from langchain.memory import ConversationBufferMemory


class LCChatMemoryComponent(Component):
Expand Down
3 changes: 1 addition & 2 deletions src/backend/base/langflow/base/prompts/api_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@
from langchain_core.prompts import PromptTemplate
from loguru import logger

from langflow.interface.utils import extract_input_variables_from_prompt
from langflow.inputs.inputs import DefaultPromptField

from langflow.interface.utils import extract_input_variables_from_prompt

_INVALID_CHARACTERS = {
" ",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
import json
from typing import Dict, Any, Union
from markdown import markdown
from bs4 import BeautifulSoup
from typing import Any, Dict, Union

import requests
from bs4 import BeautifulSoup
from langchain.tools import StructuredTool
from markdown import markdown
from pydantic import BaseModel, Field

from langflow.base.langchain_utilities.model import LCToolComponent
from langflow.inputs import SecretStrInput, StrInput, MultilineInput
from langflow.schema import Data
from langflow.field_typing import Tool
from langchain.tools import StructuredTool
from pydantic import BaseModel, Field
from langflow.inputs import MultilineInput, SecretStrInput, StrInput
from langflow.schema import Data


class AddContentToPage(LCToolComponent):
Expand Down
10 changes: 6 additions & 4 deletions src/backend/base/langflow/components/Notion/create_page.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
import json
from typing import Dict, Any, Union
from typing import Any, Dict, Union

import requests
from langchain.tools import StructuredTool
from pydantic import BaseModel, Field

from langflow.base.langchain_utilities.model import LCToolComponent
from langflow.inputs import SecretStrInput, StrInput, MultilineInput
from langflow.schema import Data
from langflow.field_typing import Tool
from langchain.tools import StructuredTool
from langflow.inputs import MultilineInput, SecretStrInput, StrInput
from langflow.schema import Data


class NotionPageCreator(LCToolComponent):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import requests
from typing import Dict, Union

import requests
from langchain.tools import StructuredTool
from pydantic import BaseModel, Field

from langflow.base.langchain_utilities.model import LCToolComponent
from langflow.field_typing import Tool
from langflow.inputs import SecretStrInput, StrInput
from langflow.schema import Data
from langflow.field_typing import Tool
from langchain.tools import StructuredTool


class NotionDatabaseProperties(LCToolComponent):
Expand Down
11 changes: 6 additions & 5 deletions src/backend/base/langflow/components/Notion/list_pages.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import requests
import json
from typing import Dict, Any, List, Optional
from typing import Any, Dict, List, Optional

import requests
from langchain.tools import StructuredTool
from pydantic import BaseModel, Field

from langflow.base.langchain_utilities.model import LCToolComponent
from langflow.inputs import SecretStrInput, StrInput, MultilineInput
from langflow.schema import Data
from langflow.field_typing import Tool
from langchain.tools import StructuredTool
from langflow.inputs import MultilineInput, SecretStrInput, StrInput
from langflow.schema import Data


class NotionListPages(LCToolComponent):
Expand Down
7 changes: 4 additions & 3 deletions src/backend/base/langflow/components/Notion/list_users.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
from typing import Dict, List

import requests
from typing import List, Dict
from langchain.tools import StructuredTool
from pydantic import BaseModel

from langflow.base.langchain_utilities.model import LCToolComponent
from langflow.field_typing import Tool
from langflow.inputs import SecretStrInput
from langflow.schema import Data
from langflow.field_typing import Tool
from langchain.tools import StructuredTool


class NotionUserList(LCToolComponent):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import requests
from langchain.tools import StructuredTool
from pydantic import BaseModel, Field

from langflow.base.langchain_utilities.model import LCToolComponent
from langflow.field_typing import Tool
from langflow.inputs import SecretStrInput, StrInput
from langflow.schema import Data
from langflow.field_typing import Tool
from langchain.tools import StructuredTool


class NotionPageContent(LCToolComponent):
Expand Down
9 changes: 5 additions & 4 deletions src/backend/base/langflow/components/Notion/search.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
from typing import Any, Dict, List

import requests
from typing import Dict, Any, List
from langchain.tools import StructuredTool
from pydantic import BaseModel, Field

from langflow.base.langchain_utilities.model import LCToolComponent
from langflow.inputs import SecretStrInput, StrInput, DropdownInput
from langflow.schema import Data
from langflow.field_typing import Tool
from langchain.tools import StructuredTool
from langflow.inputs import DropdownInput, SecretStrInput, StrInput
from langflow.schema import Data


class NotionSearch(LCToolComponent):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
import json
from typing import Any, Dict, Union

import requests
from typing import Dict, Any, Union
from langchain.tools import StructuredTool
from loguru import logger
from pydantic import BaseModel, Field

from langflow.base.langchain_utilities.model import LCToolComponent
from langflow.inputs import SecretStrInput, StrInput, MultilineInput
from langflow.schema import Data
from langflow.field_typing import Tool
from langchain.tools import StructuredTool
from loguru import logger
from langflow.inputs import MultilineInput, SecretStrInput, StrInput
from langflow.schema import Data


class NotionPageUpdate(LCToolComponent):
Expand Down
4 changes: 2 additions & 2 deletions src/backend/base/langflow/components/agents/CSVAgent.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
from langchain_experimental.agents.agent_toolkits.csv.base import create_csv_agent

from langflow.base.agents.agent import LCAgentComponent
from langflow.field_typing import AgentExecutor
from langflow.inputs import HandleInput, FileInput, DropdownInput
from langflow.inputs import DropdownInput, FileInput, HandleInput
from langflow.inputs.inputs import MessageTextInput
from langflow.schema.message import Message

from langflow.template.field.base import Output


Expand Down
2 changes: 1 addition & 1 deletion src/backend/base/langflow/components/agents/JsonAgent.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from langchain_community.tools.json.tool import JsonSpec

from langflow.base.agents.agent import LCAgentComponent
from langflow.inputs import HandleInput, FileInput
from langflow.inputs import FileInput, HandleInput


class JsonAgentComponent(LCAgentComponent):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
from typing import Optional, List
from typing import List, Optional

from langchain.agents import create_openai_tools_agent
from langchain_core.prompts import ChatPromptTemplate, PromptTemplate, HumanMessagePromptTemplate
from langchain_core.prompts import ChatPromptTemplate, HumanMessagePromptTemplate, PromptTemplate

from langflow.base.agents.agent import LCToolsAgentComponent
from langflow.inputs import MultilineInput
from langflow.inputs.inputs import HandleInput, DataInput
from langflow.inputs.inputs import DataInput, HandleInput
from langflow.schema import Data


Expand Down
6 changes: 3 additions & 3 deletions src/backend/base/langflow/components/agents/OpenAPIAgent.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
import yaml
from langchain.agents import AgentExecutor
from langchain_community.agent_toolkits import create_openapi_agent
from langchain_community.tools.json.tool import JsonSpec
from langchain_community.agent_toolkits.openapi.toolkit import OpenAPIToolkit
from langchain_community.tools.json.tool import JsonSpec
from langchain_community.utilities.requests import TextRequestsWrapper

from langflow.base.agents.agent import LCAgentComponent
from langflow.inputs import BoolInput, HandleInput, FileInput
from langchain_community.utilities.requests import TextRequestsWrapper
from langflow.inputs import BoolInput, FileInput, HandleInput


class OpenAPIAgentComponent(LCAgentComponent):
Expand Down
2 changes: 1 addition & 1 deletion src/backend/base/langflow/components/agents/SQLAgent.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from langchain_community.utilities import SQLDatabase

from langflow.base.agents.agent import LCAgentComponent
from langflow.inputs import MessageTextInput, HandleInput
from langflow.inputs import HandleInput, MessageTextInput


class SQLAgentComponent(LCAgentComponent):
Expand Down
Loading

0 comments on commit 3813484

Please sign in to comment.