django-spire 0.16.12__py3-none-any.whl → 0.16.13__py3-none-any.whl

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

@@ -1,19 +1,22 @@
-from dandy.llm import BaseLlmBot, Prompt
+from __future__ import annotations
 
+from dandy import BaseIntel, Bot, Prompt
 
-class MarkdownFormatLlmBot(BaseLlmBot):
 
-    @classmethod
-    def process(
-            cls,
-            markdown_content: str
-    ) -> str:
+class MarkdownTextIntel(BaseIntel):
+    text: str
+
+
+class MarkdownFormatLlmBot(Bot):
+    llm_intel_class = MarkdownTextIntel
+
+    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)
 
-        return cls.process_prompt_to_intel(prompt=markdown_prompt).text
+        result = self.llm.prompt_to_intel(prompt=markdown_prompt)
+        return result.text

django_spire/knowledge/entry/version/maps.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django_spire.knowledge.entry.version.converters.docx_converter import \
     DocxConverter
 from django_spire.knowledge.entry.version.converters.markdown_converter import \

django_spire/knowledge/entry/version/models.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django.db import models
 from django.utils.timezone import now
 

django_spire/knowledge/entry/version/querysets.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django_spire.history.querysets import HistoryQuerySet
 
 

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

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import random
+
 from datetime import timedelta
 
 from django.utils.timezone import localtime

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

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from keyring.testing.util import random_string
 
 from django_spire.auth.user.tests.factories import create_user

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

@@ -1,4 +1,7 @@
+from __future__ import annotations
+
 import time
+
 from unittest.mock import MagicMock, patch
 
 from django_spire.core.tests.test_cases import BaseTestCase

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

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django.urls import reverse
 
 from django_spire.core.tests.test_cases import BaseTestCase

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

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django.urls import reverse
 
 from django_spire.core.tests.test_cases import BaseTestCase

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

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django.urls import reverse
 
 from django_spire.core.tests.test_cases import BaseTestCase

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

@@ -2,6 +2,7 @@ from django.urls import path
 
 from django_spire.knowledge.entry.version.views import form_views
 
