fix(admin,api): isort and black

.isort.cfg

@@ -0,0 +1,8 @@
+[settings]
+multi_line_output = 3
+include_trailing_comma = True
+force_grid_wrap = 0
+use_parentheses = True
+ensure_newline_before_comments = True
+line_length = 88
+

admin/src/admin/lib/admin.py

@@ -32,7 +32,14 @@ import secrets
 
 from .events import Events
 from .exceptions import UserExists, UserNotFound
-from .helpers import count_repeated, rand_password, kpath2gids, kpath2kpaths, get_kid_from_kpath, get_group_with_childs
+from .helpers import (
+    count_repeated,
+    get_group_with_childs,
+    get_kid_from_kpath,
+    kpath2gids,
+    kpath2kpaths,
+    rand_password,
+)
 
 MANAGER = os.environ["CUSTOM_ROLE_MANAGER"]
 TEACHER = os.environ["CUSTOM_ROLE_TEACHER"]
@@ -580,7 +587,8 @@ class Admin:
                 + u["username"]
             )
             user_groups = [g.strip() for g in u["groups"].split(",") if g != ""]
-            if not len(user_groups): user_groups = ["/"+u["role"].strip()]
+            if not len(user_groups):
+                user_groups = ["/" + u["role"].strip()]
             pathslist = []
             for group in user_groups:
                 pathpart = ""
@@ -604,7 +612,8 @@ class Admin:
                     u["quota"] = "none"
                 if u["role"] == "admin":
                     u["quota"] = "none"
-            if u["quota"].lower() in ["false","unlimited"]: u["quota"] = "none"
+            if u["quota"].lower() in ["false", "unlimited"]:
+                u["quota"] = "none"
 
             users.append(
                 {
@@ -846,7 +855,6 @@ class Admin:
                     )
             i = i + 1
 
-
     def sync_to_moodle_external(self):  # works from the internal (keycloak)
         ### Process all groups from the users keycloak_groups key
         groups = []
@@ -967,7 +975,11 @@ class Admin:
                     u["first"] + " " + u["last"],
                 )
             except ProviderItemExists:
-                log.warning(" NEXTCLOUD USERS: User " + u["username"] + " already exists. Skipping...")
+                log.warning(
+                    " NEXTCLOUD USERS: User "
+                    + u["username"]
+                    + " already exists. Skipping..."
+                )
                 continue
             except:
                 log.error(traceback.format_exc())
@@ -995,7 +1007,9 @@ class Admin:
                     self.moodle.add_system_cohort(pathpart)
                 except:
                     # print(traceback.format_exc())
-                    log.warning("MOODLE: Group " + pathpart + " probably already exists.")
+                    log.warning(
+                        "MOODLE: Group " + pathpart + " probably already exists."
+                    )
 
         ### Get all existing moodle cohorts
         cohorts = self.moodle.get_cohorts()
@@ -1093,7 +1107,9 @@ class Admin:
                     subpath = subpath + "/" + parts[i]
                     self.nextcloud.add_group(subpath)
                 except:
-                    log.warning("NEXTCLOUD GROUPS: "+subpath+" probably already exists")
+                    log.warning(
+                        "NEXTCLOUD GROUPS: " + subpath + " probably already exists"
+                    )
             i = i + 1
 
         ev = Events(
@@ -1629,7 +1645,9 @@ class Admin:
             )
             ev.increment({"name": "Added to nextcloud", "data": []})
         except ProviderItemExists:
-            log.warning(" NEXTCLOUD USERS: User " + username + " already exists. Skipping...")
+            log.warning(
+                " NEXTCLOUD USERS: User " + username + " already exists. Skipping..."
+            )
         except:
             log.error(traceback.format_exc())
 
@@ -1819,7 +1837,11 @@ class Admin:
         except Exception as e:
             print(e)
             ev.update_text("Error deleting group. Not found in keycloak!")
-            log.error(' KEYCLOAK GROUPS: Could not delete group '+str(group_id)+' as it does not exist!')
+            log.error(
+                " KEYCLOAK GROUPS: Could not delete group "
+                + str(group_id)
+                + " as it does not exist!"
+            )
 
         # {'id': '966ad67c-499a-4f56-bd1d-283691cde0e7', 'name': 'asdgfewfwe', 'path': '/asdgfewfwe', 'attributes': {}, 'realmRoles': [], 'clientRoles': {}, 'subGroups': [], 'access': {'view': True, 'manage': True, 'manageMembership': True}}
 

