django-spire 0.21.0__tar.gz → 0.22.0__tar.gz

{django_spire-0.21.0 → django_spire-0.22.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-spire
-Version: 0.21.0
+Version: 0.22.0
 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.
@@ -49,7 +49,7 @@ Requires-Dist: beautifulsoup4>=4.14.2
 Requires-Dist: boto3>=1.34.0
 Requires-Dist: botocore>=1.34.0
 Requires-Dist: crispy-bootstrap5==2024.10
-Requires-Dist: dandy>=1.3.3
+Requires-Dist: dandy>=1.3.5
 Requires-Dist: django>=5.1.8
 Requires-Dist: django-crispy-forms==2.3
 Requires-Dist: django-glue>=0.8.1

{django_spire-0.21.0 → django_spire-0.22.0}/django_spire/ai/chat/templates/django_spire/ai/chat/element/recent_chat_select_element.html

@@ -77,7 +77,7 @@
             ></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">
+                <div @click="$dispatch('load-chat', {chat_id: {{ recent_chat.id }}})" class="cursor-pointer flex-grow-1 text-truncate" data-closes-nav>
                     <span class="px-2 fs-7" x-text="chat_name"></span>
                 </div>
             </template>

{django_spire-0.21.0 → django_spire-0.22.0}/django_spire/ai/chat/templates/django_spire/ai/chat/widget/selection_widget.html

@@ -21,7 +21,7 @@
 
     <div class="col-12 px-0">
         <div class="px-2 pb-3">
-            <button @click="$dispatch('load-chat', {chat_id: 0})" class="btn btn-app-primary-outlined p-1 w-100">
+            <button @click="$dispatch('load-chat', {chat_id: 0})" class="btn btn-app-primary-outlined p-1 w-100" data-closes-nav>
                 <i class="bi bi-plus-lg me-2"></i>New Chat
             </button>
         </div>

{django_spire-0.21.0 → django_spire-0.22.0}/django_spire/consts.py

@@ -1,4 +1,4 @@
-__VERSION__ = '0.21.0'
+__VERSION__ = '0.22.0'
 
 MAINTENANCE_MODE_SETTINGS_NAME = 'MAINTENANCE_MODE'
 

{django_spire-0.21.0 → django_spire-0.22.0}/django_spire/core/static/django_spire/css/app-navigation.css

@@ -82,14 +82,14 @@
 }
 
 .side-navigation-fade-bottom {
-    background: linear-gradient(to top, var(--app-side-navigation-bg-color) 0%, var(--app-side-navigation-bg-color) 50%, transparent 100%);
-    height: 100px;
+    background: linear-gradient(to top, var(--app-side-navigation-bg-color) 0%, transparent 100%);
+    height: 60px;
     pointer-events: none;
 }
 
 .side-navigation-fade-top {
-    background: linear-gradient(to bottom, var(--app-side-navigation-bg-color) 0%, var(--app-side-navigation-bg-color) 50%, transparent 100%);
-    height: 75px;
+    background: linear-gradient(to bottom, var(--app-side-navigation-bg-color) 0%, transparent 100%);
+    height: 60px;
     pointer-events: none;
 }
 

{django_spire-0.21.0 → django_spire-0.22.0}/django_spire/core/static/django_spire/css/app-side-panel.css

@@ -5,25 +5,6 @@
     top: var(--app-top-navigation-height);
 }
 
-.btn-close-panel {
-    align-items: center;
-    background: transparent;
-    border: none;
-    border-radius: 50%;
-    color: var(--app-primary);
-    cursor: pointer;
-    display: flex;
-    height: 28px;
-    justify-content: center;
-    transition: background 0.2s ease, color 0.2s ease;
-    width: 28px;
-}
-
-.btn-close-panel:hover {
-    background: var(--app-primary);
-    color: var(--app-default-button-text-color);
-}
-
 .panel-toggle-container {
     height: 30px;
     position: fixed;
@@ -50,32 +31,6 @@
     width: 30px !important;
 }
 
