build: bump some deps and refactor models provider folders (#586)

Co-authored-by: WD <[email protected]>

backend/app/api/admin_routes/embedding_model/models.py

@@ -3,7 +3,7 @@
 
 from pydantic import BaseModel, field_validator
 from typing_extensions import Optional
-from app.types import EmbeddingProvider
+from app.rag.embeddings.provider import EmbeddingProvider
 
 
 class EmbeddingModelCreate(BaseModel):

backend/app/api/admin_routes/embedding_model/routes.py

@@ -13,19 +13,29 @@
 )
 from app.api.deps import CurrentSuperuserDep, SessionDep
 from app.exceptions import EmbeddingModelNotFound, InternalServerError
-from app.rag.chat_config import get_embed_model
-from app.rag.embed_model_option import EmbeddingModelOption, admin_embed_model_options
 from app.repositories.embedding_model import embed_model_repo
+from app.rag.embeddings.provider import (
+    EmbeddingProviderOption,
+    embedding_provider_options,
+)
+from app.rag.embeddings.resolver import get_embed_model
 
 router = APIRouter()
 logger = logging.getLogger(__name__)
 
 
-@router.get("/admin/embedding-models/options")
+@router.get("/admin/embedding-models/provider/options")
+def list_embedding_model_provider_options(
+    user: CurrentSuperuserDep,
+) -> List[EmbeddingProviderOption]:
+    return embedding_provider_options
+
+
+@router.get("/admin/embedding-models/options", deprecated=True)
 def get_embedding_model_options(
     user: CurrentSuperuserDep,
-) -> List[EmbeddingModelOption]:
-    return admin_embed_model_options
+) -> List[EmbeddingProviderOption]:
+    return embedding_provider_options
 
 
 @router.post("/admin/embedding-models")

backend/app/api/admin_routes/llm/routes.py

@@ -9,17 +9,25 @@
 from app.api.deps import CurrentSuperuserDep, SessionDep
 from app.exceptions import InternalServerError, LLMNotFound
 from app.models import AdminLLM, LLM, ChatEngine, KnowledgeBase
-from app.rag.chat_config import get_llm
-from app.rag.llm_option import LLMOption, admin_llm_options
 from app.repositories.llm import llm_repo
+from app.rag.llms.provider import (
+    LLMProviderOption,
+    llm_provider_options,
+)
+from app.rag.llms.resolver import get_llm
 
 router = APIRouter()
 logger = logging.getLogger(__name__)
 
 
-@router.get("/admin/llms/options")
-def get_llm_options(user: CurrentSuperuserDep) -> List[LLMOption]:
-    return admin_llm_options
+@router.get("/admin/llms/provider/options")
+def list_llm_provider_options(user: CurrentSuperuserDep) -> List[LLMProviderOption]:
+    return llm_provider_options
+
+
+@router.get("/admin/llms/options", deprecated=True)
+def get_llm_options(user: CurrentSuperuserDep) -> List[LLMProviderOption]:
+    return llm_provider_options
 
 
 @router.get("/admin/llms")

backend/app/api/admin_routes/models.py

@@ -3,7 +3,7 @@
 from pydantic import BaseModel
 
 from app.api.admin_routes.embedding_model.models import EmbeddingModelItem
-from app.types import LLMProvider
+from app.rag.llms.provider import LLMProvider
 
 
 class LLMDescriptor(BaseModel):

backend/app/api/admin_routes/reranker_model/routes.py

@@ -11,20 +11,26 @@
 from app.api.deps import CurrentSuperuserDep, SessionDep
 from app.exceptions import RerankerModelNotFound, InternalServerError
 from app.models import RerankerModel, AdminRerankerModel, ChatEngine
-from app.rag.chat_config import get_reranker_model
-from app.rag.reranker_model_option import (
-    RerankerModelOption,
-    admin_reranker_model_options,
-)
 from app.repositories.reranker_model import reranker_model_repo
+from app.rag.rerankers.provider import RerankerProviderOption, reranker_provider_options
+from app.rag.rerankers.resolver import get_reranker_model
 
 router = APIRouter()
 logger = logging.getLogger(__name__)
 
 
-@router.get("/admin/reranker-models/options")
-def get_reranker_model_options(user: CurrentSuperuserDep) -> List[RerankerModelOption]:
-    return admin_reranker_model_options
+@router.get("/admin/reranker-models/provider/options")
+def list_reranker_model_provider_options(
+    user: CurrentSuperuserDep,
+) -> List[RerankerProviderOption]:
+    return reranker_provider_options
+
+
+@router.get("/admin/reranker-models/options", deprecated=True)
+def get_reranker_model_options(
+    user: CurrentSuperuserDep,
+) -> List[RerankerProviderOption]:
+    return reranker_provider_options
 
 
 @router.post("/admin/reranker-models/test")

backend/app/models/embed_model.py

@@ -3,7 +3,7 @@
 from sqlmodel import Field, Column, JSON, String
 
 from .base import UpdatableBaseModel, AESEncryptedColumn
-from app.types import EmbeddingProvider
+from app.rag.embeddings.provider import EmbeddingProvider
 
 
 DEFAULT_VECTOR_DIMENSION = 1536

backend/app/models/llm.py

@@ -1,9 +1,8 @@
 from typing import Optional, Any
-
 from sqlmodel import Field, Column, JSON, String
 
+from app.rag.llms.provider import LLMProvider
 from .base import UpdatableBaseModel, AESEncryptedColumn
-from app.types import LLMProvider
 
 
 class BaseLLM(UpdatableBaseModel):

backend/app/models/reranker_model.py

@@ -3,7 +3,7 @@
 from sqlmodel import Field, Column, JSON, String
 
 from .base import UpdatableBaseModel, AESEncryptedColumn
-from app.types import RerankerProvider
+from app.rag.rerankers.provider import RerankerProvider
 
 
 class BaseRerankerModel(UpdatableBaseModel):

backend/app/rag/chat.py

@@ -66,8 +66,10 @@
 from app.rag.knowledge_graph import KnowledgeGraphIndex
 from app.rag.chat_config import (
     ChatEngineConfig,
-    get_default_embed_model,
     KnowledgeGraphOption,
+)
+from app.rag.embeddings.resolver import (
+    get_default_embed_model,
     must_get_default_embed_model,
 )
 from app.rag.types import (