Merge branch 'feature/fix-mfr-tests' into feature/buff-worms

 Closes #384

Author: felliott

.github/workflows/test-build.yml

@@ -66,7 +66,9 @@ jobs:
         run: poetry run flake8 .
 
       - name: Build plugins
-        run: poetry run python setup.py develop
+        run: |
+          python3 setup.py egg_info
+          poetry run pip install .
 
       - name: Run unit tests
         run: |

Dockerfile

@@ -58,7 +58,8 @@ COPY ./ /code/
 ARG GIT_COMMIT=
 ENV GIT_COMMIT=${GIT_COMMIT}
 
-RUN poetry run python setup.py develop
+RUN python3 setup.py egg_info
+RUN python3 -m pip install .
 
 EXPOSE 7778
 

mfr/__init__.py

@@ -46,7 +46,7 @@ class ExtensionError(PluginError):
 
     __TYPE = 'extension'
 
-    def __init__(self, message, *args, extension: str='', **kwargs):
+    def __init__(self, message, *args, extension: str = '', **kwargs):
         super().__init__(message, *args, **kwargs)
         self.extension = extension
         self.attr_stack.append([self.__TYPE, {'extension': self.extension}])
@@ -59,7 +59,7 @@ class RendererError(ExtensionError):
 
     __TYPE = 'renderer'
 
-    def __init__(self, message, *args, renderer_class: str='', **kwargs):
+    def __init__(self, message, *args, renderer_class: str = '', **kwargs):
         super().__init__(message, *args, **kwargs)
         self.renderer_class = renderer_class
         self.attr_stack.append([self.__TYPE, {'class': self.renderer_class}])
@@ -72,7 +72,7 @@ class ExporterError(ExtensionError):
 
     __TYPE = 'exporter'
 
-    def __init__(self, message, *args, exporter_class: str='', **kwargs):
+    def __init__(self, message, *args, exporter_class: str = '', **kwargs):
         super().__init__(message, *args, **kwargs)
         self.exporter_class = exporter_class
         self.attr_stack.append([self.__TYPE, {'exporter_class': self.exporter_class}])
@@ -85,8 +85,8 @@ class SubprocessError(ExporterError):
 
     __TYPE = 'subprocess'
 
-    def __init__(self, message, *args, code: int=500, process: str='', cmd: str='',
-                 returncode: int=None, path: str='', **kwargs):
+    def __init__(self, message, *args, code: int = 500, process: str = '', cmd: str = '',
+                 returncode: int = None, path: str = '', **kwargs):
         super().__init__(message, *args, code=code, **kwargs)
         self.process = process
         self.cmd = cmd
@@ -107,7 +107,7 @@ class ProviderError(PluginError):
 
     __TYPE = 'provider'
 
-    def __init__(self, message, *args, provider: str='', **kwargs):
+    def __init__(self, message, *args, provider: str = '', **kwargs):
         super().__init__(message, *args, **kwargs)
         self.provider = provider
         self.attr_stack.append([self.__TYPE, {'provider': self.provider}])
@@ -120,7 +120,7 @@ class DownloadError(ProviderError):
 
     __TYPE = 'download'
 
-    def __init__(self, message, *args, download_url: str='', response: str='', **kwargs):
+    def __init__(self, message, *args, download_url: str = '', response: str = '', **kwargs):
         super().__init__(message, *args, **kwargs)
         self.download_url = download_url
         self.response = response
@@ -137,7 +137,7 @@ class MetadataError(ProviderError):
 
     __TYPE = 'metadata'
 
-    def __init__(self, message, *args, metadata_url: str='', response: str='', **kwargs):
+    def __init__(self, message, *args, metadata_url: str = '', response: str = '', **kwargs):
         super().__init__(message, *args, **kwargs)
         self.metadata_url = metadata_url
         self.response = response
@@ -153,8 +153,8 @@ class TooBigToRenderError(ProviderError):
 
     __TYPE = 'too_big_to_render'
 
-    def __init__(self, message, *args, requested_size: int=None, maximum_size: int=None,
-                 code: int=400, **kwargs):
+    def __init__(self, message, *args, requested_size: int = None, maximum_size: int = None,
+                 code: int = 400, **kwargs):
         super().__init__(message, *args, code=code, **kwargs)
         self.requested_size = requested_size
         self.maximum_size = maximum_size
@@ -168,8 +168,8 @@ class DriverManagerError(PluginError):
 
     __TYPE = 'drivermanager'
 
-    def __init__(self, message, *args, namespace: str='', name: str='', invoke_on_load: bool=None,
-                 invoke_args: dict=None, **kwargs):
+    def __init__(self, message, *args, namespace: str = '', name: str = '', invoke_on_load: bool = None,
+                 invoke_args: dict = None, **kwargs):
         super().__init__(message, *args, **kwargs)
 
         self.namespace = namespace
@@ -189,7 +189,7 @@ class MakeProviderError(DriverManagerError):
     """Thrown when MFR can't find an applicable provider class.  This indicates programmer error,
     so ``code`` defaults to ``500``."""
 
