API - refactor imports

fittrackee/workouts/models.py

@@ -3,7 +3,6 @@ import os
 from typing import Any, Dict, Optional, Union
 from uuid import UUID, uuid4
 
-from fittrackee import db
 from sqlalchemy.dialects import postgresql
 from sqlalchemy.engine.base import Connection
 from sqlalchemy.event import listens_for
@@ -13,6 +12,8 @@ from sqlalchemy.orm.mapper import Mapper
 from sqlalchemy.orm.session import Session, object_session
 from sqlalchemy.types import JSON, Enum
 
+from fittrackee import db
+
 from .utils_files import get_absolute_file_path
 from .utils_format import convert_in_duration, convert_value_to_integer
 from .utils_id import encode_uuid

fittrackee/workouts/records.py

@@ -2,7 +2,8 @@ from typing import Dict
 
 from flask import Blueprint
 
-from ..users.decorators import authenticate
+from fittrackee.users.decorators import authenticate
+
 from .models import Record
 
 records_blueprint = Blueprint('records', __name__)

fittrackee/workouts/sports.py

@@ -1,5 +1,8 @@
 from typing import Dict, Union
 
+from flask import Blueprint, request
+from sqlalchemy import exc
+
 from fittrackee import db
 from fittrackee.responses import (
     DataNotFoundErrorResponse,
@@ -7,11 +10,9 @@ from fittrackee.responses import (
     InvalidPayloadErrorResponse,
     handle_error_and_return_response,
 )
-from flask import Blueprint, request
-from sqlalchemy import exc
+from fittrackee.users.decorators import authenticate, authenticate_as_admin
+from fittrackee.users.models import User
 
-from ..users.decorators import authenticate, authenticate_as_admin
-from ..users.models import User
 from .models import Sport
 
 sports_blueprint = Blueprint('sports', __name__)

fittrackee/workouts/stats.py

@@ -1,6 +1,9 @@
 from datetime import datetime, timedelta
 from typing import Dict, Union
 
+from flask import Blueprint, request
+from sqlalchemy import func
+
 from fittrackee import db
 from fittrackee.responses import (
     HttpResponse,
@@ -9,11 +12,9 @@ from fittrackee.responses import (
     UserNotFoundErrorResponse,
     handle_error_and_return_response,
 )
-from flask import Blueprint, request
-from sqlalchemy import func
+from fittrackee.users.decorators import authenticate, authenticate_as_admin
+from fittrackee.users.models import User
 
-from ..users.decorators import authenticate, authenticate_as_admin
-from ..users.models import User
 from .models import Sport, Workout
 from .utils import get_datetime_with_tz, get_upload_dir_size
 from .utils_format import convert_timedelta_to_integer

fittrackee/workouts/utils.py

@@ -8,14 +8,15 @@ from uuid import UUID
 
 import gpxpy.gpx
 import pytz
-from fittrackee import appLog, db
 from flask import current_app
 from sqlalchemy import exc
 from staticmap import Line, StaticMap
 from werkzeug.datastructures import FileStorage
 from werkzeug.utils import secure_filename
 
-from ..users.models import User
+from fittrackee import appLog, db
+from fittrackee.users.models import User
+
 from .exceptions import WorkoutException
 from .models import Sport, Workout, WorkoutSegment
 from .utils_files import get_absolute_file_path

fittrackee/workouts/utils_weather.py

@@ -3,9 +3,10 @@ from typing import Dict, Optional
 
 import forecastio
 import pytz
-from fittrackee import appLog
 from gpxpy.gpx import GPXRoutePoint
 
+from fittrackee import appLog
+
 API_KEY = os.getenv('WEATHER_API_KEY')
 
 

fittrackee/workouts/workouts.py

@@ -5,6 +5,9 @@ from datetime import datetime, timedelta
 from typing import Any, Dict, List, Optional, Tuple, Union
 
 import requests
+from flask import Blueprint, Response, current_app, request, send_file
+from sqlalchemy import exc
+
 from fittrackee import appLog, db
 from fittrackee.responses import (
     DataInvalidPayloadErrorResponse,
@@ -15,11 +18,13 @@ from fittrackee.responses import (
     NotFoundErrorResponse,
     handle_error_and_return_response,
 )
-from flask import Blueprint, Response, current_app, request, send_file
-from sqlalchemy import exc
+from fittrackee.users.decorators import authenticate
+from fittrackee.users.utils import (
+    User,
+    can_view_workout,
+    verify_extension_and_size,
+)
 
-from ..users.decorators import authenticate
-from ..users.utils import User, can_view_workout, verify_extension_and_size
 from .models import Workout
 from .utils import (
     WorkoutException,