Merge with master

src/database/adapters/__init__.py

@@ -31,7 +31,7 @@ from database.models import (
     GithubRepoConfig,
     Conversation,
     ChatModelOptions,
-    SearchModel,
+    SearchModelConfig,
     Subscription,
     UserConversationConfig,
     OpenAIProcessorConversationConfig,
@@ -73,11 +73,11 @@ async def delete_khoj_token(user: KhojUser, token: str):
 async def get_or_create_user(token: dict) -> KhojUser:
     user = await get_user_by_token(token)
     if not user:
-        user = await create_user_by_token(token)
+        user = await create_user_by_google_token(token)
     return user
 
 
-async def create_user_by_token(token: dict) -> KhojUser:
+async def create_user_by_google_token(token: dict) -> KhojUser:
     user, _ = await KhojUser.objects.filter(email=token.get("email")).aupdate_or_create(
         defaults={"username": token.get("email"), "email": token.get("email")}
     )
@@ -214,9 +214,9 @@ async def set_user_github_config(user: KhojUser, pat_token: str, repos: list):
 
 
 def get_or_create_search_model():
-    search_model = SearchModel.objects.filter().first()
+    search_model = SearchModelConfig.objects.filter().first()
     if not search_model:
-        search_model = SearchModel.objects.create()
+        search_model = SearchModelConfig.objects.create()
 
     return search_model
 

src/database/admin.py

@@ -8,7 +8,7 @@ from database.models import (
     ChatModelOptions,
     OpenAIProcessorConversationConfig,
     OfflineChatProcessorConversationConfig,
-    SearchModel,
+    SearchModelConfig,
     Subscription,
 )
 
@@ -17,5 +17,5 @@ admin.site.register(KhojUser, UserAdmin)
 admin.site.register(ChatModelOptions)
 admin.site.register(OpenAIProcessorConversationConfig)
 admin.site.register(OfflineChatProcessorConversationConfig)
-admin.site.register(SearchModel)
+admin.site.register(SearchModelConfig)
 admin.site.register(Subscription)

src/database/migrations/0018_searchmodelconfig_delete_searchmodel.py

@@ -0,0 +1,30 @@
+# Generated by Django 4.2.5 on 2023-11-16 01:13
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("database", "0017_searchmodel"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="SearchModelConfig",
+            fields=[
+                ("id", models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")),
+                ("created_at", models.DateTimeField(auto_now_add=True)),
+                ("updated_at", models.DateTimeField(auto_now=True)),
+                ("name", models.CharField(default="default", max_length=200)),
+                ("model_type", models.CharField(choices=[("text", "Text")], default="text", max_length=200)),
+                ("bi_encoder", models.CharField(default="thenlper/gte-small", max_length=200)),
+                ("cross_encoder", models.CharField(default="cross-encoder/ms-marco-MiniLM-L-6-v2", max_length=200)),
+            ],
+            options={
+                "abstract": False,
+            },
+        ),
+        migrations.DeleteModel(
+            name="SearchModel",
+        ),
+    ]

src/database/models/__init__.py

@@ -102,16 +102,14 @@ class LocalPlaintextConfig(BaseModel):
     user = models.ForeignKey(KhojUser, on_delete=models.CASCADE)
 
 
-class SearchModel(BaseModel):
+class SearchModelConfig(BaseModel):
     class ModelType(models.TextChoices):
         TEXT = "text"
 
     name = models.CharField(max_length=200, default="default")
     model_type = models.CharField(max_length=200, choices=ModelType.choices, default=ModelType.TEXT)
     bi_encoder = models.CharField(max_length=200, default="thenlper/gte-small")
-    cross_encoder = models.CharField(
-        max_length=200, default="cross-encoder/ms-marco-MiniLM-L-6-v2", null=True, blank=True
-    )
+    cross_encoder = models.CharField(max_length=200, default="cross-encoder/ms-marco-MiniLM-L-6-v2")
 
 
 class OpenAIProcessorConversationConfig(BaseModel):