django-spire 0.18.3__py3-none-any.whl → 0.19.1__py3-none-any.whl

django_spire/ai/admin.py

@@ -35,6 +35,7 @@ class AiUsageAdmin(AiUsageAdminMixin):
             was_successful: bool | None = None,
     ) -> str:
         was_successful_filter = '' if was_successful is None else f'&was_successful__exact={int(was_successful)}'
+
         url = (
                 reverse("admin:django_spire_ai_aiinteraction_changelist")
                 + "?"

django_spire/ai/chat/apps.py

@@ -1,9 +1,6 @@
 from __future__ import annotations
 
 from django.apps import AppConfig
-from django.conf import settings
-
-from django_spire.consts import AI_CHAT_WORKFLOW_CLASS_SETTINGS_NAME
 from django_spire.utils import check_required_apps
 
 
@@ -20,11 +17,7 @@ class AiChatConfig(AppConfig):
         },
     )
 
-    REQUIRED_APPS = ('django_spire_ai',)
+    REQUIRED_APPS = ('django_spire_ai', 'django_spire_ai_context')
 
     def ready(self) -> None:
-        if not isinstance(getattr(settings, AI_CHAT_WORKFLOW_CLASS_SETTINGS_NAME), str):
-            message = f'"{AI_CHAT_WORKFLOW_CLASS_SETTINGS_NAME}" must be set in the django settings when using "{self.label}".'
-            raise TypeError(message)
-
         check_required_apps(self.label)

django_spire/ai/chat/intelligence/decoders/tools.py

@@ -0,0 +1,29 @@
+from __future__ import annotations
+
+from typing import Callable, TYPE_CHECKING
+
+from dandy import Decoder
+
+from django_spire.auth.controller.controller import AppAuthController
+from django_spire.knowledge.intelligence.workflows.knowledge_workflow import knowledge_search_workflow
+
+if TYPE_CHECKING:
+    from django.core.handlers.wsgi import WSGIRequest
+
+
+def generate_intent_decoder(
+    request: WSGIRequest,
+    default_callable: Callable | None = None
+) -> Decoder:
+    intent_dict = {}
+
+    if AppAuthController(app_name='knowledge', request=request).can_view():
+        intent_dict['The user is looking for information or knowledge on something.'] = knowledge_search_workflow
+
+    if default_callable is not None:
+        intent_dict['None of the above choices match the user\'s intent'] = default_callable
+
+    return Decoder(
+        mapping_keys_description='Intent of the User\'s Request',
+        mapping=intent_dict
+    )

django_spire/ai/chat/intelligence/prompts.py

@@ -2,18 +2,24 @@ from __future__ import annotations
 
 from dandy import Prompt
 
-from django_spire.conf import settings
+from django_spire.ai.context.intelligence.prompts.organization_prompts import (
+    organization_info_prompt
+)
 
 
-def organization_prompt() -> Prompt:
+def chat_system_prompt() -> Prompt:
     return (
         Prompt()
-        .text(f'You are a chat assistant for a company called "{settings.ORGANIZATION_NAME}".')
+        .text(
+            'You are a chat assistant, please use the organization information below for answering questions.'
+        )
         .line_break()
-        .text(f'Organization Description: "{settings.ORGANIZATION_DESCRIPTION}"')
+        .prompt(organization_info_prompt())
         .line_break()
         .text('Make sure to follow the rules below')
-        .list([
-            'Do not talk about being an AI at all to maintain the illusion of being a human assistant.',
-        ])
+        .list(
+            [
+                'Do not talk about being an AI at all to maintain the illusion of being a human assistant.',
+            ]
+        )
     )

django_spire/ai/chat/intelligence/workflows/chat_workflow.py

@@ -1,71 +1,69 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Callable
 
-from dandy import Prompt, Bot
+from dandy import Bot
 from dandy.recorder import recorder_to_html_file
 