-    def __init__(self, message, *args, code: int=500, **kwargs):
+    def __init__(self, message, *args, code: int = 500, **kwargs):
         super().__init__(message, *args, code=code, **kwargs)
 
 
@@ -201,7 +201,7 @@ class UnsupportedExtensionError(DriverManagerError):
 
     __TYPE = 'unsupported_extension'
 
-    def __init__(self, *args, code: int=400, handler_type: str='', **kwargs):
+    def __init__(self, *args, code: int = 400, handler_type: str = '', **kwargs):
         super().__init__(*args, code=code, **kwargs)
 
         self.handler_type = handler_type

mfr/core/exceptions.py

@@ -84,10 +84,7 @@ async def log_analytics(request, metrics, is_error=False):
                             domain='private')
 
     if (
-        keen_payload['handler']['type'] != 'render' or
-        file_metadata is None or
-        is_error or
-        not settings.KEEN_PUBLIC_LOG_VIEWS
+        keen_payload['handler']['type'] != 'render' or file_metadata is None or is_error or not settings.KEEN_PUBLIC_LOG_VIEWS
     ):
         return
 

mfr/core/remote_logging.py

@@ -114,14 +114,15 @@ def get_renderer_name(name: str) -> str:
     # `ep_iterator` is an iterable object. Must convert it to a `list` for access.
     # `list()` can only be called once because the iterator moves to the end after conversion.
     ep = entry_points().select(group='mfr.renderers', name=name.lower())
+    ep_list = list(ep)
 
     # Empty list indicates unsupported file type.  Return '' and let `make_renderer()` handle it.
-    if len(ep) == 0:
+    if len(ep_list) == 0:
         return ''
 
     # If the file type is supported, there must be only one element in the list.
-    assert len(ep) == 1
-    return ep[0].value.split(":")[1].split('.')[0]
+    assert len(ep_list) == 1
+    return ep_list[0].value.split(":")[-1]
 
 
 def get_exporter_name(name: str) -> str:
@@ -135,14 +136,15 @@ def get_exporter_name(name: str) -> str:
     # `ep_iterator` is an iterable object. Must convert it to a `list` for access.
     # `list()` can only be called once because the iterator moves to the end after conversion.
     ep = entry_points().select(group='mfr.exporters', name=name.lower())
+    ep_list = list(ep)
 
     # Empty list indicates unsupported export type.  Return '' and let `make_exporter()` handle it.
-    if len(ep) == 0:
+    if len(ep_list) == 0:
         return ''
 
     # If the export type is supported, there must be only one element in the list.
-    assert len(ep) == 1
-    return ep[0].value.split(":")[1].split('.')[0]
+    assert len(ep_list) == 1
+    return ep_list[0].value.split(":")[-1]
 
 
 def sizeof_fmt(num, suffix='B'):

mfr/core/utils.py

@@ -13,7 +13,7 @@ class FileTooLargeError(CodePygmentsRendererError):
 
     __TYPE = 'codepygments_file_too_large'
 
-    def __init__(self, message, *args, code: int=400, file_size: int=None, max_size: int=None,
+    def __init__(self, message, *args, code: int = 400, file_size: int = None, max_size: int = None,
                  **kwargs):
         super().__init__(message, *args, code=code, **kwargs)
 
@@ -33,8 +33,8 @@ class FileDecodingError(CodePygmentsRendererError):
 
     __TYPE = 'codepygments_file_decoding'
 
-    def __init__(self, message, *args, code: int=400, original_exception: Exception=None,
-                 category: str='', **kwargs):
+    def __init__(self, message, *args, code: int = 400, original_exception: Exception = None,
+                 category: str = '', **kwargs):
         super().__init__(message, *args, code=code, **kwargs)
 
         self.category = category

mfr/extensions/codepygments/exceptions.py

@@ -8,8 +8,8 @@ class PillowImageError(ExporterError):
 
     __TYPE = 'image_pillow'
 
-    def __init__(self, message, *args, export_format: str='', detected_format: str='',
-                 original_exception: Exception=None, **kwargs):
+    def __init__(self, message, *args, export_format: str = '', detected_format: str = '',
+                 original_exception: Exception = None, **kwargs):
         super().__init__(message, *args, exporter_class='image', **kwargs)
 
         self.export_format = export_format

mfr/extensions/image/exceptions.py

@@ -71,7 +71,7 @@ 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= self.detect_image_format(),
+                detected_format=self.detect_image_format(),
                 original_exception=err,
                 code=400,
             )

mfr/extensions/image/export.py

@@ -5,8 +5,8 @@ class InvalidFormatError(RendererError):
 
     __TYPE = 'ipynb_invalid_format'
 
-    def __init__(self, message, *args, code: int=400, download_url: str='',
-                 original_exception: Exception=None, **kwargs):
+    def __init__(self, message, *args, code: int = 400, download_url: str = '',
+                 original_exception: Exception = None, **kwargs):
         super().__init__(message, *args, code=code, renderer_class='ipynb', **kwargs)
 
         self.download_url = download_url,