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

django_spire/ai/prompt/tuning/bots.py

@@ -1,162 +1,114 @@
-from dandy.llm import BaseLlmBot, LlmConfigOptions, Prompt
+from __future__ import annotations
 
-from django_spire.ai.prompt.tuning import prompts, intel
+from dandy import Bot, LlmConfigOptions, Prompt
 
+from django_spire.ai.prompt.tuning import prompts, intel
 
 
-class PromptTestingBot(BaseLlmBot):
-    instructions_prompt = Prompt()
-    intel_class = intel.PromptTestingIntel
-    config_options = LlmConfigOptions(temperature=0.4)
+class PromptTestingBot(Bot):
+    llm_role = Prompt()
+    llm_config_options = LlmConfigOptions(temperature=0.4)
 
-    @classmethod
     def process(
-            cls,
-            system_prompt: str,
-            user_prompt: str,
-
-    ) -> intel.PromptTuningIntel:
-        """
-            Takes a system prompt and a user prompt.
-            Used to test the response of the system prompt.
-        """
-
-        cls.instructions_prompt = system_prompt
-        return cls.process_prompt_to_intel(
-            prompt=user_prompt
+        self,
+        system_prompt: str,
+        user_prompt: str
+    ) -> intel.PromptTestingIntel:
+        self.llm_role = system_prompt
+        return self.llm.prompt_to_intel(
+            prompt=user_prompt,
+            intel_class=intel.PromptTestingIntel
         )
 
 
-class SimplePromptTuningBot(BaseLlmBot):
-    instructions_prompt = prompts.prompt_tuning_instruction_bot_prompt()
-    intel_class = intel.PromptTuningIntel
-    config_options = LlmConfigOptions(temperature=0.1)
+class SimplePromptTuningBot(Bot):
+    llm_role = prompts.prompt_tuning_instruction_bot_prompt()
+    llm_config_options = LlmConfigOptions(temperature=0.1)
 
-
-    @classmethod
     def process(
-            cls,
-            prompt: str,
-            feedback: str,
-
+        self,
+        prompt: str,
+        feedback: str
     ) -> intel.PromptTuningIntel:
