django-spire 0.16.12__py3-none-any.whl → 0.17.0__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/profiling/__init__.py

@@ -0,0 +1,13 @@
+import threading
+
+lock = threading.Lock()
+
+from django_spire.profiling.middleware.profiling import ProfilingMiddleware
+from django_spire.profiling.panel import ProfilingPanel
+
+
+__all__ = [
+    'ProfilingMiddleware',
+    'ProfilingPanel',
+    'lock'
+]

django_spire/profiling/middleware/__init__.py

@@ -0,0 +1,6 @@
+from __future__ import annotations
+
+from django_spire.profiling.middleware.profiling import ProfilingMiddleware
+
+
+__all__ = ['ProfilingMiddleware']

django_spire/{core → profiling}/middleware/profiling.py

@@ -5,20 +5,42 @@ import threading
 import time
 
 from pathlib import Path
-from typing_extensions import Any, Callable, TYPE_CHECKING
+from typing_extensions import TYPE_CHECKING
 
 from django.conf import settings
 from django.utils.deprecation import MiddlewareMixin
 
+from django_spire.profiling import lock
+
 try:
     from pyinstrument import Profiler
 except ImportError:
     Profiler = None
 
 if TYPE_CHECKING:
+    from typing_extensions import Any, Callable
+
     from django.http import HttpRequest, HttpResponse
 
 
+IGNORE_EXTENSION = [
+    '.eot',
+    '.gif',
+    '.ico',
+    '.jpeg',
+    '.jpg',
+    '.js',
+    '.map',
+    '.pdf',
+    '.png',
+    '.svg',
+    '.ttf',
+    '.txt',
+    '.woff',
+    '.woff2',
+    '.zip',
+]
+
 IGNORE_PATH = [
     '/__',
     '/__debug__/',
@@ -36,12 +58,13 @@ IGNORE_PATH = [
     '/debug/',
     '/debug-toolbar/',
     '/django_glue/',
+    '/django_spire/theme/json/get_config/',
     '/docs/',
     '/favicon.ico',
     '/media/',
     '/openapi/',
     '/redoc/',
-    '/robots.txt',
+    '/robots.txt/',
     '/schema/',
     '/sitemap.xml',
     '/static/',
@@ -50,37 +73,15 @@ IGNORE_PATH = [
 ]
 
 
-IGNORE_EXTENSION = [
-    '.css',
-    '.eot',
-    '.gif',
-    '.ico',
-    '.jpeg',
-    '.jpg',
-    '.js',
-    '.map',
-    '.pdf',
-    '.png',
-    '.svg',
-    '.ttf',
-    '.txt',
-    '.woff',
-    '.woff2',
-    '.zip',
-]
-
-
 class ProfilingMiddleware(MiddlewareMixin):
     def __init__(self, get_response: Callable[[HttpRequest], HttpResponse]) -> None:
         super().__init__(get_response)
 
-        if Profiler is None:
-            message = 'pyinstrument is required for profiling.'
-            raise ImportError(message)
-
         configuration = {
             'PROFILING_DIR': os.getenv('PROFILING_DIR', '.profile'),
             'PROFILING_ENABLED': os.getenv('PROFILING_ENABLED', 'False') == 'True',
+            'PROFILING_MAX_FILES': int(os.getenv('PROFILING_MAX_FILES', '10')),
+            'PROFILE_THRESHOLD': float(os.getenv('PROFILE_THRESHOLD', '0')),
         }
 
         directory = configuration.get('PROFILING_DIR', '.profile')
@@ -97,32 +98,28 @@ class ProfilingMiddleware(MiddlewareMixin):
         self.directory.mkdir(exist_ok=True)
 
         self.enabled = configuration.get('PROFILING_ENABLED', False)
-        self.profile_threshold = configuration.get('PROFILE_THRESHOLD', 0)
+        self.threshold = configuration.get('PROFILE_THRESHOLD', 0)
+        self.maximum = configuration.get('PROFILING_MAX_FILES', 10)
 
         self.count = 0
         self.lock = threading.Lock()
 
-    def _remove_profile(self) -> None:
-        files = self.directory.glob('*.html')
-        profiles = list(files)
+    def _remove_profiles(self) -> None:
+        files = list(self.directory.glob('*.html'))
+
+        if len(files) <= self.maximum:
+            return
 
-        profiles.sort(
-            key=lambda p: p.stat().st_mtime,
+        files.sort(
+            key=lambda p: p.stat().st_mtime if p.exists() else 0,
             reverse=True
         )
 
-        maximum = 10
-
-        if len(profiles) > maximum:
-            for profile in profiles[maximum:]:
+        for profile in files[self.maximum:]:
+            if profile.exists():
                 profile.unlink()
 
-    def _save_profile(
-        self,
-        profiler: Profiler,
-        request: HttpRequest,
-        duration_ms: float
-    ) -> None:
+    def _save_profile(self, profiler: Profiler, request: HttpRequest, duration: float) -> None:
         with self.lock:
             timestamp = int(time.time() * 1000)
             method = request.method
@@ -131,21 +128,29 @@ class ProfilingMiddleware(MiddlewareMixin):
             if not path or path == '_':
                 path = 'root'
 
-            filename = f'{timestamp}_{method}_{path}_{duration_ms:.1f}ms_{request._profiling_id}.html'
-
-            path = str(self.directory / filename)
-            profiler.write_html(path)
+            profileid = request._profiling_id
+            filename = f'{timestamp}_{method}_{path}_{duration:.1f}ms_{profileid}.html'
+            filepath = self.directory / filename
 
-            self._remove_profile()
+            with lock:
+                profiler.write_html(str(filepath))
+                self._remove_profiles()
 
-    def _should_skip_profiling(self, request: HttpRequest) -> bool:
+    def _should_skip(self, request: HttpRequest) -> bool:
         path = request.path
 
-        return (
-            any(path.startswith(pattern) or pattern in path for pattern in IGNORE_PATH) or
-            any(path.endswith(extension) or extension in path for extension in IGNORE_EXTENSION)
+        path_match = any(
+            path.startswith(pattern) or pattern in path
+            for pattern in IGNORE_PATH
         )
 
+        extension_match = any(
+            path.endswith(extension) or extension in path
+            for extension in IGNORE_EXTENSION
+        )
+
+        return path_match or extension_match
+
     def process_view(
         self,
         request: HttpRequest,
@@ -159,7 +164,7 @@ class ProfilingMiddleware(MiddlewareMixin):
         if not self.enabled:
             return None
 
-        if self._should_skip_profiling(request):
+        if self._should_skip(request):
             return None
 
         with self.lock:
@@ -167,7 +172,7 @@ class ProfilingMiddleware(MiddlewareMixin):
             request._profiling_id = self.count
 
         profiler = Profiler(interval=0.001)
-        start_time = time.time()
+        start = time.time()
         profiler.start()
 
         try:
@@ -177,15 +182,15 @@ class ProfilingMiddleware(MiddlewareMixin):
                 response.render()
         except Exception:
             profiler.stop()
-            duration_ms = (time.time() - start_time) * 1000
-            self._save_profile(profiler, request, duration_ms)
+            duration = (time.time() - start) * 1000
+            self._save_profile(profiler, request, duration)
 
             raise
         else:
             profiler.stop()
-            duration_ms = (time.time() - start_time) * 1000
+            duration = (time.time() - start) * 1000
 
-            if duration_ms >= self.profile_threshold:
-                self._save_profile(profiler, request, duration_ms)
+            if duration >= self.threshold:
+                self._save_profile(profiler, request, duration)
 
             return response