khoj 1.16.1.dev25__py3-none-any.whl → 1.17.1.dev216__py3-none-any.whl

khoj/configure.py

@@ -42,7 +42,7 @@ from khoj.database.adapters import (
 )
 from khoj.database.models import ClientApplication, KhojUser, ProcessLock, Subscription
 from khoj.processor.embeddings import CrossEncoderModel, EmbeddingsModel
-from khoj.routers.indexer import configure_content, configure_search
+from khoj.routers.api_content import configure_content, configure_search
 from khoj.routers.twilio import is_twilio_enabled
 from khoj.utils import constants, state
 from khoj.utils.config import SearchType
@@ -308,16 +308,16 @@ def configure_routes(app):
     from khoj.routers.api import api
     from khoj.routers.api_agents import api_agents
     from khoj.routers.api_chat import api_chat
-    from khoj.routers.api_config import api_config
-    from khoj.routers.indexer import indexer
+    from khoj.routers.api_content import api_content
+    from khoj.routers.api_model import api_model
     from khoj.routers.notion import notion_router
     from khoj.routers.web_client import web_client
 
     app.include_router(api, prefix="/api")
     app.include_router(api_chat, prefix="/api/chat")
     app.include_router(api_agents, prefix="/api/agents")
-    app.include_router(api_config, prefix="/api/config")
-    app.include_router(indexer, prefix="/api/v1/index")
+    app.include_router(api_model, prefix="/api/model")
+    app.include_router(api_content, prefix="/api/content")
     app.include_router(notion_router, prefix="/api/notion")
     app.include_router(web_client)
 
@@ -336,7 +336,7 @@ def configure_routes(app):
     if is_twilio_enabled():
         from khoj.routers.api_phone import api_phone
 
-        app.include_router(api_phone, prefix="/api/config/phone")
+        app.include_router(api_phone, prefix="/api/phone")
         logger.info("📞 Enabled Twilio")
 
 

khoj/database/adapters/__init__.py

@@ -645,7 +645,11 @@ class ConversationAdapters:
 
     @staticmethod
     def get_conversation_sessions(user: KhojUser, client_application: ClientApplication = None):
