django-spire 0.20.4__py3-none-any.whl → 0.21.1__py3-none-any.whl

django_spire/core/templates/django_spire/navigation/top_navigation.html

@@ -37,49 +37,53 @@
                     </div>
                 {% endblock %}
 
-                {% block notification_icon %}
-                    <div>
-                        {% include 'django_spire/notification/app/element/notification_bell.html' %}
-                    </div>
-                {% endblock %}
+                {% if request.user.is_authenticated %}
+                    {% block notification_icon %}
+                        <div>
+                            {% include 'django_spire/notification/app/element/notification_bell.html' %}
+                        </div>
+                    {% endblock %}
+                {% endif %}
 
-                <div class="dropdown">
-                    <i
-                        class="bi bi-person-circle fs-2 mx-2 cursor-pointer"
-                        id="dropdownMenuButton1"
-                        data-bs-toggle="dropdown"
-                        aria-expanded="false"
-                    >
-                    </i>
-                    <ul class="dropdown-menu py-0 bg-app-layer-one" aria-labelledby="dropdownMenuButton1">
-                        {% if request.user.is_superuser %}
-                            <li class="py-0  ">
-                                <a class="dropdown-item fs--1 bg-app-layer-three-hover"
-                                   href="{% url 'admin:index' %}" target="_blank">
-                                    Admin Panel
+                {% if request.user.is_authenticated %}
+                    <div class="dropdown">
+                        <i
+                            class="bi bi-person-circle fs-2 mx-2 cursor-pointer"
+                            id="dropdownMenuButton1"
+                            data-bs-toggle="dropdown"
+                            aria-expanded="false"
+                        >
+                        </i>
+                        <ul class="dropdown-menu py-0 bg-app-layer-one" aria-labelledby="dropdownMenuButton1">
+                            {% if request.user.is_superuser %}
+                                <li class="py-0">
+                                    <a class="dropdown-item fs--1 bg-app-layer-three-hover"
+                                       href="{% url 'admin:index' %}" target="_blank">
+                                        Admin Panel
+                                    </a>
+                                </li>
+                                <li class="py-0">
+                                    <a class="dropdown-item fs--1 bg-app-layer-three-hover"
+                                       href="{% url 'django_spire:theme:page:dashboard' %}" target="_blank">
+                                        Theme Dashboard
+                                    </a>
+                                </li>
+                            {% endif %}
+                            <li class="py-0">
+                                <a href="{% url 'django_spire:auth:admin:password_change' %}"
+                                   class="dropdown-item fs--1 bg-app-layer-three-hover">
+                                    Change Password
                                 </a>
                             </li>
-                            <li class="py-0  ">
-                                <a class="dropdown-item fs--1 bg-app-layer-three-hover"
-                                   href="{% url 'django_spire:theme:page:dashboard' %}" target="_blank">
-                                    Theme Dashboard
+                            <li class="py-0">
+                                <a href="{% url 'django_spire:auth:redirect:logout' %}"
+                                   class="dropdown-item fs--1 bg-app-layer-three-hover">
+                                    Logout
                                 </a>
                             </li>
-                        {% endif %}
-                        <li class="py-0">
-                            <a href="{% url 'django_spire:auth:admin:password_change' %}"
-                               class="dropdown-item fs--1 bg-app-layer-three-hover">
-                                Change Password
-                            </a>
-                        </li>
-                        <li class="py-0">
-                            <a href="{% url 'django_spire:auth:redirect:logout' %}"
-                               class="dropdown-item fs--1 bg-app-layer-three-hover">
-                                Logout
-                            </a>
-                        </li>
-                    </ul>
-                </div>
+                        </ul>
+                    </div>
+                {% endif %}
 
                 <div class="col-auto d-lg-none">
                     {% include 'django_spire/navigation/mobile_navigation.html' %}

django_spire/core/templates/django_spire/page/full_page.html

@@ -25,7 +25,8 @@
             info_nav_max_width: 600,
             info_nav_min_width: 200,
             info_nav_width: 400,
