fix conflicts

This commit is contained in:
better629 2023-12-21 14:29:01 +08:00
commit 9bd900452c
2 changed files with 1 additions and 1 deletions

View file

@ -104,7 +104,6 @@ class Config(metaclass=Singleton):
self.open_llm_api_model = self._get("OPEN_LLM_API_MODEL")
self.fireworks_api_key = self._get("FIREWORKS_API_KEY")
self.gemini_api_key = self._get("GEMINI_API_KEY")
_ = self.get_default_llm_provider_enum()
self.openai_api_base = self._get("OPENAI_API_BASE")

View file

@ -50,6 +50,7 @@ class GeminiGPTAPI(BaseGPTAPI):
def __init__(self):
self.use_system_prompt = False # google gemini has no system prompt when use api
self.__init_gemini(CONFIG)
self.model = "gemini-pro" # so far only one model
self.llm = GeminiGenerativeModel(model_name=self.model)