-
-        return cls.process_prompt_to_intel(
+        return self.llm.prompt_to_intel(
             prompt=prompts.prompt_tuning_input_prompt(prompt, feedback),
+            intel_class=intel.PromptTuningIntel
         )
 
 
-class AdvancedPromptTuningBot(BaseLlmBot):
-    instructions_prompt = prompts.prompt_tuning_instruction_bot_prompt()
-    intel_class = intel.PromptTuningIntel
+class AdvancedPromptTuningBot(Bot):
+    llm_role = prompts.prompt_tuning_instruction_bot_prompt()
 
-    @classmethod
     def process(
-            cls,
-            system_prompt: str,
-            feedback: str,
-
-    ) -> intel.PromptTuningIntel:
-        tuned_prompt = SimplePromptTuningBot.process(system_prompt, feedback)
-        formatted_prompt = FormattingBot.process(tuned_prompt.prompt)
-        remove_duplicates = DuplicationRemovalBot.process(formatted_prompt.prompt)
-        improve_instructions = InstructionClarityBot.process(remove_duplicates.prompt)
-        example_optimization = ExampleOptimizationBot.process(improve_instructions.prompt)
-        persona = PersonaBot.process(example_optimization.prompt)
-        return persona
-
-
-        # return cls.process_prompt_to_intel(
-        #     prompt=prompts.prompt_tuning_input_prompt(system_prompt, feedback),
-        #     postfix_system_prompt=None
-        # )
-        #
-
-class FormattingBot(BaseLlmBot):
-    """Bot that preserves structure and standardizes formatting of system prompts."""
-    instructions_prompt = prompts.formatting_bot_instruction_prompt()
-    intel_class = intel.PromptTuningIntel
-
-    @classmethod
-    def process(
-            cls,
-            system_prompt: str,
-
+        self,
+        system_prompt: str,
+        feedback: str
     ) -> intel.PromptTuningIntel:
-
-        return cls.process_prompt_to_intel(
+        simple_bot = SimplePromptTuningBot()
+        formatting_bot = FormattingBot()
+        duplication_bot = DuplicationRemovalBot()
+        instruction_bot = InstructionClarityBot()
+        example_bot = ExampleOptimizationBot()
+        persona_bot = PersonaBot()
+
+        tuned_prompt = simple_bot.process(system_prompt, feedback)
+        formatted_prompt = formatting_bot.process(tuned_prompt.prompt)
+        remove_duplicates = duplication_bot.process(formatted_prompt.prompt)
+        improve_instructions = instruction_bot.process(remove_duplicates.prompt)
+        example_optimization = example_bot.process(improve_instructions.prompt)
+        return persona_bot.process(example_optimization.prompt)
+
+
+class FormattingBot(Bot):
+    llm_role = prompts.formatting_bot_instruction_prompt()
+
+    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
         )
 
 
-class InstructionClarityBot(BaseLlmBot):
-    """Bot that focuses on improving the clarity of instructions in system prompts."""
-    instructions_prompt = prompts.instruction_clarity_bot_instruction_prompt()
-    intel_class = intel.PromptTuningIntel
-
-    @classmethod
-    def process(
-            cls,
-            system_prompt: str,
-
-    ) -> intel.PromptTuningIntel:
+class InstructionClarityBot(Bot):
+    llm_role = prompts.instruction_clarity_bot_instruction_prompt()
 
-        return cls.process_prompt_to_intel(
+    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
         )
 
 
-class PersonaBot(BaseLlmBot):
-    """Bot that maintains consistent tone and persona throughout system prompts."""
-    instructions_prompt = prompts.persona_bot_instruction_prompt()
-    intel_class = intel.PromptTuningIntel
-
-    @classmethod
-    def process(
-            cls,
-            system_prompt: str,
+class PersonaBot(Bot):
+    llm_role = prompts.persona_bot_instruction_prompt()
 
-    ) -> intel.PromptTuningIntel:
-
-        return cls.process_prompt_to_intel(
+    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
         )
 
 
-class DuplicationRemovalBot(BaseLlmBot):
-    """Bot that identifies and removes redundancies in system prompts."""
-    instructions_prompt = prompts.duplication_removal_bot_instruction_prompt()
-    intel_class = intel.PromptTuningIntel
-
-    @classmethod
-    def process(
-            cls,
-            system_prompt: str,
-
-    ) -> intel.PromptTuningIntel:
+class DuplicationRemovalBot(Bot):
+    llm_role = prompts.duplication_removal_bot_instruction_prompt()
 
-        return cls.process_prompt_to_intel(
+    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
         )
 
 
-class ExampleOptimizationBot(BaseLlmBot):
-    """Bot that refines examples within system prompts."""
-    instructions_prompt = prompts.example_optimization_bot_instruction_prompt()
-    intel_class = intel.PromptTuningIntel
-
-    @classmethod
-    def process(
-            cls,
-            system_prompt: str,
-
-    ) -> intel.PromptTuningIntel:
+class ExampleOptimizationBot(Bot):
+    llm_role = prompts.example_optimization_bot_instruction_prompt()
 
-        return cls.process_prompt_to_intel(
+    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
         )

django_spire/ai/prompt/tuning/intel.py

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

django_spire/ai/prompt/tuning/mixins.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django.db import models
 from django.contrib.postgres.fields import JSONField
 

django_spire/ai/prompt/tuning/prompt_tuning_cli.py

@@ -1,4 +1,6 @@
-from dandy.recorder import Recorder
+from __future__ import annotations
+
+from dandy import Recorder
 
 from django_spire.ai.prompt.bots import DandyPythonPromptBot
 from django_spire.ai.prompt.tuning.bots import SimplePromptTuningBot
@@ -7,8 +9,8 @@ from django_spire.ai.prompt.tuning.bots import SimplePromptTuningBot
 def prompt_tuning_cli(prompt: str):
     Recorder.start_recording(recording_name='prompt_tuning')
 
-    # ENTER YOUR PROMPT HERE!
     holding = prompt
+    tuning_bot = SimplePromptTuningBot()
 
     print('----------------------------------------------------')
 
@@ -21,10 +23,7 @@ def prompt_tuning_cli(prompt: str):
 
         print('Attempting to tune prompt.....')
 
-        new_prompt = (
-            SimplePromptTuningBot()
-            .process(holding, feedback)
-        )
+        new_prompt = tuning_bot.process(holding, feedback)
         holding = new_prompt.prompt
 
         print('----------------------NEW PROMPT START------------------------------')
@@ -34,7 +33,8 @@ def prompt_tuning_cli(prompt: str):
         print('----------------------NEW PROMPT END------------------------------')
         print()
 
-
     Recorder.stop_recording(recording_name='prompt_tuning')
     Recorder.to_html_file(recording_name='prompt_tuning')
-    DandyPythonPromptBot().process(prompt)
+
+    python_bot = DandyPythonPromptBot()
+    python_bot.process(prompt)

django_spire/ai/prompt/tuning/prompts.py

@@ -1,4 +1,6 @@
-from dandy.llm import Prompt
+from __future__ import annotations
+
+from dandy import Prompt
 
 
 def prompt_tuning_instruction_bot_prompt():
@@ -181,7 +183,7 @@ def example_optimization_bot_instruction_prompt():
     )
 
 