+
 app_name = 'form'
 
 urlpatterns = [

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

@@ -2,6 +2,7 @@ from django.urls import path
 
 from django_spire.knowledge.entry.version.views import json_views
 
+
 app_name = 'json'
 
 urlpatterns = [

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

@@ -2,6 +2,7 @@ from django.urls import path
 
 from django_spire.knowledge.entry.version.views import page_views
 
+
 app_name = 'page'
 
 urlpatterns = [

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

@@ -2,6 +2,7 @@ from django.urls import path
 
 from django_spire.knowledge.entry.version.views import redirect_views
 
+
 app_name = 'redirect'
 
 urlpatterns = [

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

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import json
 
 from django.core.handlers.wsgi import WSGIRequest

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

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import json
 
 from django.core.handlers.wsgi import WSGIRequest

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

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django.core.handlers.wsgi import WSGIRequest
 from django.shortcuts import get_object_or_404
 from django.template.response import TemplateResponse

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

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django.core.handlers.wsgi import WSGIRequest
 from django.http import HttpResponseRedirect
 from django.shortcuts import get_object_or_404

django_spire/knowledge/exceptions.py

@@ -1,2 +1,4 @@
+from __future__ import annotations
+
 class KnowledgeBaseConversionException(Exception):
     pass

django_spire/knowledge/intelligence/bots/entry_search_llm_bot.py

@@ -1,30 +1,19 @@
-from typing import Any
+from __future__ import annotations
 
-from dandy.llm import BaseLlmBot, Prompt, DefaultLlmIntel
+from dandy import Bot, Prompt
 
 from django_spire.knowledge.entry.models import Entry
 
 
-class EntrySearchLlmBot(BaseLlmBot):
+class EntrySearchLlmBot(Bot):
     @classmethod
-    def process(
-            cls,
-            user_input: str,
-            entry: Entry
-    ) -> str:
+    def process(cls, user_input: str, entry: Entry) -> str:
         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}')
 
         for version_block in entry.current_version.blocks.all():
             entry_prompt.text(version_block.render_to_text())
 
-        result_intel: DefaultLlmIntel = cls.process_prompt_to_intel(
-            prompt=entry_prompt
-        )
-
-        return result_intel.text
+        return cls().llm.prompt_to_text(prompt=entry_prompt)

django_spire/knowledge/intelligence/intel/collection_intel.py

@@ -1,4 +1,6 @@
-from dandy.intel import BaseIntel
+from __future__ import annotations
+
+from dandy import BaseIntel
 
 
 class CollectionIntel(BaseIntel):

django_spire/knowledge/intelligence/intel/entry_intel.py

@@ -1,6 +1,6 @@
-from typing import List
+from __future__ import annotations
 
-from dandy.intel import BaseIntel, BaseListIntel
+from dandy import BaseIntel, BaseListIntel
 
 from django_spire.knowledge.intelligence.intel.collection_intel import CollectionIntel
 
@@ -11,4 +11,4 @@ class EntryIntel(BaseIntel):
 
 
 class EntriesIntel(BaseListIntel[EntryIntel]):
-    entry_intel_list: List[EntryIntel]
+    entry_intel_list: list[EntryIntel]

django_spire/knowledge/intelligence/intel/message_intel.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django_spire.ai.chat.message_intel import BaseMessageIntel
 
 

django_spire/knowledge/intelligence/maps/collection_map.py

@@ -1,20 +1,19 @@
-from typing import Type
+from __future__ import annotations
 
-from dandy.llm import BaseLlmMap
-from dandy.map import Map
+from dandy import Decoder
 
 from django_spire.knowledge.collection.models import Collection
 
 
-def get_collection_map_class() -> Type[BaseLlmMap]:
-    class CollectionMap(BaseLlmMap):
-        map_keys_description = 'Knowledge Collection Titles'
-        map = Map({
+def get_collection_map_class() -> type[Decoder]:
+    class CollectionMap(Decoder):
+        mapping_keys_description = 'Knowledge Collection Titles'
+        mapping = {
             **{
                 collection.name: 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 CollectionMap

django_spire/knowledge/intelligence/maps/entry_map.py

@@ -1,20 +1,19 @@
-from typing import Type
+from __future__ import annotations
 
-from dandy.llm import BaseLlmMap
-from dandy.map import Map
+from dandy import Decoder
 
 from django_spire.knowledge.collection.models import Collection
 
 
-def get_entry_map_class(collection: Collection) -> Type[BaseLlmMap]:
-    class EntryMap(BaseLlmMap):
-        map_keys_description = 'Knowledge Entries'
-        map = Map({
+def get_entry_map_class(collection: Collection) -> type[Decoder]:
+    class EntryMap(Decoder):
+        mapping_keys_description = 'Knowledge Entries'
+        mapping = {
             **{
                 entry.name: entry
                 for entry in collection.entries.all()
               },
-            **{'No Matching Knowledge Entries': None}
-        })
+            'No Matching Knowledge Entries': None
+        }
 
     return EntryMap

django_spire/knowledge/intelligence/workflows/knowledge_workflow.py

@@ -1,18 +1,18 @@
-from dandy.workflow import BaseWorkflow
+from __future__ import annotations
 
 from django_spire.knowledge.intelligence.bots.entry_search_llm_bot import EntrySearchLlmBot
 from django_spire.knowledge.intelligence.intel.collection_intel import CollectionIntel
 from django_spire.knowledge.intelligence.intel.entry_intel import EntriesIntel, EntryIntel
-from django_spire.knowledge.intelligence.maps.collection_map import get_collection_map_class
 from django_spire.knowledge.intelligence.intel.message_intel import KnowledgeMessageIntel
+from django_spire.knowledge.intelligence.maps.collection_map import get_collection_map_class
 from django_spire.knowledge.intelligence.maps.entry_map import get_entry_map_class
 
 
-class KnowledgeWorkflow(BaseWorkflow):
+class KnowledgeWorkflow:
     @classmethod
     def process(cls, user_input: str) -> KnowledgeMessageIntel:
         CollectionMap = get_collection_map_class()
-        collections = CollectionMap.process(user_input)
+        collections = CollectionMap().process(user_input).values
 
         if collections[0] is None:
             return KnowledgeMessageIntel(
@@ -26,7 +26,7 @@ class KnowledgeWorkflow(BaseWorkflow):
         for collection in collections:
             if collection.entry_count > 0:
                 EntryMap = get_entry_map_class(collection=collection)
-                entries.extend(EntryMap.process(user_input))
+                entries.extend(EntryMap().process(user_input).values)
 
         entries = [entry for entry in entries if entry is not None]
 
@@ -38,10 +38,12 @@ class KnowledgeWorkflow(BaseWorkflow):
                 )
             )
 
+        entry_search_bot = EntrySearchLlmBot()
+
         entries_intel = EntriesIntel(
             entry_intel_list=[
                 EntryIntel(
-                    body=EntrySearchLlmBot.process(
+                    body=entry_search_bot.process(
                         user_input=user_input,
                         entry=entry
                     ),

django_spire/knowledge/models.py

@@ -1,3 +1,5 @@
+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

django_spire/knowledge/seeding/seed.py

@@ -1 +1,3 @@
+from __future__ import annotations
+
 from django_spire.knowledge.collection.seeding.seed import *

django_spire/knowledge/templatetags/spire_knowledge_tags.py

@@ -1,7 +1,10 @@
+from __future__ import annotations
+
 import re
 
 from django import template
 
+
 register = template.Library()
 
 

django_spire/knowledge/urls/__init__.py

@@ -1,5 +1,6 @@
 from django.urls import include, path
 
+
 app_name = 'knowledge'
 
 urlpatterns = [

{django_spire-0.16.12.dist-info → django_spire-0.16.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-spire
-Version: 0.16.12
+Version: 0.16.13
 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.
@@ -45,10 +45,10 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
-Requires-Dist: boto3==1.24.18
-Requires-Dist: botocore==1.27.18
+Requires-Dist: boto3>=1.34.0
+Requires-Dist: botocore>=1.34.0
 Requires-Dist: crispy-bootstrap5==2024.10
-Requires-Dist: dandy==0.20.0
+Requires-Dist: dandy==1.1.0
 Requires-Dist: django>=5.1.8
 Requires-Dist: django-crispy-forms==2.3
 Requires-Dist: django-glue>=0.8.1
@@ -73,6 +73,7 @@ Requires-Dist: django-debug-toolbar; extra == "development"
 Requires-Dist: django-watchfiles; extra == "development"
 Requires-Dist: pip; extra == "development"
 Requires-Dist: pyinstrument; extra == "development"
+Requires-Dist: pyrefly; extra == "development"
 Requires-Dist: pytest; extra == "development"
 Requires-Dist: setuptools; extra == "development"
 Requires-Dist: twine; extra == "development"