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

django_spire/knowledge/entry/services/transformation_services.py

@@ -42,15 +42,15 @@ class EntryTransformationService(BaseDjangoModelService['Entry']):
                 if current_version.published_datetime else ''
             ),
             'status': current_version.status,
-            'delete_url': f'''
+            'delete_url': f"""
                 {site}{
                     reverse(
                         'django_spire:knowledge:entry:page:delete',
                         kwargs={'pk': self.obj.pk},
                     )
                 }
-            ''',
-            'edit_url': f'''
+            """,
+            'edit_url': f"""
                 {site}{
                     reverse(
                         'django_spire:knowledge:entry:form:update',
@@ -60,21 +60,21 @@ class EntryTransformationService(BaseDjangoModelService['Entry']):
                         },
                     )
                 }
-            ''',
-            'view_url': f'''
+            """,
+            'view_url': f"""
                 {site}{
                     reverse(
-                        'django_spire:knowledge:entry:version:page:detail',
+                        'django_spire:knowledge:entry:version:page:editor',
                         kwargs={'pk': current_version.pk},
                     )
                 }
-            ''',
-            'edit_version_url': f'''
+            """,
+            'edit_version_url': f"""
                 {site}{
                     reverse(
-                        'django_spire:knowledge:entry:version:page:detail',
+                        'django_spire:knowledge:entry:version:page:editor',
                         kwargs={'pk': current_version.pk},
                     )
                 }?view_mode=edit
-            '''
+            """
         }

django_spire/knowledge/entry/version/block/data/data.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from pydantic import BaseModel
 
 
-class BaseEditorBlockData(BaseModel):
+class BaseEditorJsBlockData(BaseModel):
     """
     This class serves as a foundational abstract model for EditorJS tool data objects.
 
@@ -29,5 +29,6 @@ class BaseEditorBlockData(BaseModel):
 
         Raises:
             NotImplementedError: If the method is not implemented in a subclass.