-            is_mobile: window.innerWidth < 992,
+            is_mobile: false,
+            is_narrow_viewport: false,
             is_resizing_info: false,
             is_resizing_sub: false,
             resize_start_width: 0,
@@ -37,7 +38,36 @@
             sub_nav_min_width: 300,
             sub_nav_width: 300,
 
+            is_touch_device() {
+                return window.matchMedia('(pointer: coarse)').matches || 'ontouchstart' in window;
+            },
+
+            update_viewport_state() {
+                const was_narrow = this.is_narrow_viewport;
+                const is_now_narrow = window.innerWidth < 992;
+                this.is_narrow_viewport = is_now_narrow;
+
+                if (!was_narrow && is_now_narrow) {
+                    this.show_sub_nav = false;
+                    this.show_info_nav = false;
+                }
+
+                if (was_narrow && !is_now_narrow) {
+                    this.$nextTick(() => {
+                        this.show_sub_nav = false;
+                        this.show_info_nav = false;
+                    });
+                }
+
+                if (!this.is_narrow_viewport) {
+                    this.show_info_nav = false;
+                }
+            },
+
             init() {
+                this.is_mobile = this.is_touch_device();
+                this.update_viewport_state();
+
                 const urlParams = new URLSearchParams(window.location.search);
 
                 if (urlParams.has('show_sub_nav')) {
@@ -46,12 +76,12 @@
                     this.show_sub_nav = window.innerWidth >= 992
                 }
 
+                if (window.innerWidth < 992) {
+                    this.show_info_nav = false;
+                }
+
                 window.addEventListener('resize', () => {
-                    this.is_mobile = window.innerWidth < 992
-                    if (this.is_mobile) {
-                        this.show_sub_nav = false
-                        this.show_info_nav = false
-                    }
+                    this.update_viewport_state();
                 })
             },
 
@@ -74,10 +104,18 @@
                 }
             },
 
