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

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

@@ -1,29 +1,28 @@
-from dandy.llm import BaseLlmBot, LlmConfigOptions
-
+from dandy import Bot, LlmConfigOptions
 
 from django_spire.contrib.seeding.intelligence.intel import SourceIntel
+from django_spire.contrib.seeding.intelligence.prompts.generate_django_model_seeder_prompts import (
+    generate_django_model_seeder_user_prompt,
+    generate_django_model_seeder_system_prompt
+)
 
 
-from django_spire.contrib.seeding.intelligence.prompts.generate_django_model_seeder_prompts import \
-    generate_django_model_seeder_user_prompt, generate_django_model_seeder_system_prompt
-
-
-class SeederGeneratorBot(BaseLlmBot):
+class SeederGeneratorBot(Bot):
+    llm_config = 'PYTHON_MODULE'
 
-    config = 'PYTHON_MODULE'
-
-    config_options = LlmConfigOptions(
+    llm_config_options = LlmConfigOptions(
         temperature=0.3,
         randomize_seed=True
     )
 
-    @classmethod
+    llm_role = 'You are an expert Python developer specializing in Django model seeders.'
+
     def process(
-            cls,
-            model_import: str,
-            model_description: str
-    ):
-        return cls.process_prompt_to_intel(
+        self,
+        model_import: str,
+        model_description: str
+    ) -> SourceIntel:
+        return self.llm.prompt_to_intel(
             prompt=generate_django_model_seeder_user_prompt(
                 model_import,
                 model_description,

django_spire/contrib/seeding/intelligence/intel.py

@@ -1,4 +1,4 @@
-from dandy.intel import BaseIntel
+from dandy import BaseIntel
 
 
 class SeedingIntel(BaseIntel):

django_spire/contrib/seeding/intelligence/prompts/factory.py

@@ -1,19 +1,17 @@
-from typing import Type
-
 from django.db.models.base import Model
 
-from dandy.llm import Prompt
+from dandy import Prompt
 
 
 class SeedingModelClassPromptFactory:
 
-    def __init__(self, model_class: Type[Model]):
+    def __init__(self, model_class: type[Model]):
         self.model_class = model_class
 
     def objective_prompt(
-            self,
-            model_description: str,
-            sector_description: str,
+        self,
+        model_description: str,
+        sector_description: str
     ) -> Prompt:
         model_name = self.model_class._meta.verbose_name_plural.title()
 

django_spire/contrib/seeding/intelligence/prompts/foreign_key_selection_prompt.py

@@ -1,13 +1,11 @@
-from typing_extensions import Type
-
 from django.db.models import Model
 
-from dandy.llm import Prompt
+from dandy import Prompt
 
 
 def foreign_key_selection_prompt(
-    model_class: Type[Model],
-    related_model_class: Type[Model]
+    model_class: type[Model],
+    related_model_class: type[Model]
 ) -> Prompt:
     model_name = model_class._meta.verbose_name.title()
     related_model_name = related_model_class._meta.verbose_name.title()

django_spire/contrib/seeding/intelligence/prompts/generate_django_model_seeder_prompts.py

@@ -1,7 +1,6 @@
-import os
 from pathlib import Path
 
-from dandy.llm import Prompt
+from dandy import Prompt
 
 
 _RELATIVE_BASE_DIR = Path(Path(__file__).parent.parent.parent.parent.parent.parent.resolve())

django_spire/contrib/seeding/intelligence/prompts/generic_relationship_selection_prompt.py

@@ -1,14 +1,12 @@
-from typing_extensions import List, Type
-
 from django.contrib.contenttypes.models import ContentType
 from django.db.models import Model
 
-from dandy.llm import Prompt
+from dandy import Prompt
 
 
 def generic_relationship_selection_prompt(
-    model_class: Type[Model],
-    related_model_classes: List[Type[Model]]
+    model_class: type[Model],
+    related_model_classes: list[type[Model]]
 ) -> Prompt:
     related_model_classes_map = {
         related_model_class._meta.verbose_name.title(): {

django_spire/contrib/seeding/intelligence/prompts/hierarchical_selection_prompt.py

@@ -2,7 +2,7 @@ from random import shuffle
 
 from django.db.models import Model
 
-from dandy.llm import Prompt
+from dandy import Prompt
 
 
 def hierarchical_selection_prompt(

django_spire/contrib/seeding/intelligence/prompts/model_field_choices_prompt.py

@@ -1,11 +1,11 @@
-from dandy.llm import Prompt
+from dandy import Prompt
 from django.db.models.enums import TextChoices
 from django.db.models.fields import Field
 
 
 def model_field_choices_prompt(
-        model_field: Field,
-        choices: TextChoices,
+    model_field: Field,
+    choices: TextChoices
 ) -> Prompt:
     model_name = model_field.field.model.__name__
     field_name = model_field.field.name

django_spire/contrib/seeding/intelligence/prompts/negation_prompt.py

@@ -1,4 +1,4 @@
-from dandy.llm import Prompt
+from dandy import Prompt
 
 
 def negation_prompt(

django_spire/contrib/seeding/intelligence/prompts/objective_prompt.py

@@ -1,12 +1,10 @@
 from django.db.models import Model
 
-from typing_extensions import Type
-
-from dandy.llm import Prompt
+from dandy import Prompt
 
 
 def objective_prompt(
-    model_class: Type[Model],
+    model_class: type[Model],
     model_description: str,
     sector_description: str,
 ) -> Prompt:

django_spire/contrib/seeding/management/commands/seeding.py

@@ -31,12 +31,15 @@ class Command(BaseCommand):
     # @recorder_to_html_file('seeding_generator')
     def handle(self, *args, **kwargs):
         if not kwargs['model_import'] or not kwargs['model_description']:
-            raise CommandError('You must provide a model import path and a model description')
+            message = 'You must provide a model import path and a model description'
+            raise CommandError(message)
 
         model_import = kwargs['model_import']
         model_description = ' '.join(kwargs['model_description'])
 
-        source_intel = SeederGeneratorBot.process(model_import, model_description)
+        # Instantiate the bot
+        bot = SeederGeneratorBot()
+        source_intel = bot.process(model_import, model_description)
 
         Path(_SEEDING_OUTPUT_PATH).mkdir(parents=True, exist_ok=True)
 

django_spire/contrib/seeding/model/base.py

@@ -1,8 +1,8 @@
 from abc import ABC, abstractmethod
 
 from dandy.recorder import recorder_to_html_file
-from dandy.cache import SqliteCache
-from dandy.cache.utils import generate_hash_key
+from dandy import SqliteCache
+from dandy.cache.utils import generate_cache_key
 
 from django_spire.contrib.seeding.field.override import FieldOverride
 from django_spire.contrib.seeding.model.config import FieldsConfig
@@ -59,10 +59,7 @@ class BaseModelSeeder(ABC):
 
     @classmethod
     def clear_cache(cls):
-        SqliteCache(
-            cache_name=cls.cache_name,
-            limit=cls.cache_limit
-        ).clear(cache_name=cls.cache_name)
+        SqliteCache.clear(cache_name=cls.cache_name)
 
     @classmethod
     @abstractmethod
@@ -80,9 +77,14 @@ class BaseModelSeeder(ABC):
         field_config = cls.get_field_config().override(fields) if fields else cls.get_field_config()
 
         if cls.cache_seed:
-            hash_key = generate_hash_key(cls.seed_data, count=count, field_config=field_config.fields)
+            cache_key = generate_cache_key(
+                cls.seed_data,
+                count=count,
+                fields=field_config.fields
+            )
+
             cache = SqliteCache(cache_name=cls.cache_name, limit=cls.cache_limit)
-            formatted_seed_data = cache.get(hash_key)
+            formatted_seed_data = cache.get(cache_key)
 
             if formatted_seed_data:
                 return formatted_seed_data
@@ -95,13 +97,13 @@ class BaseModelSeeder(ABC):
             if len(seeder.seeder_fields) > 0:
                 seed_data.append(seeder.seed(cls, count))
 
-        formatted_seed_data = [dict() for _ in range(max(len(sublist) for sublist in seed_data))]
+        formatted_seed_data = [{} for _ in range(max(len(sublist) for sublist in seed_data))]
         for sublist in seed_data:
             for i, d in enumerate(sublist):
                 formatted_seed_data[i].update(d)
 
         if cls.cache_seed:
-            cache.set(hash_key, formatted_seed_data)
+            cache.set(cache_key, formatted_seed_data)
 
         return formatted_seed_data
 

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

@@ -1,10 +1,8 @@
 from __future__ import annotations
 
-from typing import Type, TypeVar
+from typing import TypeVar, TYPE_CHECKING
 
-from dandy.llm import Prompt
 from django.db.models import ForeignKey
-
 from django.db.models.base import Model
 
 from django_spire.contrib.seeding.field.callable import CallableFieldSeeder
@@ -14,6 +12,9 @@ from django_spire.contrib.seeding.field.static import StaticFieldSeeder
 from django_spire.contrib.seeding.model.base import BaseModelSeeder
 from django_spire.contrib.seeding.model.django.config import DjangoModelFieldsConfig
 
+if TYPE_CHECKING:
+    from dandy import Prompt
+
 
 TypeModel = TypeVar('TypeModel', bound=Model)
 
@@ -21,7 +22,7 @@ TypeModel = TypeVar('TypeModel', bound=Model)
 class DjangoModelSeeder(BaseModelSeeder):
     field_config_class = DjangoModelFieldsConfig
 
-    model_class: Type[Model]
+    model_class: type[Model]
     prompt: Prompt = None
     _field_seeders = [
         CustomFieldSeeder,
@@ -32,14 +33,16 @@ class DjangoModelSeeder(BaseModelSeeder):
     ]
 
     @classmethod
-    def __init_subclass__(cls, **kwargs):
+    def __init_subclass__(cls, **kwargs) -> None:
         super().__init_subclass__(**kwargs)
 
         if cls.model_class is None:
-            raise ValueError("Seeds must have a model class")
+            message = "Seeds must have a model class"
+            raise ValueError(message)
 
         if cls.fields is None:
-            raise ValueError("Seeds must have fields")
+            message = "Seeds must have fields"
+            raise ValueError(message)
 
     @classmethod
     def field_names(cls) -> list[str]:
@@ -51,9 +54,9 @@ class DjangoModelSeeder(BaseModelSeeder):
 
     @classmethod
     def seed_database(
-            cls,
-            count=1,
-            fields: dict | None = None
+        cls,
+        count=1,
+        fields: dict | None = None
     ) -> list[TypeModel]:
         model_objects = cls.seed(count, fields)
         return cls.model_class.objects.bulk_create(model_objects)

django_spire/contrib/seeding/tests/test_seeding.py

@@ -1,4 +1,4 @@
-# from dandy.llm import Prompt
+# from dandy import Prompt
 # from django.test import TestCase
 #
 # from django_spire.seeding.processor import SeedingProcessor

django_spire/file/apps.py

@@ -1,4 +1,5 @@
 from django.apps import AppConfig
+from django.conf import settings
 
 from django_spire.utils import check_required_apps
 
@@ -13,4 +14,16 @@ class FileConfig(AppConfig):
     URLPATTERNS_NAMESPACE = 'file'
 
     def ready(self) -> None:
+        if not hasattr(settings, 'BASE_FOLDER_NAME'):
+            raise ValueError(
+                f'"BASE_FOLDER_NAME" must be set in the django settings when '
+                f'using "{self.label}".'
+            )
+
+        elif not isinstance(getattr(settings, 'BASE_FOLDER_NAME'), str):
+            raise ValueError(
+                f'"BASE_FOLDER_NAME" must be a string in the django settings when '
+                f'using "{self.label}".'
+            )
+
         check_required_apps(self.label)

django_spire/file/interfaces.py

@@ -2,6 +2,9 @@ from __future__ import annotations
 
 from abc import ABC, abstractmethod
 from dataclasses import dataclass
+
+from django.conf import settings
+from django.core.files.base import ContentFile
 from typing_extensions import TYPE_CHECKING
 
 from django.contrib.contenttypes.models import ContentType
@@ -35,16 +38,27 @@ class FileFormatter:
 
     @property
     def location(self) -> str:
-        return'django-spire/' + str(self.related_field) + '/' + '/' + str(self.app_name) + '/' + random_64_char_token() + '/' + self.name
+        location = settings.BASE_FOLDER_NAME + '/'
+        location += str(self.app_name) + '/'
+
+        if self.related_field is not None:
+            location += str(self.related_field) + '/'
+
+        location += random_64_char_token() + '/'
+        location += self.name
+
+        return location
 
     def null_file_obj(self) -> File:
-        return File(
-            file=self.file,
+        file_obj = File(
             name=self.name,
             size=self.size_verbose(),
             type=self.type,
-            related_field=self.related_field
+            related_field=self.related_field,
         )
+        self.save_file(file_obj)
+
+        return file_obj
 
     def size_verbose(self) -> str:
         if self.file.size < 512000:
@@ -62,6 +76,10 @@ class FileFormatter:
 
         return str(value) + ext
 
+    def save_file(self, file_obj: File):
+        file_path = self.location + '.' + self.type
+        file_obj.file.save(file_path, ContentFile(self.file.read()), save=False)
+
 
 @dataclass
 class FileContentObjectFormatter(FileFormatter):
@@ -69,26 +87,41 @@ class FileContentObjectFormatter(FileFormatter):
 
     @property
     def location(self) -> str:
-        return 'django-spire/' + '/' + str(self.content_object._meta.app_label) + '/' + random_64_char_token() + '/' + self.name
+        location = settings.BASE_FOLDER_NAME + '/'
+        location += str(self.content_object._meta.app_label) + '/'
+
+        if self.related_field is not None:
+            location += str(self.related_field) + '/'
+
+        location += random_64_char_token() + '/'
+        location += self.name
+        return location
 
     def null_file_obj(self) -> File:
-        return File(
+        file_obj = File(
             content_type=ContentType.objects.get_for_model(self.content_object),
             object_id=self.content_object.id,
-            file=self.file,
             name=self.name,
             size=self.size_verbose(),
             type=self.type,
-            related_field=self.related_field
+            related_field=self.related_field,
         )
+        self.save_file(file_obj)
+
+        return file_obj
 
 
 @dataclass
 class FileUploader(ABC):
     related_field: str | None
+    app_name: str = 'Uncategorized'
 
     def null_file_obj(self, file):
-        formatted_file = FileFormatter(file, self.related_field)
+        formatted_file = FileFormatter(
+            file=file,
+            related_field=self.related_field,
+            app_name=self.app_name
+        )
         return formatted_file.null_file_obj()
 
     @abstractmethod

django_spire/knowledge/admin.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.collection.admin import *

django_spire/knowledge/apps.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django.apps import AppConfig
 
 from django_spire.utils import check_required_apps

django_spire/knowledge/auth/controller.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django_spire.auth.controller.controller import BaseAuthController
 
 

django_spire/knowledge/collection/admin.py

@@ -1,4 +1,7 @@
+from __future__ import annotations
+
 from django.contrib import admin
+
 from .models import Collection, CollectionGroup
 
 

django_spire/knowledge/collection/forms.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django import forms
 
 from django_spire.knowledge.collection.models import Collection

django_spire/knowledge/collection/models.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django.db import models
 
 from django_spire.auth.group.models import AuthGroup
@@ -44,10 +46,12 @@ class CollectionGroup(models.Model):
         related_name='groups',
         related_query_name='group',
     )
+
     auth_group = models.ForeignKey(
         AuthGroup,
         on_delete=models.CASCADE,
         related_name='collection_groups',
         related_query_name='collection_group',
     )
+
     services = CollectionGroupService()

django_spire/knowledge/collection/querysets.py

@@ -2,15 +2,14 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
-from django.core.handlers.wsgi import WSGIRequest
-from django.db.models import Count, Q
+from django.db.models import Count
 
 from django_spire.auth.controller.controller import AppAuthController
 from django_spire.contrib.ordering.querysets import OrderingQuerySetMixin
 from django_spire.history.querysets import HistoryQuerySet
 
 if TYPE_CHECKING:
-    from django_spire.auth.user.models import AuthUser
+    from django.core.handlers.wsgi import WSGIRequest
     from django.db.models import QuerySet
     from django_spire.knowledge.collection.models import Collection
 
@@ -57,6 +56,7 @@ class CollectionQuerySet(HistoryQuerySet, OrderingQuerySetMixin):
         accessible_ids = set(direct_access.values_list('id', flat=True))
 
         current_level_ids = accessible_ids.copy()
+
         while current_level_ids:
             next_level = self.filter(parent_id__in=current_level_ids)
             new_ids = set(next_level.values_list('id', flat=True)) - accessible_ids

django_spire/knowledge/collection/seeding/seed.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django_spire.knowledge.collection.seeding.seeder import CollectionSeeder
 
 parent_collections = CollectionSeeder.seed_database(count=5)

django_spire/knowledge/collection/tests/factories.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django_spire.knowledge.collection.models import Collection
 
 

django_spire/knowledge/collection/tests/test_services/test_transformation_service.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import json
 
 from django.contrib.sites.models import Site

django_spire/knowledge/collection/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/collection/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/collection/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/collection/views/json_views.py

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

django_spire/knowledge/collection/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/context_processors.py

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

django_spire/knowledge/entry/services/automation_service.py

@@ -35,11 +35,9 @@ class EntryAutomationService(BaseDjangoModelService['Entry']):
                 )
             except Exception as e:
                 errored.append({'file': file_object.name, 'error': str(e)})
-                file_object.file.delete()
-                file_object.delete()
+                file_object.set_deleted()
             else:
-                file_object.file.delete()
-                file_object.delete()
+                file_object.set_deleted()
 
         message = f'Files Converted: {len(file_objects) - len(errored)}'
         if errored:

django_spire/knowledge/entry/services/factory_service.py

@@ -7,7 +7,6 @@ from django.contrib.contenttypes.models import ContentType
 from django_spire.auth.user.models import AuthUser
 from django_spire.contrib.service import BaseDjangoModelService
 from django_spire.file.models import File
-from django_spire.knowledge.entry.tests.constants import ENTRY_IMPORT_RELATED_FIELD
 
 if TYPE_CHECKING:
     from django_spire.knowledge.entry.models import Entry
@@ -34,7 +33,7 @@ class EntryFactoryService(BaseDjangoModelService['Entry']):
 
             file.content_type = ContentType.objects.get_for_model(entry.__class__)
             file.object_id = entry.id
-            file.related_field = ENTRY_IMPORT_RELATED_FIELD
+            file.related_field = None
 
             entry.ordering_services.processor.move_to_position(
                 destination_objects=collection.entries.active(),

django_spire/knowledge/entry/services/tool_service.py

@@ -1,13 +1,13 @@
 from __future__ import annotations
 
 import json
+
 from typing import TYPE_CHECKING
 
 from django.contrib.contenttypes.models import ContentType
 
 from django_spire.contrib.service import BaseDjangoModelService
 from django_spire.file.models import File
-from django_spire.knowledge.entry.tests.constants import ENTRY_IMPORT_RELATED_FIELD
 
 if TYPE_CHECKING:
     from django.db.models import QuerySet
@@ -19,7 +19,7 @@ class EntryToolService(BaseDjangoModelService['Entry']):
 
     def get_files_to_convert(self) -> QuerySet[File]:
         return (
-            File.objects.related_field(field_name=ENTRY_IMPORT_RELATED_FIELD)
+            File.objects
             .filter(content_type=ContentType.objects.get_for_model(self.obj_class))
             .active()
             .order_by('object_id')

django_spire/knowledge/entry/services/transformation_services.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import json
 from typing import TYPE_CHECKING
 
 from django.conf import settings