Merge pull request #295 from cyberjunky/revamp

Added activity file selector to demo, removed black

Author: cyberjunky

.coderabbit.yaml

@@ -2,7 +2,7 @@
 language: "en-US"
 early_access: true
 reviews:
-  profile: "pythonic"
+  profile: "assertive"
   request_changes_workflow: true
   high_level_summary: true
   poem: false
@@ -11,11 +11,7 @@ reviews:
   auto_review:
     enabled: true
     drafts: false
-  auto_fix:
-    enabled: true
-    include_imports: true
-    include_type_hints: true
-    include_security_fixes: true
+
   path_filters:
     - "!tests/**/cassettes/**"
   path_instructions:

.github/workflows/ci.yml

@@ -61,8 +61,17 @@ jobs:
       #     pdm run coverage xml
       #   continue-on-error: true
 
+      - name: Check for coverage report
+        id: coverage_check
+        run: |
+          if [ -f coverage.xml ]; then
+            echo "coverage_generated=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "coverage_generated=false" >> "$GITHUB_OUTPUT"
+          fi
+
       - name: Upload coverage artifact
-        if: matrix.python-version == '3.11'
+        if: matrix.python-version == '3.11' && steps.coverage_check.outputs.coverage_generated == 'true'
         uses: actions/upload-artifact@v4
         with:
           name: coverage-xml

.pre-commit-config.yaml

@@ -18,11 +18,12 @@ repos:
       - tomli
     exclude: 'cassettes/'
 
-- repo: https://github.com/psf/black
-  rev: 24.8.0
-  hooks:
-  - id: black
-    language_version: python3
+# Removed black - using ruff-format instead to avoid formatting conflicts
+# - repo: https://github.com/psf/black
+#   rev: 24.8.0
+#   hooks:
+#   - id: black
+#     language_version: python3
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
   rev: v0.6.4
@@ -35,7 +36,7 @@ repos:
   hooks:
   - id: mypy
     name: mypy type checking
-    entry: .venv/bin/pdm run mypy garminconnect tests
+    entry: pdm run mypy garminconnect tests
     types: [python]
     language: system
     pass_filenames: false

README.md

@@ -210,6 +210,7 @@ pdm install --group :all
 ```
 
 **Run Tests:**
+
 ```bash
 pdm run test        # Run all tests
 pdm run testcov     # Run tests with coverage report
@@ -232,6 +233,7 @@ pdm run test
 For package maintainers:
 
 **Setup PyPI credentials:**
+
 ```bash
 pip install twine
 # Edit with your preferred editor, or create via here-doc:
@@ -241,6 +243,7 @@ pip install twine
 # password = <PyPI_API_TOKEN>
 # EOF
 ```
+
 ```ini
 [pypi]
 username = __token__
@@ -256,11 +259,13 @@ export TWINE_PASSWORD="<PyPI_API_TOKEN>"
 ```
 
 **Publish new version:**
+
 ```bash
 pdm run publish    # Build and publish to PyPI
 ```
 
 **Alternative publishing steps:**
+
 ```bash
 pdm run build      # Build package only
 pdm publish        # Publish pre-built package

demo.py

@@ -70,9 +70,7 @@ def __init__(self):
 
         # Activity settings
         self.activitytype = ""  # Possible values: cycling, running, swimming, multi_sport, fitness_equipment, hiking, walking, other
-        self.activityfile = (
-            "test_data/sample_activity.gpx"  # Supported file types: .fit .gpx .tcx
-        )
+        self.activityfile = "test_data/*.gpx"  # Supported file types: .fit .gpx .tcx
         self.workoutfile = "test_data/sample_workout.json"  # Sample workout JSON file
 
         # Export settings
@@ -1288,37 +1286,42 @@ def get_solar_data(api: Garmin) -> None:
 
 def upload_activity_file(api: Garmin) -> None:
     """Upload activity data from file."""
+    import glob
+
     try:
-        # Default activity file from config
-        print(f"📤 Uploading activity from file: {config.activityfile}")
+        # List all .gpx files in test_data
+        gpx_files = glob.glob(config.activityfile)
+        if not gpx_files:
+            print("❌ No .gpx files found in test_data directory.")
+            print("ℹ️ Please add GPX files to test_data before uploading.")
+            return
 
-        # Check if file exists
-        import os
+        print("Select a GPX file to upload:")
+        for idx, fname in enumerate(gpx_files, 1):
+            print(f"  {idx}. {fname}")
 
-        if not os.path.exists(config.activityfile):
-            print(f"❌ File not found: {config.activityfile}")
-            print(
-                "ℹ️ Please place your activity file (.fit, .gpx, or .tcx) under the 'test_data' directory or update config.activityfile"
-            )
-            print("ℹ️ Supported formats: FIT, GPX, TCX")
-            return
+        while True:
+            try:
+                choice = int(input(f"Enter number (1-{len(gpx_files)}): "))
+                if 1 <= choice <= len(gpx_files):
+                    selected_file = gpx_files[choice - 1]
+                    break
+                else:
+                    print("Invalid selection. Try again.")
+            except ValueError:
+                print("Please enter a valid number.")
 
-        # Upload the activity
-        result = api.upload_activity(config.activityfile)
+        print(f"📤 Uploading activity from file: {selected_file}")
 
-        if result:
-            print("✅ Activity uploaded successfully!")
-            call_and_display(
-                api.upload_activity,
-                config.activityfile,
-                method_name="upload_activity",
-                api_call_desc=f"api.upload_activity({config.activityfile})",
-            )
-        else:
-            print(f"❌ Failed to upload activity from {config.activityfile}")
+        call_and_display(
+            api.upload_activity,
+            selected_file,
+            method_name="upload_activity",
+            api_call_desc=f"api.upload_activity({selected_file})",
+        )
 
     except FileNotFoundError:
-        print(f"❌ File not found: {config.activityfile}")
+        print(f"❌ File not found: {selected_file}")
         print("ℹ️ Please ensure the activity file exists in the current directory")
     except requests.exceptions.HTTPError as e:
         if e.response.status_code == 409:
@@ -1363,7 +1366,6 @@ def upload_activity_file(api: Garmin) -> None:
         print(f"❌ Too many requests: {e}")
         print("💡 Please wait a few minutes before trying again")
     except Exception as e:
-        # Check if this is a wrapped HTTP error from the Garmin library
         error_str = str(e)
         if "409 Client Error: Conflict" in error_str:
             print(