-.side-panel-transition-enter {
-    transition: opacity 0.3s ease;
-}
-
-.side-panel-transition-enter-start-left,
-.side-panel-transition-enter-start-right {
-    opacity: 0;
-}
-
-.side-panel-transition-enter-end {
-    opacity: 1;
-}
-
-.side-panel-transition-leave {
-    transition: opacity 0.3s ease;
-}
-
-.side-panel-transition-leave-start {
-    opacity: 1;
-}
-
-.side-panel-transition-leave-end-left,
-.side-panel-transition-leave-end-right {
-    opacity: 0;
-}
-
 @media (min-width: 992px) {
     .panel-toggle-container-left {
         left: var(--app-side-navigation-width);

{django_spire-0.21.0/django_spire/core/tags → django_spire-0.22.0/django_spire/core/tag}/intelligence/tag_set_bot.py

@@ -13,10 +13,11 @@ class TagSetBot(Bot):
         Prompt()
         .list([
             'Make sure to have enough tags to properly cover all the provided content.',
-            'Focus on tagging the words in the content',
-            'Only add additional words that are very relevant to the content.'
-            'Use spaces to separate words in tags',
-            'Include known acronyms along with the full tags.',
+            'Include tags that help searchability.',
+            'Focus on tagging the words in the content.',
+            'Only add additional words that are very relevant to the content.',
+            'Use spaces to separate words in tags.',
+            'Include common acronyms in addition to the tags.',
         ])
     )
 

django_spire-0.22.0/django_spire/core/tag/mixins.py

@@ -0,0 +1,23 @@
+from django.db import models
+
+from django_spire.core.tag.models import Tag
+from django_spire.core.tag.tools import simplify_and_weight_tag_set_to_dict, simplify_tag_set
+
+
+class TagModelMixin(models.Model):
+    tags = models.ManyToManyField(Tag, related_name='+', null=True, blank=True, editable=False)
+
+    class Meta:
+        abstract = True
+
+    @property
+    def tag_set(self) -> set[str]:
+        return set(self.tags.values_list('name', flat=True))
+
+    @property
+    def simplified_tag_set(self) -> set[str]:
+        return simplify_tag_set(self.tag_set)
+
+    @property
+    def simplified_and_weighted_tag_dict(self) -> dict[str, int]:
+        return simplify_and_weight_tag_set_to_dict(self.tag_set)

{django_spire-0.21.0/django_spire/core/tags → django_spire-0.22.0/django_spire/core/tag}/models.py

@@ -3,7 +3,7 @@ from typing import Sequence, Self
 from django.db import models
 from django.utils.text import slugify
 
-from django_spire.core.tags.querysets import TagQuerySet
+from django_spire.core.tag.querysets import TagQuerySet
 
 
 class Tag(models.Model):

django_spire-0.22.0/django_spire/core/tag/service/tag_service.py

@@ -0,0 +1,72 @@
+from abc import abstractmethod, ABC
+from typing import Generic
+
+from django.db.models import QuerySet
+
+from django_spire.contrib.constructor.django_model_constructor import TypeDjangoModel
+from django_spire.contrib.service import BaseDjangoModelService
+from django_spire.core.tag import tools
+from django_spire.core.tag.models import Tag
+from django_spire.core.tag.tools import get_score_percentage_from_tag_set_weighted
+
+
+class BaseTagService(
+    BaseDjangoModelService[TypeDjangoModel],
+    ABC,
+    Generic[TypeDjangoModel]
+):
+    obj: TypeDjangoModel
+
+    @abstractmethod
+    def process_and_set_tags(self):
+        raise NotImplementedError
+
+    def add_tags_from_tag_set(self, tag_set: set[str]):
+        self._update_global_tags_from_set(tag_set)
+
+        self.obj.tags.add(*Tag.objects.in_tag_set(tag_set))
+
+    def clear_tags(self):
+        self.obj.tags.clear()
+
+    def get_matching_tags_from_tag_set(self, tag_set: set[str]) -> QuerySet:
+        return self.obj.tags.in_tag_set(tag_set)
+
+    def get_matching_percentage_of_tag_set(self, tag_set: set[str]) -> float:
+        return tools.get_matching_a_percentage_from_tag_sets(tag_set, self.obj.tag_set)
+
+    def get_matching_percentage_of_model_tags_from_tag_set(self, tag_set: set[str]) -> float:
+        return tools.get_matching_b_percentage_from_tag_sets(tag_set, self.obj.tag_set)
+
+    def get_score_percentage_from_tag_set_weighted(self, tag_set: set[str]) -> float:
+        return get_score_percentage_from_tag_set_weighted(
+            tag_set_actual=tag_set,
+            tag_set_reference=self.obj.tag_set
+        )
+
+    def get_simplified_and_weighted_tag_dict_above_minimum(self, minimum_weight: int = 1) -> dict[str, int]:
+        above_minimum_tag_dict = self.obj.simplified_and_weighted_tag_dict
+
+        return {
+            tag: weight
+            for tag, weight in above_minimum_tag_dict.items()
+            if weight >= minimum_weight
+        }
+
+    def has_tags_in_tag_set(self, tag_set: set[str]) -> bool:
+        return self.obj.tag_set.issuperset(tag_set)
+
+    def remove_tags_by_tag_set(self, tag_set: set[str]):
+        tag_objects = Tag.objects.in_tag_set(tag_set)
+
+        self.obj.tags.remove(*tag_objects)
+
+    def set_tags_from_tag_set(self, tag_set: set[str]):
+        self._update_global_tags_from_set(tag_set)
+
+        tag_objects = Tag.objects.in_tag_set(tag_set)
+        self.obj.tags.set(tag_objects)
+
+    @staticmethod
+    def _update_global_tags_from_set(tag_set: set[str]):
+        Tag.add_tags([Tag(name=tag) for tag in tag_set])

{django_spire-0.21.0/django_spire/core/tags → django_spire-0.22.0/django_spire/core/tag}/tests/test_intelligence.py

@@ -1,6 +1,6 @@
 from unittest import TestCase
 
-from django_spire.core.tags.intelligence.tag_set_bot import TagSetBot
+from django_spire.core.tag.intelligence.tag_set_bot import TagSetBot
 
 TEST_INPUT = """
     I love reading books about science fiction, fantasy, and adventure, especially ones

django_spire-0.22.0/django_spire/core/tag/tests/test_tags.py

@@ -0,0 +1,102 @@
+from django.test import TestCase
+
+from django_spire.core.tag.models import Tag
+from django_spire.knowledge.collection.models import Collection
+
+
+class TestTags(TestCase):
+    def setUp(self):
+        self.collection = Collection.objects.create(
+            name='Test Collection', description='Test Collection Description'
+        )
+
+        self.tag_set_a = {'apple', 'banana', 'orange'}
+        self.tag_set_b = {'grape', 'kiwi', 'pear'}
+        self.tag_set_c = {'lemon', 'lime', 'mango'}
+
+        self.mixed_tag_set = {'apple', 'grape', 'lemon'}
+
+        self.dirty_tag_set = {'HaT~', 'four* tacos', '123 hoop!!'}
+
+        self.collection.services.tag.add_tags_from_tag_set(self.tag_set_a)
+        self.collection.services.tag.add_tags_from_tag_set(self.tag_set_b)
+        self.collection.services.tag.add_tags_from_tag_set(self.tag_set_c)
+
+        self.collection.services.tag.add_tags_from_tag_set(self.mixed_tag_set)
+
+        self.collection.services.tag.add_tags_from_tag_set(self.dirty_tag_set)
+
+    def test_tag_removal(self):
+        self.assertIn('apple', self.collection.tag_set)
+
+        self.collection.services.tag.remove_tags_by_tag_set(self.mixed_tag_set)
+
+        self.assertNotIn('lemon', self.collection.tag_set)
+
+        self.assertIn('kiwi', self.collection.tag_set)
+
+    def test_tag_add_and_set(self):
+        self.collection.services.tag.set_tags_from_tag_set(self.mixed_tag_set)
+
+        self.assertIn('lemon', self.collection.tag_set)
+
+        self.assertNotIn('banana', self.collection.tag_set)
+
+    def test_tag_count(self):
+        self.assertEqual(Tag.objects.count(), 12)
+        self.assertEqual(self.collection.tags.count(), 12)
+
+    def test_tag_removal(self):
+        self.collection.services.tag.remove_tags_by_tag_set(self.tag_set_a)
+
+        self.assertEqual(self.collection.tags.count(), 9)
+
+    def test_tag_bool_methods(self):
+        self.collection.services.tag.remove_tags_by_tag_set(self.tag_set_b)
+
+        self.assertTrue(self.collection.services.tag.has_tags_in_tag_set(self.tag_set_c))
+        self.assertFalse(self.collection.services.tag.has_tags_in_tag_set(self.mixed_tag_set))
+
+    def test_tag_matching_methods(self):
+        self.assertEqual(len(self.collection.services.tag.get_matching_tags_from_tag_set(self.tag_set_a)), 3)
+
+        self.collection.services.tag.remove_tags_by_tag_set(self.tag_set_a)
+
+        self.assertEqual(len(self.collection.services.tag.get_matching_tags_from_tag_set(self.tag_set_a)), 0)
+        self.assertEqual(len(self.collection.services.tag.get_matching_tags_from_tag_set(self.tag_set_b)), 3)
+        self.assertEqual(len(self.collection.services.tag.get_matching_tags_from_tag_set(self.mixed_tag_set)), 2)
+
+        self.collection.services.tag.remove_tags_by_tag_set(self.tag_set_b)
+
+        self.assertEqual(len(self.collection.services.tag.get_matching_tags_from_tag_set(self.tag_set_b)), 0)
+
+        self.assertEqual(len(self.collection.services.tag.get_matching_tags_from_tag_set(self.mixed_tag_set)), 1)
+
+    def test_tag_metric_methods(self):
+        self.assertAlmostEqual(
+            self.collection.services.tag.get_matching_percentage_of_tag_set(self.tag_set_a),
+            1.00,
+            2
+        )
+
+        self.assertAlmostEqual(
+            self.collection.services.tag.get_matching_percentage_of_model_tags_from_tag_set(self.tag_set_b),
+            0.25,
+            2
+        )
+
+        self.collection.services.tag.remove_tags_by_tag_set(self.mixed_tag_set)
+
+        self.assertAlmostEqual(
+            self.collection.services.tag.get_matching_percentage_of_tag_set(self.tag_set_a),
+            0.666,
+            2
+        )
+
+
+        self.assertAlmostEqual(
+            self.collection.services.tag.get_matching_percentage_of_model_tags_from_tag_set(self.tag_set_b),
+            0.222,
+            2
+        )
+

django_spire-0.22.0/django_spire/core/tag/tools.py

@@ -0,0 +1,66 @@
+def get_matching_tag_set_from_tag_sets(tag_set_a: set[str], tag_set_b: set[str]) -> set[str]:
+    return tag_set_a.intersection(tag_set_b)
+
+
+def get_matching_count_from_tag_sets(tag_set_a: set[str], tag_set_b: set[str]) -> int:
+    return len(get_matching_tag_set_from_tag_sets(tag_set_a, tag_set_b))
+
+
+def get_matching_a_percentage_from_tag_sets(tag_set_a: set[str], tag_set_b: set[str]) -> float:
+    try:
+        return get_matching_count_from_tag_sets(tag_set_a, tag_set_b) / len(tag_set_a)
+    except ZeroDivisionError:
+        return 0.0
+
+
+def get_matching_b_percentage_from_tag_sets(tag_set_a: set[str], tag_set_b: set[str]) -> float:
+    try:
+        return get_matching_count_from_tag_sets(tag_set_a, tag_set_b) / len(tag_set_b)
+    except ZeroDivisionError:
+        return 0.0
+
+
+def get_score_percentage_from_tag_set_weighted(tag_set_actual: set[str], tag_set_reference: set[str]) -> float:
+    total_points = len(simplify_tag_set(tag_set_reference))
+
+    multiplier = get_matching_count_from_tag_sets(tag_set_actual, tag_set_reference)
+
+    weighted_points = sum(
+        weight
+        for tag, weight in simplify_and_weight_tag_set_to_dict(tag_set_reference).items()
+        if tag in tag_set_actual
+    )
+
+    if weighted_points == 0 or total_points == 0:
+        return 0.0
+
+    return (weighted_points / total_points) * multiplier
+
+
+def simplify_tag_set(tag_set: set[str]) -> set[str]:
+    return set(simplify_tag_set_to_list(tag_set))
+
+
+def simplify_tag_set_to_list(tag_set: set[str]) -> list[str]:
+    simplified_tag_words = []
+
+    for tag in tag_set:
+        tag_words = tag.split('-')
+        simplified_tag_words.extend(tag_words)
+
+    return simplified_tag_words
+
+
+def simplify_and_weight_tag_set_to_dict(tag_set: set[str]) -> dict[str, int]:
+    simplified_and_weighted_tag_words = {}
+
+    for tag_word in simplify_tag_set_to_list(tag_set):
+        simplified_and_weighted_tag_words[tag_word] = simplified_and_weighted_tag_words.get(tag_word, 0) + 1
+
+    return dict(
+        sorted(
+            simplified_and_weighted_tag_words.items(),
+            key=lambda item: item[1],
+            reverse=True
+        )
+    )

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

@@ -0,0 +1,94 @@
+{% load static %}
+
+<div class="top-navigation row justify-content-between align-items-center p-1 p-md-2 mb-2 border-bottom shadow-sm">
+    {% block top_navigation_content %}
+        <div class="col">
+            <div class="row">
+                <div class="col">
+                    <a href="/" class="d-block mb-3">
+                    <span class="fs-5 fs-md-1 fw-bold d-lg-block float-start">
+                        {% block top_navigation_title %}
+                            Django Spire
+                        {% endblock %}
+                    </span>
+                    </a>
+                </div>
+            </div>
+
+            <div class="row">
+                <div class="col">
+                    {% include 'django_spire/element/breadcrumb_element.html' %}
+                </div>
+            </div>
+        </div>
+
+        <div class="col-auto d-flex">
+            {% block top_navigation_icons %}
+                {% if AuthController.help_desk.can_view %}
+                    {% block help_desk_icon %}
+                        {% include 'django_spire/help_desk/element/icon.html' %}
+                    {% endblock %}
+                {% endif %}
+
+
+                {% block theme_selector %}
+                    <div>
+                        {% include 'django_spire/theme/element/theme_selector.html' with icon_size='fs-2' %}
+                    </div>
+                {% endblock %}
+
+                {% if request.user.is_authenticated %}
+                    {% block notification_icon %}
+                        <div>
+                            {% include 'django_spire/notification/app/element/notification_bell.html' %}
+                        </div>
+                    {% endblock %}
+                {% endif %}
+
+                {% 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 href="{% url 'django_spire:auth:redirect:logout' %}"
+                                   class="dropdown-item fs--1 bg-app-layer-three-hover">
+                                    Logout
+                                </a>
+                            </li>
+                        </ul>
+                    </div>
+                {% endif %}
+
+                <div class="col-auto d-lg-none">
+                    {% include 'django_spire/navigation/mobile_navigation.html' %}
+                </div>
+            {% endblock %}
+        </div>
+    {% endblock %}
+</div>