-def prompt_tuning_input_prompt(system_prompt: str, feedback:str):
+def prompt_tuning_input_prompt(system_prompt: str, feedback: str):
     return (
         Prompt()
         .heading('User Supplies System Prompt')

django_spire/ai/sms/admin.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from urllib.parse import urlencode
 
 from django.contrib import admin
@@ -45,4 +47,4 @@ class SmsMessageAdmin(admin.ModelAdmin):
     readonly_fields = ('created_datetime', )
 
     class Meta:
-        ordering = ('created_datetime', )
+        ordering = ('created_datetime', )

django_spire/ai/sms/apps.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django.apps import AppConfig
 from django.conf import settings
 

django_spire/ai/sms/decorators.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import functools
 import os
 

django_spire/ai/sms/intel.py

@@ -1,5 +1,7 @@
-from dandy.intel import BaseIntel
+from __future__ import annotations
+
+from dandy import BaseIntel
 
 
 class SmsIntel(BaseIntel):
-    body: str
+    body: str

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

@@ -1,20 +1,20 @@
+from __future__ import annotations
+
 from dandy.recorder import recorder_to_html_file
-from dandy.workflow import BaseWorkflow
-from dandy.llm import MessageHistory
+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.sms.intel import SmsIntel
 
 
-class SpireSmsConversationWorkflow(BaseWorkflow):
-    @classmethod
+class SpireSmsConversationWorkflow:
+    @staticmethod
     @recorder_to_html_file('sms_workflow')
     def process(
-            cls,
-            request: WSGIRequest,
-            user_input: str,
-            message_history: MessageHistory | None = None
+        request: WSGIRequest,
+        user_input: str,
+        message_history: MessageHistory | None = None
     ) -> SmsIntel:
         return SmsIntel(
             body=str(

django_spire/ai/sms/models.py

@@ -1,5 +1,6 @@
-from dandy.llm import MessageHistory
-from dandy.llm.service.request.message import RoleLiteralStr
+from __future__ import annotations
+
+from dandy.llm.request.message import MessageHistory, RoleLiteralStr
 from django.contrib.auth.models import User
 from django.db import models
 from django.utils.timezone import now
@@ -27,11 +28,11 @@ class SmsConversation(HistoryModelMixin):
         return f"SMS Conversation with {self.phone_number}"
 
     def add_message(
-            self,
-            body: str,
-            is_inbound: bool,
-            twilio_sid: str,
-            is_processed: bool = False,
+        self,
+        body: str,
+        is_inbound: bool,
+        twilio_sid: str,
+        is_processed: bool = False
     ):
         message = self.messages.create(
             body=body,
@@ -46,9 +47,9 @@ class SmsConversation(HistoryModelMixin):
         return message
 
     def generate_message_history(
-            self,
-            message_count: int = 20,
-            exclude_last_message: bool = True
+        self,
+        message_count: int = 20,
+        exclude_last_message: bool = True
     ) -> MessageHistory:
         message_history = MessageHistory()
 
@@ -114,13 +115,14 @@ class SmsMessage(HistoryModelMixin):
     def role(self) -> RoleLiteralStr:
         if self.is_inbound:
             return 'user'
-        elif self.is_outbound:
+
+        if self.is_outbound:
             return 'assistant'
-        else:
-            return 'system'
+
+        return 'system'
 
     class Meta:
         db_table = 'django_spire_ai_sms_message'
         verbose_name = 'SMS Message'
         verbose_name_plural = 'SMS Messages'
-        ordering = ('-created_datetime',)
+        ordering = ('-created_datetime',)

django_spire/ai/sms/querysets.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django_spire.history.querysets import HistoryQuerySet
 
 
@@ -7,9 +9,10 @@ class SmsConversationQuerySet(HistoryQuerySet):
             phone_number=phone_number,
         )
 
+
 class SmsMessageQuerySet(HistoryQuerySet):
     def newest_by_count(self, count: int = 20):
         return self.order_by('-created_datetime')[:count]
 
     def newest_by_count_reversed(self, count: int = 20):
-        return self.order_by('-created_datetime')[:count][::-1]
+        return self.order_by('-created_datetime')[:count][::-1]

django_spire/ai/sms/tools.py

@@ -1,7 +1,8 @@
+from __future__ import annotations
+
 from importlib import import_module
 
-from dandy.llm import MessageHistory
-from dandy.workflow import BaseWorkflow
+from dandy.llm.request.message import MessageHistory
 from django.conf import settings
 from django.contrib.auth.base_user import AbstractBaseUser
 from django.core.handlers.wsgi import WSGIRequest
@@ -12,20 +13,21 @@ from django_spire.consts import AI_SMS_CONVERSATION_WORKFLOW_CLASS_SETTINGS_NAME
 
 
 def sms_workflow_process(
-        request: WSGIRequest,
-        user_input: str | None = None,
-        message_history: MessageHistory | None = None,
-        user: AbstractBaseUser | None = None,
-        actor: str | None = None,
+    request: WSGIRequest,
+    user_input: str | None = None,
+    message_history: MessageHistory | None = None,
+    user: AbstractBaseUser | None = None,
+    actor: str | None = None
 ) -> SmsIntel:
-
     if user_input is None:
-        raise ValueError('sms user_input is required')
+        message = 'SMS user_input is required'
+        raise ValueError(message)
 
     sms_workflow_class = getattr(settings, AI_SMS_CONVERSATION_WORKFLOW_CLASS_SETTINGS_NAME)
-    
+
     if sms_workflow_class is None:
-        raise ValueError(f'"{AI_SMS_CONVERSATION_WORKFLOW_CLASS_SETTINGS_NAME}" must be set in the django settings.')
+        message = f'"{AI_SMS_CONVERSATION_WORKFLOW_CLASS_SETTINGS_NAME}" must be set in the django settings.'
+        raise ValueError(message)
 
     module_name = '.'.join(sms_workflow_class.split('.')[:-1])
     object_name = sms_workflow_class.split('.')[-1]
@@ -33,9 +35,10 @@ def sms_workflow_process(
     try:
         workflow_module = import_module(module_name)
     except ImportError:
-        raise ImportError(f'Could not import workflow module: {module_name}')
+        message = f'Could not import workflow module: {module_name}'
+        raise ImportError(message) from None
 
-    SmsWorkFlow: BaseWorkflow = getattr(workflow_module, object_name)
+    SmsWorkFlow = getattr(workflow_module, object_name)
 
     @log_ai_interaction_from_recorder(user=user, actor=actor)
     def run_workflow_process() -> SmsIntel:
@@ -48,8 +51,7 @@ def sms_workflow_process(
     output_intel = run_workflow_process()
 
     if not issubclass(output_intel.__class__, SmsIntel):
-        raise ValueError(
-            f'{SmsWorkFlow.__class__.__module__}.{SmsWorkFlow.__class__.__qualname__}.process must return an instance of a {SmsIntel.__name__}.'
-        )
+        message = f'{SmsWorkFlow.__class__.__module__}.{SmsWorkFlow.__class__.__qualname__}.process must return an instance of a {SmsIntel.__name__}.'
+        raise TypeError(message)
 
     return output_intel

django_spire/ai/sms/urls.py

@@ -6,4 +6,4 @@ app_name = 'sms'
 
 urlpatterns = [
     path('webhook/', views.webhook_view, name='webhook'),
-]
+]

django_spire/ai/sms/views.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django.http import HttpResponse, HttpResponseForbidden
 from django.views.decorators.csrf import csrf_exempt
 from django.views.decorators.http import require_POST

django_spire/ai/tests/test_ai.py

@@ -1,8 +1,6 @@
 from __future__ import annotations
 
-from dandy.intel import BaseIntel
-from dandy.llm import LlmBot
-from dandy.recorder import recorder_to_html_file
+from dandy import BaseIntel, Bot, recorder_to_html_file
 
 from django_spire.ai.decorators import log_ai_interaction_from_recorder
 from django_spire.core.tests.test_cases import BaseTestCase
@@ -19,8 +17,8 @@ class AiTestCase(BaseTestCase):
         @log_ai_interaction_from_recorder(self.super_user, 'horse')
         @recorder_to_html_file('horse')
         def generate_horse_intel(user_input: str) -> HorseIntel:
-
-            return LlmBot.process(
+            bot = Bot()
+            return bot.llm.prompt_to_intel(
                 prompt=user_input,
                 intel_class=HorseIntel,
             )

django_spire/ai/urls.py

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

django_spire/consts.py

@@ -1,4 +1,4 @@
-__VERSION__ = '0.16.12'
+__VERSION__ = '0.17.0'
 
 
 AI_CHAT_WORKFLOW_SENDER_SETTINGS_NAME = 'AI_CHAT_WORKFLOW_NAME'

django_spire/contrib/seeding/field/django/seeder.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
-from dandy.llm import Prompt
-from dandy.intel import BaseIntel
+from dandy import BaseIntel, Prompt
 
 from django_spire.core.converters import django_to_pydantic_model, fake_model_field_value
 from django_spire.contrib.seeding.field.base import BaseFieldSeeder
@@ -40,6 +39,9 @@ class DjangoFieldLlmSeeder(BaseFieldSeeder):
             .prompt(self.field_prompt)
         )
 
+        # Instantiate the bot once
+        bot = LlmFieldSeedingBot()
+
         if count <= 25:
             # Create a prompt for the full count since it's within a single batch
             prompt = (
@@ -49,7 +51,7 @@ class DjangoFieldLlmSeeder(BaseFieldSeeder):
                 .prompt(base_prompt)
             )
 
-            intel_data = LlmFieldSeedingBot.process(
+            intel_data = bot.process(
                 prompt=prompt,
                 intel_class=SeedingIntel
             )
@@ -73,7 +75,7 @@ class DjangoFieldLlmSeeder(BaseFieldSeeder):
                     .prompt(base_prompt)
                 )
 
-                future = LlmFieldSeedingBot.process_to_future(
+                future = bot.process_to_future(
                     prompt=batch_prompt,
                     intel_class=SeedingIntel
                 )

django_spire/contrib/seeding/field/llm.py

@@ -1,8 +1,7 @@
 # from django_spire.seeding.intelligence.bots import LlmSeedingBot
 # from django_spire.seeding.seeder import BaseSeeder
 #
-# from dandy.llm import Prompt
-# from dandy.intel import BaseIntel
+# from dandy import BaseIntel, Prompt
 #
 #
 # class LlmSeeder(BaseSeeder):

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

@@ -2,18 +2,18 @@ from __future__ import annotations
 
 from django.utils.timezone import localdate
 
-from dandy.llm import LlmBot, LlmConfigOptions, Prompt
+from dandy import Bot, LlmConfigOptions, Prompt
 
 
-class LlmFieldSeedingBot(LlmBot):
-    config = 'SEEDING_LLM_BOT'
+class LlmFieldSeedingBot(Bot):
+    llm_config = 'SEEDING_LLM_BOT'
 
-    config_options = LlmConfigOptions(
+    llm_config_options = LlmConfigOptions(
         randomize_seed=True,
         temperature=0.5
     )
 
-    instructions_prompt = (
+    llm_role = (
         Prompt()
         .title('You are a database seeding bot.')
         .text('Below you will find rules and instructions.')
@@ -23,9 +23,8 @@ class LlmFieldSeedingBot(LlmBot):
         .text(f'Today\'s date is {localdate().strftime("%Y-%m-%d")} use this in context for generating dates and datetimes')
     )
 
-    @classmethod
-    def process(cls, prompt: Prompt, intel_class) -> list[dict]:
-        intel_data = cls.process_prompt_to_intel(
+    def process(self, prompt: Prompt, intel_class) -> list[dict]:
+        intel_data = self.llm.prompt_to_intel(
             prompt=prompt,
             intel_class=intel_class
         )