-from django_spire.ai.chat.intelligence.bots.chat_bot import ChatBot
-from django_spire.ai.chat.intelligence.maps.intent_llm_map import IntentDecoder
-from django_spire.ai.chat.intelligence.prompts import organization_prompt
-from django_spire.ai.chat.message_intel import DefaultMessageIntel
-from django_spire.auth.controller.controller import AppAuthController
+from django_spire.ai.chat.intelligence.decoders.tools import generate_intent_decoder
+from django_spire.ai.chat.message_intel import BaseMessageIntel, DefaultMessageIntel
+from django_spire.ai.decorators import log_ai_interaction_from_recorder
 
 if TYPE_CHECKING:
     from dandy.llm.request.message import MessageHistory
     from django.core.handlers.wsgi import WSGIRequest
 
-    from django_spire.ai.chat.message_intel import BaseMessageIntel
 
+def SpireChatWorkflow(
+    request: WSGIRequest,
+    user_input: str,
+    message_history: MessageHistory | None = None
+) -> BaseMessageIntel:
+    return chat_workflow(
+        request=request,
+        user_input=user_input,
+        message_history=message_history
+    )
+
+
+def default_chat_response(
+    request: WSGIRequest,
+    user_input: str,
+    message_history: MessageHistory | None = None
+) -> BaseMessageIntel:
+    bot = Bot()
+    return bot.llm.prompt_to_intel(
+        prompt=user_input,
+        intel_class=DefaultMessageIntel,
+        message_history=message_history,
+    )
+
+
+@recorder_to_html_file('spire_ai_chat_workflow')
+def chat_workflow(
+    request: WSGIRequest,
+    user_input: str,
+    message_history: MessageHistory | None = None
+) -> BaseMessageIntel:
+    intent_decoder = generate_intent_decoder(
+        request=request,
+        default_callable=default_chat_response,
+    )
+
+    intent_process = intent_decoder.process(user_input, max_return_values=1)[0]
+
+    @log_ai_interaction_from_recorder(request.user)
+    def run_workflow_process(callable_: Callable) -> BaseMessageIntel | None:
+        return callable_(
+            request=request,
+            user_input=user_input,
+            message_history=message_history,
+        )
 
-class SpireChatWorkflow:
-    @staticmethod
-    def _generate_intent_decoder(request: WSGIRequest) -> IntentDecoder:
-        from django_spire.knowledge.intelligence.workflows.knowledge_workflow import KnowledgeWorkflow
-
-        intent_dict = {}
-
-        if AppAuthController(app_name='knowledge', request=request).can_view():
-            intent_message = (
-                'The user is looking for information or knowledge on something.'
-            )
-
-            intent_dict[intent_message] = KnowledgeWorkflow
-
-        intent_dict['None of the above choices match the user\'s intent'] = None
-
-        decoder = IntentDecoder()
-        decoder.mapping = intent_dict
-        return decoder
-
-    @staticmethod
-    @recorder_to_html_file('spire_chat_workflow')
-    def process(
-        request: WSGIRequest,
-        user_input: str,
-        message_history: MessageHistory | None = None
-    ) -> BaseMessageIntel:
-        intent_decoder = SpireChatWorkflow._generate_intent_decoder(request)
-        intents = intent_decoder.process(user_input, max_return_values=1)
-
-        chat_bot = ChatBot()
+    message_intel = run_workflow_process(intent_process)
 
-        if intents[0] is None:
-            return chat_bot.llm.prompt_to_intel(
-                prompt=user_input,
-                intel_class=DefaultMessageIntel,
-                message_history=message_history,
-                postfix_system_prompt=organization_prompt()
-            )
+    if not isinstance(message_intel, BaseMessageIntel):
+        message = f'{intent_process.__qualname__} must return an instance of a {BaseMessageIntel.__name__} sub class.'
+        raise TypeError(message)
 
-        return chat_bot.llm.prompt_to_intel(
-            prompt=(
-                Prompt()
-                .text(f'User Input: {user_input}')
-                .line_break()
-                .text(intents[0].process(user_input))
-            ),
-            intel_class=DefaultMessageIntel,
-            message_history=message_history,
-            postfix_system_prompt=organization_prompt()
-        )
+    return message_intel

django_spire/ai/chat/models.py

