django-spire 0.16.11__tar.gz → 0.16.12__tar.gz

{django_spire-0.16.11 → django_spire-0.16.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-spire
-Version: 0.16.11
+Version: 0.16.12
 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,12 +45,15 @@ 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: crispy-bootstrap5==2024.10
 Requires-Dist: dandy==0.20.0
 Requires-Dist: django>=5.1.8
 Requires-Dist: django-crispy-forms==2.3
 Requires-Dist: django-glue>=0.8.1
 Requires-Dist: django-sendgrid-v5
+Requires-Dist: django-storages==1.14.5
 Requires-Dist: docutils
 Requires-Dist: faker
 Requires-Dist: marko==2.1.4
@@ -60,6 +63,7 @@ Requires-Dist: pydantic
 Requires-Dist: Pygments
 Requires-Dist: Pillow==11.2.1
 Requires-Dist: python-dateutil
+Requires-Dist: robit==0.4.8
 Requires-Dist: typing_extensions
 Requires-Dist: twilio
 Provides-Extra: development

{django_spire-0.16.11 → django_spire-0.16.12}/django_spire/consts.py

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

django_spire-0.16.12/django_spire/file/apps.py

@@ -0,0 +1,29 @@
+from django.apps import AppConfig
+from django.conf import settings
+
+from django_spire.utils import check_required_apps
+
+
+class FileConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    label = 'django_spire_file'
+    name = 'django_spire.file'
+
+    REQUIRED_APPS = ('django_spire_core',)
+    URLPATTERNS_INCLUDE = 'django_spire.file.urls'
+    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-0.16.11 → django_spire-0.16.12}/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-0.16.11 → django_spire-0.16.12}/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-0.16.11 → django_spire-0.16.12}/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-0.16.11 → django_spire-0.16.12}/django_spire/knowledge/entry/services/tool_service.py

@@ -7,7 +7,6 @@ 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 +18,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-0.16.11 → django_spire-0.16.12}/django_spire/knowledge/entry/version/converters/docx_converter.py

@@ -29,7 +29,7 @@ class DocxConverter(BaseConverter):
 
     def convert_file_to_blocks(self, file: File) -> list[models.EntryVersionBlock]:
         markitdown = MarkItDown()
-        markdown_result = markitdown.convert(file.file.path)
+        markdown_result = markitdown.convert(file.file.url)
         markdown_content = markdown_result.markdown
 
         markdown_converter = MarkdownConverter(entry_version=self.entry_version)

{django_spire-0.16.11 → django_spire-0.16.12}/django_spire/knowledge/entry/version/converters/markdown_converter.py

@@ -7,6 +7,7 @@ import marko
 
 from typing import TYPE_CHECKING
 
+from django.core.files.storage import default_storage
 from marko.element import Element
 from marko.block import Heading, List, ListItem
 
@@ -31,7 +32,7 @@ class MarkdownConverter(BaseConverter):
         self._order = 0
 
     def convert_file_to_blocks(self, file: File) -> list[models.EntryVersionBlock]:
