rename getters to deps

This commit is contained in:
Gabriel Luiz Freitas Almeida 2023-10-17 21:00:10 -03:00
commit c50d1344ca
58 changed files with 89 additions and 81 deletions

View file

@ -11,7 +11,7 @@ import typer
from dotenv import load_dotenv
from langflow.main import setup_app
from langflow.services.database.utils import session_getter
from langflow.services.getters import get_db_service, get_settings_service
from langflow.services.deps import get_db_service, get_settings_service
from langflow.services.utils import initialize_services, initialize_settings_service
from langflow.utils.logger import configure, logger
from multiprocess import Process, cpu_count # type: ignore

View file

@ -5,7 +5,7 @@ from sqlalchemy import pool
from alembic import context
from langflow.services.database.manager import SQLModel
from langflow.services.database.service import SQLModel
# this is the Alembic Config object, which provides
# access to the values within the .ini file in use.

View file

@ -14,7 +14,7 @@ from langflow.services.database.models.api_key.crud import (
delete_api_key,
)
from langflow.services.database.models.user.user import User
from langflow.services.getters import get_session
from langflow.services.deps import get_session
from sqlmodel import Session

View file

@ -7,7 +7,7 @@ from langflow.api.v1.schemas import ChatResponse, PromptResponse
from typing import Any, Dict, List, Optional
from langflow.services.getters import get_chat_service
from langflow.services.deps import get_chat_service
from langflow.utils.util import remove_ansi_escape_codes

View file

@ -15,10 +15,10 @@ from langflow.graph.graph.base import Graph
from langflow.services.auth.utils import get_current_active_user, get_current_user
from langflow.services.cache.utils import update_build_status
from loguru import logger
from langflow.services.getters import get_chat_service, get_session, get_cache_service
from langflow.services.deps import get_chat_service, get_session, get_cache_service
from sqlmodel import Session
from langflow.services.chat.manager import ChatService
from langflow.services.cache.manager import BaseCacheService
from langflow.services.chat.service import ChatService
from langflow.services.cache.service import BaseCacheService
router = APIRouter(tags=["Chat"])

View file

@ -2,7 +2,7 @@ from datetime import timezone
from typing import List
from uuid import UUID
from langflow.services.database.models.component import Component, ComponentModel
from langflow.services.getters import get_session
from langflow.services.deps import get_session
from sqlmodel import Session, select
from fastapi import APIRouter, Depends, HTTPException
from sqlalchemy.exc import IntegrityError

View file