-        return Conversation.objects.filter(user=user, client=client_application).order_by("-updated_at")
+        return (
+            Conversation.objects.filter(user=user, client=client_application)
+            .prefetch_related("agent")
+            .order_by("-updated_at")
+        )
 
     @staticmethod
     async def aset_conversation_title(
@@ -680,34 +684,18 @@ class ConversationAdapters:
     async def aget_conversation_by_user(
         user: KhojUser, client_application: ClientApplication = None, conversation_id: int = None, title: str = None
     ) -> Optional[Conversation]:
+        query = Conversation.objects.filter(user=user, client=client_application).prefetch_related("agent")
+
         if conversation_id:
-            return (
-                await Conversation.objects.filter(user=user, client=client_application, id=conversation_id)
-                .prefetch_related("agent")
-                .afirst()
-            )
+            return await query.filter(id=conversation_id).afirst()
         elif title:
-            return (
-                await Conversation.objects.filter(user=user, client=client_application, title=title)
-                .prefetch_related("agent")
-                .afirst()
-            )
-        else:
-            conversation = (
-                Conversation.objects.filter(user=user, client=client_application)
-                .prefetch_related("agent")
-                .order_by("-updated_at")
-            )
+            return await query.filter(title=title).afirst()
 
-        if await conversation.aexists():
-            return await conversation.prefetch_related("agent").afirst()
+        conversation = await query.order_by("-updated_at").afirst()
 
-        return await (
-            Conversation.objects.filter(user=user, client=client_application)
-            .prefetch_related("agent")
-            .order_by("-updated_at")
-            .afirst()
-        ) or await Conversation.objects.prefetch_related("agent").acreate(user=user, client=client_application)
+        return conversation or await Conversation.objects.prefetch_related("agent").acreate(
+            user=user, client=client_application
+        )
 
     @staticmethod
     async def adelete_conversation_by_user(
@@ -814,11 +802,14 @@ class ConversationAdapters:
     def create_conversation_from_public_conversation(
         user: KhojUser, public_conversation: PublicConversation, client_app: ClientApplication
     ):
+        scrubbed_title = public_conversation.title if public_conversation.title else public_conversation.slug
+        if scrubbed_title:
+            scrubbed_title = scrubbed_title.replace("-", " ")
         return Conversation.objects.create(
             user=user,
             conversation_log=public_conversation.conversation_log,
             client=client_app,
-            slug=public_conversation.slug,
+            slug=scrubbed_title,
             title=public_conversation.title,
             agent=public_conversation.agent,
         )
@@ -959,6 +950,34 @@ class ConversationAdapters:
         )
         return new_config
 
+    @staticmethod
+    def add_files_to_filter(user: KhojUser, conversation_id: int, files: List[str]):
+        conversation = ConversationAdapters.get_conversation_by_user(user, conversation_id=conversation_id)
+        file_list = EntryAdapters.get_all_filenames_by_source(user, "computer")
+        for filename in files:
+            if filename in file_list and filename not in conversation.file_filters:
+                conversation.file_filters.append(filename)
+        conversation.save()
+
+        # remove files from conversation.file_filters that are not in file_list
+        conversation.file_filters = [file for file in conversation.file_filters if file in file_list]
+        conversation.save()
+        return conversation.file_filters
+
+    @staticmethod
+    def remove_files_from_filter(user: KhojUser, conversation_id: int, files: List[str]):
+        conversation = ConversationAdapters.get_conversation_by_user(user, conversation_id=conversation_id)
+        for filename in files:
+            if filename in conversation.file_filters:
+                conversation.file_filters.remove(filename)
+        conversation.save()
+
+        # remove files from conversation.file_filters that are not in file_list
+        file_list = EntryAdapters.get_all_filenames_by_source(user, "computer")
+        conversation.file_filters = [file for file in conversation.file_filters if file in file_list]
+        conversation.save()
+        return conversation.file_filters
+
 
 class FileObjectAdapters:
     @staticmethod
@@ -1087,6 +1106,16 @@ class EntryAdapters:
     async def adelete_entry_by_file(user: KhojUser, file_path: str):
         return await Entry.objects.filter(user=user, file_path=file_path).adelete()
 
+    @staticmethod
+    async def adelete_entries_by_filenames(user: KhojUser, filenames: List[str], batch_size=1000):
+        deleted_count = 0
+        for i in range(0, len(filenames), batch_size):
+            batch = filenames[i : i + batch_size]
+            count, _ = await Entry.objects.filter(user=user, file_path__in=batch).adelete()
+            deleted_count += count
+
+        return deleted_count
+
     @staticmethod
     def get_all_filenames_by_source(user: KhojUser, file_source: str):
         return (

khoj/database/migrations/0053_agent_style_color_agent_style_icon.py

@@ -0,0 +1,61 @@
+# Generated by Django 5.0.6 on 2024-07-13 16:26
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("database", "0052_alter_searchmodelconfig_bi_encoder_docs_encode_config_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="agent",
+            name="style_color",
+            field=models.CharField(
+                choices=[
+                    ("blue", "Blue"),
+                    ("green", "Green"),
+                    ("red", "Red"),
+                    ("yellow", "Yellow"),
+                    ("orange", "Orange"),
+                    ("purple", "Purple"),
+                    ("pink", "Pink"),
+                    ("teal", "Teal"),
+                    ("cyan", "Cyan"),
+                    ("lime", "Lime"),
+                    ("indigo", "Indigo"),
+                    ("fuschia", "Fuschia"),
+                    ("rose", "Rose"),
+                    ("sky", "Sky"),
+                    ("amber", "Amber"),
+                    ("emerald", "Emerald"),
+                ],
+                default="blue",
+                max_length=200,
+            ),
+        ),
+        migrations.AddField(
+            model_name="agent",
+            name="style_icon",
+            field=models.CharField(
+                choices=[
+                    ("Lightbulb", "Lighbulb"),
+                    ("Health", "Health"),
+                    ("Robot", "Robot"),
+                    ("Aperture", "Aperture"),
+                    ("GraduationCap", "Graduation Cap"),
+                    ("Jeep", "Jeep"),
+                    ("Island", "Island"),
+                    ("MathOperations", "Math Operations"),
+                    ("Asclepius", "Asclepius"),
+                    ("Couch", "Couch"),
+                    ("Code", "Code"),
+                    ("Atom", "Atom"),
+                    ("ClockCounterClockwise", "Clock Counter Clockwise"),
+                ],
+                default="Lightbulb",
+                max_length=200,
+            ),
+        ),
+    ]

khoj/database/models/__init__.py

@@ -103,6 +103,39 @@ class VoiceModelOption(BaseModel):
 
 
 class Agent(BaseModel):
+    class StyleColorTypes(models.TextChoices):
+        BLUE = "blue"
+        GREEN = "green"
+        RED = "red"
+        YELLOW = "yellow"
+        ORANGE = "orange"
+        PURPLE = "purple"
+        PINK = "pink"
+        TEAL = "teal"
+        CYAN = "cyan"
+        LIME = "lime"
+        INDIGO = "indigo"
+        FUSCHIA = "fuschia"
+        ROSE = "rose"
+        SKY = "sky"
+        AMBER = "amber"
+        EMERALD = "emerald"
+
+    class StyleIconTypes(models.TextChoices):
+        LIGHBULB = "Lightbulb"
+        HEALTH = "Health"
+        ROBOT = "Robot"
+        APERTURE = "Aperture"
+        GRADUATION_CAP = "GraduationCap"
+        JEEP = "Jeep"
+        ISLAND = "Island"
+        MATH_OPERATIONS = "MathOperations"
+        ASCLEPIUS = "Asclepius"
+        COUCH = "Couch"
+        CODE = "Code"
+        ATOM = "Atom"
+        CLOCK_COUNTER_CLOCKWISE = "ClockCounterClockwise"
+
     creator = models.ForeignKey(
         KhojUser, on_delete=models.CASCADE, default=None, null=True, blank=True
     )  # Creator will only be null when the agents are managed by admin
@@ -114,6 +147,8 @@ class Agent(BaseModel):
     managed_by_admin = models.BooleanField(default=False)
     chat_model = models.ForeignKey(ChatModelOptions, on_delete=models.CASCADE)
     slug = models.CharField(max_length=200)
+    style_color = models.CharField(max_length=200, choices=StyleColorTypes.choices, default=StyleColorTypes.BLUE)
+    style_icon = models.CharField(max_length=200, choices=StyleIconTypes.choices, default=StyleIconTypes.LIGHBULB)
 
 
 class ProcessLock(BaseModel):