+
         """
         raise NotImplementedError

django_spire/knowledge/entry/version/block/data/heading_data.py

@@ -1,9 +1,9 @@
 from __future__ import annotations
 
-from django_spire.knowledge.entry.version.block.data.data import BaseEditorBlockData
+from django_spire.knowledge.entry.version.block.data.data import BaseEditorJsBlockData
 
 
-class HeadingEditorBlockData(BaseEditorBlockData):
+class HeadingEditorBlockData(BaseEditorJsBlockData):
     text: str
     level: int
 

django_spire/knowledge/entry/version/block/data/list/data.py

@@ -1,18 +1,17 @@
 from __future__ import annotations
 
-from typing import Optional
 
 from pydantic import model_validator, BaseModel
 
 from django_spire.knowledge.entry.version.block.constants import SPACES_PER_INDENT
-from django_spire.knowledge.entry.version.block.data.data import BaseEditorBlockData
+from django_spire.knowledge.entry.version.block.data.data import BaseEditorJsBlockData
 from django_spire.knowledge.entry.version.block.data.list.meta import ChecklistItemMeta, \
     OrderedListItemMeta
 from django_spire.knowledge.entry.version.block.data.list.choices import \
     ListEditorBlockDataStyle
 
 
-class ListEditorBlockData(BaseEditorBlockData):
+class ListEditorBlockData(BaseEditorJsBlockData):
     style: ListEditorBlockDataStyle | str
     meta: ChecklistItemMeta | OrderedListItemMeta | None = None
     items: list[ListItemEditorBlockData]
@@ -41,7 +40,7 @@ class ListEditorBlockData(BaseEditorBlockData):
 class ListItemEditorBlockData(BaseModel):
     content: str
     meta: ChecklistItemMeta | OrderedListItemMeta | dict | None = None
-    items: Optional[list[ListItemEditorBlockData]] = []
+    items: list[ListItemEditorBlockData] | None = []
 
     def get_prefix(
             self,

django_spire/knowledge/entry/version/block/data/maps.py

@@ -9,15 +9,13 @@ from django_spire.knowledge.entry.version.block.data.text_data import \
     TextEditorBlockData
 
 
-EDITOR_BLOCK_DATA_MAP = {
+EDITOR_JS_BLOCK_DATA_MAP = {
     BlockTypeChoices.TEXT: TextEditorBlockData,
     BlockTypeChoices.HEADING: HeadingEditorBlockData,
     BlockTypeChoices.LIST: ListEditorBlockData,
 }
 
 
-EDITOR_BLOCK_DATA_REVERSE_MAP = {
-    TextEditorBlockData: BlockTypeChoices.TEXT,
-    HeadingEditorBlockData: BlockTypeChoices.HEADING,
-    ListEditorBlockData: BlockTypeChoices.LIST
+EDITOR_JS_BLOCK_DATA_REVERSE_MAP = {
+    value: key for key, value in EDITOR_JS_BLOCK_DATA_MAP.items()
 }

django_spire/knowledge/entry/version/block/data/text_data.py

@@ -1,9 +1,9 @@
 from __future__ import annotations
 
-from django_spire.knowledge.entry.version.block.data.data import BaseEditorBlockData
+from django_spire.knowledge.entry.version.block.data.data import BaseEditorJsBlockData
 
 
-class TextEditorBlockData(BaseEditorBlockData):
+class TextEditorBlockData(BaseEditorJsBlockData):
     text: str
 
     def render_to_text(self) -> str:

django_spire/knowledge/entry/version/block/models.py

@@ -5,8 +5,8 @@ from django.db import models
 from django_spire.contrib.ordering.mixins import OrderingModelMixin
 from django_spire.history.mixins import HistoryModelMixin
 from django_spire.knowledge.entry.version.block.choices import BlockTypeChoices
-from django_spire.knowledge.entry.version.block.data.data import BaseEditorBlockData
-from django_spire.knowledge.entry.version.block.data.maps import EDITOR_BLOCK_DATA_MAP
+from django_spire.knowledge.entry.version.block.data.data import BaseEditorJsBlockData
+from django_spire.knowledge.entry.version.block.data.maps import EDITOR_JS_BLOCK_DATA_MAP
 from django_spire.knowledge.entry.version.block.querysets import \
     EntryVersionBlockQuerySet
 from django_spire.knowledge.entry.version.block.services.service import \
@@ -40,18 +40,21 @@ class EntryVersionBlock(HistoryModelMixin, OrderingModelMixin):
     services = EntryVersionBlockService()
 
     @property
-    def editor_block_data(self) -> BaseEditorBlockData:
-        return EDITOR_BLOCK_DATA_MAP[self.type](**self._block_data)
+    def editor_js_block_data(self) -> BaseEditorJsBlockData:
+        return EDITOR_JS_BLOCK_DATA_MAP[self.type](**self._block_data)
 
-    @editor_block_data.setter
-    def editor_block_data(self, value: BaseEditorBlockData):
+    @editor_js_block_data.setter
+    def editor_js_block_data(self, value: BaseEditorJsBlockData):
         # exclude_none=True ensures that block meta objects aren't autofilled with keys,
         # which can mess up editor rendering
         self._block_data = value.model_dump(exclude_none=True)
         self._text_data = value.render_to_text()
 
+    def update_editor_js_block_data_from_dict(self, value: dict):
+        self.editor_js_block_data = EDITOR_JS_BLOCK_DATA_MAP[self.type](**value)
+
     def render_to_text(self) -> str:
-        return self.editor_block_data.render_to_text()
+        return self.editor_js_block_data.render_to_text()
 
     class Meta:
         verbose_name = 'Block'

django_spire/knowledge/entry/version/block/services/factory_service.py

@@ -4,7 +4,7 @@ from django_spire.contrib.service import BaseDjangoModelService
 
 from typing import TYPE_CHECKING
 
-from django_spire.knowledge.entry.version.block.data.maps import EDITOR_BLOCK_DATA_MAP
+from django_spire.knowledge.entry.version.block.data.maps import EDITOR_JS_BLOCK_DATA_MAP
 from django_spire.knowledge.entry.version.maps import FILE_TYPE_CONVERTER_MAP
 
 if TYPE_CHECKING:
@@ -34,17 +34,18 @@ class EntryVersionBlockFactoryService(BaseDjangoModelService['EntryVersionBlock'
     def create_validated_block(
             self,
             entry_version: EntryVersion,
-            block_type: BlockTypeChoices,
-            block_data: dict,
-            block_order: int,
-            block_tunes: dict = {}
+            type: BlockTypeChoices,
+            data: dict,
+            order: int,
+            tunes: dict = {},
+            **kwargs,
     ):
         self.obj.version = entry_version
-        self.obj.type = block_type
-        self.obj.order = block_order
-        self.obj.tunes = block_tunes
-        self.obj.editor_block_data = EDITOR_BLOCK_DATA_MAP[block_type](**block_data)
+        self.obj.type = type
+        self.obj.order = order
+        self.obj.tunes = tunes
+        self.obj.editor_js_block_data = EDITOR_JS_BLOCK_DATA_MAP[type](**data)
 
         self.obj.clean()
 
-        return self.obj
+        return self.obj

django_spire/knowledge/entry/version/block/tests/factories.py

@@ -12,10 +12,11 @@ from django_spire.knowledge.entry.version.tests.factories import \
 
 def create_test_block_form_data(**kwargs) -> dict:
     data = {
-        'block_order': 0,
-        'block_type': BlockTypeChoices.TEXT,
-        'block_data': {'text': 'test text'},
-        'block_tunes': {}
+        'id': 'ABC123',
+        'order': 0,
+        'type': BlockTypeChoices.TEXT,
+        'data': {'text': 'test text'},
+        'tunes': {}
     }
 
     data.update(kwargs)
@@ -33,7 +34,7 @@ def create_test_version_block(**kwargs) -> EntryVersionBlock:
 
     data.update(kwargs)
     version_block = EntryVersionBlock.objects.create(**data)
-    version_block.editor_block_data = TextEditorBlockData(
+    version_block.editor_js_block_data = TextEditorBlockData(
         text='',
     )
     version_block.save()

django_spire/knowledge/entry/version/converters/docx_converter.py

@@ -6,7 +6,7 @@ from typing import TYPE_CHECKING
 
 from markitdown import MarkItDown
 
-from django_spire.knowledge.entry.version.constants import MARKDOWN_AI_CHUNK_SIZE
+from django_spire.knowledge.entry.version.consts import MARKDOWN_AI_CHUNK_SIZE
 from django_spire.knowledge.entry.version.converters.converter import \
     BaseConverter
 from django_spire.knowledge.entry.version.block import models

django_spire/knowledge/entry/version/intelligence/bots/markdown_format_llm_bot.py

@@ -3,22 +3,24 @@ from __future__ import annotations
 from dandy import BaseIntel, Bot, Prompt, recorder_to_html_file
 
 
-class MarkdownTextIntel(BaseIntel):
-    text: str
+class MarkdownIntel(BaseIntel):
+    markdown_content: str
 
 
 class MarkdownFormatLlmBot(Bot):
-    llm_intel_class = MarkdownTextIntel
+    llm_role = 'Markdown Formater'
+    llm_task = 'Improve the markdown formatting of the content provided to make more logical sense.'
+    llm_guidelines = (
+        Prompt()
+        .list([
+            'Make sure the relevant heading text is from a heading with mark down formatting.'
+            'Do not change any of the content only change the formatting as needed.'
+        ])
+    )
+    llm_intel_class = MarkdownIntel
 
     @recorder_to_html_file('knowledge_markdown_improvement')
     def process(self, markdown_content: str) -> str:
-        markdown_prompt = Prompt()
-        markdown_prompt.text(
-            'Can you improve the markdown formatting? Do NOT add or change any of the '
-            'content.'
-        )
-        markdown_prompt.line_break()
-        markdown_prompt.text(markdown_content)
+        markdown_intel = self.llm.prompt_to_intel(prompt=markdown_content)
 
-        result = self.llm.prompt_to_intel(prompt=markdown_prompt)
-        return result.text
+        return markdown_intel.markdown_content

django_spire/knowledge/entry/version/seeding/seeder.py

@@ -12,7 +12,7 @@ from django_spire.knowledge.entry.version import models
 
 from django_spire.contrib.seeding import DjangoModelSeeder
 from django_spire.knowledge.entry.version.block.data.maps import \
-    EDITOR_BLOCK_DATA_REVERSE_MAP
+    EDITOR_JS_BLOCK_DATA_REVERSE_MAP
 from django_spire.knowledge.entry.version.block.models import EntryVersionBlock
 from django_spire.knowledge.entry.version.block.seeding.constants import SAFETY_BLOCKS
 from django_spire.knowledge.entry.version.choices import EntryVersionStatusChoices
@@ -63,10 +63,10 @@ class EntryVersionSeeder(DjangoModelSeeder):
             for idx, safety_block in enumerate(safety_blocks):
                 version_block = EntryVersionBlock(
                     version=entry_version,
-                    type=EDITOR_BLOCK_DATA_REVERSE_MAP[type(safety_block)],
+                    type=EDITOR_JS_BLOCK_DATA_REVERSE_MAP[type(safety_block)],
                     order=idx,
                 )
-                version_block.editor_block_data = safety_block
+                version_block.editor_js_block_data = safety_block
                 version_blocks.append(version_block)
 
             EntryVersionBlock.objects.bulk_create(version_blocks)

django_spire/knowledge/entry/version/services/processor_service.py

@@ -20,19 +20,45 @@ class EntryVersionProcessorService(BaseDjangoModelService['EntryVersion']):
         self.obj.published_datetime = localtime()
         self.obj.save()
 
-    def update_blocks(self, raw_block_data: list[dict]):
+    def add_update_delete_blocks(self, block_data_list: list[dict]):
         from django_spire.knowledge.entry.version.block.models import EntryVersionBlock
 
+        entry_blocks_to_add = []
+        entry_blocks_to_update = []
+        entry_blocks_to_delete = []
+
+        handled_block_ids = []
+
         old_entry_blocks = self.obj.blocks.active()
 
-        incoming_entry_blocks = [
-            EntryVersionBlock.services.factory.create_validated_block(
-                entry_version=self.obj,
-                **block_data,
-            )
-            for block_data in raw_block_data
-        ]
+        old_entry_block_ids = [entry_block.id for entry_block in old_entry_blocks]
+
+        for block_data in block_data_list:
+            if block_data['id'] in old_entry_block_ids:
+                entry_block: EntryVersionBlock = old_entry_blocks.get(id=block_data['id'])
+
+                entry_block.type = block_data['type']
+                entry_block.order = block_data['order']
+                entry_block.update_editor_js_block_data_from_dict(block_data['data'])
+
+                entry_blocks_to_update.append(entry_block)
+
+                handled_block_ids.append(block_data['id'])
+
+            else:
+                entry_block = EntryVersionBlock.services.factory.create_validated_block(
+                    entry_version=self.obj,
+                    **block_data,
+                )
+                entry_blocks_to_add.append(entry_block)
+
+                handled_block_ids.append(block_data['id'])
+
+        for entry_block in old_entry_blocks:
+            if entry_block.id not in handled_block_ids:
+                entry_blocks_to_delete.append(entry_block.id)
 
         with transaction.atomic():
-            old_entry_blocks.delete()
-            EntryVersionBlock.objects.bulk_create(incoming_entry_blocks)
+            EntryVersionBlock.objects.filter(id__in=entry_blocks_to_delete).delete()
+            EntryVersionBlock.objects.bulk_update(entry_blocks_to_update, ['order', 'type', '_block_data', '_text_data'])
+            EntryVersionBlock.objects.bulk_create(entry_blocks_to_add)

django_spire/knowledge/entry/version/tests/test_converters/test_docx_converter.py

@@ -5,7 +5,7 @@ import time
 from unittest.mock import MagicMock, patch
 
 from django_spire.core.tests.test_cases import BaseTestCase
-from django_spire.knowledge.entry.version.constants import MARKDOWN_AI_CHUNK_SIZE
+from django_spire.knowledge.entry.version.consts import MARKDOWN_AI_CHUNK_SIZE
 from django_spire.knowledge.entry.version.converters.docx_converter import DocxConverter
 
 from django_spire.knowledge.entry.version.tests.factories import \

django_spire/knowledge/entry/version/tests/test_urls/test_page_urls.py

@@ -22,7 +22,7 @@ class EntryVersionPageUrlsTests(BaseTestCase):
     def test_detail_view_url_path(self):
         response = self.client.get(
             reverse(
-                'django_spire:knowledge:entry:version:page:detail',
+                'django_spire:knowledge:entry:version:page:editor',
                 kwargs={'pk': self.test_entry_version.pk}
             )
         )

django_spire/knowledge/entry/version/urls/page_urls.py

@@ -6,5 +6,5 @@ from django_spire.knowledge.entry.version.views import page_views
 app_name = 'page'
 
 urlpatterns = [
-    path('<int:pk>/detail/', page_views.detail_view, name='detail'),
+    path('<int:pk>/editor/', page_views.editor_view, name='editor'),
 ]

django_spire/knowledge/entry/version/views/json_views.py

@@ -15,7 +15,9 @@ from django_spire.knowledge.entry.version.models import EntryVersion
 @AppAuthController('knowledge').permission_required('can_change')
 def update_blocks_view(request: WSGIRequest, pk: int) -> JsonResponse:
     entry_version = get_object_or_404(EntryVersion.objects.prefetch_blocks(), pk=pk)
-    new_block_data = json.loads(request.body.decode('utf-8'))
-    entry_version.services.processor.update_blocks(new_block_data)
 
-    return JsonResponse({'type': 'success'})
+    block_data_list = json.loads(request.body.decode('utf-8'))
+
+    entry_version.services.processor.add_update_delete_blocks(block_data_list)
+
+    return JsonResponse({'type': 'success'})

django_spire/knowledge/entry/version/views/page_views.py

@@ -3,22 +3,22 @@ from __future__ import annotations
 import json
 
 from django.core.handlers.wsgi import WSGIRequest
-from django.db.models import F, Prefetch
 from django.shortcuts import get_object_or_404
 from django.template.response import TemplateResponse
 from django.urls import reverse
 
 from django_spire.auth.controller.controller import AppAuthController
 from django_spire.contrib.generic_views import portal_views
-from django_spire.knowledge.entry.version.block.models import EntryVersionBlock
+from django_spire.knowledge.collection.models import Collection
 from django_spire.knowledge.entry.version.models import EntryVersion
 
 
 @AppAuthController('knowledge').permission_required('can_view')
-def detail_view(request: WSGIRequest, pk: int) -> TemplateResponse:
+def editor_view(request: WSGIRequest, pk: int) -> TemplateResponse:
     entry_version = get_object_or_404(EntryVersion.objects.prefetch_blocks(),pk=pk)
 
     entry = entry_version.entry
+    top_level_collection = entry.top_level_collection
     version_blocks = entry_version.blocks.format_for_editor()
 
     def breadcrumbs_func(breadcrumbs):
@@ -26,13 +26,7 @@ def detail_view(request: WSGIRequest, pk: int) -> TemplateResponse:
             name='Knowledge',
             href=reverse('django_spire:knowledge:page:home')
         )
-        collection = entry.collection
-        breadcrumbs.add_breadcrumb(
-            name=f'{collection.name}'
-        )
-        breadcrumbs.add_breadcrumb(
-            name=f'{entry.name}',
-        )
+        breadcrumbs.add_base_breadcrumb(entry)
 
     return portal_views.detail_view(
         request,
@@ -40,8 +34,13 @@ def detail_view(request: WSGIRequest, pk: int) -> TemplateResponse:
         breadcrumbs_func=breadcrumbs_func,
         context_data={
             'entry': entry,
-            'version': entry_version,
+            'current_version': entry_version,
+            'collection': top_level_collection,
             'version_blocks': json.dumps(list(version_blocks)),
+            'collection_tree_json': Collection.services.transformation.to_hierarchy_json(
+                request=request,
+                parent_id=top_level_collection.id,
+            ),
         },
-        template='django_spire/knowledge/entry/version/page/detail_page.html',
+        template='django_spire/knowledge/entry/version/page/editor_page.html',
     )

django_spire/knowledge/entry/version/views/redirect_views.py

@@ -16,7 +16,7 @@ def publish_view(request: WSGIRequest, pk: int) -> HttpResponseRedirect:
 
     return HttpResponseRedirect(
         reverse(
-            'django_spire:knowledge:entry:version:page:detail',
+            'django_spire:knowledge:entry:version:page:editor',
             kwargs={'pk': version.pk}
         )
     )

django_spire/knowledge/entry/views/form_views.py

@@ -37,7 +37,7 @@ def form_view(
 
             return HttpResponseRedirect(
                 reverse(
-                    'django_spire:knowledge:entry:version:page:detail',
+                    'django_spire:knowledge:entry:version:page:editor',
                     kwargs={'pk': entry.pk}
                 )
             )

django_spire/knowledge/intelligence/bots/entry_search_llm_bot.py

@@ -1,23 +1,45 @@
 from __future__ import annotations
 
 from dandy import Bot, Prompt
-from dandy.intel.intel import DefaultIntel
 
 from django_spire.knowledge.entry.models import Entry
+from django_spire.knowledge.intelligence.intel.collection_intel import CollectionIntel
+from django_spire.knowledge.intelligence.intel.entry_intel import EntryIntel
 
 
-class EntrySearchLlmBot(Bot):
-    @classmethod
-    def process(cls, user_input: str, entry: Entry) -> str:
+class EntrySearchBot(Bot):
+    llm_role = 'Knowledge Entry Search Assistant'
+    llm_task = 'Read through the knowledge entry the information request and return information and the block id that relevant'
+    llm_guidelines = (
+        Prompt()
+        .list([
+            '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 = EntryIntel
+
+    def process(self, user_input: str, entry: Entry) -> EntryIntel:
         entry_prompt = Prompt()
-        entry_prompt.text('You are a helpful assistant that helps users find information about entries.')
-        entry_prompt.text(f'User Input: {user_input}')
-        entry_prompt.text(f'Entry: {entry.name}')
+        entry_prompt.sub_heading('Information Request')
+        entry_prompt.line_break()
+        entry_prompt.text(f'{user_input}')
+        entry_prompt.line_break()
+        entry_prompt.sub_heading(f'Knowledge Entry: {entry.name}')
+        entry_prompt.line_break()
 
         for version_block in entry.current_version.blocks.all():
-            entry_prompt.text(version_block.render_to_text())
+            entry_prompt.text(f'{version_block.id}: {version_block.render_to_text()}')
 
-        return cls().llm.prompt_to_intel(
+        entry_intel = self.llm.prompt_to_intel(
             prompt=entry_prompt,
-            intel_class=DefaultIntel
-        ).content
+            exclude_fields={'entry_id', 'collection_intel'},
+        )
+
+        entry_intel.entry_id = entry.id
+        entry_intel.collection_intel = CollectionIntel(
+            name=entry.collection.name,
+            collection_id=entry.collection.id,
+        )
+
+        return entry_intel

django_spire/knowledge/intelligence/{maps/collection_map.py → decoders/collection_decoder.py}

@@ -5,15 +5,15 @@ from dandy import Decoder
 from django_spire.knowledge.collection.models import Collection
 
 
-def get_collection_map_class() -> type[Decoder]:
-    class CollectionMap(Decoder):
+def get_collection_decoder() -> Decoder:
+    class CollectionDecoder(Decoder):
         mapping_keys_description = 'Knowledge Collection Titles'
         mapping = {
             **{
-                collection.name: collection
+                f'{collection.name}: {collection.description}': collection
                 for collection in Collection.objects.all().annotate_entry_count()
             },
-            'No Matching Knowledge Collection Titles': None
+            'No Matching Knowledge Collection Titles': None,
         }
 
-    return CollectionMap
+    return CollectionDecoder()

django_spire/knowledge/intelligence/{maps/entry_map.py → decoders/entry_decoder.py}

@@ -5,8 +5,8 @@ from dandy import Decoder
 from django_spire.knowledge.collection.models import Collection
 
 
-def get_entry_map_class(collection: Collection) -> type[Decoder]:
-    class EntryMap(Decoder):
+def get_entry_decoder(collection: Collection) -> Decoder:
+    class EntryDecoder(Decoder):
         mapping_keys_description = 'Knowledge Entries'
         mapping = {
             **{
@@ -16,4 +16,4 @@ def get_entry_map_class(collection: Collection) -> type[Decoder]:
             'No Matching Knowledge Entries': None
         }
 
-    return EntryMap
+    return EntryDecoder()

django_spire/knowledge/intelligence/intel/collection_intel.py

@@ -5,3 +5,4 @@ from dandy import BaseIntel
 
 class CollectionIntel(BaseIntel):
     name: str
+    collection_id: int = None

django_spire/knowledge/intelligence/intel/entry_intel.py

@@ -6,8 +6,11 @@ from django_spire.knowledge.intelligence.intel.collection_intel import Collectio
 
 
 class EntryIntel(BaseIntel):
-    body: str
-    collection_intel: CollectionIntel
+    relevant_heading_text: str
+    relevant_subject_text: str
+    relevant_block_id: int
+    entry_id: int = None
+    collection_intel: CollectionIntel = None
 
 
 class EntriesIntel(BaseListIntel[EntryIntel]):

django_spire/knowledge/intelligence/intel/message_intel.py

@@ -1,11 +1,13 @@
 from __future__ import annotations
 
 from django_spire.ai.chat.message_intel import BaseMessageIntel
+from django_spire.knowledge.intelligence.intel.entry_intel import EntriesIntel
 
 
 class KnowledgeMessageIntel(BaseMessageIntel):
     _template: str = 'django_spire/knowledge/message/knowledge_message_intel.html'
     body: str
+    entries_intel: EntriesIntel
 
     def content_to_str(self) -> str:
         return self.body