@@ -143,7 +143,8 @@ class ChatMessage(HistoryModelMixin):
         return MessageResponse(
             type=MessageResponseType(self.response_type),
             sender=self.sender,
-            message_intel=self.intel
+            message_intel=self.intel,
+            message_timestamp=self.created_datetime.strftime('%b %d, %Y at %I:%M %p')
         )
 
     class Meta:

django_spire/ai/chat/querysets.py

@@ -7,9 +7,7 @@ from django_spire.history.querysets import HistoryQuerySet
 
 class ChatQuerySet(HistoryQuerySet):
     def by_user(self, user):
-        return self.filter(
-            user=user,
-        )
+        return self.filter(user=user)
 
     def get_empty_or_create(self, user):
         try:

django_spire/ai/chat/responses.py

@@ -18,12 +18,14 @@ class MessageResponse:
     type: MessageResponseType
     sender: str
     message_intel: BaseMessageIntel
+    message_timestamp: str | None = None
     synthesis_speech: bool = False
 
     def _render_template_to_html_string(self, template: str, context_data: dict[str, Any] | None = None) -> str:
         return render_to_string(
             template_name=template,
             context={
+                'message_timestamp': self.message_timestamp,
                 'sender': self.sender,
                 'message_intel': self.message_intel,
                 'synthesis_speech': self.synthesis_speech,
@@ -63,6 +65,9 @@ class MessageResponseGroup:
     def render_to_html_string(self, context_data: dict[str, Any] | None = None) -> str:
         html_string = ''
 
+        context_data = context_data or {}
+        context_data['is_loading'] = context_data.get('is_loading', False)
+
         for message_response in self.message_responses:
             html_string += message_response.render_to_html_string(context_data)
 

django_spire/ai/chat/templates/django_spire/ai/chat/card/chat_card.html

@@ -6,8 +6,8 @@
 
 {% block card_content %}
     <div class="row">
-        <div class="col-12 vh-minus-nav">
-            {% include 'django_spire/ai/chat/widget/chat_widget.html' %}
+        <div class="col-12 vh-minus-top-nav">
+            {% include 'django_spire/ai/chat/widget/selection_widget.html' %}
         </div>
     </div>
 {% endblock %}

django_spire/ai/chat/templates/django_spire/ai/chat/dropdown/ellipsis_dropdown.html

@@ -11,7 +11,7 @@
 {% endblock %}
 
 {% block dropdown_content %}
-    {% include 'django_spire/dropdown/element/dropdown_link_element.html' with x_click="enable_rename_chat()" link_text='Rename' link_css='text-start' %}
+    {% include 'django_spire/dropdown/element/dropdown_link_element.html' with x_click="enable_rename_chat(); toggle_dropdown()" link_text='Rename' link_css='text-start' %}
 
     {% url 'django_spire:ai:chat:template:confirm_delete' pk=recent_chat.id as delete_url %}
     {% include 'django_spire/dropdown/element/ellipsis_dropdown_modal_link_element.html' with view_url=delete_url link_text='Delete' link_css='text-app-danger text-start' %}

django_spire/ai/chat/templates/django_spire/ai/chat/element/recent_chat_select_element.html

@@ -1,84 +1,122 @@
 <div
-    class="row mb-2"
+    class="mb-1"
     x-data="{
         can_rename_chat: false,
         chat_name: '{{ recent_chat.name|escapejs }}',
+        is_active: false,
         new_chat_name: '{{ recent_chat.name|escapejs }}',
         show_recent_chat: true,
 
+        cancel_rename_chat() {
+            this.new_chat_name = this.chat_name
+            this.can_rename_chat = false
+        },
+
+        confirm_rename_chat() {
+            this.rename_chat()
+        },
+
         disable_rename_chat() {
             this.can_rename_chat = false
         },
+
         enable_rename_chat() {
             this.can_rename_chat = true
+
+            $nextTick(() => {
+                let input = this.$el.querySelector('input')
+                if (input) input.focus()
+            })
         },
+
         async rename_chat() {
+            if (this.new_chat_name.trim() === '') {
+                this.new_chat_name = this.chat_name
+                this.can_rename_chat = false
+                return
+            }
+
             let response = await django_glue_fetch(
                 '{% url "django_spire:ai:chat:json:rename" pk=recent_chat.pk %}',
                 {payload: {new_name: this.new_chat_name}}
             )
 
             let type = response.type
+
             if (type === 'success') {
                 this.chat_name = this.new_chat_name
             } else {
                 $dispatch('notify', {'type': type, 'message': response.message})
+                this.new_chat_name = this.chat_name
             }
 
             this.can_rename_chat = false
         }
     }"
     x-show="show_recent_chat"
+    @chat-activated.window="is_active = ($event.detail.chat_id === {{ recent_chat.id }})"
+    @click.outside="if (can_rename_chat) cancel_rename_chat()"
     @deleted_chat.window="if (show_recent_chat) show_recent_chat = $event.detail !== {{ recent_chat.id }}"
 >
-    <div class="col-12">
-        <div class="d-flex flex-wrap justify-content-between btn shadow-sm btn-sm w-100 text-muted">
-            <div
-                x-show="!can_rename_chat"
-                class="col cursor-pointer px-0 text-start"
-                @click="() => {
-                    load_chat({{ recent_chat.id }})
-                    close_chat_select()
+    <div
+        :class="is_active ? 'bg-app-primary-soft' : ''"
+        class="d-flex align-items-center justify-content-between px-2 py-1 rounded"
+        data-chat-id="{{ recent_chat.id }}"
+        style="transition: background-color 0.15s ease;"
+    >
+        <div class="d-flex align-items-center flex-grow-1" style="min-width: 0; width: 0;">
+            <i
+                :class="{
+                    'bi-chat-dots-fill': !can_rename_chat,
+                    'bi-chat-dots': can_rename_chat,
+                    'text-app-primary': is_active || can_rename_chat,
+                    'text-muted': !is_active && !can_rename_chat
                 }"