+            close_info() {
+                this.show_info_nav = false
+            },
+
+            close_sub() {
+                this.show_sub_nav = false
+            },
+
             toggle_info() {
                 this.show_info_nav = !this.show_info_nav
 
-                if (this.is_mobile) {
+                if (this.is_mobile && this.is_narrow_viewport) {
                     this.show_sub_nav = false
                 }
             },
@@ -85,7 +123,7 @@
             toggle_sub() {
                 this.show_sub_nav = !this.show_sub_nav
 
-                if (this.is_mobile) {
+                if (this.is_mobile && this.is_narrow_viewport) {
                     this.show_info_nav = false
                 }
             }
@@ -108,27 +146,20 @@
 
             <div class="row">
                 <div
-                    :class="is_mobile ? '' : 'position-relative col-auto'"
-                    :style="is_mobile ? 'position: fixed; width: 100vw; height: 100vh; left: 0; top: 0; z-index: 1040;' : (sub_nav_has_been_resized ? `width: ${sub_nav_width}px; min-width: ${sub_nav_width}px; max-width: ${sub_nav_width}px;` : `min-width: ${sub_nav_min_width}px;`)"
+                    :class="(is_mobile && is_narrow_viewport) ? '' : 'position-relative col-auto'"
+                    :style="(is_mobile && is_narrow_viewport) ? 'position: fixed; width: 100vw; height: 100vh; left: 0; top: 0; z-index: 1040;' : (sub_nav_has_been_resized ? `width: ${sub_nav_width}px; min-width: ${sub_nav_width}px; max-width: ${sub_nav_width}px;` : `min-width: ${sub_nav_min_width}px;`)"
                     x-ref="sub_nav_container"
                     x-show="has_content($refs.full_page_sub_navigation) && show_sub_nav"
-                    x-transition:enter="side-panel-transition-enter"
-                    x-transition:enter-end="side-panel-transition-enter-end"
-                    x-transition:enter-start="side-panel-transition-enter-start-left"
-                    x-transition:leave="side-panel-transition-leave"
-                    x-transition:leave-end="side-panel-transition-leave-end-left"
-                    x-transition:leave-start="side-panel-transition-leave-start"
+                    x-transition
                 >
                     <div
-                        :style="is_mobile ? 'height: 100vh;' : ''"
+                        :style="(is_mobile && is_narrow_viewport) ? 'height: 100vh;' : ''"
                         class="row sticky-top border-end border-app-primary side-panel overflow-y-auto"
                     >
                         <div class="col">
                             <div class="row pb-2 align-items-center">
                                 <div class="col-auto px-1" style="visibility: hidden;">
-                                    <button class="btn-close-panel" type="button">
-                                        <i class="bi bi-x-lg f5"></i>
-                                    </button>
+                                    {% include 'django_spire/button/primary_button.html' with button_icon='bi bi-x-lg' %}
                                 </div>
                                 <div class="col h5 text-app-primary text-center text-nowrap overflow-hidden text-truncate mb-0" style="min-width: 0;">
                                     {% block full_page_sub_navigation_title %}
@@ -139,18 +170,16 @@
                                     {% endblock %}
                                 </div>
                                 <div class="col-auto px-1">
-                                    <button
-                                        @click="show_sub_nav = false"
-                                        class="btn-close-panel"
-                                        type="button"
-                                    >
-                                        <i class="bi bi-x-lg f5"></i>
-                                    </button>
+                                    {% include 'django_spire/button/primary_button.html' with button_icon='bi bi-x-lg' x_button_click='close_sub()' %}
                                 </div>
                             </div>
 
                             <div class="row">
-                                <div class="col" x-ref="full_page_sub_navigation">
+                                <div
+                                    @click.capture="if (is_narrow_viewport && $event.target.closest('[data-closes-nav]')) { $nextTick(() => { show_sub_nav = false }) }"
+                                    class="col"
+                                    x-ref="full_page_sub_navigation"
+                                >
                                     {% block full_page_sub_navigation %}
                                     {% endblock %}
                                 </div>
@@ -168,7 +197,7 @@
 
                 <div
                     class="panel-toggle-container panel-toggle-container-left"
-                    x-show="has_content($refs.full_page_sub_navigation) && !show_sub_nav && !(is_mobile && show_info_nav)"
+                    x-show="has_content($refs.full_page_sub_navigation) && !show_sub_nav && !((is_mobile && is_narrow_viewport) && show_info_nav)"
                 >
                     {% include 'django_spire/button/primary_button.html' with button_icon='bi bi-chevron-right' x_button_click='toggle_sub()' %}
                 </div>
@@ -183,24 +212,19 @@
 
                 <div
                     class="col-auto panel-toggle-container panel-toggle-container-right"
-                    x-show="has_content($refs.full_page_info_navigation) && !show_info_nav && !(is_mobile && show_sub_nav)"
+                    x-show="has_content($refs.full_page_info_navigation) && !show_info_nav && !((is_mobile && is_narrow_viewport) && show_sub_nav)"
                 >
                     {% include 'django_spire/button/primary_button.html' with button_icon='bi bi-chevron-left' x_button_click='toggle_info()' %}
                 </div>
 
                 <div
-                    :class="is_mobile ? '' : 'position-relative col-auto'"
-                    :style="is_mobile ? 'position: fixed; width: 100vw; height: 100vh; right: 0; top: 0; z-index: 1040;' : `width: ${info_nav_width}px; min-width: ${info_nav_width}px; max-width: ${info_nav_width}px; margin-left: -${info_nav_width}px; z-index: 1040;`"
+                    :class="(is_mobile && is_narrow_viewport) ? '' : 'position-relative col-auto'"
+                    :style="(is_mobile && is_narrow_viewport) ? 'position: fixed; width: 100vw; height: 100vh; right: 0; top: 0; z-index: 1040;' : (show_info_nav ? `width: ${info_nav_width}px; min-width: ${info_nav_width}px; max-width: ${info_nav_width}px; margin-left: -${info_nav_width}px; z-index: 1040;` : 'margin-left: 0px; z-index: 1040;')"
                     x-show="has_content($refs.full_page_info_navigation) && show_info_nav"
-                    x-transition:enter="side-panel-transition-enter"
-                    x-transition:enter-end="side-panel-transition-enter-end"
-                    x-transition:enter-start="side-panel-transition-enter-start-right"
-                    x-transition:leave="side-panel-transition-leave"
-                    x-transition:leave-end="side-panel-transition-leave-end-right"
-                    x-transition:leave-start="side-panel-transition-leave-start"
+                    x-transition
                 >
                     <div
-                        :style="is_mobile ? 'height: 100vh;' : ''"
+                        :style="(is_mobile && is_narrow_viewport) ? 'height: 100vh;' : ''"
                         class="row sticky-top border-start border-app-primary side-panel overflow-y-auto bg-app-layer-one"
                     >
                         <div class="col">
@@ -216,18 +240,16 @@
                                 </div>
 
                                 <div class="col-auto px-1">
-                                    <button
-                                        @click="show_info_nav = false"
-                                        class="btn-close-panel"
-                                        type="button"
-                                    >
-                                        <i class="bi bi-x-lg"></i>
-                                    </button>
+                                    {% include 'django_spire/button/primary_button.html' with button_icon='bi bi-x-lg' x_button_click="close_info()" %}
                                 </div>
                             </div>
 
                             <div class="row">
-                                <div class="col" x-ref="full_page_info_navigation">
+                                <div
+                                    x-on:click.capture="if (is_narrow_viewport) { $nextTick(() => { show_info_nav = false }) }"
+                                    class="col"
+                                    x-ref="full_page_info_navigation"
+                                >
                                     {% block full_page_info_navigation %}
                                     {% endblock %}
                                 </div>

django_spire/knowledge/collection/seeding/seeder.py

@@ -23,8 +23,8 @@ class CollectionSeeder(DjangoModelSeeder):
 
     @classmethod
     def _correct_order(
-            cls,
-            child_collections: list[models.Collection]
+        cls,
+        child_collections: list[models.Collection]
     ) -> list[models.Collection]:
         parent_collections = cls.model_class.objects.parentless()
 

django_spire/knowledge/entry/seeding/seeder.py

@@ -34,9 +34,9 @@ class EntrySeeder(DjangoModelSeeder):
 
     @classmethod
     def seed_database(
-            cls,
-            count: int = 1,
-            fields: dict | None = None
+        cls,
+        count: int = 1,
+        fields: dict | None = None
     ) -> list[models.Entry]:
         entries = super().seed_database(
             count=count,
@@ -44,13 +44,18 @@ class EntrySeeder(DjangoModelSeeder):
         )
 
         cls._correct_order(entries)
-        return cls._set_current_version(entries=entries, count=count)
+        entries = cls._set_current_version(entries=entries, count=count)
+
+        for entry in entries:
+            entry.services.tag.process_and_set_tags()
+
+        return entries
 
     @classmethod
     def _set_current_version(cls, entries: list[models.Entry], count: int = 1):
         entry_versions = EntryVersionSeeder.seed_database(count=count)
 
-        for entry, entry_version in zip(entries, entry_versions):
+        for entry, entry_version in zip(entries, entry_versions, strict=False):
             entry_version.entry = entry
             entry.current_version = entry_version
 

django_spire/knowledge/intelligence/decoders/entry_decoder.py

@@ -1,8 +1,11 @@
 from __future__ import annotations
 
+from typing import TYPE_CHECKING
+
 from dandy import Decoder
 
-from django_spire.knowledge.collection.models import Collection
+if TYPE_CHECKING:
+    from django_spire.knowledge.collection.models import Collection
 
 
 def get_entry_decoder(collection: Collection) -> Decoder:

django_spire/knowledge/intelligence/intel/message_intel.py

@@ -9,5 +9,5 @@ class KnowledgeMessageIntel(BaseMessageIntel):
     body: str
     entries_intel: EntriesIntel
 
-    def content_to_str(self) -> str:
+    def render_to_str(self) -> str:
         return self.body

django_spire/knowledge/intelligence/router.py

@@ -0,0 +1,26 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from django_spire.ai.chat.router import BaseChatRouter
+from django_spire.knowledge.intelligence.workflows.knowledge_workflow import knowledge_search_workflow
+
+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
+
+
+class KnowledgeSearchRouter(BaseChatRouter):
+    def workflow(
+        self,
+        request: WSGIRequest,
+        user_input: str,
+        message_history: MessageHistory | None = None
+    ) -> BaseMessageIntel:
+        return knowledge_search_workflow(
+            request=request,
+            user_input=user_input,
+            message_history=message_history
+        )

django_spire/knowledge/intelligence/workflows/knowledge_workflow.py

@@ -15,15 +15,16 @@ if TYPE_CHECKING:
     from django.core.handlers.wsgi import WSGIRequest
     from dandy.llm.request.message import MessageHistory
 
+
 NO_KNOWLEDGE_MESSAGE_INTEL = DefaultMessageIntel(
     text='Sorry, I could not find any information on that.'
 )
 
 
 def knowledge_search_workflow(
-        request: WSGIRequest,
-        user_input: str,
-        message_history: MessageHistory,
+    request: WSGIRequest,
+    user_input: str,
+    message_history: MessageHistory | None = None,
 ) -> BaseMessageIntel | None:
     collection_decoder = get_collection_decoder()
     collections = collection_decoder.process(user_input).values

django_spire/knowledge/templates/django_spire/knowledge/sub_navigation/item/entry_sub_navigation_item.html

@@ -7,6 +7,7 @@
         {% if AuthController.knowledge.can_view %}
             :href="'{% url "django_spire:knowledge:entry:version:page:editor" pk=0 %}'.replace(0, entry.version_id)"
         {% endif %}
+        data-closes-nav
     >
         <i class="bi bi-file-earmark-text flex-shrink-0"></i>
         <span class="text-truncate ms-1" x-text="entry.name"></span>

django_spire/settings.py

@@ -5,13 +5,20 @@ DJANGO_SPIRE_AUTH_CONTROLLERS = {
 }
 
 # AI Settings
-AI_PERSONA_NAME = 'AI Assistant'
-AI_CHAT_CALLABLE = None
-AI_CHAT_DEFAULT_CALLABLE = None
-AI_SMS_CONVERSATION_DEFAULT_CALLABLE = None
+DJANGO_SPIRE_AI_PERSONA_NAME = 'AI Assistant'
+DJANGO_SPIRE_AI_DEFAULT_CHAT_ROUTER = 'SPIRE'
 
-ORGANIZATION_NAME = 'No Organization Provided'
-ORGANIZATION_DESCRIPTION = 'No Description Provided'
+DJANGO_SPIRE_AI_CHAT_ROUTERS = {
+    'SPIRE': 'django_spire.ai.chat.router.SpireChatRouter',
+}
+
+DJANGO_SPIRE_AI_INTENT_CHAT_ROUTERS = {
+    'KNOWLEDGE_SEARCH': {
+        'INTENT_DESCRIPTION': 'The user is asking about information in the knowledge base.',
+        'REQUIRED_PERMISSION': 'django_spire_knowledge.view_collection',
+        'CHAT_ROUTER': 'django_spire.knowledge.intelligence.router.KnowledgeSearchRouter',
+    },
+}
 
 # Theme Settings
 DJANGO_SPIRE_DEFAULT_THEME = 'default-light'

{django_spire-0.20.4.dist-info → django_spire-0.21.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-spire
-Version: 0.20.4
+Version: 0.21.1
 Summary: A project for Django Spire
 Author-email: Brayden Carlson <braydenc@stratusadv.com>, Nathan Johnson <nathanj@stratusadv.com>
 License: Copyright (c) 2024 Stratus Advanced Technologies and Contributors.