django-fast-treenode 2.0.9__py3-none-any.whl → 2.0.10__py3-none-any.whl

{django_fast_treenode-2.0.9.dist-info → django_fast_treenode-2.0.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: django-fast-treenode
-Version: 2.0.9
+Version: 2.0.10
 Summary: Application for supporting tree (hierarchical) data structure in Django projects
 Home-page: https://github.com/TimurKady/django-fast-treenode
 Author: Timur Kady
@@ -53,11 +53,12 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: Django>=4.0
 Requires-Dist: pympler>=1.0
+Requires-Dist: numpy>=2.0
 Requires-Dist: django-widget-tweaks>=1.5
 Provides-Extra: import-export
 Requires-Dist: openpyxl; extra == "import-export"
 Requires-Dist: pyyaml; extra == "import-export"
-Requires-Dist: pandas; extra == "import-export"
+Requires-Dist: xlsxwriter; extra == "import-export"
 
 # Django-fast-treenode 
 __Combination of Adjacency List and Closure Table__

{django_fast_treenode-2.0.9.dist-info → django_fast_treenode-2.0.10.dist-info}/RECORD

@@ -1,8 +1,8 @@
 treenode/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-treenode/admin.py,sha256=N7WdbFT2hTM3mp4YrfgSVkLGFHXruUqATn-OPMKDajg,15154
+treenode/admin.py,sha256=VkGuqc8KI1_SPgvM6yynyfYLEmZRfgMm2M5d9OoDxZE,14720
 treenode/apps.py,sha256=M0O9IKEnJZFfhfz12v4wksYJ-0ECyj1Cy3qXrfywos8,472
 treenode/cache.py,sha256=Z_FpaS0vTKXqAI4n1QkZ7A_ILsLU3Q8rLgerA6pYyAA,7210
-treenode/forms.py,sha256=imoLzr7qFlOBdeMQK12rAFp6hINpe0PS_U4-V8RRcDU,2802
+treenode/forms.py,sha256=KJOVqIhMt8Z3J38LTl1exO2JyS46mZKzkQJZI-Uem9Q,3573
 treenode/managers.py,sha256=7z8GU64A2_jEonJyQDTyIpdOocaBbM352DkwZTHjdQk,10828
 treenode/urls.py,sha256=7N0d4XiI6880sc8P89eWGr-ZjmOqPorA-fWfcnviqAM,876
 treenode/version.py,sha256=-zaHoXRvTvJ0QzwA9ocYp7O38iBtIarACZbCNzwyc4s,222
@@ -11,7 +11,7 @@ treenode/widgets.py,sha256=4Q6WlPPT5fggEuTXiZ_Z40pjb46CylSp28pa0xBT_Ps,2079
 treenode/docs/Documentation,sha256=6USAESU8MuY1vlj95yY8S6T0o_0RsktGv6S_0SdSkwk,21030
 treenode/models/__init__.py,sha256=gjDwVai0jf-l0hMaeeEBTYLR-DXkxUZMLUMGGs_tnuo,83
 treenode/models/classproperty.py,sha256=IrwBWpmyjsAXpkpfDSOIMsnX6EMcbXql3mZjurHgRcw,556
-treenode/models/closure.py,sha256=chTa9T9yC3H_2LaZXR7KLdNh1pc50iUolut5GB4Bm-Q,5297
+treenode/models/closure.py,sha256=N026nzqY62FfP7DsCH-I4j_HLGbbsrJQrQ_-rAUUboA,5361
 treenode/models/factory.py,sha256=Wt1szWhbeICPwm0-RUy9p4VovcxltHECVxTSRyCQHc8,2100
 treenode/models/proxy.py,sha256=6BFElk_NL1ARTEAikOOfMneUK5wEjofNnfXQWFSZUsA,21766
 treenode/static/.gitkeep,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -25,17 +25,17 @@ treenode/static/treenode/js/treenode_admin.js,sha256=3fdvy1VoHb3rmzI19YXw4JPt6ZG
 treenode/templates/.gitkeep,sha256=frcCV1k9oG9oKj3dpUqdJg1PxRT2RSN_XKdLCPjaYaY,2
 treenode/templates/admin/.gitkeep,sha256=frcCV1k9oG9oKj3dpUqdJg1PxRT2RSN_XKdLCPjaYaY,2
 treenode/templates/admin/export_success.html,sha256=xN2D-BCH249CJB10fo_vHYUyFenQ9mFKqq7UTWcrXS4,747
-treenode/templates/admin/tree_node_changelist.html,sha256=ykksipIBMy2LvH6UqPuM-y00UlXAjsypMHqiMm_KlTg,261
+treenode/templates/admin/tree_node_changelist.html,sha256=NudAsaO6di_cDWQDewBe-1Bay61FdlGiEFzdvfP_Wk8,314
 treenode/templates/admin/tree_node_export.html,sha256=vJxEoGI-US6VdFddxAFgL5r3MgGt6mgA43vltCsbA2k,1043
 treenode/templates/admin/tree_node_import.html,sha256=ZFoveJ08X99EGiwFCfQowXI9oS9VgcFtRLYVDIWq-Fg,969
 treenode/templates/widgets/tree_widget.css,sha256=2bEaxu1x7QJZ7erbs2SLMaxeaiMkjQXadfcDEW8wfok,551
 treenode/templates/widgets/tree_widget.html,sha256=GKcCU-B2FkkJ2BSOuXOw9e_PdYTtADcvyITEXqOlZ9Y,723
-treenode/utils/__init__.py,sha256=CWXGaFcNI7nEApZeMzLxx8P7qT8G2EterlV-j6ivNbc,317
+treenode/utils/__init__.py,sha256=_eKk3iiiyyk4GB5dupwJxl3RPWDEHZ1DW5vHteDrbVI,343
 treenode/utils/base36.py,sha256=ydgu9hqDaK-WyS8zG-mtSWo7hJqbB4iHqkGz4-IVrb4,834
-treenode/utils/exporter.py,sha256=l-IEsk2fK8xe-E-Hi7SMOV7ZIwxM6mZih5-0rhvsx9E,5396
-treenode/utils/importer.py,sha256=n23PBFPXN-6S_Dl8Qmx56sp0eLy_lWfpxrzJqwygQf0,14190
-django_fast_treenode-2.0.9.dist-info/LICENSE,sha256=GiiEe4Y9oOCbn9eGuNew1mMYHU_bJWaCK9zOusnKvvU,1091
-django_fast_treenode-2.0.9.dist-info/METADATA,sha256=8VpCVo5aaG7VirWvqv0cflloIZaSM2xGYQhb6C9VCCQ,23242
-django_fast_treenode-2.0.9.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-django_fast_treenode-2.0.9.dist-info/top_level.txt,sha256=fmgxHbXyx1O2MPi_9kjx8aL9L-8TmV0gre4Go8XgqFk,9
-django_fast_treenode-2.0.9.dist-info/RECORD,,
+treenode/utils/exporter.py,sha256=hCTPnSdFdoE_s7s_iW1Xy6598fWQY5htJzPA0DpnG5s,6199
+treenode/utils/importer.py,sha256=RYtl0CHfH1tZjCbhrFf0-Qp-wm4QJp-DD5Y5nyLK7yQ,12643
+django_fast_treenode-2.0.10.dist-info/LICENSE,sha256=GiiEe4Y9oOCbn9eGuNew1mMYHU_bJWaCK9zOusnKvvU,1091
+django_fast_treenode-2.0.10.dist-info/METADATA,sha256=kQgDgrx9hH6bdz0wwbUZ4VxUQIxZLxFd3CPbvRmmhi0,23274
+django_fast_treenode-2.0.10.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+django_fast_treenode-2.0.10.dist-info/top_level.txt,sha256=fmgxHbXyx1O2MPi_9kjx8aL9L-8TmV0gre4Go8XgqFk,9
+django_fast_treenode-2.0.10.dist-info/RECORD,,

treenode/admin.py

@@ -6,7 +6,7 @@ This module provides Django admin integration for the TreeNode model.
 It includes custom tree-based sorting, optimized queries, and
 import/export functionality for hierarchical data structures.
 
-Version: 2.0.6
+Version: 2.0.10
 Author: Timur Kady
 Email: kaduevtr@gmail.com
 """
@@ -14,11 +14,11 @@ Email: kaduevtr@gmail.com
 
 import os
 import importlib
+import numpy as np
 from datetime import datetime
 from django.contrib import admin
 from django.contrib.admin.views.main import ChangeList
 from django.db import models
-from django.db.models import Case, When, Value, IntegerField
 from django.shortcuts import render, redirect
 from django.urls import path
 from django.utils.encoding import force_str
@@ -33,8 +33,8 @@ import logging
 logger = logging.getLogger(__name__)
 
 
-class NoPkDescOrderedChangeList(ChangeList):
-    """Custom ChangeList to remove descending sorting `pk` (default)."""
+class SortedChangeList(ChangeList):
+    """Custom ChangeList that sorts results in Python (after DB query)."""
 
     def get_ordering(self, request, queryset):
         """
@@ -44,28 +44,26 @@ class NoPkDescOrderedChangeList(ChangeList):
         Django Admin sorts by `-pk` (descending) by default.
         This method removes `-pk` so that objects are not sorted by ID.
         """
-        rv = list(super().get_ordering(request, queryset))
-        if '-pk' in rv:
-            rv.remove('-pk')
-        return tuple(rv)
+        # Remove the default '-pk' ordering if present.
+        ordering = list(super().get_ordering(request, queryset))
+        if '-pk' in ordering:
+            ordering.remove('-pk')
+        return tuple(ordering)
 
     def get_queryset(self, request):
-        """
-        Override QuerySet.
-
-        Overrides data selection to optimize queries. Also adds
-        `select_related('tn_parent')` to avoid N+1 queries.
-        """
-        queryset = super(NoPkDescOrderedChangeList, self).get_queryset(request)
-        node_list = sorted(queryset, key=lambda x: x.tn_order)
-        pk_list = [node.pk for node in node_list]
+        """Get QuerySet with select_related."""
+        return super().get_queryset(request).select_related('tn_parent')
 
-        return queryset.filter(pk__in=pk_list).order_by(
-            Case(*[When(pk=pk, then=Value(index))
-                   for index, pk in enumerate(pk_list)],
-                 default=Value(len(pk_list)),
-                 output_field=IntegerField())
-        ).select_related('tn_parent')
+    def get_results(self, request):
+        """Return sorted results for ChangeList rendering."""
+        # Populate self.result_list with objects from the DB.
+        super().get_results(request)
+        result_list = self.result_list
+        # Extract tn_order values from each object.
+        tn_orders = np.array([obj.tn_order for obj in result_list])
+        # Get sorted indices based on tn_order (ascending order).
+        # Reorder the original result_list based on the sorted indices.
+        self.result_list = [result_list[int(i)] for i in np.argsort(tn_orders)]
 
 
 class TreeNodeAdminModel(admin.ModelAdmin):
@@ -111,10 +109,16 @@ class TreeNodeAdminModel(admin.ModelAdmin):
             self.list_display = [field.name for field in model._meta.fields]
 
         # Check for necessary dependencies
-        self.import_export = all(
+        self.import_export = all([
             importlib.util.find_spec(pkg) is not None
-            for pkg in ["openpyxl", "pyyaml", "pandas"]
-        )
+            for pkg in ["openpyxl", "yaml", "xlsxwriter"]
+        ])
+        if not self.import_export:
+            check_results = [
+                pkg for pkg in ["openpyxl", "pyyaml", "xlsxwriter"] if importlib.util.find_spec(pkg) is not None
+            ]
+            logger.info("Packages" + ", ".join(check_results) + " are \
+not installed. Export and import functions are disabled.")
 
         if self.import_export:
             from .utils import TreeNodeImporter, TreeNodeExporter
@@ -126,35 +130,12 @@ class TreeNodeAdminModel(admin.ModelAdmin):
             self.TreeNodeExporter = None
 
     def get_queryset(self, request):
-        """Override get_ueryset()."""
+        """Override get_queryset to simply return an optimized queryset."""
         queryset = super().get_queryset(request)
-
-        search_term = request.GET.get("q")
-        if search_term:
-            """
-            print(f"Поиск: {search_term}")
-            search_fields = self.get_search_fields(request)
-            print(f"Поиск по полям: {search_fields}")
-
-            q_objects = Q()
-
-            for field in search_fields:
-                q_objects |= Q(**{f"{field}__icontains": search_term})
-
-
-            queryset = queryset.filter(q_objects)
-            print(f"Найдено записей: {queryset.count()}")
-            """
+        # If a search term is present, leave the queryset as is.
+        if request.GET.get("q"):
             return queryset
-
-        node_list = sorted(queryset, key=lambda x: x.tn_order)
-        pk_list = [node.pk for node in node_list]
-        return queryset.filter(pk__in=pk_list).order_by(
-            Case(*[When(pk=pk, then=Value(index))
-                   for index, pk in enumerate(pk_list)],
-                 default=Value(len(pk_list)),
-                 output_field=IntegerField())
-        )
+        return queryset.select_related('tn_parent')
 
     def get_search_fields(self, request):
         """Return the correct search field."""
@@ -190,8 +171,8 @@ class TreeNodeAdminModel(admin.ModelAdmin):
             return (treenode_field_display,) + tuple(base_list_display)
 
     def get_changelist(self, request):
-        """Get ChangeList."""
-        return NoPkDescOrderedChangeList
+        """Use SortedChangeList to sort the results at render time."""
+        return SortedChangeList
 
     def changelist_view(self, request, extra_context=None):
         """Changelist View."""
@@ -311,7 +292,7 @@ packages are not installed."
                 )
 
             # Import data from file
-            importer = TreeNodeImporter(self.model, file, ext)
+            importer = self.TreeNodeImporter(self.model, file, ext)
             raw_data = importer.import_data()
             clean_result = importer.clean(raw_data)
             errors = importer.finalize_import(clean_result)
@@ -355,14 +336,14 @@ packages are not installed."
         if 'download' in request.GET:
             # Get file format
             export_format = request.GET.get('format', 'csv')
-            # Important: This QuerySet provides a convenient ("friendly") order
-            # of tree node output during export/import.
-            queryset = self.get_queryset()
             # Filename
             now = force_str(datetime.now().strftime("%Y-%m-%d %H-%M"))
             filename = self.model._meta.label + " " + now
             # Init
-            exporter = TreeNodeExporter(queryset, filename=filename)
+            exporter = self.TreeNodeExporter(
+                self.get_queryset(),
+                filename=filename
+            )
             # Export working
             response = exporter.export(export_format)
             logger.debug("DEBUG: File response generated.")
@@ -376,7 +357,7 @@ packages are not installed."
         # If the format is specified, we try to perform a test export
         # (without returning the file)
         export_format = request.GET['format']
-        exporter = TreeNodeExporter(
+        exporter = self.TreeNodeExporter(
             self.model.objects.all(),
             filename=self.model._meta.model_name
         )

treenode/forms.py

@@ -9,14 +9,51 @@ Functions:
 - __init__: Initializes the form and filters out invalid parent choices.
 - factory: Dynamically creates a form class for a given TreeNode model.
 
-Version: 2.0.0
+Version: 2.0.10
 Author: Timur Kady
 Email: timurkady@yandex.com
 """
 
 from django import forms
+import numpy as np
+from django.forms.models import ModelChoiceField, ModelChoiceIterator
+
 from .widgets import TreeWidget
-from django.db.models import Case, When, Value, IntegerField
+
+
+class SortedModelChoiceIterator(ModelChoiceIterator):
+    """Iterator Class for ModelChoiceField."""
+
+    def __iter__(self):
+        """Return sorted choices based on tn_order."""
+        qs_list = list(self.queryset.all())
+        # Sort objects by their tn_order using NumPy.
+        tn_orders = np.array([obj.tn_order for obj in qs_list])
+        sorted_indices = np.argsort(tn_orders)
+        # Iterate over sorted indices and yield (value, label) pairs.
+        for idx in sorted_indices:
+            # Cast the index to int if it is numpy.int64.
+            obj = qs_list[int(idx)]
+            yield (
+                self.field.prepare_value(obj),
+                self.field.label_from_instance(obj)
+            )
+
+
+class SortedModelChoiceField(ModelChoiceField):
+    """ModelChoiceField Class for tn_paret field."""
+
+    def _get_choices(self):
+        """Get sorted choices."""
+        if hasattr(self, '_choices'):
+            return self._choices
+        return SortedModelChoiceIterator(self)
+
+    def _set_choices(self, value):
+        """Set choices."""
+        self._choices = value
+
+    choices = property(_get_choices, _set_choices)
 
 
 class TreeNodeForm(forms.ModelForm):
@@ -40,29 +77,20 @@ class TreeNodeForm(forms.ModelForm):
         """Init Method."""
         super().__init__(*args, **kwargs)
 
-        # Get the model from the form instance
         # Use a model bound to a form
         model = self._meta.model
 
-        # Проверяем наличие tn_parent и исключаем текущий узел и его потомков
         if "tn_parent" in self.fields and self.instance.pk:
-            excluded_ids = [self.instance.pk] + list(
-                self.instance.get_descendants_pks())
-
-            # Sort by tn_order
+            excluded_ids = [self.instance.pk] + \
+                list(self.instance.get_descendants_pks())
             queryset = model.objects.exclude(pk__in=excluded_ids)
-            node_list = sorted(queryset, key=lambda x: x.tn_order)
-            pk_list = [node.pk for node in node_list]
-            queryset = queryset.filter(pk__in=pk_list).order_by(
-                Case(*[When(pk=pk, then=Value(index))
-                       for index, pk in enumerate(pk_list)],
-                     default=Value(len(pk_list)),
-                     output_field=IntegerField())
+            original_field = self.fields["tn_parent"]
+            self.fields["tn_parent"] = SortedModelChoiceField(
+                queryset=queryset,
+                label=self.fields["tn_parent"].label,
+                widget=original_field.widget
             )
 
-            # Set QuerySet
-            self.fields["tn_parent"].queryset = queryset
-
     @classmethod
     def factory(cls, model):
         """

treenode/models/closure.py

@@ -11,7 +11,7 @@ Features:
 - Implements cached queries for improved performance.
 - Provides bulk operations for inserting, moving, and deleting nodes.
 
-Version: 2.0.0
+Version: 2.0.1
 Author: Timur Kady
 Email: timurkady@yandex.com
 """
@@ -53,6 +53,7 @@ class ClosureModel(models.Model):
         unique_together = (("parent", "child"),)
         indexes = [
             models.Index(fields=["parent", "child"]),
+            models.Index(fields=["parent", "child", "depth"]),
         ]
 
     def __str__(self):

treenode/templates/admin/tree_node_changelist.html

@@ -2,10 +2,12 @@
 
 {% block object-tools-items %}
     {{ block.super }}
+    {% if import_export_enabled %}
     <li>
         <a href="import/" class="button">Import</a>
     </li>
     <li>
         <a href="export/" class="button">Export</a>
     </li>
+    {% endif %}
 {% endblock %}

treenode/utils/__init__.py

@@ -1,9 +1,9 @@
 import importlib
 
-extra = all(
-    importlib.util.find_spec(pkg) is not None
-    for pkg in ["openpyxl", "pyyaml", "pandas"]
-)
+extra = all([
+            importlib.util.find_spec(pkg) is not None
+            for pkg in ["openpyxl", "yaml", "xlsxwriter"]
+        ])
 
 if extra:
     from .exporter import TreeNodeExporter
@@ -11,4 +11,3 @@ if extra:
     __all__ = ["TreeNodeExporter", "TreeNodeImporter"]
 else:
     __all__ = []
-

treenode/utils/exporter.py

@@ -12,7 +12,7 @@ Features:
 - Provides optimized data extraction for QuerySets.
 - Generates downloadable files with appropriate HTTP responses.
 
-Version: 2.0.0
+Version: 2.0.10
 Author: Timur Kady
 Email: timurkady@yandex.com
 """
@@ -21,7 +21,8 @@ Email: timurkady@yandex.com
 import csv
 import json
 import yaml
-import pandas as pd
+import xlsxwriter
+import numpy as np
 from io import BytesIO
 from django.http import HttpResponse
 import logging
@@ -67,10 +68,16 @@ class TreeNodeExporter:
                     record[key] = None
         return record
 
+    def get_sorted_queryset(self):
+        """Sort queryset by tn_order."""
+        queryset_list = list(self.queryset)
+        tn_orders = np.array([obj.tn_order for obj in queryset_list])
+        return [queryset_list[int(i)] for i in np.argsort(tn_orders)]
+
     def get_data(self):
         """Return a list of data from QuerySet as dictionaries."""
         data = []
-        for obj in self.queryset:
+        for obj in self.get_sorted_queryset():
             record = {}
             for field in self.fields:
                 value = getattr(obj, field, None)
@@ -83,7 +90,7 @@ class TreeNodeExporter:
                             ensure_ascii=False)
                     elif field_object.many_to_one:
                         # ForeignKey - save as ID
-                        record[field] = value.id if value else None
+                        record[field] = getattr(value, "id", None)
                     else:
                         record[field] = value
                 else:
@@ -105,22 +112,40 @@ class TreeNodeExporter:
         """Export to JSON with UUID serialization handling."""
         response = HttpResponse(content_type="application/octet-stream")
         response["Content-Disposition"] = f'attachment; filename="{self.filename}.json"'
-        json.dump(self.get_data(), response,
-                  ensure_ascii=False, indent=4, default=str)
+        json.dump(
+            self.get_data(),
+            response,
+            ensure_ascii=False,
+            indent=4,
+            default=str
+        )
         return response
 
     def to_xlsx(self):
         """Export to XLSX."""
         response = HttpResponse(
-            content_type="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
+            content_type="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+        )
         response["Content-Disposition"] = f'attachment; filename="{self.filename}.xlsx"'
-        df = pd.DataFrame(self.get_data())
-        with BytesIO() as buffer:
-            writer = pd.ExcelWriter(buffer, engine="xlsxwriter")
-            df.to_excel(writer, index=False)
-            writer.close()
-            response.write(buffer.getvalue())
-        return response
+
+        data = self.get_data()
+        output = BytesIO()
+        workbook = xlsxwriter.Workbook(output)
+        worksheet = workbook.add_worksheet()
+
+        # Записываем заголовки
+        headers = list(data[0].keys()) if data else []
+        for col_num, header in enumerate(headers):
+            worksheet.write(0, col_num, header)
+
+        # Записываем строки данных
+        for row_num, row in enumerate(data, start=1):
+            for col_num, key in enumerate(headers):
+                worksheet.write(row_num, col_num, row[key])
+
+        workbook.close()
+        output.seek(0)
+        return response.write(output.read())
 
     def to_yaml(self):
         """Export to YAML with proper attachment handling."""
@@ -135,7 +160,10 @@ class TreeNodeExporter:
         response = HttpResponse(content_type="application/octet-stream")
         response["Content-Disposition"] = f'attachment; filename="{self.filename}.tsv"'
         writer = csv.DictWriter(
-            response, fieldnames=self.fields, delimiter="	")
+            response,
+            fieldnames=self.fields,
+            delimiter="	"
+        )
         writer.writeheader()
         writer.writerows(self.get_data())
         return response

treenode/utils/importer.py

@@ -21,8 +21,8 @@ Email: timurkady@yandex.com
 import csv
 import json
 import yaml
+import openpyxl
 import math
-import pandas as pd
 from io import BytesIO, StringIO
 from django.db import transaction
 import logging
@@ -55,13 +55,13 @@ class TreeNodeImporter:
         self.file_content = file.read()
 
     def get_text_content(self):
-        """Возвращает содержимое файла в виде строки."""
+        """Return the contents of a file as a string."""
         if isinstance(self.file_content, bytes):
             return self.file_content.decode("utf-8")
         return self.file_content
 
     def import_data(self):
-        """Импортирует данные и возвращает список словарей."""
+        """Import data and returns a list of dictionaries."""
         importers = {
             "csv": self.from_csv,
             "json": self.from_json,
@@ -73,37 +73,46 @@ class TreeNodeImporter:
             raise ValueError("Unsupported import format")
 
         raw_data = importers[self.format]()
-        # Обработка: фильтрация полей, упаковка сложных значений и приведение типов
+        # Processing: field filtering, complex value packing and type casting
         processed_data = self.process_records(raw_data)
         return processed_data
 
     def from_csv(self):
-        """Импорт из CSV."""
+        """Import from CSV."""
         text = self.get_text_content()
         return list(csv.DictReader(StringIO(text)))
 
     def from_json(self):
-        """Импорт из JSON."""
+        """Import from JSON."""
         return json.loads(self.get_text_content())
 
     def from_xlsx(self):
-        """Импорт из XLSX (Excel)."""
-        df = pd.read_excel(BytesIO(self.file_content))
-        return df.to_dict(orient="records")
+        """Import from XLSX (Excel)."""
+        file_stream = BytesIO(self.file_content)
+        rows = []
+        wb = openpyxl.load_workbook(file_stream, read_only=True)
+        ws = wb.active
+        headers = [
+            cell.value for cell in next(ws.iter_rows(min_row=1, max_row=1))
+        ]
+        for row in ws.iter_rows(min_row=2, values_only=True):
+            rows.append(dict(zip(headers, row)))
+        return rows
 
     def from_yaml(self):
-        """Импорт из YAML."""
+        """Import from YAML."""
         return yaml.safe_load(self.get_text_content())
 
     def from_tsv(self):
-        """Импорт из TSV."""
+        """Import from TSV."""
         text = self.get_text_content()
         return list(csv.DictReader(StringIO(text), delimiter="\t"))
 
     def filter_fields(self, record):
         """
-        Фильтрует запись согласно маппингу.
-        Остаются только нужные ключи, при этом имена переименовываются.
+        Filter the record according to the mapping.
+
+        Only the necessary keys remain, while the names are renamed.
         """
         new_record = {}
         for file_key, model_field in self.mapping.items():
@@ -112,7 +121,9 @@ class TreeNodeImporter:
 
     def process_complex_fields(self, record):
         """
-        Если значение поля — словарь или список, упаковывает его в JSON-строку.
+        Pack it into a JSON string.
+
+        If the field value is a dictionary or list.
         """
         for key, value in record.items():
             if isinstance(value, (list, dict)):
@@ -125,13 +136,12 @@ class TreeNodeImporter:
 
     def cast_record_types(self, record):
         """
-        Приводит значения полей записи к типам, определённым в модели.
+        Casts the values ​​of the record fields to the types defined in the model.
 
-        Для каждого поля вызывается его метод to_python(). Если значение равно nan,
-        оно заменяется на None.
-
-        Для ForeignKey-полей (many-to-one) значение записывается в атрибут <field>_id,
-        а исходный ключ удаляется.
+        For each field, its to_python() method is called. If the value is nan,
+        it is replaced with None.
+        For ForeignKey fields (many-to-one), the value is written to 
+        the <field>_id attribute, and the original key is removed.
         """
         for field in self.model._meta.fields:
             field_name = field.name
@@ -166,10 +176,11 @@ class TreeNodeImporter:
 
     def process_records(self, records):
         """
-        Обрабатывает список записей:
-          1. Фильтрует поля по маппингу.
-          2. Упаковывает сложные (вложенные) данные в JSON.
-          3. Приводит значения каждого поля к типам, определённым в модели.
+        Process a list of records.
+
+        1. Filters fields by mapping.
+        2. Packs complex (nested) data into JSON.
+        3. Converts the values ​​of each field to the types defined in the model.
         """
         processed = []
         for record in records:
@@ -181,20 +192,24 @@ class TreeNodeImporter:
 
     def clean(self, raw_data):
         """
-        Валидирует и подготавливает данные для массового сохранения объектов.
-
-        Для каждой записи:
-         - Проверяется наличие уникального поля 'id'.
-         - Значение родительской связи (tn_parent или tn_parent_id) сохраняется отдельно и удаляется из данных.
-         - Приводит данные к типам модели.
-         - Пытается создать экземпляр модели с валидацией через full_clean().
-
-        Возвращает словарь со следующими ключами:
-          'create'         - список объектов для создания,
-          'update'         - список объектов для обновления (в данном случае оставим пустым),
-          'update_fields'  - список полей, подлежащих обновлению (например, ['tn_parent']),
-          'fk_mappings'    - словарь {id_объекта: значение родительского ключа из исходных данных},
-          'errors'         - список ошибок валидации.
+        Validat and prepare data for bulk saving of objects.
+
+        For each record:
+        - The presence of a unique field 'id' is checked.
+        - The value of the parent relationship (tn_parent or tn_parent_id)
+          is saved separately and removed from the data.
+        - Casts the data to model types.
+        - Attempts to create a model instance with validation via full_clean().
+
+        Returns a dictionary with the following keys:
+        'create' - a list of objects to create,
+        'update' - a list of objects to update (in this case, we leave 
+        it empty),
+        'update_fields' - a list of fields to update (for example, 
+        ['tn_parent']),
+        'fk_mappings' - a dictionary of {object_id: parent key value from 
+        the source data},
+        'errors' - a list of validation errors.
         """
         result = {
             "create": [],
@@ -211,7 +226,7 @@ class TreeNodeImporter:
                 logger.warning(error_message)
                 continue
 
-            # Сохраняем значение родительской связи и удаляем его из данных
+            # Save the parent relationship value and remove it from the data
             fk_value = None
             if 'tn_parent' in data:
                 fk_value = data['tn_parent']
@@ -220,14 +235,14 @@ class TreeNodeImporter:
                 fk_value = data['tn_parent_id']
                 del data['tn_parent_id']
 
-            # Приводим значения к типам модели
+            # Convert values ​​to model types
             data = self.cast_record_types(data)
 
             try:
                 instance = self.model(**data)
                 instance.full_clean()
                 result["create"].append(instance)
-                # Сохраняем значение родительского ключа для последующего обновления
+                # Save the parent key value for future update
                 result["fk_mappings"][instance.id] = fk_value
             except Exception as e:
                 error_message = f"Validation error creating {data}: {e}"
@@ -235,16 +250,17 @@ class TreeNodeImporter:
                 logger.warning(error_message)
                 continue
 
-        # В данном сценарии обновление происходит только для родительской связи
+        # In this scenario, the update occurs only for the parent relationship
         result["update_fields"] = ['tn_parent']
         return result
 
     def save_data(self, create, update, fields):
         """
-        Сохраняет объекты в базу в рамках атомарной транзакции.
-        :param create: список объектов для создания.
-        :param update: список объектов для обновления.
-        :param fields: список полей, которые обновляются (для bulk_update).
+        Save objects to the database as part of an atomic transaction.
+
+        :param create: list of objects to create.
+        :param update: list of objects to update.
+        :param fields: list of fields to update (for bulk_update).
         """
         with transaction.atomic():
             if update:
@@ -254,12 +270,14 @@ class TreeNodeImporter:
 
     def update_parent_relations(self, fk_mappings):
         """
-        Обновляет поле tn_parent для объектов, используя сохранённые fk_mappings.
-        :param fk_mappings: словарь {id_объекта: значение родительского ключа из исходных данных}
+        Update the tn_parent field for objects using the saved fk_mappings.
+
+        :param fk_mappings: dictionary {object_id: parent key value from 
+        the source data}
         """
         instances_to_update = []
         for obj_id, parent_id in fk_mappings.items():
-            # Если родитель не указан, пропускаем
+            # If parent is not specified, skip
             if not parent_id:
                 continue
             try:
@@ -269,28 +287,35 @@ class TreeNodeImporter:
                 instances_to_update.append(instance)
             except self.model.DoesNotExist:
                 logger.warning(
-                    "Parent with id %s not found for instance %s", parent_id, obj_id)
+                    "Parent with id %s not found for instance %s",
+                    parent_id,
+                    obj_id
+                )
         if instances_to_update:
             update_fields = ['tn_parent']
             self.model.objects.bulk_update(
                 instances_to_update, update_fields, batch_size=1000)
 
-    # Если захочешь объединить операции сохранения и обновления родителей,
-    # можно добавить метод, который вызовет save_data и update_parent_relations последовательно.
+        # If you want to combine the save and update parent operations,
+        # you can add a method that calls save_data and update_parent_relations
+        # sequentially.
+
     def finalize_import(self, clean_result):
         """
-        Финализирует импорт: сохраняет новые объекты и обновляет родительские связи.
-        :param clean_result: словарь, возвращённый методом clean.
+        Finalize the import: saves new objects and updates parent links.
+
+        :param clean_result: dictionary returned by the clean method.
         """
-        # Если есть ошибки – можно прервать импорт или вернуть их для обработки
+        # If there are errors, you can interrupt the import or return them
+        # for processing
         if clean_result["errors"]:
             return clean_result["errors"]
 
-        # Сначала выполняем массовое создание
+        # First we do a bulk creation
         self.save_data(
             clean_result["create"], clean_result["update"], clean_result["update_fields"])
-        # Затем обновляем родительские связи
+        # Then we update the parent links
         self.update_parent_relations(clean_result["fk_mappings"])
-        return None  # Или вернуть успешное сообщение
+        return None  # Or return a success message
 
 # The End