v8.2: Remove unnecessary blank lines and exception handling

Removed multiple unnecessary blank lines across various files to maintain code cleanliness and readability. Simplified exception handling in the `roxywi/auth.py` module and updated the import statements in `ha/routes.py`. Added a timeout parameter to the requests call in `alerting.py` for better error management.

app/middleware.py

@@ -1,6 +1,6 @@
 from functools import wraps
 
-from flask import redirect, url_for, abort, g
+from flask import abort, g
 
 import app.modules.roxywi.auth as roxywi_auth
 import app.modules.roxywi.common as roxywi_common
@@ -25,7 +25,8 @@ def get_user_params(virt=0, disable=0):
             try:
                 user_params = roxywi_common.get_users_params(virt=virt, disable=disable, service=kwargs.get('service'))
                 g.user_params = user_params
-            except Exception:
+            except Exception as e:
+                print(e)
                 return abort(401)
             return fn(*args, **kwargs)
         return decorated_views

app/modules/roxywi/auth.py

@@ -118,10 +118,7 @@ def do_login(user_params: dict, next_url: str):
     except Exception:
         user_group_name = ''
 
-    try:
-        roxywi_common.logging('RMON server', f' user: {user_params["name"]}, group: {user_group_name} login', roxywi=1)
-    except Exception as e:
-        print(f'error: {e}')
+    roxywi_common.logging('Roxy-WI server', f' user: {user_params["name"]}, group: {user_group_name} login', roxywi=1)
 
     return response
 

app/modules/tools/alerting.py

@@ -320,14 +320,14 @@ def mm_send_mess(mess, level, server_ip=None, service_id=None, alert_type=None,
 				"short": "true",
 				"title": "Server",
 				"value": f"{server_ip}",
-				},
-			]
+			},
+		]
 	}
 	attach = str(json.dumps(attach))
 	values = f'{{"channel": "{channel}", "username": "Roxy-WI", "attachments": [{attach}]}}'
 	proxy_dict = common.return_proxy_dict()
 	try:
-		requests.post(token, headers=headers, data=str(values), proxies=proxy_dict)
+		requests.post(token, headers=headers, data=str(values), proxies=proxy_dict, timeout=15)
 	except Exception as e:
 		roxywi_common.logging('Roxy-WI server', str(e), roxywi=1)
 		raise Exception(e)

app/routes/ha/routes.py

@@ -1,4 +1,4 @@
-from flask import render_template, g, request, jsonify
+from flask import render_template, g, jsonify
 from flask_jwt_extended import jwt_required
 from playhouse.shortcuts import model_to_dict
 

app/routes/user/routes.py

@@ -70,7 +70,6 @@ def update_user_password(user_id):
         return ErrorResponse(error=str(e)).model_dump(mode='json'), 501
 
 
-
 @bp.route('/services/<int:user_id>', methods=['GET', 'POST'])
 def show_user_services(user_id):
     if request.method == 'GET':

app/views/ha/views.py

@@ -454,7 +454,6 @@ class HAVIPView(MethodView):
         except Exception as e:
             return roxywi_common.handler_exceptions_for_json_data(e, 'Cannot create VIP')
 
-
     @validate(body=HAClusterVIP)
     def put(self, service: str, cluster_id: int, vip_id: int, body: HAClusterVIP):
         """

app/views/service/haproxy_section_views.py

@@ -1258,7 +1258,6 @@ class GlobalSectionView(HaproxySectionView):
         """
         return super().get(service, 'global', 'global', server_id)
 
-
     @validate(body=HaproxyGlobalRequest, query=GenerateConfigRequest)
     def put(self, service: Literal['haproxy'], server_id: Union[int, str], body: HaproxyGlobalRequest):
         """
@@ -1443,7 +1442,6 @@ class DefaultsSectionView(HaproxySectionView):
         """
         return super().get(service, 'defaults', 'defaults', server_id)
 
-
     @validate(body=HaproxyDefaultsRequest, query=GenerateConfigRequest)
     def put(self, service: Literal['haproxy'], server_id: Union[int, str], body: HaproxyDefaultsRequest):
         """

app/views/service/views.py

@@ -456,7 +456,6 @@ class ServiceConfigView(MethodView):
         if body.action != 'test':
             config_mod.diff_config(body.config_local_path, cfg)
 
-
         return DataStrResponse(data=stderr).model_dump(mode='json'), 201
 
 

app/views/tools/port_scanner_views.py

@@ -64,7 +64,6 @@ class PortScannerView(MethodView):
 
         return jsonify(model_to_dict(ps_settings, recurse=False, exclude=[PortScannerSettings.user_group_id]))
 
-
     @validate(body=PortScannerRequest)
     def post(self, server_id: Union[int, str], body: PortScannerRequest):
         """