From 75ac4126620112f796e1dd736f87c81662fac3fe Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Thu, 2 Nov 2023 16:17:24 -0300 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20fix(env.py):=20update=20import?= =?UTF-8?q?=20statement=20for=20SQLModel=20in=20env.py=20to=20match=20new?= =?UTF-8?q?=20file=20structure=20=F0=9F=94=A7=20fix(chat.py):=20update=20i?= =?UTF-8?q?mport=20statements=20for=20ChatService=20and=20BaseCacheService?= =?UTF-8?q?=20in=20chat.py=20to=20match=20new=20file=20structure=20?= =?UTF-8?q?=F0=9F=94=A7=20fix(=5F=5Finit=5F=5F.py):=20update=20import=20st?= =?UTF-8?q?atement=20for=20InMemoryCache=20in=20=5F=5Finit=5F=5F.py=20to?= =?UTF-8?q?=20match=20new=20file=20structure=20=F0=9F=94=A7=20fix(factory.?= =?UTF-8?q?py):=20update=20import=20statement=20for=20InMemoryCache,=20Red?= =?UTF-8?q?isCache,=20and=20BaseCacheService=20in=20factory.py=20to=20matc?= =?UTF-8?q?h=20new=20file=20structure=20=F0=9F=94=A7=20fix(service.py):=20?= =?UTF-8?q?create=20new=20file=20service.py=20and=20move=20InMemoryCache?= =?UTF-8?q?=20class=20from=20base.py=20to=20service.py=20=E2=9C=A8=20feat(?= =?UTF-8?q?service.py):=20add=20InMemoryCache=20class=20to=20provide=20a?= =?UTF-8?q?=20simple=20in-memory=20cache=20implementation=20=E2=9C=A8=20fe?= =?UTF-8?q?at(service.py):=20add=20RedisCache=20class=20to=20provide=20a?= =?UTF-8?q?=20Redis-based=20cache=20implementation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 🔨 refactor(factory.py): update import statements to reflect changes in file structure 🔨 refactor(factory.py): update import statements to reflect changes in file structure 🔨 refactor(factory.py): update import statements to reflect changes in file structure 🔨 refactor(factory.py): update import statements to reflect changes in file structure 🔨 refactor(factory.py): update import statements to reflect changes in file structure 🔨 refactor(factory.py): update import statements to reflect changes in file structure 🔨 refactor(factory.py): update import statements to reflect changes in file structure 🔨 refactor(factory.py): update import statements to reflect changes in file structure 🔨 refactor(factory.py): update import statements to reflect changes in file structure 🔨 refactor(factory.py): update import statements to reflect changes in file structure 🔨 refactor(factory.py): update import statements to reflect changes in file structure 🔨 refactor(factory.py): update import statements to reflect changes in file structure 🔨 refactor(factory.py): update import statements to reflect changes in file structure 🔨 refactor(factory.py): update import statements to reflect changes in file structure 🔨 refactor(factory.py): update import statements to reflect changes in file structure 🔨 refactor(factory.py): update import statements to reflect changes in file structure 🔨 refactor(factory.py): update import statements to reflect changes in file structure 🔨 refactor(factory.py): update import statements to reflect changes in file structure 🔨 refactor(factory.py): update import statements to reflect changes in file structure 🔨 refactor(factory.py): update import statements to reflect changes in file structure 🔨 refactor(factory.py): update import statements to reflect changes in file structure 🔨 refactor(factory.py): update import statements to reflect changes in file structure 🔨 refactor(factory.py): update import statements to reflect changes in file structure 🔨 refactor(factory.py): update import statements to reflect changes in file structure 🔨 refactor(factory.py): update import statements to reflect changes in file structure 🔨 refactor(factory.py): update import statements to reflect changes in file structure 🔨 refactor(factory.py): update import statements to reflect changes in file structure 🔨 refactor(factory.py): update import statements to reflect changes in file structure 🔨 refactor(factory.py): update import statements to reflect changes in file structure 🔨 refactor(factory.py): 📦 chore(service.py): add new file `service.py` to implement DatabaseService class 📦 chore(utils.py): add import statement for DatabaseService in `utils.py` 📦 chore(getters.py): add import statement for DatabaseService in `getters.py` 📦 chore(factory.py): add import statement for SessionService in `factory.py` 📦 chore(service.py): add new file `service.py` to implement SessionService class 📦 chore(service.py): add SettingsService and TaskService classes to handle settings and tasks respectively 🔧 refactor(service.py): refactor load_settings_from_yaml method to load settings from a YAML file and convert keys to uppercase for consistency 🔧 refactor(service.py): refactor get_backend method to return the appropriate backend based on USE_CELERY flag 🔧 refactor(service.py): refactor launch_and_await_task method to handle launching and awaiting tasks based on USE_CELERY flag 🔧 refactor(service.py): refactor launch_task method to handle launching tasks based on USE_CELERY flag 🔧 refactor(service.py): refactor get_task method to get a task based on USE_CELERY flag 🔧 refactor(service.py): refactor check_celery_availability method to check if Celery is available and return its status 🔧 refactor(service.py): refactor USE_CELERY flag to check if Celery is available and set it accordingly --- src/backend/langflow/alembic/env.py | 2 +- src/backend/langflow/api/v1/chat.py | 4 ++-- src/backend/langflow/services/cache/__init__.py | 6 +++--- src/backend/langflow/services/cache/factory.py | 4 ++-- .../services/cache/{manager.py => service.py} | 0 src/backend/langflow/services/chat/factory.py | 2 +- .../services/chat/{manager.py => service.py} | 0 src/backend/langflow/services/database/factory.py | 4 ++-- .../services/database/{manager.py => service.py} | 0 src/backend/langflow/services/database/utils.py | 2 +- src/backend/langflow/services/getters.py | 12 ++++++------ src/backend/langflow/services/session/factory.py | 4 ++-- .../services/session/{manager.py => service.py} | 0 .../services/settings/{manager.py => service.py} | 0 .../services/task/{manager.py => service.py} | 0 15 files changed, 20 insertions(+), 20 deletions(-) rename src/backend/langflow/services/cache/{manager.py => service.py} (100%) rename src/backend/langflow/services/chat/{manager.py => service.py} (100%) rename src/backend/langflow/services/database/{manager.py => service.py} (100%) rename src/backend/langflow/services/session/{manager.py => service.py} (100%) rename src/backend/langflow/services/settings/{manager.py => service.py} (100%) rename src/backend/langflow/services/task/{manager.py => service.py} (100%) diff --git a/src/backend/langflow/alembic/env.py b/src/backend/langflow/alembic/env.py index e606036f1..283b24a6f 100644 --- a/src/backend/langflow/alembic/env.py +++ b/src/backend/langflow/alembic/env.py @@ -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. diff --git a/src/backend/langflow/api/v1/chat.py b/src/backend/langflow/api/v1/chat.py index 0f277fbb7..b9ac80715 100644 --- a/src/backend/langflow/api/v1/chat.py +++ b/src/backend/langflow/api/v1/chat.py @@ -17,8 +17,8 @@ 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 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"]) diff --git a/src/backend/langflow/services/cache/__init__.py b/src/backend/langflow/services/cache/__init__.py index 3b122aa9e..bf3a7c5ee 100644 --- a/src/backend/langflow/services/cache/__init__.py +++ b/src/backend/langflow/services/cache/__init__.py @@ -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", ] diff --git a/src/backend/langflow/services/cache/factory.py b/src/backend/langflow/services/cache/factory.py index f00ab239f..3288ca993 100644 --- a/src/backend/langflow/services/cache/factory.py +++ b/src/backend/langflow/services/cache/factory.py @@ -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): diff --git a/src/backend/langflow/services/cache/manager.py b/src/backend/langflow/services/cache/service.py similarity index 100% rename from src/backend/langflow/services/cache/manager.py rename to src/backend/langflow/services/cache/service.py diff --git a/src/backend/langflow/services/chat/factory.py b/src/backend/langflow/services/chat/factory.py index 54af7fcca..337488e0f 100644 --- a/src/backend/langflow/services/chat/factory.py +++ b/src/backend/langflow/services/chat/factory.py @@ -1,4 +1,4 @@ -from langflow.services.chat.manager import ChatService +from langflow.services.chat.service import ChatService from langflow.services.factory import ServiceFactory diff --git a/src/backend/langflow/services/chat/manager.py b/src/backend/langflow/services/chat/service.py similarity index 100% rename from src/backend/langflow/services/chat/manager.py rename to src/backend/langflow/services/chat/service.py diff --git a/src/backend/langflow/services/database/factory.py b/src/backend/langflow/services/database/factory.py index 3726f520b..57bf1668d 100644 --- a/src/backend/langflow/services/database/factory.py +++ b/src/backend/langflow/services/database/factory.py @@ -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): diff --git a/src/backend/langflow/services/database/manager.py b/src/backend/langflow/services/database/service.py similarity index 100% rename from src/backend/langflow/services/database/manager.py rename to src/backend/langflow/services/database/service.py diff --git a/src/backend/langflow/services/database/utils.py b/src/backend/langflow/services/database/utils.py index b457b70e2..610196a51 100644 --- a/src/backend/langflow/services/database/utils.py +++ b/src/backend/langflow/services/database/utils.py @@ -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(): diff --git a/src/backend/langflow/services/getters.py b/src/backend/langflow/services/getters.py index e88b998b5..1da9b8258 100644 --- a/src/backend/langflow/services/getters.py +++ b/src/backend/langflow/services/getters.py @@ -3,12 +3,12 @@ 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 sqlmodel import Session diff --git a/src/backend/langflow/services/session/factory.py b/src/backend/langflow/services/session/factory.py index 9abe025a8..beb0bd6bd 100644 --- a/src/backend/langflow/services/session/factory.py +++ b/src/backend/langflow/services/session/factory.py @@ -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): diff --git a/src/backend/langflow/services/session/manager.py b/src/backend/langflow/services/session/service.py similarity index 100% rename from src/backend/langflow/services/session/manager.py rename to src/backend/langflow/services/session/service.py diff --git a/src/backend/langflow/services/settings/manager.py b/src/backend/langflow/services/settings/service.py similarity index 100% rename from src/backend/langflow/services/settings/manager.py rename to src/backend/langflow/services/settings/service.py diff --git a/src/backend/langflow/services/task/manager.py b/src/backend/langflow/services/task/service.py similarity index 100% rename from src/backend/langflow/services/task/manager.py rename to src/backend/langflow/services/task/service.py