Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions mavis/reporting/__init__.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import os

from flask import Flask, redirect

from mavis.reporting.config import config
from mavis.reporting.config.jinja2 import configure_jinja2

import os


def create_app(config_name=None):
if config_name is None:
Expand Down
5 changes: 3 additions & 2 deletions mavis/reporting/config/jinja2.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import os

from jinja2 import FileSystemLoader, ChoiceLoader, PackageLoader, ChainableUndefined
from jinja2 import ChainableUndefined, ChoiceLoader, FileSystemLoader, PackageLoader

from mavis.reporting.helpers.number_helper import percentage, thousands
from mavis.reporting.helpers.static_file_helper import static
from mavis.reporting.helpers.number_helper import thousands, percentage


def configure_jinja2(app):
Expand Down
11 changes: 5 additions & 6 deletions mavis/reporting/helpers/auth_helper.py
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
from datetime import datetime, timedelta, timezone
import jwt
from urllib.parse import quote
from functools import wraps
from typing import Any
from urllib.parse import quote

import jwt
from flask import (
current_app,
redirect,
request,
session,
redirect,
current_app,
)
from flask.sessions import SessionMixin

from functools import wraps

from mavis.reporting.helpers import mavis_helper, url_helper


Expand Down
6 changes: 3 additions & 3 deletions mavis/reporting/helpers/mavis_helper.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
from http import HTTPStatus
import requests
import urllib.parse
from werkzeug.exceptions import Unauthorized
from http import HTTPStatus

import requests
from flask import redirect
from werkzeug.exceptions import Unauthorized

from mavis.reporting.helpers import auth_helper

Expand Down
3 changes: 2 additions & 1 deletion mavis/reporting/helpers/static_file_helper.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import os
from flask import url_for, current_app

from flask import current_app, url_for


def get_file_mtime(file_path):
Expand Down
2 changes: 1 addition & 1 deletion mavis/reporting/helpers/url_helper.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from urllib.parse import urlparse, parse_qs, parse_qsl, urlencode, urlunparse, urljoin
from urllib.parse import parse_qs, parse_qsl, urlencode, urljoin, urlparse, urlunparse


def url_without_param(url: str, param: str) -> str:
Expand Down
12 changes: 5 additions & 7 deletions mavis/reporting/views.py
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
import logging

from flask import (
Blueprint,
current_app,
redirect,
render_template,
request,
session,
current_app,
redirect,
url_for,
)

from healthcheck import HealthCheck

from werkzeug.exceptions import Unauthorized

import logging

from mavis.reporting.helpers import mavis_helper, auth_helper, url_helper
from mavis.reporting.helpers import auth_helper, mavis_helper, url_helper

logger = logging.getLogger(__name__)

Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ output-format = "github"

[tool.ruff.lint]
select = ["ARG", "PL", "E", "W", "F"]
extend-select = ["I"]

[tool.hatch.build.targets.wheel]
packages = []
Expand Down
5 changes: 3 additions & 2 deletions scripts/populate_ssm_parameters.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
#!/usr/bin/env python3

import argparse
import sys
import os
import sys
from typing import Any, Dict, List

import boto3
import yaml
from typing import Dict, List, Any


def load_yaml_config(file_path: str) -> Dict[str, Any]:
Expand Down
5 changes: 2 additions & 3 deletions tests/auth/test_auth.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import urllib.parse
from datetime import datetime, timedelta, timezone
from http import HTTPStatus
from flask import session
from os import urandom
from unittest import mock


import urllib.parse
from flask import session


def configure_app(app):
Expand Down
4 changes: 2 additions & 2 deletions tests/conftest.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# Import sys module for modifying Python's runtime environment
import sys

# Import os module for interacting with the operating system
import os
import sys

# Add the parent directory to sys.path
sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))

import pytest

from mavis.reporting import create_app


Expand Down
3 changes: 2 additions & 1 deletion tests/helpers/test_auth_helper.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
from datetime import datetime, timedelta, timezone
from os import urandom
from typing import cast
from datetime import datetime, timedelta, timezone

from flask.sessions import SessionMixin

from mavis.reporting.helpers import auth_helper


Expand Down
6 changes: 3 additions & 3 deletions tests/helpers/test_mavis_helper.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import json
from http import HTTPStatus
import pytest
from werkzeug.exceptions import Unauthorized
from unittest.mock import patch

import pytest
from flask import current_app
from unittest.mock import patch
from werkzeug.exceptions import Unauthorized

from mavis.reporting.helpers import mavis_helper

Expand Down