admin/src/admin/lib/dashboard.py

@@ -1,16 +1,14 @@
 import logging as log
+import os
+import shutil
 import traceback
+from io import BytesIO
 from pprint import pprint
 
-import os, shutil
-
 import requests
-
-from schema import And, Optional, Schema, SchemaError, Use
 import yaml
-
-from io import BytesIO
 from PIL import Image
+from schema import And, Optional, Schema, SchemaError, Use
 
 from admin import app
 

admin/src/admin/lib/helpers.py

@@ -3,6 +3,7 @@ import string
 from collections import Counter
 from pprint import pprint
 
+
 def get_recursive_groups(l_groups, l):
     for d_group in l_groups:
         data = {}
@@ -14,6 +15,7 @@ def get_recursive_groups(l_groups, l):
         l.append(data)
     return l
 
+
 def get_group_with_childs(keycloak_group):
     return [g["path"] for g in get_recursive_groups([keycloak_group], [])]
 
@@ -25,19 +27,29 @@ def system_username(username):
         else False
     )
 
+
 def system_group(groupname):
     return True if groupname in ["admin", "manager", "teacher", "student"] else False
 
+
 def get_group_from_group_id(group_id, groups):
     return next((d for d in groups if d.get("id") == group_id), None)
 
+
 def get_kid_from_kpath(kpath, groups):
     ids = [g["id"] for g in groups if g["path"] == kpath]
-    if not len(ids) or len(ids) > 1: return False
+    if not len(ids) or len(ids) > 1:
+        return False
     return ids[0]
 
+
 def get_gid_from_kgroup_id(kgroup_id, groups):
-    return [g["path"].replace("/", ".")[1:] if len(g["path"].split("/")) else g["path"][1:] for g in groups if g["id"] == kgroup_id][0]
+    return [
+        g["path"].replace("/", ".")[1:] if len(g["path"].split("/")) else g["path"][1:]
+        for g in groups
+        if g["id"] == kgroup_id
+    ][0]
+
 
 def get_gids_from_kgroup_ids(kgroup_ids, groups):
     return [get_gid_from_kgroup_id(kgroup_id, groups) for kgroup_id in kgroup_ids]
@@ -49,6 +61,7 @@ def kpath2gid(path):
         return path.replace("/", ".")[1:]
     return path.replace("/", ".")
 
+
 def kpath2gids(path):
     path = kpath2gid(path)
     l = []
@@ -56,12 +69,14 @@ def kpath2gids(path):
         l.append(".".join(path.split(".")[: i + 1]))
     return l
 
+
 def kpath2kpaths(path):
     l = []
     for i in range(len(path.split("/"))):
         l.append("/".join(path.split("/")[: i + 1]))
     return l[1:]
 
+
 def gid2kpath(gid):
     return "/" + gid.replace(".", "/")
 

admin/src/admin/lib/keycloak_client.py

@@ -11,12 +11,12 @@ from pprint import pprint
 import yaml
 from jinja2 import Environment, FileSystemLoader
 from keycloak import KeycloakAdmin
-from .helpers import kpath2kpaths, get_recursive_groups
+
+from .helpers import get_recursive_groups, kpath2kpaths
+from .postgres import Postgres
 
 # from admin import app
 
