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

django_spire/ai/context/models.py

@@ -0,0 +1,67 @@
+from __future__ import annotations
+
+from django.core.exceptions import ValidationError
+from django.db import models
+
+from django_spire.ai.context import querysets
+from django_spire.ai.context.choices import PersonRoleChoices
+from django_spire.auth.user.models import AuthUser
+from django_spire.history.mixins import HistoryModelMixin
+
+
+class Organization(HistoryModelMixin):
+    name = models.CharField(max_length=255, blank=True, null=True)
+    legal_name = models.CharField(max_length=255, blank=True, null=True)
+    description = models.TextField(blank=True, null=True)
+    sector = models.CharField(max_length=255, blank=True, null=True)
+    sub_sector = models.CharField(max_length=255, blank=True, null=True)
+    website = models.URLField(max_length=255, blank=True, null=True)
+    street_address = models.CharField(max_length=255, blank=True, null=True)
+    unit_number = models.CharField(max_length=32, blank=True, null=True)
+    city = models.CharField(max_length=255, blank=True, null=True)
+    province = models.CharField(max_length=255, blank=True, null=True)
+    postal_code = models.CharField(max_length=16, blank=True, null=True)
+    country = models.CharField(max_length=255, blank=True, null=True)
+    phone = models.CharField(max_length=255, blank=True, null=True)
+    email = models.EmailField(max_length=255, blank=True, null=True)
+
+    objects = querysets.OrganizationQuerySet.as_manager()
+
+    def save(self, *args, **kwargs) -> None:
+        if self.pk is None:
+            if self.__class__.objects.exists():
+                message = 'Only one AI Organization Context is allowed'
+                raise ValidationError(message)
+
+        return super().save(*args, **kwargs)
+
+    class Meta:
+        db_table = 'django_spire_ai_context_organization'
+        verbose_name = 'Organization Context'
+        verbose_name_plural = 'Organization Context'
+
+
+class Person(HistoryModelMixin):
+    is_internal_to_organization = models.BooleanField(default=True)
+    user = models.ForeignKey(
+        AuthUser,
+        blank=True,
+        null=True,
+        on_delete=models.SET_NULL,
+        related_name='ai_context_people',
+        related_query_name='ai_context_person'
+    )
+    role = models.CharField(max_length=16, choices=PersonRoleChoices, default=PersonRoleChoices.ADMIN)
+    role_details = models.TextField(blank=True, null=True)
+    first_name = models.CharField(max_length=255, blank=True, null=True)
+    last_name = models.CharField(max_length=255, blank=True, null=True)
+    phone = models.CharField(max_length=255, blank=True, null=True)
+    email = models.EmailField(max_length=255, blank=True, null=True)
+
+    objects = querysets.PeopleQuerySet.as_manager()
+
+    class Meta:
+        db_table = 'django_spire_ai_context_person'
+        verbose_name = 'Person Context'
+        verbose_name_plural = 'People Context'
+

django_spire/ai/context/querysets.py

@@ -0,0 +1,15 @@
+from __future__ import annotations
+
+from django_spire.history.querysets import HistoryQuerySet
+
+
+class OrganizationQuerySet(HistoryQuerySet):
+    def get_only_or_none(self):
+        try:
+            return self.earliest('id')
+        except self.model.DoesNotExist:
+            return None
+
+
+class PeopleQuerySet(HistoryQuerySet):
+    pass

django_spire/ai/context/seeding/seed.py

@@ -0,0 +1,24 @@
+from __future__ import annotations
+
+from django_spire.ai.context import models
+from django_spire.ai.context import choices
+
+from faker import Faker
+
+
+models.Organization.objects.create(
+    name='Spire Candy',
+    legal_name='Spire Candy Processors Limited',
+)
+
+for people_role_choice in choices.PersonRoleChoices:
+    first_name = Faker().first_name()
+    last_name = Faker().last_name()
+
+    people = models.Person.objects.create(
+        role=people_role_choice.value,
+        first_name=first_name,
+        last_name=last_name,
+        email=f'{first_name.lower()}.{last_name.lower()}@spirecandy.ca',
+        phone=Faker().phone_number(),
+    )

django_spire/ai/prompt/system/bots.py

@@ -1,10 +1,8 @@
 from __future__ import annotations
 
-from dandy import Bot, LlmConfigOptions, recorder_to_html_file
+from dandy import Bot, LlmConfigOptions
 