-            >
-                <i class="bi bi-chat-dots-fill"></i>
-                <span x-text="chat_name.length > 24 ? chat_name.slice(0, 24) + '...' : chat_name"></span>
-            </div>
-            <div
-                x-show="can_rename_chat"
-                class="col px-0 text-start"
-            >
-                <div class="d-flex flex-wrap align-items-center">
-                    <i class="col-auto bi bi-chat-dots-fill"></i>
+                class="bi me-2"
+                style="flex-shrink: 0;"
+            ></i>
+
+            <template x-if="!can_rename_chat">
+                <div @click="$dispatch('load-chat', {chat_id: {{ recent_chat.id }}})" class="cursor-pointer flex-grow-1 text-truncate">
+                    <span class="px-2 fs-7" x-text="chat_name"></span>
+                </div>
+            </template>
+
+            <template x-if="can_rename_chat">
+                <div class="d-flex align-items-center position-relative w-100 py-0 px-1" style="flex: 1 1 0; min-width: 0;">
                     <input
-                        x-model="new_chat_name"
-                        class="col form-control d-inline p-0 mx-1 fs-7"
-                        type="text"
-                        style="max-width: 150px;"
-                        @keydown.enter="rename_chat()"
-                        @keydown.esc="disable_rename_chat()"
                         @focus="$el.select()"
+                        @keydown.enter="confirm_rename_chat()"
+                        @keydown.esc="cancel_rename_chat()"
+                        class="form-control ps-1 pe-5 py-0 fs-7"
+                        type="text"
+                        x-init="$el.focus()"
+                        x-model="new_chat_name"
                     />