-from .postgres import Postgres
-
 
 class KeycloakClient:
     """https://www.keycloak.org/docs-api/13.0/rest-api/index.html

admin/src/admin/views/ApiViews.py

@@ -26,12 +26,12 @@ threads = {"external": None}
 
 from keycloak.exceptions import KeycloakGetError
 
+from ..lib.dashboard import Dashboard
 from ..lib.exceptions import UserExists, UserNotFound
 
-from ..lib.dashboard import Dashboard
-
 dashboard = Dashboard()
 
+
 @app.route("/sysadmin/api/resync")
 @app.route("/api/resync")
 @login_required
@@ -510,13 +510,18 @@ def dashboard_put(item):
         {"Content-Type": "application/json"},
     )
 
+
 @app.route("/api/legal/<item>", methods=["GET", "POST"])
 # @login_required
 def legal_put(item):
     if request.method == "GET":
         if item == "legal":
             lang = request.args.get("lang")
-            return json.dumps({ "html": "<b>Legal</b><br>This works! in lang: "+lang}), 200, {'Content-Type': 'application/json'}
+            return (
+                json.dumps({"html": "<b>Legal</b><br>This works! in lang: " + lang}),
+                200,
+                {"Content-Type": "application/json"},
+            )
         # if item == "privacy":
         #     return json.dumps({ "html": "<b>Privacy policy</b><br>This works!"}), 200, {'Content-Type': 'application/json'}
     if request.method == "POST":
@@ -528,7 +533,7 @@ def legal_put(item):
                 lang = data["lang"]
             except:
                 log.error(traceback.format_exc())
-            return json.dumps(data), 200, {'Content-Type': 'application/json'}
+            return json.dumps(data), 200, {"Content-Type": "application/json"}
         # if item == "privacy":
         #     data = None
         #     try:

admin/src/admin/views/WebViews.py

@@ -10,6 +10,7 @@ import traceback
 from pprint import pprint
 from uuid import uuid4
 
+import requests
 from flask import (
     Response,
     jsonify,
@@ -26,8 +27,6 @@ from admin import app
 from ..lib.avatars import Avatars
 from .decorators import is_admin
 
-import requests
-
 avatars = Avatars()
 
 """  OIDC TESTS """
@@ -93,6 +92,7 @@ def dashboard(provider=False):
         "pages/dashboard.html", title="Customization", nav="Customization", data=data
     )
 
+
 @app.route("/legal")
 @login_required
 def legal():

admin/src/nextcloud_saml_onlycerts.py

@@ -12,7 +12,6 @@ from datetime import datetime, timedelta
 
 import psycopg2
 import yaml
-
 from admin.lib.keycloak_client import KeycloakClient
 from admin.lib.postgres import Postgres
 

admin/src/saml_scripts/keycloak_config.py

@@ -1,9 +1,10 @@
 #!/usr/bin/env python
 # coding=utf-8
 import json
-from lib.keycloak_client import KeycloakClient
 import logging as log
 
+from lib.keycloak_client import KeycloakClient
+
 
 class KeycloakConfig:
     def __init__(self):

admin/src/saml_scripts/lib/keycloak_client.py

@@ -12,10 +12,10 @@ import yaml
 from jinja2 import Environment, FileSystemLoader
 from keycloak import KeycloakAdmin
 
-# from admin import app
-
 from .postgres import Postgres
 
+# from admin import app
+
 
 class KeycloakClient:
     """https://www.keycloak.org/docs-api/13.0/rest-api/index.html

admin/src/saml_scripts/moodle_saml.py

@@ -12,7 +12,6 @@ from datetime import datetime, timedelta
 
 import psycopg2
 import yaml
-
 from lib.keycloak_client import KeycloakClient
 from lib.postgres import Postgres
 

admin/src/saml_scripts/nextcloud_saml.py

@@ -12,7 +12,6 @@ from datetime import datetime, timedelta
 
 import psycopg2
 import yaml
-
 from lib.keycloak_client import KeycloakClient
 from lib.postgres import Postgres
 

admin/src/saml_scripts/wordpress_saml.py

@@ -12,7 +12,6 @@ from datetime import datetime, timedelta
 
 import psycopg2
 import yaml
-
 from lib.keycloak_client import KeycloakClient
 from lib.mysql import Mysql
 

admin/src/scripts/avatars.py

@@ -12,7 +12,6 @@ from keycloak import KeycloakAdmin
 from minio import Minio
 from minio.commonconfig import REPLACE, CopySource
 from minio.deleteobjects import DeleteObject
-
 from postgres import Postgres
 
 

admin/src/scripts/reset_pwds.py

@@ -11,7 +11,6 @@ import diceware
 import yaml
 from jinja2 import Environment, FileSystemLoader
 from keycloak import KeycloakAdmin
-
 from postgres import Postgres
 
 options = diceware.handle_options(None)

admin/src/scripts/temporary_no.py

@@ -10,7 +10,6 @@ from pprint import pprint
 import yaml
 from jinja2 import Environment, FileSystemLoader
 from keycloak import KeycloakAdmin
