Merge branch 'feature/dep-group-image-ipy' into feature/buff-worms

 Closes #383

Author: felliott

mfr/extensions/docx/__init__.py

@@ -1,5 +1,4 @@
 import os
-import imghdr
 import warnings
 
 from PIL import Image
@@ -14,7 +13,7 @@ class ImageExporter(extension.BaseExporter):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.metrics.add('pil_version', Image.VERSION)
+        self.metrics.add('pil_version', Image.__version__)
 
     def export(self):
         parts = self.format.split('.')
@@ -45,7 +44,7 @@ def export(self):
                 self.metrics.add('ratio', ratio)
                 if ratio < 1:
                     size_tuple = (round(image.size[0] * ratio), round(image.size[1] * ratio))
-                    image = image.resize(size_tuple, Image.ANTIALIAS)
+                    image = image.resize(size_tuple, Image.Resampling.LANCZOS)
 
             # Mode 'P' is for paletted images. They must be converted to RGB before exporting to
             # jpeg, otherwise Pillow will throw an error.  This is a temporary workaround, as the
@@ -72,7 +71,14 @@ def export(self):
                 'Unable to export the file as a {}, please check that the '
                 'file is a valid image.'.format(image_type),
                 export_format=image_type,
-                detected_format=imghdr.what(self.source_file_path),
+                detected_format= self.detect_image_format(),
                 original_exception=err,
                 code=400,
             )
+
+    def detect_image_format(self):
+        try:
+            with Image.open(self.source_file_path) as img:
+                return img.format.lower()
+        except Exception:
+            return None

mfr/extensions/docx/render.py

@@ -35,9 +35,6 @@ def render(self):
             )
 
         exporter = HTMLExporter(config=Config({
-            'HTMLExporter': {
-                'template_file': 'basic',
-            },
             'CSSHtmlHeaderTransformer': {
                 'enabled': False,
             },

mfr/extensions/docx/templates/viewer.mako

@@ -24,7 +24,7 @@ class MdRenderer(extension.BaseRenderer):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.metrics.add('markdown_version', markdown.version)
+        self.metrics.add('markdown_version', markdown.__version__)
 
     def render(self):
         """Render a markdown file to html."""

mfr/extensions/image/export.py

@@ -1,5 +1,4 @@
 import os
-import imghdr
 import logging
 from http import HTTPStatus
 
@@ -18,7 +17,7 @@ class PdfExporter(extension.BaseExporter):
     def __init__(self, *args, **kwargs):
 
         super().__init__(*args, **kwargs)
-        self.metrics.add('pil_version', Image.VERSION)
+        self.metrics.add('pil_version', Image.__version__)
 
     def tiff_to_pdf(self, tiff_img, max_size):
         """ Turn a tiff into a pdf to support multipage tiffs"""
@@ -94,7 +93,14 @@ def export(self):
                 'Unable to export the file as a {}, please check that the '
                 'file is a valid tiff image.'.format(export_type),
                 export_format=export_type,
-                detected_format=imghdr.what(self.source_file_path),
+                detected_format= self.detect_image_format(),
                 original_exception=err,
                 code=HTTPStatus.BAD_REQUEST,
             )
+
+    def detect_image_format(self):
+        try:
+            with Image.open(self.source_file_path) as img:
+                return img.format.lower()
+        except Exception as e:
+            return None

mfr/extensions/ipynb/render.py

@@ -31,7 +31,7 @@ def mat_v73(fp):
         if isinstance(data, h5py.Dataset):
             # h5py Uses row-major ordering. this fixes it so it displays like it does in matlab
             # basically just flip it on its axis
-            list_data = list(zip(*data.value.tolist()))
+            list_data = list(zip(*data[()].tolist()))
             build_sheets(name, list_data, sheets)
 
     return sheets

mfr/extensions/md/render.py

@@ -62,7 +62,7 @@ def data_from_dataframe(dataframe):
     data = []
     for _, frame_row in dataframe.iterrows():
         data_row = {}
-        for name, value in frame_row.iteritems():
+        for name, value in frame_row.items():
             try:
                 data_row[name] = numpy.asscalar(value)
             except AttributeError:

mfr/extensions/pdf/export.py

@@ -1,7 +1,7 @@
 aiohttp==3.10.5
 chardet==5.2.0
 furl==2.0.0
-humanfriendly==10
+humanfriendly==10.0
 invoke==2.2.0
 mako==1.3.2
 sentry-sdk==2.22.0
@@ -20,21 +20,20 @@ Pygments==2.19.1
 
 # Docx
 #git+https://github.com/jsocol/bleach.git
-pydocx==0.9.10
 
 # Image
-olefile==0.44
-Pillow==11.0.0
+olefile==0.47
+Pillow==11.2.1
 psd-tools==1.10.7
 
 # IPython
 ipython==7.31.1
-nbconvert==6.4.0
-nbformat==5.1.3
-traitlets==5.0
-jsonschema==2.4.0
-jinja2==3.0.0
-mistune==0.8.1
+nbconvert==7.16.6
+nbformat==5.10.4
+traitlets==5.14.3
+jsonschema==4.24.0
+jinja2==3.1.5
+mistune==3.1.2
 
 # Pdf
 reportlab==4.4.0
@@ -52,12 +51,8 @@ h5py==3.13
 scipy==1.15.2
 
 # Md
-markdown==3.8.0
+markdown==3.3.7
 
 certifi==2025.1.31
 
-
 markupsafe==2.0.1
-
-# Standard library imghdr redistribution because it is not supported in python 3.13.
-standard-imghdr==3.13.0