-from django_spire.ai.prompt.system import prompts
-from django_spire.ai.prompt.system import intel
-from django_spire.ai.prompt.system.intel import SystemPromptIntel
+from django_spire.ai.prompt.system import intel, prompts
 
 
 class RoleSystemPromptBot(Bot):
@@ -70,7 +68,7 @@ class SystemPromptBot(Bot):
         guidelines = guidelines_bot.process(user_story)
         output_format = output_format_bot.process(user_story)
 
-        return SystemPromptIntel(
+        return intel.SystemPromptIntel(
             role=role.result,
             task=task.result,
             guidelines=guidelines.result,

django_spire/ai/prompt/tuning/bots.py

@@ -65,8 +65,7 @@ class FormattingBot(Bot):
     def process(self, system_prompt: str) -> intel.PromptTuningIntel:
         return self.llm.prompt_to_intel(
             prompt=prompts.specialized_bot_input_prompt(system_prompt),
-            intel_class=intel.PromptTuningIntel,
-            postfix_system_prompt=None
+            intel_class=intel.PromptTuningIntel
         )
 
 
@@ -76,8 +75,7 @@ class InstructionClarityBot(Bot):
     def process(self, system_prompt: str) -> intel.PromptTuningIntel:
         return self.llm.prompt_to_intel(
             prompt=prompts.specialized_bot_input_prompt(system_prompt),
-            intel_class=intel.PromptTuningIntel,
-            postfix_system_prompt=None
+            intel_class=intel.PromptTuningIntel
         )
 
 
@@ -87,8 +85,7 @@ class PersonaBot(Bot):
     def process(self, system_prompt: str) -> intel.PromptTuningIntel:
         return self.llm.prompt_to_intel(
             prompt=prompts.specialized_bot_input_prompt(system_prompt),
-            intel_class=intel.PromptTuningIntel,
-            postfix_system_prompt=None
+            intel_class=intel.PromptTuningIntel
         )
 
 
@@ -98,8 +95,7 @@ class DuplicationRemovalBot(Bot):
     def process(self, system_prompt: str) -> intel.PromptTuningIntel:
         return self.llm.prompt_to_intel(
             prompt=prompts.specialized_bot_input_prompt(system_prompt),
-            intel_class=intel.PromptTuningIntel,
-            postfix_system_prompt=None
+            intel_class=intel.PromptTuningIntel
         )
 
 
@@ -109,6 +105,5 @@ class ExampleOptimizationBot(Bot):
     def process(self, system_prompt: str) -> intel.PromptTuningIntel:
         return self.llm.prompt_to_intel(
             prompt=prompts.specialized_bot_input_prompt(system_prompt),
-            intel_class=intel.PromptTuningIntel,
-            postfix_system_prompt=None
+            intel_class=intel.PromptTuningIntel
         )

django_spire/ai/sms/admin.py

@@ -25,11 +25,13 @@ class SmsConversationAdmin(admin.ModelAdmin):
 
     def view_sms_messages_link(self, obj):
         count = obj.messages.count()
+
         url = (
                 reverse("admin:django_spire_ai_sms_smsmessage_changelist")
                 + "?"
                 + urlencode({"sms_conversation__id": f"{obj.id}"})
         )
+
         return format_html('<a href="%s">%s Messages</a>' % (url, count))
 
     view_sms_messages_link.short_description = "Messages"

django_spire/ai/sms/apps.py

@@ -1,9 +1,7 @@
 from __future__ import annotations
 
 from django.apps import AppConfig
-from django.conf import settings
 
-from django_spire.consts import AI_SMS_CONVERSATION_WORKFLOW_CLASS_SETTINGS_NAME
 from django_spire.utils import check_required_apps
 
 
@@ -12,10 +10,7 @@ class SmsConfig(AppConfig):
     name = 'django_spire.ai.sms'
     label = 'django_spire_ai_sms'
 
-    REQUIRED_APPS = ('django_spire_ai',)
-
-    def ready(self):
-        if not isinstance(getattr(settings, AI_SMS_CONVERSATION_WORKFLOW_CLASS_SETTINGS_NAME), str):
-            raise ValueError(f'"{AI_SMS_CONVERSATION_WORKFLOW_CLASS_SETTINGS_NAME}" must be set in the django settings when using "{self.label}".')
+    REQUIRED_APPS = ('django_spire_ai', 'django_spire_ai_context')
 
+    def ready(self) -> None:
         check_required_apps(self.label)

django_spire/ai/sms/decorators.py

@@ -25,7 +25,7 @@ def twilio_auth_required(func):
 
         if request_valid:
             return func(request, *args, **kwargs)
-        else:
-            return HttpResponseForbidden()
+
+        return HttpResponseForbidden()
 
     return decorated_function

django_spire/ai/sms/intelligence/workflows/sms_conversation_workflow.py

@@ -1,27 +1,27 @@
 from __future__ import annotations
 
+from typing import TYPE_CHECKING
+
 from dandy.recorder import recorder_to_html_file
-from dandy.llm.request.message import MessageHistory
-from django.core.handlers.wsgi import WSGIRequest
 
-from django_spire.ai.chat.intelligence.workflows.chat_workflow import SpireChatWorkflow
+from django_spire.ai.chat.intelligence.workflows.chat_workflow import chat_workflow
 from django_spire.ai.sms.intel import SmsIntel
 
+if TYPE_CHECKING:
+    from django.core.handlers.wsgi import WSGIRequest
+    from dandy.llm.request.message import MessageHistory
+
 
-class SpireSmsConversationWorkflow:
-    @staticmethod
-    @recorder_to_html_file('sms_workflow')
-    def process(
-        request: WSGIRequest,
-        user_input: str,
-        message_history: MessageHistory | None = None
-    ) -> SmsIntel:
-        return SmsIntel(
-            body=str(
-                SpireChatWorkflow.process(
-                    request,
-                    user_input=user_input,
-                    message_history=message_history,
-                )
+@recorder_to_html_file('spire_ai_sms_conversation_workflow')
+def sms_conversation_workflow(
+    request: WSGIRequest, user_input: str, message_history: MessageHistory | None = None, actor: str | None = None
+) -> SmsIntel:
+    return SmsIntel(
+        body=str(
+            chat_workflow(
+                request,
+                user_input=user_input,
+                message_history=message_history,
             )
         )
+    )

django_spire/ai/sms/tests/test_webhook.py

@@ -1,14 +1,15 @@
 from unittest.mock import patch
 
-from django.test import TestCase, Client
 from django.urls import reverse
 
 from django_spire.ai.sms.models import SmsConversation
+from django_spire.core.tests.test_cases import BaseTestCase
 
 
-class SmsWebhookTests(TestCase):
+class SmsWebhookTests(BaseTestCase):
     def setUp(self):
-        self.client = Client()
+        super().setUp()
+
         self.webhook_url = reverse('django_spire:ai:sms:webhook')
 
     @patch('twilio.request_validator.RequestValidator.validate')
@@ -34,4 +35,4 @@ class SmsWebhookTests(TestCase):
         self.assertEqual(inbound_message.twilio_sid, 'SM123456789')
 
         outbound_message = conversation.messages.filter(is_inbound=False).first()
-        self.assertTrue(len(outbound_message.body) > 0)
+        self.assertTrue(len(outbound_message.body) > 0)

django_spire/ai/sms/urls.py

@@ -1,7 +1,10 @@
+from __future__ import annotations
+
 from django.urls import path
 
 from django_spire.ai.sms import views
 
+
 app_name = 'sms'
 
 urlpatterns = [

django_spire/ai/sms/views.py

@@ -6,8 +6,8 @@ from django.views.decorators.http import require_POST
 from twilio.twiml.messaging_response import MessagingResponse
 
 from django_spire.ai.sms.decorators import twilio_auth_required
+from django_spire.ai.sms.intelligence.workflows.sms_conversation_workflow import sms_conversation_workflow
 from django_spire.ai.sms.models import SmsConversation
-from django_spire.ai.sms.tools import sms_workflow_process
 
 
 @csrf_exempt
@@ -22,7 +22,7 @@ def webhook_view(request):
     body = request.POST.get('Body', '')
     message_sid = request.POST.get('MessageSid', '')
 
-    conversation, created = SmsConversation.objects.get_or_create(
+    conversation, _ = SmsConversation.objects.get_or_create(
         phone_number=from_number
     )
 
@@ -33,8 +33,7 @@ def webhook_view(request):
     )
 
     try:
-
-        sms_intel = sms_workflow_process(
+        sms_intel = sms_conversation_workflow(
             request=request,
             user_input=body,
             message_history=conversation.generate_message_history(),
@@ -55,7 +54,6 @@ def webhook_view(request):
         message.save()
 
         return HttpResponse(twiml_response)
-
     except:
         raise
 

django_spire/ai/urls.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django.urls import include, path
 
 

django_spire/auth/templates/django_spire/auth/form/login_form.html

@@ -0,0 +1,25 @@
+<form
+        class="text-app-secondary"
+        method="post"
+        x-data="{
+            username: new GlueCharField('username', {required: true, label: {% block username_label %}'Email Address'{% endblock %}}),
+            password: new GlueCharField('password', {required: true})
+        }"
+>
+    {% csrf_token %}
+    <div class="row">
+        <div class="col">
+            {% include 'django_glue/form/field/char_field.html' with glue_field='username' %}
+        </div>
+    </div>
+    <div class="row mt-2">
+        <div class="col">
+            {% include 'django_glue/form/field/password_field.html' with glue_field='password' %}
+        </div>
+    </div>
+    <div class="row mt-2">
+        <div class="col">
+            <button type="submit" class="d-block mx-auto btn btn-app-primary-outlined my-4 w-100">Login</button>
+        </div>
+    </div>
+</form>

django_spire/auth/templates/django_spire/auth/page/auth_page.html

@@ -3,15 +3,14 @@
 {% load static %}
 
 {% block page_content %}
-    <div class="row justify-content-center ps-3 mt-5">
+    <div class="row justify-content-center mx-auto mt-5">
         <div class="col-11 col-md-6 col-lg-4 bg-app-layer-one">
             <div class="px-4 py-5">
                 {% block authentication_page_top_content %}
                     <div class="text-center pb-5">
                         <a href="/">
                             {% block authentication_page_img %}
-                                <img class="ms-1 img-fluid" src="{% static 'django_spire/img/stratus_secondary_medium.png' %}"
-                                     alt="">
+                                <img height="120px" class="ms-1" src="{% static 'img/django_spire.png' %}" alt="">
                             {% endblock %}
                         </a>
                     </div>

django_spire/auth/templates/django_spire/auth/page/login_page.html

@@ -1,31 +1,7 @@
 {% extends 'django_spire/auth/page/auth_page.html' %}
 
 {% block authentication_page_content %}
-    <form
-        class="text-app-secondary"
-        method="post"
-        x-data="{
-            username: new GlueCharField('username', {required: true, label: {% block username_label %}'Email Address'{% endblock %}}),
-            password: new GlueCharField('password', {required: true})
-        }"
-    >
-        {% csrf_token %}
-        <div class="row">
-            <div class="col">
-                {% include 'django_glue/form/field/char_field.html' with glue_field='username' %}
-            </div>
-        </div>
-        <div class="row mt-2">
-            <div class="col">
-                {% include 'django_glue/form/field/password_field.html' with glue_field='password' %}
-            </div>
-        </div>
-        <div class="row mt-2">
-            <div class="col">
-                <button type="submit" class="d-block mx-auto btn btn-app-primary-outlined my-4 w-100">Login</button>
-            </div>
-        </div>
-    </form>
+    {% include 'django_spire/auth/form/login_form.html' %}
 
     <div class="text-center">
         <a href="{% url 'django_spire:auth:admin:password_reset' %}"

django_spire/conf.py

@@ -27,8 +27,6 @@ class Settings:
         if django_spire_value is not None:
             return django_spire_value
 
-        message = f'No attribute {name} found in settings.'
-        raise AttributeError(message)
-
+        return None
 
 settings = Settings()

django_spire/consts.py

@@ -1,10 +1,4 @@
-__VERSION__ = '0.18.2'
-
-
-AI_CHAT_WORKFLOW_SENDER_SETTINGS_NAME = 'AI_CHAT_WORKFLOW_NAME'
-AI_CHAT_WORKFLOW_CLASS_SETTINGS_NAME = 'AI_CHAT_WORKFLOW_CLASS'
-AI_SMS_CONVERSATION_WORKFLOW_CLASS_SETTINGS_NAME = 'AI_SMS_CONVERSATION_WORKFLOW_CLASS'
-
+__VERSION__ = '0.19.0'
 
 MAINTENANCE_MODE_SETTINGS_NAME = 'MAINTENANCE_MODE'
 

django_spire/contrib/seeding/intelligence/bots/seeder_generator_bot.py

@@ -15,6 +15,8 @@ class SeederGeneratorBot(Bot):
         randomize_seed=True
     )
 
+    llm_guidelines = generate_django_model_seeder_system_prompt()
+
     llm_role = 'You are an expert Python developer specializing in Django model seeders.'
 
     def process(
@@ -27,6 +29,5 @@ class SeederGeneratorBot(Bot):
                 model_import,
                 model_description,
             ),
-            intel_class=SourceIntel,
-            postfix_system_prompt=generate_django_model_seeder_system_prompt()
+            intel_class=SourceIntel
         )

django_spire/contrib/utils.py

@@ -0,0 +1,2 @@
+def truncate_string(string: str, length: int) -> str:
+    return string[:(length - 3)] + '...' if len(string) > length else string

django_spire/core/static/django_spire/css/app-button.css

@@ -67,11 +67,21 @@
 }
 
 .btn-app-primary-outlined {
+    color: var(--app-btn-primary) !important;
+    border: 1px solid var(--app-btn-primary) !important;
+}
+
+.btn-app-primary-outlined:hover {
+    background-color: var(--app-btn-primary) !important;
+    color: var(--app-default-button-text-color) !important;
+}
+
+.btn-app-primary-dark-outlined {
     color: var(--app-btn-primary-dark) !important;
     border: 1px solid var(--app-btn-primary-dark) !important;
 }
 
-.btn-app-primary-outlined:hover {
+.btn-app-primary-dark-outlined:hover {
     background-color: var(--app-btn-primary-dark) !important;
     color: var(--app-default-button-text-color) !important;
 }

django_spire/core/static/django_spire/css/app-import.css

@@ -1,4 +1,5 @@
 @import url('app-default.css');
+@import url('app-layout.css');
 @import url('app-theme.css');
 @import url('app-background.css');
 @import url('app-border.css');
@@ -6,5 +7,6 @@
 @import url('app-offcanvas.css');
 @import url('app-navigation.css');
 @import url('app-page.css');
+@import url('app-side-panel.css');
 @import url('app-text.css');
 @import url('app-template.css');

django_spire/core/static/django_spire/css/app-layout.css

@@ -0,0 +1,15 @@
+:root {
+    --app-footer-height: 70px;
+    --app-mobile-navigation-width: 250px;
+    --app-side-navigation-width: 250px;
+    --app-side-navigation-top-content-height: 230px;
+    --app-top-navigation-height: 80px;
+
+    --app-content-height: calc(100vh - var(--app-top-navigation-height) );
+    --app-side-panel-height: calc(100vh - var(--app-top-navigation-height) - 1vh);
+}
+
+.vh-minus-top-nav {
+    height: calc(100vh - var(--app-top-navigation-height));
+}
+

django_spire/core/static/django_spire/css/app-navigation.css

@@ -39,6 +39,11 @@
     color: var(--app-footer-link-hover-color) !important;
 }
 
+.navbar-nav-scroll {
+    max-height: calc(100vh - 120px);
+    overflow-y: auto;
+}
+
 .top-navigation {
     background-color: var(--app-top-navigation-bg-color) !important;
     color: var(--app-top-navigation-text-color) !important;
@@ -52,22 +57,39 @@
     color: var(--app-top-navigation-link-hover-color) !important;
 }
 
-/* Must be below top-navigation for mobile side navigation css to be correct */
 .side-navigation {
     background-color: var(--app-side-navigation-bg-color) !important;
+    border-color: var(--bs-border-color);
+    border-right-style: solid;
+    border-right-width: 1px;
     color: var(--app-side-navigation-text-color) !important;
     width: var(--app-side-navigation-width);
 }
 
 .side-navigation a {
     color: var(--app-side-navigation-link-color) !important;
+    display: block;
+    padding: 0.75rem 1rem;
+    transition: background-color 0.2s ease, color 0.2s ease;
 }
 
 .side-navigation a:hover {
     color: var(--app-side-navigation-link-hover-color) !important;
 }
 
-.vh-minus-nav {
+.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;
+    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;
+    pointer-events: none;
+}
+
+.vh-minus-top-nav {
     height: calc(100vh - var(--app-top-navigation-height));
 }
 

django_spire/core/static/django_spire/css/app-page.css

@@ -2,6 +2,14 @@
     width: 100%;
 }
 
+.main-content-with-panels {
+    transition: margin-left 0.3s ease, margin-right 0.3s ease;
+}
+
+.main-content-with-panels.with-left-panel {
+    margin-left: calc(var(--app-side-panel-width) * 0.5);
+}
+
 @media (min-width: 992px) {
     .full-page-content {
         width: calc(100% - var(--app-side-navigation-width));