-
 from postgres import Postgres
 
 

admin/src/scripts/temporary_no.py.mod

@@ -10,7 +10,6 @@ from pprint import pprint
 import yaml
 from jinja2 import Environment, FileSystemLoader
 from keycloak import KeycloakAdmin
-
 from postgres import Postgres
 
 

admin/src/wordpress_saml_onlycerts.py

@@ -12,7 +12,6 @@ from datetime import datetime, timedelta
 
 import psycopg2
 import yaml
-
 from admin.lib.keycloak_client import KeycloakClient
 from admin.lib.mysql import Mysql
 

docker/api/src/api/__init__.py

@@ -50,4 +50,4 @@ def send_templates(path):
 """
 Import all views
 """
-from .views import AvatarsViews, MenuViews, InternalViews
+from .views import AvatarsViews, InternalViews, MenuViews

docker/api/src/api/lib/avatars.py

@@ -9,9 +9,8 @@ import traceback
 from datetime import datetime, timedelta
 
 import yaml
-from keycloak import KeycloakAdmin
-
 from api import app as application
+from keycloak import KeycloakAdmin
 
 
 class Avatars:

docker/api/src/api/lib/menu.py

@@ -12,9 +12,8 @@ import traceback
 from datetime import datetime, timedelta
 
 import yaml
-from jinja2 import Environment, FileSystemLoader
-
 from api import app as application
+from jinja2 import Environment, FileSystemLoader
 
 
 def write_css():
@@ -81,7 +80,9 @@ class Menu:
             "https://api." + application.config["DOMAIN"] + custom["background_login"]
         )
         custom["logo"] = "https://api." + application.config["DOMAIN"] + custom["logo"]
-        custom["product_logo"] = "https://api." + application.config["DOMAIN"] + custom["product_logo"]
+        custom["product_logo"] = (
+            "https://api." + application.config["DOMAIN"] + custom["product_logo"]
+        )
 
         menudict = {**custom, **{"apps_internal": apps_internal, **user_menu_dict}}
         menudict["user"] = {}

docker/api/src/api/views/AvatarsViews.py

@@ -8,6 +8,7 @@ import time
 import traceback
 from uuid import uuid4
 
+from api import app
 from flask import (
     Response,
     jsonify,
@@ -18,8 +19,6 @@ from flask import (
     url_for,
 )
 
-from api import app
-
 from ..lib.avatars import Avatars
 
 avatars = Avatars()

docker/api/src/api/views/InternalViews.py

@@ -2,11 +2,11 @@
 
 import os
 
+from api import app
 from flask import Response, jsonify, redirect, render_template, request, url_for
 
 from .decorators import is_internal
 
-from api import app
 
 @app.route("/restart", methods=["GET"])
 @is_internal

docker/api/src/api/views/MenuViews.py

@@ -8,9 +8,8 @@ import time
 import traceback
 from uuid import uuid4
 
-from flask import Response, jsonify, redirect, render_template, request, url_for
-
 from api import app
+from flask import Response, jsonify, redirect, render_template, request, url_for
 
 from ..lib.menu import Menu
 
@@ -36,6 +35,7 @@ def api_v2_header(format, application=False):
             if application == "wordpress":
                 return render_template("header_wordpress.html")
 
+
 # @app.route('/user_menu/<format>', methods=['GET'])
 # @app.route('/user_menu/<format>/<application>', methods=['GET'])
 # def api_v2_user_menu(format,application=False):

docker/api/src/api/views/decorators.py

@@ -6,6 +6,7 @@ from functools import wraps
 
 from flask import redirect, request, url_for
 
+
 def is_internal(fn):
     @wraps(fn)
     def decorated_view(*args, **kwargs):

docker/api/src/start.py

@@ -4,9 +4,8 @@ from eventlet import monkey_patch
 
 monkey_patch()
 
-from flask_socketio import SocketIO
-
 from api import app
+from flask_socketio import SocketIO
 
 socketio = SocketIO(app)
 

docker/keycloak-client/kcli.py

@@ -1,4 +1,5 @@
-import json, sys
+import json
+import sys
 from pprint import pprint
 
 from keycloak import KeycloakAdmin