appkit-assistant 0.17.3__py3-none-any.whl → 1.0.1__py3-none-any.whl

appkit_assistant/backend/{response_accumulator.py → services/response_accumulator.py}

@@ -1,8 +1,10 @@
+import json
 import logging
+import re
 import uuid
 from typing import Any
 
-from appkit_assistant.backend.models import (
+from appkit_assistant.backend.schemas import (
     Chunk,
     ChunkType,
     Message,
@@ -14,6 +16,49 @@ from appkit_assistant.backend.models import (
 
 logger = logging.getLogger(__name__)
 
+# Minimum number of consecutive links required to format as a list
+MIN_LINKS_FOR_LIST_FORMAT = 2
+
+
+def _format_consecutive_links_as_list(text: str) -> str:
+    """Format multiple consecutive markdown links as a bullet list.
+
+    Detects patterns where markdown links are concatenated directly without
+    spacing (e.g., `[text1](url1)[text2](url2)`) and converts them to a
+    properly formatted bullet list with human-readable link texts.
+
+    Args:
+        text: The markdown text to process.
+
+    Returns:
+        The text with consecutive links formatted as a bullet list.
+    """
+    # Pattern to match consecutive markdown links: [text](url)[text](url)
+    # This regex matches two or more consecutive links
+    consecutive_links_pattern = re.compile(
+        r"(\[[^\]]+\]\([^)]+\))(\[[^\]]+\]\([^)]+\))+", re.MULTILINE
+    )
+
+    def format_links_match(match: re.Match[str]) -> str:
+        """Convert matched consecutive links to a bullet list."""
+        full_match = match.group(0)
+
+        # Extract all individual links from the match
+        link_pattern = re.compile(r"\[([^\]]+)\]\(([^)]+)\)")
+        links = link_pattern.findall(full_match)
+
+        if len(links) < MIN_LINKS_FOR_LIST_FORMAT:
+            return full_match
+
+        # Format as a bullet list with proper spacing
+        formatted_links = "\n\n**Quellen:**\n"
+        for link_text, url in links:
+            formatted_links += f"- [{link_text}]({url})\n"
+
+        return formatted_links
+
+    return consecutive_links_pattern.sub(format_links_match, text)
+
 
 class ResponseAccumulator:
     """
@@ -63,6 +108,8 @@ class ResponseAccumulator:
         if chunk.type == ChunkType.TEXT:
             if self.messages and self.messages[-1].type == MessageType.ASSISTANT:
                 self.messages[-1].text += chunk.text
+                # Extract citations from metadata and add as annotations
+                self._extract_citations_to_annotations(chunk)
 
         elif chunk.type in (ChunkType.THINKING, ChunkType.THINKING_RESULT):
             self._handle_reasoning_chunk(chunk)
@@ -79,10 +126,18 @@ class ResponseAccumulator:
 
         elif chunk.type == ChunkType.COMPLETION:
             self.show_thinking = False
+            # Post-process message text to format consecutive links as list
+            self._format_message_links()
 
         elif chunk.type == ChunkType.AUTH_REQUIRED:
             self._handle_auth_required_chunk(chunk)
 
+        elif chunk.type == ChunkType.PROCESSING:
+            self._handle_processing_chunk(chunk)
+
+        elif chunk.type == ChunkType.ANNOTATION:
+            self._handle_annotation_chunk(chunk)
+
         elif chunk.type == ChunkType.ERROR:
             # We append it to the message text if it's not a hard error,
             # or creates a new message?
@@ -254,6 +309,13 @@ class ResponseAccumulator:
             item.status = status
             item.result = result
             item.error = error
+            # Also update tool_name from result if item is missing it
+            if (
+                display_name
+                and display_name != "Unknown"
+                and (not item.tool_name or item.tool_name == "Unknown")
+            ):
+                item.tool_name = display_name
         elif chunk.type == ChunkType.ACTION:
             item.text += f"\n---\nAktion: {chunk.text}"
 
@@ -273,3 +335,103 @@ class ResponseAccumulator:
         self.pending_auth_server_name = chunk.chunk_metadata.get("server_name", "")
         self.pending_auth_url = chunk.chunk_metadata.get("auth_url", "")
         self.auth_required = True
+
+    def _handle_processing_chunk(self, chunk: Chunk) -> None:
+        """Handle file processing progress chunks."""
+        status = chunk.chunk_metadata.get("status", "")
+
+        # Skip empty/skipped chunks (used for signaling completion without UI)
+        if not chunk.text or status == "skipped":
+            return
+
+        # Show thinking panel when processing
+        self.show_thinking = True
+        self.current_activity = chunk.text
+
+        # Determine item status based on metadata
+        if status == "completed":
+            item_status = ThinkingStatus.COMPLETED
+        elif status in ("failed", "timeout"):
+            item_status = ThinkingStatus.ERROR
+        else:
+            item_status = ThinkingStatus.IN_PROGRESS
+
+        # Use a single processing item that gets updated
+        item = self._get_or_create_thinking_item(
+            "file_processing",
+            ThinkingType.PROCESSING,
+            text=chunk.text,
+            status=item_status,
+            tool_name="Dateiverarbeitung",
+        )
+
+        item.text = chunk.text
+        item.status = item_status
+
+        # Store error if present
+        if status in ("failed", "timeout"):
+            item.error = chunk.chunk_metadata.get("error", chunk.text)
+
+    def _handle_annotation_chunk(self, chunk: Chunk) -> None:
+        """Handle file annotation/citation chunks."""
+        if not self.messages:
+            return
+
+        last_message = self.messages[-1]
+        if last_message.type != MessageType.ASSISTANT:
+            return
+
+        # Extract annotation text (filename or source reference)
+        annotation_text = chunk.text
+        if annotation_text and annotation_text not in last_message.annotations:
+            last_message.annotations.append(annotation_text)
+
+    def _extract_citations_to_annotations(self, chunk: Chunk) -> None:
+        """Extract citations from TEXT chunk metadata and add as annotations."""
+        citations_json = chunk.chunk_metadata.get("citations")
+        if not citations_json:
+            return
+
+        if not self.messages:
+            return
+
+        last_message = self.messages[-1]
+        if last_message.type != MessageType.ASSISTANT:
+            return
+
+        try:
+            citations = json.loads(citations_json)
+        except json.JSONDecodeError:
+            logger.warning("Failed to parse citations JSON: %s", citations_json)
+            return
+
+        max_citation_length = 50
+        for citation in citations:
+            # Prefer document_title, fall back to cited_text excerpt
+            annotation_text = citation.get("document_title")
+            if not annotation_text:
+                cited_text = citation.get("cited_text", "")
+                # Use first N chars of cited_text as fallback
+                if len(cited_text) > max_citation_length:
+                    annotation_text = cited_text[:max_citation_length] + "..."
+                else:
+                    annotation_text = cited_text
+
+            if annotation_text and annotation_text not in last_message.annotations:
+                last_message.annotations.append(annotation_text)
+
+    def _format_message_links(self) -> None:
+        """Format consecutive markdown links in the last message as a bullet list.
+
+        This post-processes the accumulated message text to improve readability
+        when the LLM returns multiple links concatenated without proper spacing.
+        """
+        if not self.messages:
+            return
+
+        last_message = self.messages[-1]
+        if last_message.type != MessageType.ASSISTANT:
+            return
+
+        if last_message.text:
+            last_message.text = _format_consecutive_links_as_list(last_message.text)

appkit_assistant/backend/services/system_prompt_builder.py

@@ -0,0 +1,89 @@
+"""System Prompt Builder service.
+
+Provides unified system prompt construction with MCP tool injection
+for all AI processors.
+"""
+
+import logging
+
+from appkit_assistant.backend.system_prompt_cache import get_system_prompt
+
+logger = logging.getLogger(__name__)
+
+
+class SystemPromptBuilder:
+    """Service for building system prompts with MCP tool injection."""
+
+    # Header for MCP tool selection guidelines
+    MCP_SECTION_HEADER = (
+        "### Tool-Auswahlrichtlinien (Einbettung externer Beschreibungen)"
+    )
+
+    def _build_mcp_section(self, mcp_prompt: str) -> str:
+        """Build the MCP tool selection section.
+
+        Args:
+            mcp_prompt: The MCP tool prompts from servers
+
+        Returns:
+            Formatted MCP section or empty string
+        """
+        if not mcp_prompt:
+            return ""
+        return f"{self.MCP_SECTION_HEADER}\n{mcp_prompt}"
+
+    async def build(self, mcp_prompt: str = "") -> str:
+        """Build the complete system prompt with MCP section.
+
+        Retrieves the base system prompt from cache and injects
+        the MCP tool prompts via the {mcp_prompts} placeholder.
+
+        Args:
+            mcp_prompt: Optional MCP tool prompts from servers
+
+        Returns:
+            Complete formatted system prompt
+        """
+        # Get base system prompt from cache
+        system_prompt_template = await get_system_prompt()
+
+        # Build MCP section
+        mcp_section = self._build_mcp_section(mcp_prompt)
+
+        # Format template with MCP prompts
+        return system_prompt_template.format(mcp_prompts=mcp_section)
+
+    async def build_with_prefix(
+        self,
+        mcp_prompt: str = "",
+        prefix: str = "",
+    ) -> str:
+        """Build system prompt with optional prefix.
+
+        Args:
+            mcp_prompt: Optional MCP tool prompts
+            prefix: Optional prefix to prepend (e.g., for Gemini's leading newlines)
+
+        Returns:
+            Complete formatted system prompt with prefix
+        """
+        prompt = await self.build(mcp_prompt)
+        if prefix:
+            return f"{prefix}{prompt}"
+        return prompt
+
+
+# Singleton instance
+_system_prompt_builder: SystemPromptBuilder | None = None
+
+
+def get_system_prompt_builder() -> SystemPromptBuilder:
+    """Get or create the system prompt builder singleton.
+
+    Returns:
+        The SystemPromptBuilder instance
+    """
+    global _system_prompt_builder
+    if _system_prompt_builder is None:
+        _system_prompt_builder = SystemPromptBuilder()
+    return _system_prompt_builder

appkit_assistant/backend/services/thread_service.py

@@ -1,14 +1,16 @@
 import logging
 import uuid
 
-from appkit_assistant.backend.model_manager import ModelManager
-from appkit_assistant.backend.models import (
+from appkit_assistant.backend.database.models import (
     AssistantThread,
+)
+from appkit_assistant.backend.database.repositories import thread_repo
+from appkit_assistant.backend.model_manager import ModelManager
+from appkit_assistant.backend.schemas import (
     Message,
     ThreadModel,
     ThreadStatus,
 )
-from appkit_assistant.backend.repositories import thread_repo
 from appkit_commons.database.session import get_asyncdb_session
 
 logger = logging.getLogger(__name__)

appkit_assistant/backend/system_prompt_cache.py

@@ -1,9 +1,9 @@
 import asyncio
 import logging
 from datetime import UTC, datetime, timedelta
-from typing import Final
+from typing import Final, Self
 
-from appkit_assistant.backend.repositories import system_prompt_repo
+from appkit_assistant.backend.database.repositories import system_prompt_repo
 from appkit_commons.database.session import get_asyncdb_session
 
 logger = logging.getLogger(__name__)
@@ -25,7 +25,7 @@ class SystemPromptCache:
     _instance: "SystemPromptCache | None" = None
     _lock: asyncio.Lock = asyncio.Lock()
 
-    def __new__(cls) -> "SystemPromptCache":
+    def __new__(cls) -> Self:
         """Ensure singleton pattern."""
         if cls._instance is None:
             cls._instance = super().__new__(cls)

appkit_assistant/components/__init__.py

@@ -1,16 +1,19 @@
-from appkit_assistant.backend.models import Suggestion
 from appkit_assistant.components.composer import composer
+from appkit_assistant.components.file_manager import file_manager
 from appkit_assistant.components.thread import Assistant
 from appkit_assistant.components.message import MessageComponent
-from appkit_assistant.backend.models import (
+from appkit_assistant.backend.database.models import (
+    MCPServer,
+    ThreadStatus,
+)
+from appkit_assistant.backend.schemas import (
     AIModel,
     Chunk,
     ChunkType,
-    MCPServer,
     Message,
     MessageType,
+    Suggestion,
     ThreadModel,
-    ThreadStatus,
     UploadedFile,
 )
 from appkit_assistant.state.thread_list_state import ThreadListState
@@ -34,5 +37,6 @@ __all__ = [
     "ThreadStatus",
     "UploadedFile",
     "composer",
+    "file_manager",
     "mcp_servers_table",
 ]

appkit_assistant/components/composer.py

@@ -3,7 +3,7 @@ from collections.abc import Callable
 import reflex as rx
 
 import appkit_mantine as mn
-from appkit_assistant.backend.models import UploadedFile
+from appkit_assistant.backend.schemas import UploadedFile
 from appkit_assistant.components.tools_modal import tools_popover
 from appkit_assistant.state.thread_state import ThreadState
 
@@ -67,11 +67,14 @@ def submit() -> rx.Component:
             ),
             content="Stoppen",
         ),
-        rx.button(
-            rx.icon("arrow-right", size=18),
-            id="composer-submit",
-            name="composer_submit",
-            type="submit",
+        rx.tooltip(
+            rx.button(
+                rx.icon("arrow-right", size=18),
+                id="composer-submit",
+                name="composer_submit",
+                type="submit",
+            ),
+            content="Absenden",
         ),
     )
 
@@ -137,36 +140,41 @@ def file_upload(show: bool = False) -> rx.Component:
         show & ThreadState.selected_model_supports_attachments,
         rx.tooltip(
             rx.upload.root(
-                rx.box(
-                    rx.icon("paperclip", size=18, color=rx.color("gray", 9)),
-                    cursor="pointer",
-                    padding="8px",
-                    border_radius="8px",
-                    _hover={"background": rx.color("gray", 3)},
+                rx.tooltip(
+                    rx.button(
+                        rx.icon("paperclip", size=17),
+                        cursor="pointer",
+                        variant="ghost",
+                        padding="8px",
+                    ),
+                    content=(
+                        "Dateien hochladen (max. "
+                        f"{ThreadState.max_files_per_thread}, "
+                        f"{ThreadState.max_file_size_mb}MB pro Datei)"
+                    ),
                 ),
                 id="composer_file_upload",
                 accept={
-                    #                "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet": [
-                    #                    ".xlsx"
-                    #                ],
-                    #                "text/csv": [".csv"],
-                    #                "application/vnd.openxmlformats-officedocument."
-                    #                "wordprocessingml.document": [".docx"],
-                    #                "application/vnd.openxmlformats-officedocument."
-                    #                "presentationml.presentation": [".pptx"],
-                    #                "text/markdown": [".md"],
+                    "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet": [  # noqa: E501
+                        ".xlsx"
+                    ],
+                    "text/csv": [".csv"],
+                    "application/vnd.openxmlformats-officedocument."
+                    "wordprocessingml.document": [".docx"],
+                    "application/vnd.openxmlformats-officedocument."
+                    "presentationml.presentation": [".pptx"],
+                    "text/markdown": [".md"],
                     "application/pdf": [".pdf"],
                     "image/png": [".png"],
                     "image/jpeg": [".jpg", ".jpeg"],
                 },
                 multiple=True,
-                max_files=5,
-                max_size=5 * 1024 * 1024,
+                max_size=ThreadState.max_file_size_mb * 1024 * 1024,
                 on_drop=ThreadState.handle_upload(
                     rx.upload_files(upload_id="composer_file_upload")
                 ),
             ),
-            content="Dateien hochladen (max. 5, 5MB pro Datei)",
+            content=f"Dateien hochladen (max. {ThreadState.max_files_per_thread}, {ThreadState.max_file_size_mb}MB pro Datei)",
         ),
         rx.fragment(),
     )
@@ -200,11 +208,36 @@ def choose_model(show: bool = False) -> rx.Component | None:
     )
 
 
+def web_search_toggle() -> rx.Component:
+    """Render web search toggle button."""
+    return rx.cond(
+        ThreadState.selected_model_supports_search,
+        rx.tooltip(
+            rx.button(
+                rx.icon("globe", size=17),
+                cursor="pointer",
+                variant=rx.cond(ThreadState.web_search_enabled, "solid", "ghost"),
+                color_scheme=rx.cond(ThreadState.web_search_enabled, "blue", "accent"),
+                padding="8px",
+                margin_right=rx.cond(
+                    ThreadState.selected_model_supports_attachments, "6px", "14px"
+                ),
+                margin_left="-6px",
+                on_click=ThreadState.toggle_web_search,
+                type="button",
+            ),
+            content="Websuche aktivieren",
+        ),
+        rx.fragment(),
+    )
+
+
 def tools(show: bool = False) -> rx.Component:
     """Render tools button with conditional visibility."""
     return rx.cond(
         show,
         rx.hstack(
+            web_search_toggle(),
             tools_popover(),
             spacing="1",
             align="center",
@@ -220,6 +253,7 @@ def clear(show: bool = True) -> rx.Component | None:
     return rx.tooltip(
         rx.button(
             rx.icon("paintbrush", size=17),
+            cursor="pointer",
             variant="ghost",
             padding="8px",
             on_click=ThreadState.clear,
@@ -244,6 +278,7 @@ class ComposerComponent(rx.ComponentNamespace):
     choose_model = staticmethod(choose_model)
     clear = staticmethod(clear)
     file_upload = staticmethod(file_upload)
+    web_search_toggle = staticmethod(web_search_toggle)
     input = staticmethod(composer_input)
     selected_files_row = staticmethod(selected_files_row)
     submit = staticmethod(submit)