Адаптация вариантов использования системы под модули Database и cache

App/Report/__init__.py

@@ -5,7 +5,7 @@ from datetime import date
 from .report_model import view_report_model, create_report_model
 import json
 
-with open(path.join(path.dirname(__file__), 'reports.json')) as f:
+with open(path.join(path.dirname(__file__), 'reports.json'), encoding='utf-8') as f:
     report_list = json.load(f)
 
 report_bp = Blueprint('report_bp', __name__, template_folder='templates')

App/Report/report_model.py

@@ -1,6 +1,6 @@
 from dataclasses import dataclass
-from .db.work import select_list, procedure
+from Database.work import select_list, procedure
-from .db.sql_provider import SQLProvider
+from Database.sql_provider import SQLProvider
 from flask import current_app, session
 from os import path
 

App/Requests/requests_model.py

@@ -1,6 +1,6 @@
 from dataclasses import dataclass
-from .db.select import select_list
+from Database.work import select_list
-from .db.sql_provider import SQLProvider
+from Database.sql_provider import SQLProvider
 from flask import current_app
 from os import path
 

App/Waybill/model.py

@@ -1,11 +1,11 @@
-from .db.sql_provider import SQLProvider
+from Database.sql_provider import SQLProvider
-from .db.work import select_list, transaction
+from Database.work import select_list, transaction
-from .db.DBconnect import DBContextManager
+from Database.DBconnect import DBContextManager
 
 from flask import current_app, session
 from dataclasses import dataclass
 from datetime import date
-from .cache.wrapper import fetch_from_cache
+from cache.wrapper import fetch_from_cache
 import os
 
 @dataclass