apply poetry run ruff check --fix --unsafe-fixes . to show and fix more fixes than ruff format .

add B904 for ruff ignore maybe if we do some actions to update codestyle it may change business logic

Author: mkovalua

docs/conf.py

@@ -10,8 +10,8 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys
 import os
+import sys
 
 from mfr.version import __version__
 

mfr/core/provider.py

@@ -1,11 +1,11 @@
 import abc
-import markupsafe
 
 import furl
+import markupsafe
 
 from mfr.core import exceptions
-from mfr.server import settings
 from mfr.core.metrics import MetricsRecord
+from mfr.server import settings
 
 
 class BaseProvider(metaclass=abc.ABCMeta):
@@ -51,9 +51,7 @@ def download(self):
 
 
 class ProviderMetadata:
-    def __init__(
-        self, name, ext, content_type, unique_key, download_url, stable_id=None
-    ):
+    def __init__(self, name, ext, content_type, unique_key, download_url, stable_id=None):
         self.name = name
         self.ext = ext
         self.content_type = content_type

mfr/core/remote_logging.py

@@ -3,11 +3,10 @@
 import logging
 
 import aiohttp
+from waterbutler.core.utils import async_retry
 
 from mfr.server import settings
 from mfr.version import __version__
-from waterbutler.core.utils import async_retry
-
 
 logger = logging.getLogger(__name__)
 
@@ -75,9 +74,7 @@ async def log_analytics(request, metrics, is_error=False):
 
     # send the private payload
     private_collection = "mfr_errors" if is_error else "mfr_action"
-    if (
-        is_error and settings.KEEN_PRIVATE_LOG_ERRORS
-    ) or settings.KEEN_PRIVATE_LOG_VIEWS:
+    if (is_error and settings.KEEN_PRIVATE_LOG_ERRORS) or settings.KEEN_PRIVATE_LOG_VIEWS:
         await _send_to_keen(
             keen_payload,
             private_collection,
@@ -108,9 +105,7 @@ async def log_analytics(request, metrics, is_error=False):
 
 
 @async_retry(retries=5, backoff=5)
-async def _send_to_keen(
-    payload, collection, project_id, write_key, action, domain="private"
-):
+async def _send_to_keen(payload, collection, project_id, write_key, action, domain="private"):
     """Serialize and send an event to Keen.  If an error occurs, try up to five more times.
     Will raise an excpetion if the event cannot be sent."""
 
@@ -126,9 +121,7 @@ async def _send_to_keen(
 
     async with aiohttp.request("POST", url, headers=headers, data=serialized) as resp:
         if resp.status == 201:
-            logger.info(
-                f"Successfully logged {action} to {collection} collection in {domain} Keen"
-            )
+            logger.info(f"Successfully logged {action} to {collection} collection in {domain} Keen")
         else:
             raise Exception(
                 "Failed to log {} to {} collection in {} Keen. Status: {} Error: {}".format(

mfr/core/utils.py

@@ -1,4 +1,5 @@
 from importlib.metadata import entry_points
+
 from stevedore import driver
 
 from mfr.core import exceptions

mfr/extensions/codepygments/render.py

@@ -1,18 +1,17 @@
-import os
 import logging
+import os
 
 import chardet
-from humanfriendly import format_size
 import pygments
+import pygments.formatters
 import pygments.lexers
 import pygments.lexers.special
-import pygments.formatters
-from pygments.util import ClassNotFound
+from humanfriendly import format_size
 from mako.lookup import TemplateLookup
+from pygments.util import ClassNotFound
 
 from mfr.core import extension
-from mfr.extensions.codepygments import settings
-from mfr.extensions.codepygments import exceptions
+from mfr.extensions.codepygments import exceptions, settings
 
 logger = logging.getLogger(__name__)
 

mfr/extensions/image/render.py

@@ -5,7 +5,7 @@
 
 from mfr.core import extension
 from mfr.extensions.image import settings
-from mfr.extensions.utils import munge_url_for_localdev, escape_url_for_template
+from mfr.extensions.utils import escape_url_for_template, munge_url_for_localdev
 
 
 class ImageRenderer(extension.BaseRenderer):
@@ -22,9 +22,7 @@ def render(self):
 
         exported_url = furl.furl(self.export_url)
         if settings.EXPORT_MAXIMUM_SIZE and settings.EXPORT_TYPE:
-            exported_url.args["format"] = (
-                f"{settings.EXPORT_MAXIMUM_SIZE}.{settings.EXPORT_TYPE}"
-            )
+            exported_url.args["format"] = f"{settings.EXPORT_MAXIMUM_SIZE}.{settings.EXPORT_TYPE}"
         elif settings.EXPORT_TYPE:
             exported_url.args["format"] = settings.EXPORT_TYPE
         else:

mfr/extensions/jamovi/render.py

@@ -1,6 +1,6 @@
-from distutils.version import LooseVersion
 import os
-from zipfile import ZipFile, BadZipFile
+from distutils.version import LooseVersion
+from zipfile import BadZipFile, ZipFile
 
 from mako.lookup import TemplateLookup
 

mfr/extensions/jasp/html_processor.py

@@ -1,7 +1,6 @@
-from io import StringIO
-from html.parser import HTMLParser
-
 import base64
+from html.parser import HTMLParser
+from io import StringIO
 
 
 class HTMLProcessor(HTMLParser):
@@ -18,9 +17,7 @@ def set_src_source(self, zip_file):
         self._zip_file = zip_file
 
     def handle_starttag(self, tag, attrs):
-        if (
-            tag == "script" or tag == "object"
-        ):  # filter scripts and objects (attack vectors)
+        if tag == "script" or tag == "object":  # filter scripts and objects (attack vectors)
             return
 
         self._html.write("<")

mfr/extensions/jasp/render.py

@@ -1,11 +1,12 @@
 import json
 import os
+from distutils.version import LooseVersion
+from zipfile import BadZipFile, ZipFile
 
 from mako.lookup import TemplateLookup
+
 from mfr.core import extension
 from mfr.extensions.jasp import exceptions
-from zipfile import ZipFile, BadZipFile
-from distutils.version import LooseVersion
 
 from .html_processor import HTMLProcessor
 

mfr/extensions/jsc3d/export.py

@@ -1,12 +1,12 @@
 import shutil
 from http import HTTPStatus
-from subprocess import DEVNULL, check_call, TimeoutExpired, CalledProcessError
 from os.path import basename, splitext
+from subprocess import DEVNULL, CalledProcessError, TimeoutExpired, check_call
 from tempfile import NamedTemporaryFile
 
 from mfr.core import exceptions
 from mfr.core.extension import BaseExporter
-from mfr.extensions.jsc3d.settings import TIMEOUT, FREECAD_BIN, CONVERSION_SCRIPT
+from mfr.extensions.jsc3d.settings import CONVERSION_SCRIPT, FREECAD_BIN, TIMEOUT
 
 
 class JSC3DExporter(BaseExporter):