Browse Source

Add **kwargs to model base class constructors (#9252)

Updated constructors for base and derived classes in chat, embedding,
rerank, sequence2txt, and tts models to accept **kwargs. This change
improves extensibility and allows passing additional parameters without
breaking existing interfaces.

- [x] Bug Fix (non-breaking change which fixes an issue)

---------

Co-authored-by: IT: Sop.Son <sop.son@feavn.local>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
tags/v0.20.1
so95 2 months ago
parent
commit
35539092d0
No account linked to committer's email address

+ 2
- 2
rag/llm/chat_model.py View File

@@ -1216,11 +1216,11 @@ class LmStudioChat(Base):
class OpenAI_APIChat(Base):
_FACTORY_NAME = ["VLLM", "OpenAI-API-Compatible"]

def __init__(self, key, model_name, base_url):
def __init__(self, key, model_name, base_url, **kwargs):
if not base_url:
raise ValueError("url cannot be None")
model_name = model_name.split("___")[0]
super().__init__(key, model_name, base_url)
super().__init__(key, model_name, base_url, **kwargs)


class PPIOChat(Base):

+ 8
- 3
rag/llm/embedding_model.py View File

@@ -37,7 +37,12 @@ from rag.utils import num_tokens_from_string, truncate


class Base(ABC):
def __init__(self, key, model_name):
def __init__(self, key, model_name, **kwargs):
"""
Constructor for abstract base class.
Parameters are accepted for interface consistency but are not stored.
Subclasses should implement their own initialization as needed.
"""
pass

def encode(self, texts: list):
@@ -864,7 +869,7 @@ class VoyageEmbed(Base):
class HuggingFaceEmbed(Base):
_FACTORY_NAME = "HuggingFace"

def __init__(self, key, model_name, base_url=None):
def __init__(self, key, model_name, base_url=None, **kwargs):
if not model_name:
raise ValueError("Model name cannot be None")
self.key = key
@@ -946,4 +951,4 @@ class Ai302Embed(Base):
def __init__(self, key, model_name, base_url="https://api.302.ai/v1/embeddings"):
if not base_url:
base_url = "https://api.302.ai/v1/embeddings"
super().__init__(key, model_name, base_url)
super().__init__(key, model_name, base_url)

+ 7
- 3
rag/llm/rerank_model.py View File

@@ -33,7 +33,11 @@ from api.utils.log_utils import log_exception
from rag.utils import num_tokens_from_string, truncate

class Base(ABC):
def __init__(self, key, model_name):
def __init__(self, key, model_name, **kwargs):
"""
Abstract base class constructor.
Parameters are not stored; initialization is left to subclasses.
"""
pass

def similarity(self, query: str, texts: list):
@@ -315,7 +319,7 @@ class NvidiaRerank(Base):
class LmStudioRerank(Base):
_FACTORY_NAME = "LM-Studio"

def __init__(self, key, model_name, base_url):
def __init__(self, key, model_name, base_url, **kwargs):
pass

def similarity(self, query: str, texts: list):
@@ -396,7 +400,7 @@ class CoHereRerank(Base):
class TogetherAIRerank(Base):
_FACTORY_NAME = "TogetherAI"

def __init__(self, key, model_name, base_url):
def __init__(self, key, model_name, base_url, **kwargs):
pass

def similarity(self, query: str, texts: list):

+ 5
- 1
rag/llm/sequence2txt_model.py View File

@@ -28,7 +28,11 @@ from rag.utils import num_tokens_from_string


class Base(ABC):
def __init__(self, key, model_name):
def __init__(self, key, model_name, **kwargs):
"""
Abstract base class constructor.
Parameters are not stored; initialization is left to subclasses.
"""
pass

def transcription(self, audio, **kwargs):

+ 5
- 1
rag/llm/tts_model.py View File

@@ -63,7 +63,11 @@ class ServeTTSRequest(BaseModel):


class Base(ABC):
def __init__(self, key, model_name, base_url):
def __init__(self, key, model_name, base_url, **kwargs):
"""
Abstract base class constructor.
Parameters are not stored; subclasses should handle their own initialization.
"""
pass

def tts(self, audio):

Loading…
Cancel
Save