diff --git a/documentation/docs/advanced/admin.md b/documentation/docs/advanced/admin.md index c1d641e1..a9727d2b 100644 --- a/documentation/docs/advanced/admin.md +++ b/documentation/docs/advanced/admin.md @@ -38,14 +38,13 @@ To add a server chat setting: - The `Advanced` field doesn't need to be set when self-hosting. When unset, the `Default` chat model is used for all users and the intermediate steps. -### OpenAI Processor Conversation Configs -These settings configure chat model providers to be accessed over API. -The name of this setting is kind of a misnomer, we know, it'll hopefully be changed at some point. -For each chat model provider you [add](http://localhost:42110/server/admin/database/openaiprocessorconversationconfig/add): +### AI Model API +These settings configure APIs to interact with AI models. +For each AI Model API you [add](http://localhost:42110/server/admin/database/aimodelapi/add): - `Api key`: Set to your [OpenAI](https://platform.openai.com/api-keys), [Anthropic](https://console.anthropic.com/account/keys) or [Gemini](https://aistudio.google.com/app/apikey) API keys. - `Name`: Give the configuration any friendly name like `OpenAI`, `Gemini`, `Anthropic`. - `Api base url`: Set the API base URL. This is only relevant to set if you're using another OpenAI-compatible proxy server like [Ollama](/advanced/ollama) or [LMStudio](/advanced/lmstudio). - ![example configuration for openai processor](/img/example_openai_processor_config.png) + ![example configuration for ai model api](/img/example_openai_processor_config.png) ### Search Model Configs Search models are used to generate vector embeddings of your documents for natural language search and chat. You can choose any [embeddings models on HuggingFace](https://huggingface.co/models?pipeline_tag=sentence-similarity) to try, use for your to create vector embeddings of your documents for natural language search and chat. diff --git a/documentation/docs/advanced/litellm.md b/documentation/docs/advanced/litellm.md index 9dfaaf34..212ac047 100644 --- a/documentation/docs/advanced/litellm.md +++ b/documentation/docs/advanced/litellm.md @@ -21,7 +21,7 @@ Using LiteLLM with Khoj makes it possible to turn any LLM behind an API into you export MISTRAL_API_KEY= litellm --model mistral/mistral-tiny --drop_params ``` -3. Create a new [OpenAI Processor Conversation Config](http://localhost:42110/server/admin/database/openaiprocessorconversationconfig/add) on your Khoj admin panel +3. Create a new [API Model API](http://localhost:42110/server/admin/database/aimodelapi/add) on your Khoj admin panel - Name: `proxy-name` - Api Key: `any string` - Api Base Url: **URL of your Openai Proxy API** diff --git a/documentation/docs/advanced/ollama.mdx b/documentation/docs/advanced/ollama.mdx index ef5295ef..78d77d26 100644 --- a/documentation/docs/advanced/ollama.mdx +++ b/documentation/docs/advanced/ollama.mdx @@ -60,7 +60,7 @@ Restart your Khoj server after first run or update to the settings below to ensu ```bash ollama pull llama3.1 ``` - 3. Create a new [OpenAI Processor Conversation Config](http://localhost:42110/server/admin/database/openaiprocessorconversationconfig/add) on your Khoj admin panel + 3. Create a new [AI Model API](http://localhost:42110/server/admin/database/aimodelapi/add) on your Khoj admin panel - Name: `ollama` - Api Key: `any string` - Api Base Url: `http://localhost:11434/v1/` (default for Ollama) diff --git a/documentation/docs/advanced/use-openai-proxy.md b/documentation/docs/advanced/use-openai-proxy.md index ec674767..6efaad1c 100644 --- a/documentation/docs/advanced/use-openai-proxy.md +++ b/documentation/docs/advanced/use-openai-proxy.md @@ -11,7 +11,7 @@ This is only helpful for self-hosted users. If you're using [Khoj Cloud](https:/ Khoj natively supports local LLMs [available on HuggingFace in GGUF format](https://huggingface.co/models?library=gguf). Using an OpenAI API proxy with Khoj maybe useful for ease of setup, trying new models or using commercial LLMs via API. ::: -Khoj can use any OpenAI API compatible server including [Ollama](/advanced/ollama), [LMStudio](/advanced/lmstudio) and [LiteLLM](/advanced/litellm). +Khoj can use any OpenAI API compatible server including local providers like [Ollama](/advanced/ollama), [LMStudio](/advanced/lmstudio) and [LiteLLM](/advanced/litellm) and commercial providers like [HuggingFace](https://huggingface.co/docs/api-inference/tasks/chat-completion#using-the-api), [OpenRouter](https://openrouter.ai/docs/quick-start) etc. Configuring this allows you to use non-standard, open or commercial, local or hosted LLM models for Khoj Combine them with Khoj can turn your favorite LLM into an AI agent. Allowing you to chat with your docs, find answers from the internet, build custom agents and run automations. @@ -20,8 +20,8 @@ For specific integrations, see our [Ollama](/advanced/ollama), [LMStudio](/advan ## General Setup -1. Start your preferred OpenAI API compatible app -2. Create a new [OpenAI Processor Conversation Config](http://localhost:42110/server/admin/database/openaiprocessorconversationconfig/add) on your Khoj admin panel +1. Start your preferred OpenAI API compatible app locally or get API keys from commercial AI model providers. +3. Create a new [API Model API](http://localhost:42110/server/admin/database/aimodelapi/add) on your Khoj admin panel - Name: `any name` - Api Key: `any string` - Api Base Url: **URL of your Openai Proxy API** diff --git a/documentation/docs/get-started/setup.mdx b/documentation/docs/get-started/setup.mdx index a7459376..a3081e96 100644 --- a/documentation/docs/get-started/setup.mdx +++ b/documentation/docs/get-started/setup.mdx @@ -302,11 +302,11 @@ Setup which chat model you'd want to use. Khoj supports local and online chat mo Using Ollama? See the [Ollama Integration](/advanced/ollama) section for more custom setup instructions. ::: -1. Create a new [OpenAI processor conversation config](http://localhost:42110/server/admin/database/openaiprocessorconversationconfig/add) in the server admin settings. This is kind of a misnomer, we know. +1. Create a new [AI Model Api](http://localhost:42110/server/admin/database/aimodelapi/add) in the server admin settings. - Add your [OpenAI API key](https://platform.openai.com/api-keys) - Give the configuration a friendly name like `OpenAI` - (Optional) Set the API base URL. It is only relevant if you're using another OpenAI-compatible proxy server like [Ollama](/advanced/ollama) or [LMStudio](/advanced/lmstudio).
-![example configuration for openai processor](/img/example_openai_processor_config.png) +![example configuration for ai model api](/img/example_openai_processor_config.png) 2. Create a new [chat model options](http://localhost:42110/server/admin/database/chatmodeloptions/add) - Set the `chat-model` field to an [OpenAI chat model](https://platform.openai.com/docs/models). Example: `gpt-4o`. - Make sure to set the `model-type` field to `OpenAI`. @@ -315,22 +315,22 @@ Using Ollama? See the [Ollama Integration](/advanced/ollama) section for more cu ![example configuration for chat model options](/img/example_chatmodel_option.png) -1. Create a new [OpenAI processor conversation config](http://localhost:42110/server/admin/database/openaiprocessorconversationconfig/add) in the server admin settings. This is kind of a misnomer, we know. +1. Create a new [AI Model API](http://localhost:42110/server/admin/database/aimodelapi/add) in the server admin settings. - Add your [Anthropic API key](https://console.anthropic.com/account/keys) - Give the configuration a friendly name like `Anthropic`. Do not configure the API base url. 2. Create a new [chat model options](http://localhost:42110/server/admin/database/chatmodeloptions/add) - Set the `chat-model` field to an [Anthropic chat model](https://docs.anthropic.com/en/docs/about-claude/models#model-names). Example: `claude-3-5-sonnet-20240620`. - Set the `model-type` field to `Anthropic`. - - Set the `Openai config` field to the OpenAI processor conversation config for Anthropic you created in step 1. + - Set the `ai model api` field to the Anthropic AI Model API you created in step 1. -1. Create a new [OpenAI processor conversation config](http://localhost:42110/server/admin/database/openaiprocessorconversationconfig/add) in the server admin settings. This is kind of a misnomer, we know. +1. Create a new [AI Model API](http://localhost:42110/server/admin/database/aimodelapi/add) in the server admin settings. - Add your [Gemini API key](https://aistudio.google.com/app/apikey) - Give the configuration a friendly name like `Gemini`. Do not configure the API base url. 2. Create a new [chat model options](http://localhost:42110/server/admin/database/chatmodeloptions/add) - Set the `chat-model` field to a [Google Gemini chat model](https://cloud.google.com/vertex-ai/generative-ai/docs/learn/models#gemini-models). Example: `gemini-1.5-flash`. - Set the `model-type` field to `Gemini`. - - Set the `Openai config` field to the OpenAI processor conversation config for Gemini you created in step 1. + - Set the `ai model api` field to the Gemini AI Model API you created in step 1. diff --git a/src/khoj/configure.py b/src/khoj/configure.py index 0ed5aa63..33008b6c 100644 --- a/src/khoj/configure.py +++ b/src/khoj/configure.py @@ -232,9 +232,9 @@ def configure_server( config = FullConfig() state.config = config - if ConversationAdapters.has_valid_openai_conversation_config(): - openai_config = ConversationAdapters.get_openai_conversation_config() - state.openai_client = openai.OpenAI(api_key=openai_config.api_key) + if ConversationAdapters.has_valid_ai_model_api(): + ai_model_api = ConversationAdapters.get_ai_model_api() + state.openai_client = openai.OpenAI(api_key=ai_model_api.api_key) # Initialize Search Models from Config and initialize content try: diff --git a/src/khoj/database/adapters/__init__.py b/src/khoj/database/adapters/__init__.py index 151abc83..df4852bf 100644 --- a/src/khoj/database/adapters/__init__.py +++ b/src/khoj/database/adapters/__init__.py @@ -35,6 +35,7 @@ from torch import Tensor from khoj.database.models import ( Agent, + AiModelApi, ChatModelOptions, ClientApplication, Conversation, @@ -46,7 +47,6 @@ from khoj.database.models import ( KhojApiUser, KhojUser, NotionConfig, - OpenAIProcessorConversationConfig, ProcessLock, PublicConversation, ReflectiveQuestion, @@ -981,7 +981,7 @@ class ConversationAdapters: @staticmethod async def aget_all_conversation_configs(): - return await sync_to_async(list)(ChatModelOptions.objects.prefetch_related("openai_config").all()) + return await sync_to_async(list)(ChatModelOptions.objects.prefetch_related("ai_model_api").all()) @staticmethod def get_vision_enabled_config(): @@ -1000,12 +1000,12 @@ class ConversationAdapters: return None @staticmethod - def get_openai_conversation_config(): - return OpenAIProcessorConversationConfig.objects.filter().first() + def get_ai_model_api(): + return AiModelApi.objects.filter().first() @staticmethod - def has_valid_openai_conversation_config(): - return OpenAIProcessorConversationConfig.objects.filter().exists() + def has_valid_ai_model_api(): + return AiModelApi.objects.filter().exists() @staticmethod @arequire_valid_user @@ -1093,7 +1093,7 @@ class ConversationAdapters: server_chat_settings: ServerChatSettings = ( await ServerChatSettings.objects.filter() .prefetch_related( - "chat_default", "chat_default__openai_config", "chat_advanced", "chat_advanced__openai_config" + "chat_default", "chat_default__ai_model_api", "chat_advanced", "chat_advanced__ai_model_api" ) .afirst() ) @@ -1109,7 +1109,7 @@ class ConversationAdapters: # Get the user's chat settings, if the server chat settings are not set user_chat_settings = ( - (await UserConversationConfig.objects.filter(user=user).prefetch_related("setting__openai_config").afirst()) + (await UserConversationConfig.objects.filter(user=user).prefetch_related("setting__ai_model_api").afirst()) if user else None ) @@ -1117,7 +1117,7 @@ class ConversationAdapters: return user_chat_settings.setting # Get the first chat model if even the user chat settings are not set - return await ChatModelOptions.objects.filter().prefetch_related("openai_config").afirst() + return await ChatModelOptions.objects.filter().prefetch_related("ai_model_api").afirst() @staticmethod def get_advanced_conversation_config(user: KhojUser): @@ -1130,7 +1130,7 @@ class ConversationAdapters: async def aget_advanced_conversation_config(user: KhojUser = None): server_chat_settings: ServerChatSettings = ( await ServerChatSettings.objects.filter() - .prefetch_related("chat_advanced", "chat_advanced__openai_config") + .prefetch_related("chat_advanced", "chat_advanced__ai_model_api") .afirst() ) if server_chat_settings is not None and server_chat_settings.chat_advanced is not None: @@ -1258,7 +1258,7 @@ class ConversationAdapters: @staticmethod async def aget_user_conversation_config(user: KhojUser): config = ( - await UserConversationConfig.objects.filter(user=user).prefetch_related("setting__openai_config").afirst() + await UserConversationConfig.objects.filter(user=user).prefetch_related("setting__ai_model_api").afirst() ) if not config: return None @@ -1313,7 +1313,7 @@ class ConversationAdapters: ChatModelOptions.ModelType.OPENAI, ChatModelOptions.ModelType.GOOGLE, ] - ) and conversation_config.openai_config: + ) and conversation_config.ai_model_api: return conversation_config else: @@ -1321,7 +1321,7 @@ class ConversationAdapters: @staticmethod async def aget_text_to_image_model_config(): - return await TextToImageModelConfig.objects.filter().prefetch_related("openai_config").afirst() + return await TextToImageModelConfig.objects.filter().prefetch_related("ai_model_api").afirst() @staticmethod def get_text_to_image_model_config(): @@ -1343,9 +1343,9 @@ class ConversationAdapters: @staticmethod async def aget_user_text_to_image_model(user: KhojUser) -> Optional[TextToImageModelConfig]: - # Create a custom queryset for prefetching settings__openai_config, handling null cases + # Create a custom queryset for prefetching settings__ai_model_api, handling null cases settings_prefetch = Prefetch( - "setting", queryset=TextToImageModelConfig.objects.prefetch_related("openai_config") + "setting", queryset=TextToImageModelConfig.objects.prefetch_related("ai_model_api") ) config = await UserTextToImageModelConfig.objects.filter(user=user).prefetch_related(settings_prefetch).afirst() diff --git a/src/khoj/database/admin.py b/src/khoj/database/admin.py index 73fd5340..7f03ed52 100644 --- a/src/khoj/database/admin.py +++ b/src/khoj/database/admin.py @@ -1,6 +1,6 @@ import csv import json -from datetime import date, datetime, timedelta, timezone +from datetime import datetime, timedelta from apscheduler.job import Job from django.contrib import admin, messages @@ -15,6 +15,7 @@ from unfold import admin as unfold_admin from khoj.database.models import ( Agent, + AiModelApi, ChatModelOptions, ClientApplication, Conversation, @@ -22,7 +23,6 @@ from khoj.database.models import ( GithubConfig, KhojUser, NotionConfig, - OpenAIProcessorConversationConfig, ProcessLock, ReflectiveQuestion, SearchModelConfig, @@ -232,8 +232,8 @@ class TextToImageModelOptionsAdmin(unfold_admin.ModelAdmin): search_fields = ("id", "model_name", "model_type") -@admin.register(OpenAIProcessorConversationConfig) -class OpenAIProcessorConversationConfigAdmin(unfold_admin.ModelAdmin): +@admin.register(AiModelApi) +class AiModelApiAdmin(unfold_admin.ModelAdmin): list_display = ( "id", "name", diff --git a/src/khoj/database/migrations/0076_rename_openaiprocessorconversationconfig_aimodelapi_and_more.py b/src/khoj/database/migrations/0076_rename_openaiprocessorconversationconfig_aimodelapi_and_more.py new file mode 100644 index 00000000..d9f536f9 --- /dev/null +++ b/src/khoj/database/migrations/0076_rename_openaiprocessorconversationconfig_aimodelapi_and_more.py @@ -0,0 +1,26 @@ +# Generated by Django 5.0.9 on 2024-12-05 09:00 + +from django.db import migrations + + +class Migration(migrations.Migration): + dependencies = [ + ("database", "0075_migrate_generated_assets_and_validate"), + ] + + operations = [ + migrations.RenameModel( + old_name="OpenAIProcessorConversationConfig", + new_name="AiModelApi", + ), + migrations.RenameField( + model_name="chatmodeloptions", + old_name="openai_config", + new_name="ai_model_api", + ), + migrations.RenameField( + model_name="texttoimagemodelconfig", + old_name="openai_config", + new_name="ai_model_api", + ), + ] diff --git a/src/khoj/database/models/__init__.py b/src/khoj/database/models/__init__.py index dea678d8..c3b4621b 100644 --- a/src/khoj/database/models/__init__.py +++ b/src/khoj/database/models/__init__.py @@ -181,7 +181,7 @@ class Subscription(DbBaseModel): enabled_trial_at = models.DateTimeField(null=True, default=None, blank=True) -class OpenAIProcessorConversationConfig(DbBaseModel): +class AiModelApi(DbBaseModel): name = models.CharField(max_length=200) api_key = models.CharField(max_length=200) api_base_url = models.URLField(max_length=200, default=None, blank=True, null=True) @@ -200,9 +200,7 @@ class ChatModelOptions(DbBaseModel): chat_model = models.CharField(max_length=200, default="bartowski/Meta-Llama-3.1-8B-Instruct-GGUF") model_type = models.CharField(max_length=200, choices=ModelType.choices, default=ModelType.OFFLINE) vision_enabled = models.BooleanField(default=False) - openai_config = models.ForeignKey( - OpenAIProcessorConversationConfig, on_delete=models.CASCADE, default=None, null=True, blank=True - ) + ai_model_api = models.ForeignKey(AiModelApi, on_delete=models.CASCADE, default=None, null=True, blank=True) class VoiceModelOption(DbBaseModel): @@ -504,26 +502,24 @@ class TextToImageModelConfig(DbBaseModel): model_name = models.CharField(max_length=200, default="dall-e-3") model_type = models.CharField(max_length=200, choices=ModelType.choices, default=ModelType.OPENAI) api_key = models.CharField(max_length=200, default=None, null=True, blank=True) - openai_config = models.ForeignKey( - OpenAIProcessorConversationConfig, on_delete=models.CASCADE, default=None, null=True, blank=True - ) + ai_model_api = models.ForeignKey(AiModelApi, on_delete=models.CASCADE, default=None, null=True, blank=True) def clean(self): # Custom validation logic error = {} if self.model_type == self.ModelType.OPENAI: - if self.api_key and self.openai_config: + if self.api_key and self.ai_model_api: error[ "api_key" - ] = "Both API key and OpenAI config cannot be set for OpenAI models. Please set only one of them." + ] = "Both API key and AI Model API cannot be set for OpenAI models. Please set only one of them." error[ - "openai_config" + "ai_model_api" ] = "Both API key and OpenAI config cannot be set for OpenAI models. Please set only one of them." if self.model_type != self.ModelType.OPENAI: if not self.api_key: error["api_key"] = "The API key field must be set for non OpenAI models." - if self.openai_config: - error["openai_config"] = "OpenAI config cannot be set for non OpenAI models." + if self.ai_model_api: + error["ai_model_api"] = "AI Model API cannot be set for non OpenAI models." if error: raise ValidationError(error) diff --git a/src/khoj/migrations/migrate_server_pg.py b/src/khoj/migrations/migrate_server_pg.py index a770a38d..a46664c3 100644 --- a/src/khoj/migrations/migrate_server_pg.py +++ b/src/khoj/migrations/migrate_server_pg.py @@ -60,11 +60,7 @@ import logging from packaging import version -from khoj.database.models import ( - ChatModelOptions, - OpenAIProcessorConversationConfig, - SearchModelConfig, -) +from khoj.database.models import AiModelApi, ChatModelOptions, SearchModelConfig from khoj.utils.yaml import load_config_from_file, save_config_to_file logger = logging.getLogger(__name__) @@ -121,16 +117,14 @@ def migrate_server_pg(args): if openai.get("chat-model") is None: openai["chat-model"] = "gpt-3.5-turbo" - openai_config = OpenAIProcessorConversationConfig.objects.create( - api_key=openai.get("api-key"), name="default" - ) + openai_model_api = AiModelApi.objects.create(api_key=openai.get("api-key"), name="default") ChatModelOptions.objects.create( chat_model=openai.get("chat-model"), tokenizer=processor_conversation.get("tokenizer"), max_prompt_size=processor_conversation.get("max-prompt-size"), model_type=ChatModelOptions.ModelType.OPENAI, - openai_config=openai_config, + ai_model_api=openai_model_api, ) save_config_to_file(raw_config, args.config_file) diff --git a/src/khoj/processor/conversation/openai/utils.py b/src/khoj/processor/conversation/openai/utils.py index 2f01be32..160af77c 100644 --- a/src/khoj/processor/conversation/openai/utils.py +++ b/src/khoj/processor/conversation/openai/utils.py @@ -19,12 +19,7 @@ from khoj.processor.conversation.utils import ( ThreadedGenerator, commit_conversation_trace, ) -from khoj.utils import state -from khoj.utils.helpers import ( - get_chat_usage_metrics, - in_debug_mode, - is_promptrace_enabled, -) +from khoj.utils.helpers import get_chat_usage_metrics, is_promptrace_enabled logger = logging.getLogger(__name__) diff --git a/src/khoj/processor/image/generate.py b/src/khoj/processor/image/generate.py index e543ac7d..a4628115 100644 --- a/src/khoj/processor/image/generate.py +++ b/src/khoj/processor/image/generate.py @@ -124,8 +124,8 @@ def generate_image_with_openai( # Get the API key from the user's configuration if text_to_image_config.api_key: api_key = text_to_image_config.api_key - elif text_to_image_config.openai_config: - api_key = text_to_image_config.openai_config.api_key + elif text_to_image_config.ai_model_api: + api_key = text_to_image_config.ai_model_api.api_key elif state.openai_client: api_key = state.openai_client.api_key auth_header = {"Authorization": f"Bearer {api_key}"} if api_key else {} diff --git a/src/khoj/routers/api.py b/src/khoj/routers/api.py index 4c86d1c4..11c72eb9 100644 --- a/src/khoj/routers/api.py +++ b/src/khoj/routers/api.py @@ -430,9 +430,8 @@ async def extract_references_and_questions( tracer=tracer, ) elif conversation_config.model_type == ChatModelOptions.ModelType.OPENAI: - openai_chat_config = conversation_config.openai_config - api_key = openai_chat_config.api_key - base_url = openai_chat_config.api_base_url + api_key = conversation_config.ai_model_api.api_key + base_url = conversation_config.ai_model_api.api_base_url chat_model = conversation_config.chat_model inferred_queries = extract_questions( defiltered_query, @@ -449,7 +448,7 @@ async def extract_references_and_questions( tracer=tracer, ) elif conversation_config.model_type == ChatModelOptions.ModelType.ANTHROPIC: - api_key = conversation_config.openai_config.api_key + api_key = conversation_config.ai_model_api.api_key chat_model = conversation_config.chat_model inferred_queries = extract_questions_anthropic( defiltered_query, @@ -465,7 +464,7 @@ async def extract_references_and_questions( tracer=tracer, ) elif conversation_config.model_type == ChatModelOptions.ModelType.GOOGLE: - api_key = conversation_config.openai_config.api_key + api_key = conversation_config.ai_model_api.api_key chat_model = conversation_config.chat_model inferred_queries = extract_questions_gemini( defiltered_query, diff --git a/src/khoj/routers/helpers.py b/src/khoj/routers/helpers.py index 29c44d94..3ec701b7 100644 --- a/src/khoj/routers/helpers.py +++ b/src/khoj/routers/helpers.py @@ -136,7 +136,7 @@ def validate_conversation_config(user: KhojUser): if default_config is None: raise HTTPException(status_code=500, detail="Contact the server administrator to add a chat model.") - if default_config.model_type == "openai" and not default_config.openai_config: + if default_config.model_type == "openai" and not default_config.ai_model_api: raise HTTPException(status_code=500, detail="Contact the server administrator to add a chat model.") @@ -163,7 +163,7 @@ async def is_ready_to_chat(user: KhojUser): ChatModelOptions.ModelType.GOOGLE, ] ) - and user_conversation_config.openai_config + and user_conversation_config.ai_model_api ): return True @@ -990,7 +990,7 @@ async def send_message_to_model_wrapper( ) elif model_type == ChatModelOptions.ModelType.OPENAI: - openai_chat_config = conversation_config.openai_config + openai_chat_config = conversation_config.ai_model_api api_key = openai_chat_config.api_key api_base_url = openai_chat_config.api_base_url truncated_messages = generate_chatml_messages_with_context( @@ -1015,7 +1015,7 @@ async def send_message_to_model_wrapper( tracer=tracer, ) elif model_type == ChatModelOptions.ModelType.ANTHROPIC: - api_key = conversation_config.openai_config.api_key + api_key = conversation_config.ai_model_api.api_key truncated_messages = generate_chatml_messages_with_context( user_message=query, context_message=context, @@ -1037,7 +1037,7 @@ async def send_message_to_model_wrapper( tracer=tracer, ) elif model_type == ChatModelOptions.ModelType.GOOGLE: - api_key = conversation_config.openai_config.api_key + api_key = conversation_config.ai_model_api.api_key truncated_messages = generate_chatml_messages_with_context( user_message=query, context_message=context, @@ -1102,7 +1102,7 @@ def send_message_to_model_wrapper_sync( ) elif conversation_config.model_type == ChatModelOptions.ModelType.OPENAI: - api_key = conversation_config.openai_config.api_key + api_key = conversation_config.ai_model_api.api_key truncated_messages = generate_chatml_messages_with_context( user_message=message, system_message=system_message, @@ -1124,7 +1124,7 @@ def send_message_to_model_wrapper_sync( return openai_response elif conversation_config.model_type == ChatModelOptions.ModelType.ANTHROPIC: - api_key = conversation_config.openai_config.api_key + api_key = conversation_config.ai_model_api.api_key truncated_messages = generate_chatml_messages_with_context( user_message=message, system_message=system_message, @@ -1144,7 +1144,7 @@ def send_message_to_model_wrapper_sync( ) elif conversation_config.model_type == ChatModelOptions.ModelType.GOOGLE: - api_key = conversation_config.openai_config.api_key + api_key = conversation_config.ai_model_api.api_key truncated_messages = generate_chatml_messages_with_context( user_message=message, system_message=system_message, @@ -1255,7 +1255,7 @@ def generate_chat_response( ) elif conversation_config.model_type == ChatModelOptions.ModelType.OPENAI: - openai_chat_config = conversation_config.openai_config + openai_chat_config = conversation_config.ai_model_api api_key = openai_chat_config.api_key chat_model = conversation_config.chat_model chat_response = converse( @@ -1285,7 +1285,7 @@ def generate_chat_response( ) elif conversation_config.model_type == ChatModelOptions.ModelType.ANTHROPIC: - api_key = conversation_config.openai_config.api_key + api_key = conversation_config.ai_model_api.api_key chat_response = converse_anthropic( compiled_references, query_to_run, @@ -1311,7 +1311,7 @@ def generate_chat_response( tracer=tracer, ) elif conversation_config.model_type == ChatModelOptions.ModelType.GOOGLE: - api_key = conversation_config.openai_config.api_key + api_key = conversation_config.ai_model_api.api_key chat_response = converse_gemini( compiled_references, query_to_run, diff --git a/src/khoj/utils/initialization.py b/src/khoj/utils/initialization.py index 27decd65..2677da03 100644 --- a/src/khoj/utils/initialization.py +++ b/src/khoj/utils/initialization.py @@ -6,9 +6,9 @@ import openai from khoj.database.adapters import ConversationAdapters from khoj.database.models import ( + AiModelApi, ChatModelOptions, KhojUser, - OpenAIProcessorConversationConfig, SpeechToTextModelOptions, TextToImageModelConfig, ) @@ -98,7 +98,7 @@ def initialization(interactive: bool = True): TextToImageModelConfig.objects.create( model_name=openai_text_to_image_model, model_type=TextToImageModelConfig.ModelType.OPENAI, - openai_config=openai_provider, + ai_model_api=openai_provider, ) # Set up Google's Gemini online chat models @@ -177,7 +177,7 @@ def initialization(interactive: bool = True): vision_enabled: bool = False, is_offline: bool = False, provider_name: str = None, - ) -> Tuple[bool, OpenAIProcessorConversationConfig]: + ) -> Tuple[bool, AiModelApi]: supported_vision_models = ( default_openai_chat_models + default_anthropic_chat_models + default_gemini_chat_models ) @@ -192,16 +192,14 @@ def initialization(interactive: bool = True): logger.info(f"️💬 Setting up your {provider_name} chat configuration") - chat_provider = None + ai_model_api = None if not is_offline: if interactive: user_api_key = input(f"Enter your {provider_name} API key (default: {default_api_key}): ") api_key = user_api_key if user_api_key != "" else default_api_key else: api_key = default_api_key - chat_provider = OpenAIProcessorConversationConfig.objects.create( - api_key=api_key, name=provider_name, api_base_url=api_base_url - ) + ai_model_api = AiModelApi.objects.create(api_key=api_key, name=provider_name, api_base_url=api_base_url) if interactive: chat_model_names = input( @@ -223,19 +221,19 @@ def initialization(interactive: bool = True): "max_prompt_size": default_max_tokens, "vision_enabled": vision_enabled, "tokenizer": default_tokenizer, - "openai_config": chat_provider, + "ai_model_api": ai_model_api, } ChatModelOptions.objects.create(**chat_model_options) logger.info(f"🗣️ {provider_name} chat model configuration complete") - return True, chat_provider + return True, ai_model_api def _update_chat_model_options(): """Update available chat models for OpenAI-compatible APIs""" try: # Get OpenAI configs with custom base URLs - custom_configs = OpenAIProcessorConversationConfig.objects.exclude(api_base_url__isnull=True) + custom_configs = AiModelApi.objects.exclude(api_base_url__isnull=True) for config in custom_configs: try: @@ -247,7 +245,7 @@ def initialization(interactive: bool = True): # Get existing chat model options for this config existing_models = ChatModelOptions.objects.filter( - openai_config=config, model_type=ChatModelOptions.ModelType.OPENAI + ai_model_api=config, model_type=ChatModelOptions.ModelType.OPENAI ) # Add new models @@ -259,7 +257,7 @@ def initialization(interactive: bool = True): max_prompt_size=model_to_prompt_size.get(model), vision_enabled=model in default_openai_chat_models, tokenizer=model_to_tokenizer.get(model), - openai_config=config, + ai_model_api=config, ) # Remove models that are no longer available diff --git a/tests/conftest.py b/tests/conftest.py index 7c233594..7561d901 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -34,8 +34,8 @@ from khoj.utils.constants import web_directory from khoj.utils.helpers import resolve_absolute_path from khoj.utils.rawconfig import ContentConfig, ImageSearchConfig, SearchConfig from tests.helpers import ( + AiModelApiFactory, ChatModelOptionsFactory, - OpenAIProcessorConversationConfigFactory, ProcessLockFactory, SubscriptionFactory, UserConversationProcessorConfigFactory, @@ -319,9 +319,7 @@ def chat_client_builder(search_config, user, index_content=True, require_auth=Fa elif chat_provider == ChatModelOptions.ModelType.ANTHROPIC: online_chat_model = ChatModelOptionsFactory(chat_model="claude-3-5-haiku-20241022", model_type="anthropic") if online_chat_model: - online_chat_model.openai_config = OpenAIProcessorConversationConfigFactory( - api_key=get_chat_api_key(chat_provider) - ) + online_chat_model.ai_model_api = AiModelApiFactory(api_key=get_chat_api_key(chat_provider)) UserConversationProcessorConfigFactory(user=user, setting=online_chat_model) state.anonymous_mode = not require_auth diff --git a/tests/helpers.py b/tests/helpers.py index 3824c615..04ed6df5 100644 --- a/tests/helpers.py +++ b/tests/helpers.py @@ -5,11 +5,11 @@ import factory from django.utils.timezone import make_aware from khoj.database.models import ( + AiModelApi, ChatModelOptions, Conversation, KhojApiUser, KhojUser, - OpenAIProcessorConversationConfig, ProcessLock, SearchModelConfig, Subscription, @@ -76,9 +76,9 @@ class ApiUserFactory(factory.django.DjangoModelFactory): token = factory.Faker("password") -class OpenAIProcessorConversationConfigFactory(factory.django.DjangoModelFactory): +class AiModelApiFactory(factory.django.DjangoModelFactory): class Meta: - model = OpenAIProcessorConversationConfig + model = AiModelApi api_key = get_chat_api_key() @@ -91,9 +91,7 @@ class ChatModelOptionsFactory(factory.django.DjangoModelFactory): tokenizer = None chat_model = "bartowski/Meta-Llama-3.2-3B-Instruct-GGUF" model_type = get_chat_provider() - openai_config = factory.LazyAttribute( - lambda obj: OpenAIProcessorConversationConfigFactory() if get_chat_api_key() else None - ) + ai_model_api = factory.LazyAttribute(lambda obj: AiModelApiFactory() if get_chat_api_key() else None) class UserConversationProcessorConfigFactory(factory.django.DjangoModelFactory):