-                    <i
-                        class="col-auto bi bi-check fs-5 btn-hover"
-                        @click="rename_chat()"
-                        title="Confirm"
-                    ></i>
-                    <i
-                        class="col-auto bi bi-x fs-5 btn-hover"
-                        @click="disable_rename_chat()"
-                        title="Cancel"
-                    ></i>
-                </div>
-            </div>
-            {% if not recent_chat.is_empty %}
-                <div
-                    x-show="!can_rename_chat"
-                    class="col-auto px-0 text-end"
-                >
-                    {% include 'django_spire/ai/chat/dropdown/ellipsis_dropdown.html' %}
+                    <div class="d-flex align-items-center position-absolute g-2" style="pointer-events: none; right: 8px;">
+                        <i
+                            @click="confirm_rename_chat()"
+                            @mouseenter="$el.style.opacity = '0.75'"
+                            @mouseleave="$el.style.opacity = '1'"
+                            class="bi bi-check cursor-pointer text-success"
+                            style="pointer-events: auto; transition: opacity 0.15s ease;"
+                            title="Confirm"
+                        ></i>
+                        <i
+                            @click="cancel_rename_chat()"
+                            @mouseenter="$el.style.opacity = '0.75'"
+                            @mouseleave="$el.style.opacity = '1'"
+                            class="bi bi-x cursor-pointer text-danger pe-1"
+                            style="pointer-events: auto; transition: opacity 0.15s ease;"
+                            title="Cancel"
+                        ></i>
+                    </div>
                 </div>
-            {% endif %}
+            </template>
+        </div>
+
+        <div class="ms-2" style="flex-shrink: 0; visibility: hidden;" :style="can_rename_chat ? '' : 'visibility: visible;'">
+            {% include 'django_spire/ai/chat/dropdown/ellipsis_dropdown.html' %}
         </div>
     </div>
 </div>

django_spire/ai/chat/templates/django_spire/ai/chat/message/loading_response_message.html

@@ -1,11 +1,13 @@
 {% load spire_core_tags %}
 
 {% generate_id as response_message_intel_id %}
+
 <div
     x-data="{
         show_loading: false,
         show_reading: true,
         show_typing: false,
+
         init() {
             this.response_message.render_outer($refs.loading_response_message)
 
@@ -14,6 +16,7 @@
             setTimeout(() => {this.show_reading = false}, 4000)
             setTimeout(() => {this.show_typing = true}, 4000)
         },