@ -7,7 +7,7 @@ from langflow.services.cache.utils import save_uploaded_file
from langflow.services.database.models.flow import Flow
from langflow.processing.process import process_graph_cached, process_tweaks
from langflow.services.database.models.user.user import User
from langflow.services.getters import (
from langflow.services.deps import (
get_session_service,
get_settings_service,
get_task_service,
@ -27,7 +27,7 @@ from langflow.api.v1.schemas import (
)
from langflow.services.getters import get_session
from langflow.services.deps import get_session
try:
from langflow.worker import process_graph_cached_task
@ -40,7 +40,7 @@ except ImportError:
from sqlmodel import Session
from langflow.services.task.manager import TaskService
from langflow.services.task.service import TaskService
# build router
router = APIRouter(tags=["Base"])

View file

@ -12,8 +12,8 @@ from langflow.services.database.models.flow import (
FlowUpdate,
)
from langflow.services.database.models.user.user import User
from langflow.services.getters import get_session
from langflow.services.getters import get_settings_service
from langflow.services.deps import get_session
from langflow.services.deps import get_settings_service
import orjson
from sqlmodel import Session
from fastapi import APIRouter, Depends, HTTPException

View file

@ -2,7 +2,7 @@ from sqlmodel import Session
from fastapi import APIRouter, Depends, HTTPException, status
from fastapi.security import OAuth2PasswordRequestForm
from langflow.services.getters import get_session
from langflow.services.deps import get_session
from langflow.api.v1.schemas import Token
from langflow.services.auth.utils import (
authenticate_user,
@ -12,7 +12,7 @@ from langflow.services.auth.utils import (
get_current_active_user,
)
from langflow.services.getters import get_settings_service
from langflow.services.deps import get_settings_service
router = APIRouter(tags=["Login"])

View file

@ -13,7 +13,7 @@ from sqlalchemy.exc import IntegrityError
from sqlmodel import Session, select
from fastapi import APIRouter, Depends, HTTPException
from langflow.services.getters import get_session, get_settings_service
from langflow.services.deps import get_session, get_settings_service
from langflow.services.auth.utils import (
get_current_active_superuser,
get_current_active_user,

View file

@ -5,7 +5,7 @@ from langchain.agents import types
from langflow.custom.customs import get_custom_nodes
from langflow.interface.agents.custom import CUSTOM_AGENTS
from langflow.interface.base import LangChainTypeCreator
from langflow.services.getters import get_settings_service
from langflow.services.deps import get_settings_service
from langflow.template.frontend_node.agents import AgentFrontendNode
from loguru import logger

View file

@ -2,7 +2,7 @@ from abc import ABC, abstractmethod
from typing import Any, Dict, List, Optional, Type, Union
from langchain.chains.base import Chain
from langchain.agents import AgentExecutor
from langflow.services.getters import get_settings_service
from langflow.services.deps import get_settings_service
from pydantic import BaseModel
from langflow.template.field.base import TemplateField

View file

@ -3,7 +3,7 @@ from typing import Any, Dict, List, Optional, Type
from langflow.custom.customs import get_custom_nodes
from langflow.interface.base import LangChainTypeCreator
from langflow.interface.importing.utils import import_class
from langflow.services.getters import get_settings_service
from langflow.services.deps import get_settings_service
from langflow.template.frontend_node.chains import ChainFrontendNode
from loguru import logger

View file

@ -4,7 +4,7 @@ from fastapi import HTTPException
from langflow.field_typing.constants import CUSTOM_COMPONENT_SUPPORTED_TYPES
from langflow.interface.custom.component import Component
from langflow.interface.custom.directory_reader import DirectoryReader
from langflow.services.getters import get_db_service
from langflow.services.deps import get_db_service
from langflow.interface.custom.utils import extract_inner_type
from langflow.utils import validate

View file

@ -1,7 +1,7 @@
from typing import Dict, List, Optional, Type
from langflow.interface.base import LangChainTypeCreator
from langflow.services.getters import get_settings_service
from langflow.services.deps import get_settings_service
from langflow.template.frontend_node.documentloaders import DocumentLoaderFrontNode
from langflow.interface.custom_lists import documentloaders_type_to_cls_dict

View file

@ -2,7 +2,7 @@ from typing import Dict, List, Optional, Type
from langflow.interface.base import LangChainTypeCreator
from langflow.interface.custom_lists import embedding_type_to_cls_dict
from langflow.services.getters import get_settings_service
from langflow.services.deps import get_settings_service
from langflow.template.frontend_node.base import FrontendNode
from langflow.template.frontend_node.embeddings import EmbeddingFrontendNode

View file

@ -1,4 +1,4 @@
from langflow.services.getters import get_settings_service
from langflow.services.deps import get_settings_service
from langflow.utils.lazy_load import LazyLoadDictBase

View file

@ -2,7 +2,7 @@ from typing import Dict, List, Optional, Type
from langflow.interface.base import LangChainTypeCreator
from langflow.interface.custom_lists import llm_type_to_cls_dict
from langflow.services.getters import get_settings_service
from langflow.services.deps import get_settings_service
from langflow.template.frontend_node.llms import LLMFrontendNode
from loguru import logger

View file

@ -2,7 +2,7 @@ from typing import Dict, List, Optional, Type
from langflow.interface.base import LangChainTypeCreator
from langflow.interface.custom_lists import memory_type_to_cls_dict
from langflow.services.getters import get_settings_service
from langflow.services.deps import get_settings_service
from langflow.template.frontend_node.base import FrontendNode
from langflow.template.frontend_node.memories import MemoryFrontendNode

View file

@ -4,7 +4,7 @@ from langchain import output_parsers
from langflow.interface.base import LangChainTypeCreator
from langflow.interface.importing.utils import import_class
from langflow.services.getters import get_settings_service
from langflow.services.deps import get_settings_service
from langflow.template.frontend_node.output_parsers import OutputParserFrontendNode
from loguru import logger

View file

@ -5,7 +5,7 @@ from langchain import prompts
from langflow.custom.customs import get_custom_nodes
from langflow.interface.base import LangChainTypeCreator
from langflow.interface.importing.utils import import_class
from langflow.services.getters import get_settings_service
from langflow.services.deps import get_settings_service
from langflow.template.frontend_node.prompts import PromptFrontendNode
from loguru import logger

View file

@ -4,7 +4,7 @@ from langchain import retrievers
from langflow.interface.base import LangChainTypeCreator
from langflow.interface.importing.utils import import_class
from langflow.services.getters import get_settings_service
from langflow.services.deps import get_settings_service
from langflow.template.frontend_node.retrievers import RetrieverFrontendNode
from loguru import logger

View file

@ -1,7 +1,7 @@
from typing import Dict, List, Optional, Type
from langflow.interface.base import LangChainTypeCreator
from langflow.services.getters import get_settings_service
from langflow.services.deps import get_settings_service
from langflow.template.frontend_node.textsplitters import TextSplittersFrontendNode
from langflow.interface.custom_lists import textsplitter_type_to_cls_dict

View file

@ -4,7 +4,7 @@ from langchain.agents import agent_toolkits
from langflow.interface.base import LangChainTypeCreator
from langflow.interface.importing.utils import import_class, import_module
from langflow.services.getters import get_settings_service
from langflow.services.deps import get_settings_service
from loguru import logger
from langflow.utils.util import build_template_from_class

View file

@ -15,7 +15,7 @@ from langflow.interface.tools.constants import (
OTHER_TOOLS,
)
from langflow.interface.tools.util import get_tool_params
from langflow.services.getters import get_settings_service
from langflow.services.deps import get_settings_service
from langflow.template.field.base import TemplateField
from langflow.template.template.base import Template

View file

@ -5,7 +5,7 @@ from langchain import utilities
from langflow.custom.customs import get_custom_nodes
from langflow.interface.base import LangChainTypeCreator
from langflow.interface.importing.utils import import_class
from langflow.services.getters import get_settings_service
from langflow.services.deps import get_settings_service
from langflow.template.frontend_node.utilities import UtilitiesFrontendNode
from loguru import logger

View file

@ -10,7 +10,7 @@ from langchain.base_language import BaseLanguageModel
from PIL.Image import Image
from loguru import logger
from langflow.services.chat.config import ChatConfig
from langflow.services.getters import get_settings_service
from langflow.services.deps import get_settings_service
def load_file_into_dict(file_path: str) -> dict:

View file

@ -4,7 +4,7 @@ from langchain import vectorstores
from langflow.interface.base import LangChainTypeCreator
from langflow.interface.importing.utils import import_class
from langflow.services.getters import get_settings_service
from langflow.services.deps import get_settings_service
from langflow.template.frontend_node.vectorstores import VectorStoreFrontendNode
from loguru import logger

View file

@ -6,7 +6,7 @@ from langflow.interface.run import (
get_memory_key,
update_memory_keys,
)
from langflow.services.getters import get_session_service
from langflow.services.deps import get_session_service
from loguru import logger
from langflow.graph import Graph
from langchain.chains.base import Chain

View file

@ -2,7 +2,7 @@ from langflow.services.base import Service
from typing import TYPE_CHECKING
if TYPE_CHECKING:
from langflow.services.settings.manager import SettingsService
from langflow.services.settings.service import SettingsService
class AuthService(Service):

View file

@ -12,7 +12,7 @@ from langflow.services.database.models.user.crud import (
get_user_by_username,
update_user_last_login_at,
)
from langflow.services.getters import get_session, get_settings_service
from langflow.services.deps import get_session, get_settings_service
from sqlmodel import Session
oauth2_login = OAuth2PasswordBearer(tokenUrl="api/v1/login")

View file

@ -1,9 +1,9 @@
from . import factory, manager
from langflow.services.cache.manager import InMemoryCache
from . import factory, service
from langflow.services.cache.service import InMemoryCache
__all__ = [
"factory",
"manager",
"service",
"InMemoryCache",
]

View file

@ -1,10 +1,10 @@
from langflow.services.cache.manager import InMemoryCache, RedisCache, BaseCacheService
from langflow.services.cache.service import InMemoryCache, RedisCache, BaseCacheService
from langflow.services.factory import ServiceFactory
from langflow.utils.logger import logger
from typing import TYPE_CHECKING
if TYPE_CHECKING:
from langflow.services.settings.manager import SettingsService
from langflow.services.settings.service import SettingsService
class CacheServiceFactory(ServiceFactory):

View file

@ -1,4 +1,4 @@
from langflow.services.chat.manager import ChatService
from langflow.services.chat.service import ChatService
from langflow.services.factory import ServiceFactory

View file

@ -1,9 +1,9 @@
from typing import TYPE_CHECKING
from langflow.services.database.manager import DatabaseService
from langflow.services.database.service import DatabaseService
from langflow.services.factory import ServiceFactory
if TYPE_CHECKING:
from langflow.services.settings.manager import SettingsService
from langflow.services.settings.service import SettingsService
class DatabaseServiceFactory(ServiceFactory):

View file

@ -3,7 +3,7 @@ from typing import Union
from uuid import UUID
from fastapi import Depends, HTTPException, status
from langflow.services.database.models.user.user import User, UserUpdate
from langflow.services.getters import get_session
from langflow.services.deps import get_session
from sqlalchemy.exc import IntegrityError
from sqlmodel import Session
from typing import Optional

View file

@ -3,7 +3,7 @@ from typing import TYPE_CHECKING
from langflow.services.base import Service
from langflow.services.database.models.user.crud import get_user_by_username
from langflow.services.database.utils import Result, TableResults
from langflow.services.getters import get_settings_service
from langflow.services.deps import get_settings_service
from sqlalchemy import inspect
import sqlalchemy as sa
from sqlalchemy.exc import OperationalError

View file

@ -6,7 +6,7 @@ from alembic.util.exc import CommandError
from sqlmodel import Session
if TYPE_CHECKING:
from langflow.services.database.manager import DatabaseService
from langflow.services.database.service import DatabaseService
def initialize_database():

View file

@ -3,12 +3,13 @@ from typing import TYPE_CHECKING, Generator
if TYPE_CHECKING:
from langflow.services.database.manager import DatabaseService
from langflow.services.settings.manager import SettingsService
from langflow.services.cache.manager import BaseCacheService
from langflow.services.session.manager import SessionService
from langflow.services.task.manager import TaskService
from langflow.services.chat.manager import ChatService
from langflow.services.database.service import DatabaseService
from langflow.services.settings.service import SettingsService
from langflow.services.cache.service import BaseCacheService
from langflow.services.session.service import SessionService
from langflow.services.task.service import TaskService
from langflow.services.chat.service import ChatService
from langflow.services.marketplace.service import MarketplaceService
from sqlmodel import Session
@ -46,3 +47,7 @@ def get_task_service() -> "TaskService":
def get_chat_service() -> "ChatService":
return service_manager.get(ServiceType.CHAT_SERVICE)
def get_marketplace_service() -> "MarketplaceService":
return service_manager.get(ServiceType.MARKETPLACE_SERVICE)

View file

@ -1,4 +1,4 @@
from langflow.services.getters import get_settings_service
from langflow.services.deps import get_settings_service
from langflow.utils.logger import logger
### Temporary implementation

View file

@ -14,3 +14,4 @@ class ServiceType(str, Enum):
CHAT_SERVICE = "chat_service"
SESSION_SERVICE = "session_service"
TASK_SERVICE = "task_service"
MARKETPLACE_SERVICE = "marketplace_service"

View file

@ -1,9 +1,9 @@
from typing import TYPE_CHECKING
from langflow.services.session.manager import SessionService
from langflow.services.session.service import SessionService
from langflow.services.factory import ServiceFactory
if TYPE_CHECKING:
from langflow.services.cache.manager import BaseCacheService
from langflow.services.cache.service import BaseCacheService
class SessionServiceFactory(ServiceFactory):

View file

@ -1,3 +1,3 @@
from . import factory, manager
from . import factory, service
__all__ = ["factory", "manager"]
__all__ = ["factory", "service"]

View file

@ -52,6 +52,8 @@ class Settings(BaseSettings):
LANGFUSE_PUBLIC_KEY: Optional[str] = None
LANGFUSE_HOST: Optional[str] = None
MARKETPLACE_URL: Optional[str] = None
@validator("CONFIG_DIR", pre=True, allow_reuse=True)
def set_langflow_dir(cls, value):
if not value:

View file

@ -1,5 +1,5 @@
from pathlib import Path
from langflow.services.settings.manager import SettingsService
from langflow.services.settings.service import SettingsService
from langflow.services.factory import ServiceFactory

View file

@ -1,4 +1,4 @@
from langflow.services.task.manager import TaskService
from langflow.services.task.service import TaskService
from langflow.services.factory import ServiceFactory

View file

@ -7,7 +7,7 @@ from langflow.services.settings.constants import (
DEFAULT_SUPERUSER_PASSWORD,
)
from sqlmodel import Session
from .getters import get_db_service, get_session, get_settings_service
from .deps import get_db_service, get_session, get_settings_service
from loguru import logger

View file

@ -9,7 +9,7 @@ from langflow.processing.process import (
process_inputs,
)
from langflow.services.manager import initialize_session_service
from langflow.services.getters import get_session_service
from langflow.services.deps import get_session_service
if TYPE_CHECKING:
from langflow.graph.vertex.base import Vertex

View file

@ -10,7 +10,7 @@ from langflow.services.database.models.flow.flow import Flow, FlowCreate
from langflow.services.database.models.user.user import User, UserCreate
import orjson
from langflow.services.database.utils import session_getter
from langflow.services.getters import get_db_service
from langflow.services.deps import get_db_service
import pytest
from fastapi.testclient import TestClient
from httpx import AsyncClient
@ -22,7 +22,7 @@ from typer.testing import CliRunner
import tempfile
if TYPE_CHECKING:
from langflow.services.database.manager import DatabaseService
from langflow.services.database.service import DatabaseService
def pytest_configure():

View file

@ -3,7 +3,7 @@ from tempfile import tempdir
from langflow.__main__ import app
import pytest
from langflow.services import getters
from langflow.services import deps
@pytest.fixture(scope="module")
@ -26,7 +26,7 @@ def test_components_path(runner, client, default_settings):
["run", "--components-path", str(temp_dir), *default_settings],
)
assert result.exit_code == 0, result.stdout
settings_service = getters.get_settings_service()
settings_service = deps.get_settings_service()
assert str(temp_dir) in settings_service.settings.COMPONENTS_PATH

View file

@ -1,6 +1,6 @@
from langflow.services.database.models.base import orjson_dumps
from langflow.services.database.utils import session_getter
from langflow.services.getters import get_db_service
from langflow.services.deps import get_db_service
import orjson
import pytest

View file

@ -3,9 +3,9 @@ import uuid
from langflow.processing.process import Result
from langflow.services.auth.utils import get_password_hash
from langflow.services.database.models.api_key.api_key import ApiKey
from langflow.services.getters import get_settings_service
from langflow.services.deps import get_settings_service
from langflow.services.database.utils import session_getter
from langflow.services.getters import get_db_service
from langflow.services.deps import get_db_service
import pytest
from fastapi.testclient import TestClient
from langflow.interface.tools.constants import CUSTOM_TOOLS

View file

@ -1,5 +1,5 @@
from langflow.services.database.utils import session_getter
from langflow.services.getters import get_db_service
from langflow.services.deps import get_db_service
import pytest
from langflow.services.database.models.user import User
from langflow.services.auth.utils import get_password_hash

View file

@ -1,5 +1,5 @@
from langflow.processing.process import process_tweaks
from langflow.services.getters import get_session_service
from langflow.services.deps import get_session_service
def test_no_tweaks():

View file

@ -1,5 +1,5 @@
from fastapi.testclient import TestClient
from langflow.services.getters import get_settings_service
from langflow.services.deps import get_settings_service
def test_prompts_settings(client: TestClient, logged_in_headers):

View file

@ -9,9 +9,9 @@ from langflow.services.utils import (
)
# @patch("langflow.services.getters.get_session")
# @patch("langflow.services.deps.get_session")
# @patch("langflow.services.utils.create_super_user")
# @patch("langflow.services.getters.get_settings_service")
# @patch("langflow.services.deps.get_settings_service")
# # @patch("langflow.services.utils.verify_password")
# def test_setup_superuser(
# mock_get_session, mock_create_super_user, mock_get_settings_service
@ -92,8 +92,8 @@ from langflow.services.utils import (
# assert str(actual_expr) == str(expected_expr)
@patch("langflow.services.getters.get_settings_service")
@patch("langflow.services.getters.get_session")
@patch("langflow.services.deps.get_settings_service")
@patch("langflow.services.deps.get_session")
def test_teardown_superuser_default_superuser(
mock_get_session, mock_get_settings_service
):
@ -120,8 +120,8 @@ def test_teardown_superuser_default_superuser(
mock_session.commit.assert_called_once()
@patch("langflow.services.getters.get_settings_service")
@patch("langflow.services.getters.get_session")
@patch("langflow.services.deps.get_settings_service")
@patch("langflow.services.deps.get_session")
def test_teardown_superuser_no_default_superuser(
mock_get_session, mock_get_settings_service
):

View file

@ -3,7 +3,7 @@ from langflow.services.auth.utils import create_super_user, get_password_hash
from langflow.services.database.models.user.user import User
from langflow.services.database.utils import session_getter
from langflow.services.getters import get_db_service, get_settings_service
from langflow.services.deps import get_db_service, get_settings_service
import pytest
from langflow.services.database.models.user import UserUpdate

View file

@ -1,5 +1,5 @@
from fastapi.testclient import TestClient
from langflow.services.getters import get_settings_service
from langflow.services.deps import get_settings_service
# check that all agents are in settings.agents