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

django_spire/core/templatetags/spire_core_tags.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import random
 import string
+from typing import Any
 
 from typing_extensions import Sequence, TYPE_CHECKING, TypeVar
 
@@ -48,6 +49,17 @@ def content_type_url(url_name: str, obj: T, **kwargs) -> str:
     return reverse(url_name, kwargs=kwargs)
 
 
+@register.filter
+def safe_dict_items(dictionary: dict) -> Any:
+    """
+    Explicitly call .items() on a dictionary, bypassing key lookup.
+    Use when the dict has a key named 'items' and you need the method.
+    """
+    if hasattr(dictionary, 'items'):
+        return dictionary.items()
+    return []
+
+
 @register.filter
 def in_list(value: str, arg: str) -> bool:
     """

django_spire/knowledge/collection/models.py

@@ -5,7 +5,7 @@ from django.db import models
 from django_spire.auth.group.models import AuthGroup
 from django_spire.contrib import Breadcrumbs
 from django_spire.contrib.ordering.mixins import OrderingModelMixin
-from django_spire.core.tags.mixins import TagsModelMixin
+from django_spire.core.tag.mixins import TagModelMixin
 from django_spire.contrib.utils import truncate_string
 from django_spire.history.mixins import HistoryModelMixin
 from django_spire.knowledge.collection.querysets import CollectionQuerySet
@@ -16,7 +16,7 @@ from django_spire.knowledge.collection.services.service import CollectionGroupSe
 class Collection(
     HistoryModelMixin,
     OrderingModelMixin,
-    TagsModelMixin,
+    TagModelMixin,
 ):
     parent = models.ForeignKey(
         'self',

django_spire/knowledge/collection/services/tag_service.py

@@ -4,14 +4,16 @@ from typing import TYPE_CHECKING
 
 from dandy import Prompt
 
-from django_spire.contrib.service import BaseDjangoModelService
-from django_spire.core.tags.intelligence.tag_set_bot import TagSetBot
+from django_spire.core.tag.intelligence.tag_set_bot import TagSetBot
+from django_spire.core.tag.service.tag_service import BaseTagService
+from django_spire.core.tag.tools import simplify_tag_set, simplify_and_weight_tag_set_to_dict, \
+    get_score_percentage_from_tag_set_weighted
 
 if TYPE_CHECKING:
     from django_spire.knowledge.collection.models import Collection
 
 
-class CollectionTagService(BaseDjangoModelService['Collection']):
+class CollectionTagService(BaseTagService['Collection']):
     obj: Collection
 
     def process_and_set_tags(self):
@@ -24,11 +26,11 @@ class CollectionTagService(BaseDjangoModelService['Collection']):
             content=collection_prompt
         )
 
-        self.obj.set_tags_from_tag_set(
+        self.set_tags_from_tag_set(
             tag_set=tag_set,
         )
 
-    def get_aggregated_tag_set(self):
+    def get_aggregated_tag_set(self) -> set[str]:
         tag_set = self.obj.tag_set
 
         for collection in self.obj.children.active():
@@ -39,14 +41,14 @@ class CollectionTagService(BaseDjangoModelService['Collection']):
 
         return tag_set
 
-    def get_aggregated_tag_set_simplified(self):
-        tag_set = self.obj.tag_set_simplified
-
-        for collection in self.obj.children.active():
-            tag_set.update(collection.services.tag.get_aggregated_tag_set())
-
-        for entry in self.obj.entries.active():
-            tag_set.update(entry.tag_set_simplified)
+    def get_score_percentage_from_aggregated_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.get_aggregated_tag_set()
+        )
 
-        return tag_set
+    def get_simplified_aggregated_tag_set(self) -> set[str]:
+        return simplify_tag_set(self.get_aggregated_tag_set())
 
+    def get_simplified_and_weighted_aggregated_tag_set(self) -> dict[str, int]:
+        return simplify_and_weight_tag_set_to_dict(self.get_aggregated_tag_set())

django_spire/knowledge/entry/models.py

@@ -3,7 +3,7 @@ from django.urls import reverse
 
 from django_spire.contrib import Breadcrumbs
 from django_spire.contrib.ordering.mixins import OrderingModelMixin
-from django_spire.core.tags.mixins import TagsModelMixin
+from django_spire.core.tag.mixins import TagModelMixin
 from django_spire.contrib.utils import truncate_string
 from django_spire.history.mixins import HistoryModelMixin
 from django_spire.knowledge.collection.models import Collection
@@ -15,7 +15,7 @@ from django_spire.knowledge.entry.version.models import EntryVersion
 class Entry(
     HistoryModelMixin,
     OrderingModelMixin,
-    TagsModelMixin
+    TagModelMixin
 ):
     collection = models.ForeignKey(
         Collection,

django_spire/knowledge/entry/querysets.py

@@ -30,3 +30,8 @@ class EntryQuerySet(HistoryQuerySet, OrderingQuerySetMixin):
                 current_version__status=EntryVersionStatusChoices.DRAFT
             )
         )
+
+    def get_by_version_block_id(self, version_block_id: int) -> Entry:
+        return self.get(
+            current_version__block__id=version_block_id
+        )

django_spire/knowledge/entry/services/tag_service.py

@@ -4,21 +4,21 @@ from typing import TYPE_CHECKING
 
 from dandy import Prompt
 
-from django_spire.contrib.service import BaseDjangoModelService
-from django_spire.core.tags.intelligence.tag_set_bot import TagSetBot
+from django_spire.core.tag.intelligence.tag_set_bot import TagSetBot
+from django_spire.core.tag.service.tag_service import BaseTagService
 
 if TYPE_CHECKING:
     from django_spire.knowledge.entry.models import Entry
 
 
 
-class EntryTagService(BaseDjangoModelService['Entry']):
+class EntryTagService(BaseTagService['Entry']):
     obj: Entry
 
     def process_and_set_tags(self):
         entry_prompt = Prompt()
 
-        entry_prompt.text(self.obj.name)
+        entry_prompt.sub_heading(self.obj.name)
 
         for version_block in self.obj.current_version.blocks.all():
             entry_prompt.text(f'{version_block.render_to_text()}')
@@ -27,7 +27,7 @@ class EntryTagService(BaseDjangoModelService['Entry']):
             content=entry_prompt
         )
 
-        self.obj.set_tags_from_tag_set(
+        self.set_tags_from_tag_set(
             tag_set=tag_set,
         )
 

django_spire/knowledge/intelligence/bots/entries_search_llm_bot.py

@@ -0,0 +1,44 @@
+from __future__ import annotations
+from typing import TYPE_CHECKING
+
+from dandy import Bot, Prompt
+
+from django_spire.knowledge.intelligence.intel.entry_intel import EntriesIntel
+
+if TYPE_CHECKING:
+    from django_spire.knowledge.entry.models import Entry
+
+
+class EntriesSearchBot(Bot):
+    llm_role = 'Knowledge Entry Search Assistant'
+    llm_task = 'Read through the knowledge and return information and the block id that relevant to the information request.'
+    llm_guidelines = (
+        Prompt()
+        .list([
+            'Please read through all the blocks and return 2 of the most relevant ones.',
+            'You can add any of the text in the knowledge entries to the 2 responses if it helps.',
+            'Make sure the relevant heading text is from a heading with mark down formatting.',
+            'When returning the relevant heading remove any of the markdown formating characters.',
+        ])
+    )
+    llm_intel_class = EntriesIntel
+
+    def process(self, user_input: str, entries: list[Entry]) -> EntriesIntel:
+
+        entry_prompt = Prompt()
+        entry_prompt.sub_heading('Information Request')
+        entry_prompt.line_break()
+        entry_prompt.text(f'{user_input}')
+        entry_prompt.line_break()
+        entry_prompt.sub_heading('Knowledge Entries')
+        entry_prompt.line_break()
+
+        for entry in entries:
+            for version_block in entry.current_version.blocks.all():
+                if version_block.render_to_text() != '\n':
+                    entry_prompt.text(f'{version_block.id}: {version_block.render_to_text()}')
+
+        return self.llm.prompt_to_intel(
+            prompt=entry_prompt,
+        )
+

django_spire/knowledge/intelligence/intel/entry_intel.py

@@ -1,16 +1,36 @@
 from __future__ import annotations
 
+from enum import Enum
+
 from dandy import BaseIntel, BaseListIntel
 
-from django_spire.knowledge.intelligence.intel.collection_intel import CollectionIntel
+from django_spire.knowledge.entry.models import Entry
+
+
+class EntryRelevancy(str, Enum):
+    EXTREMELY = 'Extremely'
+    VERY = 'Very'
+    SOMEWHAT = 'Somewhat'
+    NOT_SO_MUCH = 'Not so much'
+    NO_RELEVANCE = 'No Relevance'
 
 
 class EntryIntel(BaseIntel):
     relevant_heading_text: str
-    relevant_subject_text: str
+    relevant_text: str
     relevant_block_id: int
-    entry_id: int = None
-    collection_intel: CollectionIntel = None
+    relevancy: EntryRelevancy
+
+    def __str__(self):
+        return self.relevant_heading_text + ' ' + self.relevant_text
+
+    @property
+    def collection(self):
+        return self.entry.collection
+
+    @property
+    def entry(self):
+        return Entry.objects.get_by_version_block_id(self.relevant_block_id)
 
 
 class EntriesIntel(BaseListIntel[EntryIntel]):

django_spire/knowledge/intelligence/workflows/knowledge_workflow.py

@@ -5,51 +5,72 @@ from typing import TYPE_CHECKING
 from django.core.handlers.wsgi import WSGIRequest
 
 from django_spire.ai.chat.message_intel import DefaultMessageIntel, BaseMessageIntel
-from django_spire.knowledge.intelligence.bots.entry_search_llm_bot import EntrySearchBot
-from django_spire.knowledge.intelligence.intel.entry_intel import EntriesIntel
+from django_spire.core.tag.intelligence.tag_set_bot import TagSetBot
+from django_spire.knowledge.collection.models import Collection
+from django_spire.knowledge.intelligence.bots.entries_search_llm_bot import EntriesSearchBot
 from django_spire.knowledge.intelligence.intel.message_intel import KnowledgeMessageIntel
-from django_spire.knowledge.intelligence.decoders.collection_decoder import get_collection_decoder
-from django_spire.knowledge.intelligence.decoders.entry_decoder import get_entry_decoder
 
 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 | None = None,
+        request: WSGIRequest,
+        user_input: str,
+        message_history: MessageHistory | None = None,
 ) -> BaseMessageIntel | None:
-    collection_decoder = get_collection_decoder()
-    collections = collection_decoder.process(user_input).values
+    user_tag_set = TagSetBot().process(user_input)
 
-    if collections[0] is None:
-        return NO_KNOWLEDGE_MESSAGE_INTEL
+    def get_top_scored_from_dict_to_list(
+            scored_dict: dict[str, float],
+            score_floor: float = 0.05
+    ) -> list:
+        if not scored_dict:
+            return []
 
-    entries = []
+        min_score = min(scored_dict.values())
+        max_score = max(scored_dict.values())
 
-    for collection in collections:
-        if collection.entry_count > 0:
-            entry_decoder = get_entry_decoder(collection=collection)
+        if min_score == 0 and max_score == 0:
+            return []
 
-            entries.extend(entry_decoder.process(user_input).values)
+        median_score = (max_score - min_score) / 2
 
-    entries = [entry for entry in entries if entry is not None]
+        top_scored_list = []
 
-    if not entries:
-        return NO_KNOWLEDGE_MESSAGE_INTEL
+        for key, value in scored_dict.items():
+            if value >= score_floor and value >= median_score:
+                top_scored_list.append(key)
 
-    entries_intel = EntriesIntel(entry_intel_list=[])
+        return top_scored_list
 
-    for entry in entries:
-        entries_intel.append(
-            EntrySearchBot().process(user_input=user_input, entry=entry)
+    collections = get_top_scored_from_dict_to_list({
+        collection: collection.services.tag.get_score_percentage_from_aggregated_tag_set_weighted(
+            user_tag_set
         )
+        for collection in Collection.objects.all().annotate_entry_count()
+    })
+
+    entries = get_top_scored_from_dict_to_list({
+        entry: entry.services.tag.get_score_percentage_from_tag_set_weighted(user_tag_set)
+        for collection in collections
+        for entry in collection.entries.all()
+    })
+
+    if not entries:
+        return NO_KNOWLEDGE_MESSAGE_INTEL
+
+    entries_intel = EntriesSearchBot(llm_temperature=0.0).process(
+        user_input=user_input,
+        entries=entries
+    )
 
-    return KnowledgeMessageIntel(body=f'Entries: {entries_intel}', entries_intel=entries_intel)
+    return KnowledgeMessageIntel(
+        body=f'{" ".join([str(entry) for entry in entries_intel])}',
+        entries_intel=entries_intel,
+    )

django_spire/knowledge/models.py

@@ -2,7 +2,15 @@ from __future__ import annotations
 
 # These imports are for the migrations to work as a single app "django_spire_knowledge"
 
-from django_spire.knowledge.entry import models
-from django_spire.knowledge.entry.version import models
-from django_spire.knowledge.entry.version.block import models
-from django_spire.knowledge.collection import models
+from django_spire.knowledge.entry import models as entry_models
+from django_spire.knowledge.entry.version import models as entry_version_models
+from django_spire.knowledge.entry.version.block import models as \
+    entry_version_block_models
+from django_spire.knowledge.collection import models as collection_models
+
+# Must assert to stop unused import removals.
+
+assert entry_models
+assert entry_version_models
+assert entry_version_block_models
+assert collection_models

django_spire/knowledge/templates/django_spire/knowledge/collection/page/display_page.html

@@ -1,5 +1,7 @@
 {% extends 'django_spire/knowledge/page/full_page.html' %}
 
+{% load spire_core_tags %}
+
 {% block full_page_sub_navigation_title %}
     {{ collection.name_short }}
 {% endblock %}
@@ -49,16 +51,16 @@
     <div class="row">
         <div class="col-12 col-lg-8 mx-auto pb-4">
             Tags:
-            {% for tag in collection.tags.all %}
-                <span class="badge bg-secondary">{{ tag.name }}</span>
+            {% for tag, weight in collection.simplified_and_weighted_tag_dict|safe_dict_items %}
+                {% include 'django_spire/tag/element/tag.html' %}
             {% endfor %}
         </div>
     </div>
     <div class="row">
         <div class="col-12 col-lg-8 mx-auto pb-4">
             Aggregated Tags:
-            {% for tag in collection.services.tag.get_aggregated_tag_set %}
-                <span class="badge bg-secondary">{{ tag }}</span>
+            {% for tag, weight in collection.services.tag.get_simplified_and_weighted_aggregated_tag_set|safe_dict_items %}
+                {% include 'django_spire/tag/element/tag.html' %}
             {% endfor %}
         </div>
     </div>

django_spire/knowledge/templates/django_spire/knowledge/entry/version/page/editor_page.html

@@ -1,6 +1,7 @@
 {% extends 'django_spire/knowledge/page/full_page.html' %}
 
 {% load static %}
+{% load spire_core_tags %}
 
 {% block base_body_additional_top_js %}
     {{ block.super }}
@@ -46,8 +47,8 @@
     <div class="row">
         <div class="col-12 mb-3">
             {% include 'django_spire/element/attribute_element.html' with attribute_title='Tags' %}
-            {% for tag in entry.tags.all %}
-            	<span class="badge bg-secondary">{{ tag.name }}</span>
+            {% for tag, weight in entry.simplified_and_weighted_tag_dict|safe_dict_items %}
+                {% include 'django_spire/tag/element/tag.html' %}
             {% endfor %}
         </div>
     </div>

django_spire/knowledge/templates/django_spire/knowledge/message/knowledge_message_intel.html

@@ -4,19 +4,27 @@
     {% for entry_intel in message_intel.entries_intel %}
 
         <div class="row">
-            <div class="col pt-2">
-                <a href="{% url 'django_spire:knowledge:entry:version:page:editor' pk=entry_intel.entry_id %}?show_sub_nav=false&block_id={{ entry_intel.relevant_block_id }}" target="_blank">
-                    {{ entry_intel.relevant_heading_text }}
-                </a>
+            <div class="col">
+                {{ entry_intel.relevant_text|linebreaksbr }}
             </div>
         </div>
 
         <div class="row">
-            <div class="col pb-2">
-                {{ entry_intel.relevant_subject_text }}
+            <div class="col pt-1 pb-3 fs-7">
+                <a href="{% url 'django_spire:knowledge:entry:version:page:editor' pk=entry_intel.entry.id %}?show_sub_nav=false&block_id={{ entry_intel.relevant_block_id }}"
+                   target="_blank">
+                    {{ entry_intel.relevant_heading_text }}
+                </a>
             </div>
         </div>
 
     {% endfor %}
 
+    <div class="row">
+        <div class="col">
+            Is there anything else I can help with?
+        </div>
+    </div>
+
+
 {% endblock %}

django_spire/settings.py

@@ -14,7 +14,7 @@ DJANGO_SPIRE_AI_CHAT_ROUTERS = {
 
 DJANGO_SPIRE_AI_INTENT_CHAT_ROUTERS = {
     'KNOWLEDGE_SEARCH': {
-        'INTENT_DESCRIPTION': 'The user is asking about information in the knowledge base.',
+        'INTENT_DESCRIPTION': 'The user is asking about information, help or support that could be found in knowledge base.',
         'REQUIRED_PERMISSION': 'django_spire_knowledge.view_collection',
         'CHAT_ROUTER': 'django_spire.knowledge.intelligence.router.KnowledgeSearchRouter',
     },

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-spire
-Version: 0.21.1
+Version: 0.22.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.
@@ -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