+
         response_message: new ViewGlue(
             '{% url "django_spire:ai:chat:message:response:new" %}',
             {
@@ -27,18 +30,20 @@
     x-cloak
 >
     {{ message_intel.text|json_script:response_message_intel_id }}
+
     <div x-ref="loading_response_message" class="row mt-2 pb-3">
         <div class="col-auto align-self-center">
             <div class="row align-items-center">
                 <div class="col-12 fs--1">
                     {{ chat_workflow_name }}
                 </div>
-                <div class="col-12 ps-4 pt-2">
-                    <span class="spinner-border spinner-border-sm" role="status">
+
+                <div class="col-12 px-3 pt-2">
+                    <span class="spinner-border spinner-border-sm text-muted" role="status">
                         <span class="visually-hidden">Loading...</span>
                     </span>
-                    <span x-show="show_reading">Reading...</span>
-                    <span x-show="show_typing">Typing...</span>
+                    <span class="text-muted" x-show="show_reading">Reading...</span>
+                    <span class="text-muted" x-show="show_typing">Typing...</span>
                 </div>
             </div>
         </div>

django_spire/ai/chat/templates/django_spire/ai/chat/message/message.html

@@ -2,50 +2,50 @@
 
 {% block message %}
     {% generate_id as message_intel_id %}
+
     <div
         class="col-auto mb-1 {{ message_class }}"
-        @mouseover="show_message_menu = true"
         @mouseleave="show_message_menu = false"
+        @mouseover="show_message_menu = true"
+        style="max-width: 70%;"
         x-data="{
-            show_message_menu: false,
             message_intel_str: '',
+            show_message_menu: false,
+
             init() {
                 this.message_intel_str = JSON.parse(document.getElementById('{{ message_intel_id }}').textContent)
-                {% if synthesis_speech %}this.start_speaking(this.message_intel_str){% endif %}
-                $el.scrollIntoView({behavior: 'smooth'})
+                {% if synthesis_speech %}$dispatch('speak', {text: this.message_intel_str}){% endif %}
+                {% if not is_loading %}$el.scrollIntoView({behavior: 'smooth'}){% endif %}
             }
         }"
     >
-        <div class="container-fluid">
-            {{ message_intel.content_to_str|json_script:message_intel_id }}
-            <div class="row">
-                <div class="col fs--1 {{ sender_class }}">
-                    {% block message_sender %}
-                        {{ sender }}
-                    {% endblock %}
-                </div>
-            </div>
-            <div class="row">
-                <div class="col-12 px-3 py-2 rounded-3 shadow-sm {{ content_class|default:'border' }}">
-                    {% block message_content %}
-                        {{ message_intel.content_to_str|linebreaksbr }}
-                    {% endblock %}
-                </div>
+        {{ message_intel.content_to_str|json_script:message_intel_id }}
+
+        <div class="px-1 text-muted {{ sender_class }}" style="font-size: 0.7rem;">
+            {% block message_sender %}
+                <span class="fw-semibold">{{ sender }}</span>
+            {% endblock %}
+
+            {% if message_timestamp %}
+                <span>- {{ message_timestamp }}</span>
+            {% endif %}
+        </div>
+
+        <div class="d-inline-block px-2 py-1 rounded-3 shadow-sm {{ content_class|default:'border' }}">
+            {% block message_content %}
+                {{ message_intel.content_to_str|linebreaksbr }}
+            {% endblock %}
+        </div>
+
+        <div
+            :class="show_message_menu ? 'opacity-100' : 'opacity-0'"
+            class="d-flex justify-content-end"
+        >
+            <div @click="$dispatch('speak', {text: message_intel_str})" class="py-1 px-2 cursor-pointer">
+                <i class="bi bi-soundwave"></i>
             </div>
-            <div
-                class="row justify-content-end"
-                :class="show_message_menu ? 'opacity-100' : 'opacity-0'"
-            >
-                <div class="col-auto px-0">
-                    <div @click="start_speaking(message_intel_str)" class="py-1 px-2 cursor-pointer">
-                        <i class="bi bi-soundwave"></i>
-                    </div>
-                </div>
-                <div class="col-auto pe-0 ps-1">
-                    <div @click="send_chat({message_body: message_intel_str})" class="py-1 px-2 cursor-pointer">
-                        <i class="bi bi-repeat"></i>
-                    </div>
-                </div>
+            <div @click="$dispatch('send-message', {message_body: message_intel_str})" class="py-1 px-2 cursor-pointer">
+                <i class="bi bi-repeat"></i>
             </div>
         </div>
     </div>

django_spire/ai/chat/templates/django_spire/ai/chat/message/request_message.html

@@ -1,14 +1,11 @@
-<div
-    class="row justify-content-end ps-4 ps-lg-5"
-    x-data="{
+<div class="row justify-content-end ps-4 ps-lg-5" data-message-chat-id="{{ chat_id }}" {% if not is_loading %}x-data="{
         show_message: false,
+
         init() {
             setTimeout(() => this.show_message = true, 500)
             setTimeout(() => $el.scrollIntoView({behavior: 'smooth'}), 550)
         }
-    }"
-    x-show="show_message"
-    x-transition
->
-    {% include message_intel.template with sender_class="text-end" speech_synthesis_class='justify-content-end' content_class="bg-app-layer-three" %}
+    }" x-show="show_message" x-transition{% endif %}>
+
+    {% include message_intel.template with sender_class="text-end" speech_synthesis_class='justify-content-end' content_class="bg-app-primary-soft" %}
 </div>

django_spire/ai/chat/templates/django_spire/ai/chat/message/response_message.html

@@ -1,14 +1,18 @@
 <div
-    x-data="{
-        show_message: false,
-        init() {
-            setTimeout(() => this.show_message = true, 300)
-            setTimeout(() => $el.scrollIntoView({behavior: 'smooth'}), 350)
-        }
-    }"
     class="row justify-content-start pe-4 pe-lg-5"
-    x-show="show_message"
-    x-transition
+    data-message-chat-id="{{ chat_id }}"
+    {% if not is_loading %}
+        x-data="{
+            show_message: false,
+
+            init() {
+                setTimeout(() => this.show_message = true, 300)
+                setTimeout(() => $el.scrollIntoView({behavior: 'smooth'}), 350)
+            }
+        }"
+        x-show="show_message"
+        x-transition
+    {% endif %}
 >
-    {% include message_intel.template with content_class="bg-app-alt-layer-three" %}
+    {% include message_intel.template with content_class="bg-app-warning-soft" %}
 </div>