consolidate conftests and clean up imports

Author: jpstroop

fitbit_client/auth/callback_handler.py

@@ -111,7 +111,7 @@ def do_GET(self) -> None:
 
         try:
             # Parse and validate query parameters
-            query_params = self.parse_query_parameters()
+            self.parse_query_parameters()
 
             # Send success response
             self.send_success_response()

fitbit_client/auth/oauth.py

@@ -202,7 +202,6 @@ def fetch_token(self, authorization_response: str) -> Dict[str, Any]:
             )
         except Exception as e:
             error_msg = str(e).lower()
-            logger = getLogger("fitbit_client.oauth")
 
             if "invalid_client" in error_msg:
                 self.logger.error(

fitbit_client/exceptions.py

@@ -6,9 +6,6 @@
 from typing import List
 from typing import Optional
 
-# Local imports
-from fitbit_client.resources.constants import IntradayDetailLevel
-
 
 class FitbitAPIException(Exception):
     """Base exception for all Fitbit API errors"""

fitbit_client/resources/base.py

@@ -303,7 +303,7 @@ def _handle_json_response(self, calling_method: str, endpoint: str, response: Re
         """
         try:
             content = response.json()
-        except JSONDecodeError as e:
+        except JSONDecodeError:
             self.logger.error(f"Invalid JSON response from {endpoint}")
             raise
 

fitbit_client/resources/heartrate_timeseries.py

@@ -5,7 +5,6 @@
 from typing import Dict
 from typing import Optional
 
-pass
 # Local imports
 from fitbit_client.resources.base import BaseResource
 from fitbit_client.resources.constants import Period

fitbit_client/resources/subscription.py

@@ -6,7 +6,6 @@
 from typing import Optional
 
 # Local imports
-from fitbit_client.exceptions import ValidationException
 from fitbit_client.resources.base import BaseResource
 from fitbit_client.resources.constants import SubscriptionCategory
 

lint/add_file_headers.py

@@ -3,6 +3,7 @@
 # Standard library imports
 from os import getcwd
 from pathlib import Path
+from sys import exit
 from typing import List
 
 SEARCH_DIRS = ["tests", "fitbit_client", "lint"]
@@ -48,10 +49,13 @@ def main():
     """Main script function."""
     project_root = Path(getcwd())
     python_files = find_python_files(project_root)
-
+    updated = 0
     for file_path in python_files:
+        add_file_header(file_path, project_root)
         if add_file_header(file_path, project_root):
-            print(f"Added or corrected path comment in {file_path.relative_to(project_root)}")
+            updated = 1
+            # print(f"Added or corrected path comment in {file_path.relative_to(project_root)}")
+    exit(updated)
 
 
 if __name__ == "__main__":

pyproject.toml

@@ -46,13 +46,15 @@ build-backend = "pdm.backend"
 line-length = 100
 target-version = ['py312']
 preview = true
+quiet = true
 skip-magic-trailing-comma = true
 
 [tool.isort]
 profile = "black"
 multi_line_output = 3
 force_single_line = true
 force_sort_within_sections = true
+quiet = true
 known_first_party = ["fitbit_client"]
 sections = ["FUTURE", "STDLIB", "THIRDPARTY", "FIRSTPARTY", "LOCALFOLDER"]
 import_heading_stdlib = "Standard library imports"
@@ -75,7 +77,7 @@ extensions = [
 testpaths = ["tests"]
 minversion = 6.0
 python_files = "test_*.py"
-addopts = "-ra -q --cov=fitbit_client --cache-clear --cov-report=term-missing --cov-report=html:cov_html -v --tb=native"
+addopts = "-ra -q --cov=fitbit_client --cache-clear --cov-report=term-missing --cov-report=html:_cov_html -v --tb=native"
 pythonpath = ["."]
 
 # https://pytest-cov.readthedocs.io/en/latest/config.html
@@ -94,7 +96,7 @@ exclude_lines = [
 ]
 
 [tool.pdm.scripts]
-autoflake = { cmd = "autoflake . -ri --remove-all-unused-imports --quiet --exclude .venv/* --exclude _scripts/" }
+autoflake = { cmd = "autoflake . -r --remove-unused-variables --remove-all-unused-imports --ignore-pass-after-docstring --exclude ./.venv/*,./_scripts/*" }
 headers = { cmd = "python lint/add_file_headers.py" }
 format = { composite = [ "headers", "black .", "isort .", "mdformat .", ] }
 

tests/conftest.py

@@ -2,12 +2,39 @@
 
 # Standard library imports
 from unittest.mock import Mock
+from unittest.mock import patch
 
 # Third party imports
 from pytest import fixture
 from requests import Response
 from requests_oauthlib import OAuth2Session
 
+# fmt: off
+# isort: off
+from fitbit_client.resources.active_zone_minutes import ActiveZoneMinutesResource
+from fitbit_client.resources.activity import ActivityResource
+from fitbit_client.resources.activity_timeseries import ActivityTimeSeriesResource
+from fitbit_client.resources.body import BodyResource
+from fitbit_client.resources.body_timeseries import BodyTimeSeriesResource
+from fitbit_client.resources.breathing_rate import BreathingRateResource
+from fitbit_client.resources.cardio_fitness_score import CardioFitnessScoreResource
+from fitbit_client.resources.device import DeviceResource
+from fitbit_client.resources.electrocardiogram import ElectrocardiogramResource
+from fitbit_client.resources.friends import FriendsResource
+from fitbit_client.resources.heartrate_timeseries import HeartrateTimeSeriesResource
+from fitbit_client.resources.heartrate_variability import HeartrateVariabilityResource
+from fitbit_client.resources.intraday import IntradayResource
+from fitbit_client.resources.irregular_rhythm_notifications import IrregularRhythmNotificationsResource
+from fitbit_client.resources.nutrition import NutritionResource
+from fitbit_client.resources.nutrition_timeseries import NutritionTimeSeriesResource
+from fitbit_client.resources.sleep import SleepResource
+from fitbit_client.resources.spo2 import SpO2Resource
+from fitbit_client.resources.subscription import SubscriptionResource
+from fitbit_client.resources.temperature import TemperatureResource
+from fitbit_client.resources.user import UserResource
+# isort: on
+# fmt: on
+
 
 @fixture
 def mock_oauth_session():
@@ -59,3 +86,135 @@ def _create_mock_response(status_code, json_data=None, content_type="application
         return response
 
     return _create_mock_response
+
+
+@fixture
+def activity_resource(mock_oauth_session, mock_logger):
+    with patch("fitbit_client.resources.base.getLogger", return_value=mock_logger):
+        return ActivityResource(oauth_session=mock_oauth_session, locale="en_US", language="en_US")
+
+
+@fixture
+def activity_timeseries_resource(mock_oauth_session, mock_logger):
+    with patch("fitbit_client.resources.base.getLogger", return_value=mock_logger):
+        return ActivityTimeSeriesResource(
+            oauth_session=mock_oauth_session, locale="en_US", language="en_US"
+        )
+
+
+@fixture
+def azm_resource(mock_oauth_session, mock_logger):
+    with patch("fitbit_client.resources.base.getLogger", return_value=mock_logger):
+        return ActiveZoneMinutesResource(
+            oauth_session=mock_oauth_session, locale="en_US", language="en_US"
+        )
+
+
+@fixture
+def body_resource(mock_oauth_session, mock_logger):
+    with patch("fitbit_client.resources.base.getLogger", return_value=mock_logger):
+        return BodyResource(mock_oauth_session, "en_US", "en_US")
+
+
+@fixture
+def body_timeseries(mock_oauth_session, mock_logger):
+    with patch("fitbit_client.resources.base.getLogger", return_value=mock_logger):
+        return BodyTimeSeriesResource(mock_oauth_session, "en_US", "en_US")
+
+
+@fixture
+def breathing_rate_resource(mock_oauth_session, mock_logger):
+    with patch("fitbit_client.resources.base.getLogger", return_value=mock_logger):
+        return BreathingRateResource(mock_oauth_session, "en_US", "en_US")
+
+
+@fixture
+def cardio_fitness_score_resource(mock_oauth_session, mock_logger):
+    with patch("fitbit_client.resources.base.getLogger", return_value=mock_logger):
+        return CardioFitnessScoreResource(mock_oauth_session, "en_US", "en_US")
+
+
+@fixture
+def device_resource(mock_oauth_session, mock_logger):
+    with patch("fitbit_client.resources.base.getLogger", return_value=mock_logger):
+        return DeviceResource(mock_oauth_session, "en_US", "en_US")
+
+
+@fixture
+def ecg_resource(mock_oauth_session, mock_logger):
+    with patch("fitbit_client.resources.base.getLogger", return_value=mock_logger):
+        return ElectrocardiogramResource(mock_oauth_session, "en_US", "en_US")
+
+
+@fixture
+def friends_resource(mock_oauth_session, mock_logger):
+    with patch("fitbit_client.resources.base.getLogger", return_value=mock_logger):
+        return FriendsResource(oauth_session=mock_oauth_session, locale="en_US", language="en_US")
+
+
+@fixture
+def heartrate_resource(mock_oauth_session, mock_logger):
+    with patch("fitbit_client.resources.base.getLogger", return_value=mock_logger):
+        return HeartrateTimeSeriesResource(
+            oauth_session=mock_oauth_session, locale="en_US", language="en_US"
+        )
+
+
+@fixture
+def hrv_resource(mock_oauth_session, mock_logger):
+    with patch("fitbit_client.resources.base.getLogger", return_value=mock_logger):
+        return HeartrateVariabilityResource(mock_oauth_session, "en_US", "en_US")
+
+
+@fixture
+def intraday_resource(mock_oauth_session, mock_logger):
+    with patch("fitbit_client.resources.base.getLogger", return_value=mock_logger):
+        return IntradayResource(oauth_session=mock_oauth_session, locale="en_US", language="en_US")
+
+
+@fixture
+def irn_resource(mock_oauth_session, mock_logger):
+    with patch("fitbit_client.resources.base.getLogger", return_value=mock_logger):
+        return IrregularRhythmNotificationsResource(mock_oauth_session, "en_US", "en_US")
+
+
+@fixture
+def nutrition_resource(mock_oauth_session, mock_logger):
+    with patch("fitbit_client.resources.base.getLogger", return_value=mock_logger):
+        return NutritionResource(oauth_session=mock_oauth_session, locale="en_US", language="en_US")
+
+
+@fixture
+def nutrition_timeseries_resource(mock_oauth_session, mock_logger):
+    with patch("fitbit_client.resources.base.getLogger", return_value=mock_logger):
+        return NutritionTimeSeriesResource(mock_oauth_session, "en_US", "en_US")
+
+
+@fixture
+def sleep_resource(mock_oauth_session, mock_logger):
+    with patch("fitbit_client.resources.base.getLogger", return_value=mock_logger):
+        return SleepResource(mock_oauth_session, "en_US", "en_US")
+
+
+@fixture
+def spo2_resource(mock_oauth_session, mock_logger):
+    with patch("fitbit_client.resources.base.getLogger", return_value=mock_logger):
+        return SpO2Resource(mock_oauth_session, "en_US", "en_US")
+
+
+@fixture
+def subscription_resource(mock_oauth_session, mock_logger):
+    with patch("fitbit_client.resources.base.getLogger", return_value=mock_logger):
+        return SubscriptionResource(mock_oauth_session, "en_US", "en_US")
+
+
+@fixture
+def temperature_resource(mock_oauth_session, mock_logger):
+    with patch("fitbit_client.resources.base.getLogger", return_value=mock_logger):
+        return TemperatureResource(mock_oauth_session, "en_US", "en_US")
+
+
+@fixture
+def user_resource(mock_oauth_session, mock_logger):
+    with patch("fitbit_client.resources.base.getLogger", return_value=mock_logger):
+        return UserResource(mock_oauth_session, "en_US", "en_US")