-        with open(file.file.path, 'r') as f:
+        with default_storage.open(file.file.name, 'r') as f:
             return self.convert_markdown_to_blocks(f.read())
 
     def _convert_heading_block(

{django_spire-0.16.11 → django_spire-0.16.12}/django_spire/knowledge/entry/views/form_views.py

@@ -84,9 +84,11 @@ def import_form_view(
         file_form = EntryFilesForm(request.POST, request.FILES)
 
         if file_form.is_valid():
-            file_objects = MultiFileUploader(related_field=None).upload(
-                request.FILES.getlist('import_files')
+            file_uploader = MultiFileUploader(
+                related_field=None,
+                app_name='knowledge'
             )
+            file_objects = file_uploader.upload(request.FILES.getlist('import_files'))
 
             _ = Entry.services.factory.create_from_files(
                 author=request.user,

{django_spire-0.16.11 → django_spire-0.16.12}/django_spire.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-spire
-Version: 0.16.11
+Version: 0.16.12
 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,12 +45,15 @@ 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: crispy-bootstrap5==2024.10
 Requires-Dist: dandy==0.20.0
 Requires-Dist: django>=5.1.8
 Requires-Dist: django-crispy-forms==2.3
 Requires-Dist: django-glue>=0.8.1
 Requires-Dist: django-sendgrid-v5
+Requires-Dist: django-storages==1.14.5
 Requires-Dist: docutils
 Requires-Dist: faker
 Requires-Dist: marko==2.1.4
@@ -60,6 +63,7 @@ Requires-Dist: pydantic
 Requires-Dist: Pygments
 Requires-Dist: Pillow==11.2.1
 Requires-Dist: python-dateutil
+Requires-Dist: robit==0.4.8
 Requires-Dist: typing_extensions
 Requires-Dist: twilio
 Provides-Extra: development

{django_spire-0.16.11 → django_spire-0.16.12}/django_spire.egg-info/SOURCES.txt

@@ -770,7 +770,6 @@ django_spire/knowledge/entry/services/service.py
 django_spire/knowledge/entry/services/tool_service.py
 django_spire/knowledge/entry/services/transformation_services.py
 django_spire/knowledge/entry/tests/__init__.py
-django_spire/knowledge/entry/tests/constants.py
 django_spire/knowledge/entry/tests/factories.py
 django_spire/knowledge/entry/tests/test_urls/__init__.py
 django_spire/knowledge/entry/tests/test_urls/test_form_urls.py

{django_spire-0.16.11 → django_spire-0.16.12}/django_spire.egg-info/requires.txt

@@ -1,9 +1,12 @@
+boto3==1.24.18
+botocore==1.27.18
 crispy-bootstrap5==2024.10
 dandy==0.20.0
 django>=5.1.8
 django-crispy-forms==2.3
 django-glue>=0.8.1
 django-sendgrid-v5
+django-storages==1.14.5
 docutils
 faker
 marko==2.1.4
@@ -13,6 +16,7 @@ pydantic
 Pygments
 Pillow==11.2.1
 python-dateutil
+robit==0.4.8
 typing_extensions
 twilio
 

{django_spire-0.16.11 → django_spire-0.16.12}/pyproject.toml

@@ -38,12 +38,15 @@ requires-python = ">=3.11"
 dynamic = ["version"]
 
 dependencies = [
+    "boto3==1.24.18",
+    "botocore==1.27.18",
     "crispy-bootstrap5==2024.10",
     "dandy==0.20.0",
     "django>=5.1.8",
     "django-crispy-forms==2.3",
     "django-glue>=0.8.1",
     "django-sendgrid-v5",
+    "django-storages==1.14.5",
     "docutils",
     "faker",
     "marko==2.1.4",
@@ -53,6 +56,7 @@ dependencies = [
     "Pygments",
     "Pillow==11.2.1",
     "python-dateutil",
+    "robit==0.4.8",
     "typing_extensions",
     "twilio"
 ]

django_spire-0.16.11/django_spire/file/apps.py

@@ -1,16 +0,0 @@
-from django.apps import AppConfig
-
-from django_spire.utils import check_required_apps
-
-
-class FileConfig(AppConfig):
-    default_auto_field = 'django.db.models.BigAutoField'
-    label = 'django_spire_file'
-    name = 'django_spire.file'
-
-    REQUIRED_APPS = ('django_spire_core',)
-    URLPATTERNS_INCLUDE = 'django_spire.file.urls'
-    URLPATTERNS_NAMESPACE = 'file'
-
-    def ready(self) -> None:
-        check_required_apps(self.label)

django_spire-0.16.11/django_spire/knowledge/entry/tests/constants.py

@@ -1 +0,0 @@
-ENTRY_IMPORT_RELATED_FIELD = 'kbi'