Fix: Pass allow_device_to_device parameter to WgServer constructor

Alex J Lennon · Alex J Lennon · commit 66312cff0241 · 2025-11-20T17:09:41.000-03:00
- Fixed load_from_factory classmethod to pass allow_device_to_device parameter to constructor
- This ensures the --allow-device-to-device CLI flag works correctly
- Code formatting improvements in export_to_google_sheets.py
- Import reorganization in tool_handlers.py

This fix ensures device-to-device communication works when the flag is enabled.
diff --git a/export_to_google_sheets.py b/export_to_google_sheets.py
@@ -14,10 +14,10 @@
     python export_to_google_sheets.py [--spreadsheet-id SPREADSHEET_ID] [--sheet-name SHEET_NAME]
 """
 
+import argparse
+import json
 import os
 import sys
-import json
-import argparse
 from datetime import datetime
 from pathlib import Path
 
@@ -39,7 +39,7 @@ def get_google_credentials():
     """Get Google Sheets credentials from environment or file."""
     # Check environment variable first
     creds_path = os.getenv("GOOGLE_SHEETS_CREDENTIALS")
-    
+
     # Fall back to credentials.json in project root
     if not creds_path:
         creds_path = Path(__file__).parent / "credentials.json"
@@ -48,17 +48,17 @@ def get_google_credentials():
                 "Google Sheets credentials not found. "
                 "Set GOOGLE_SHEETS_CREDENTIALS environment variable or place credentials.json in project root."
             )
-    
+
     creds_path = Path(creds_path)
     if not creds_path.exists():
         raise FileNotFoundError(f"Credentials file not found: {creds_path}")
-    
+
     # Load credentials
     scope = [
         "https://spreadsheets.google.com/feeds",
         "https://www.googleapis.com/auth/drive",
     ]
-    
+
     creds = Credentials.from_service_account_file(str(creds_path), scopes=scope)
     return creds
 
@@ -79,13 +79,13 @@ def create_or_get_spreadsheet(gc, spreadsheet_id=None, title=None):
 
 def export_devices_to_sheet(devices, worksheet, factory_name):
     """Export devices data to Google Sheet.
-    
+
     SECURITY NOTE: This export only includes non-sensitive device metadata:
     - Device names, status, targets, apps
     - VPN IP addresses (not secrets)
     - Creation dates
     - Production flags
-    
+
     NO SECRETS EXPORTED:
     - No API keys, tokens, or passwords
     - No private keys or certificates
@@ -94,7 +94,7 @@ def export_devices_to_sheet(devices, worksheet, factory_name):
     if not devices:
         print("No devices to export")
         return
-    
+
     # Define headers - ordered by importance/usefulness
     # SECURITY: Only include non-sensitive metadata
     headers = [
@@ -117,13 +117,13 @@ def export_devices_to_sheet(devices, worksheet, factory_name):
         "Days Since Created",  # Calculated field
         "Days Since Last Seen",  # Calculated field
     ]
-    
+
     # Prepare data rows
     rows = [headers]
-    
+
     # Calculate days since created for each device
     from datetime import datetime as dt
-    
+
     def parse_date(date_str):
         """Parse date string from various formats."""
         if not date_str:
@@ -134,18 +134,18 @@ def parse_date(date_str):
             except ValueError:
                 continue
         return None
-    
+
     def days_since(date_str):
         """Calculate days since a date string."""
         date_obj = parse_date(date_str)
         if date_obj:
             return str((dt.now() - date_obj).days)
         return ""
-    
+
     for device in devices:
         created_at = device.get("created_at", "")
         last_seen = device.get("last_seen", "")
-        
+
         row = [
             device.get("name", ""),
             device.get("status", ""),
@@ -167,11 +167,11 @@ def days_since(date_str):
             days_since(last_seen),
         ]
         rows.append(row)
-    
+
     # Clear existing content and add new data
     worksheet.clear()
     worksheet.update(values=rows, range_name="A1")
-    
+
     # Calculate column letter for last column
     def col_letter(col_num):
         """Convert column number (1-based) to letter (A, B, C, ..., Z, AA, AB, ...)"""
@@ -181,74 +181,83 @@ def col_letter(col_num):
             result = chr(65 + (col_num % 26)) + result
             col_num //= 26
         return result
-    
+
     last_col = col_letter(len(headers))
     header_range = f"A1:{last_col}1"
-    
+
     # Format header row (bold, colored background)
-    worksheet.format(header_range, {
-        "textFormat": {"bold": True},
-        "backgroundColor": {"red": 0.2, "green": 0.6, "blue": 0.9},
-        "horizontalAlignment": "CENTER",
-    })
-    
+    worksheet.format(
+        header_range,
+        {
+            "textFormat": {"bold": True},
+            "backgroundColor": {"red": 0.2, "green": 0.6, "blue": 0.9},
+            "horizontalAlignment": "CENTER",
+        },
+    )
+
     # Freeze header row for scrolling
     try:
         worksheet.freeze(rows=1)
     except Exception:
         pass  # Freeze might not be available in all gspread versions
-    
+
     # Add filters to header row (makes spreadsheet filterable and sortable)
     # Filters automatically enable sorting on all columns
     try:
         spreadsheet = worksheet.spreadsheet
         # Use the correct API format for setBasicFilter
-        requests = [{
-            "setBasicFilter": {
-                "filter": {
-                    "range": {
-                        "sheetId": worksheet.id,
-                        "startRowIndex": 0,
-                        "endRowIndex": len(devices) + 1,  # Include all data rows
-                        "startColumnIndex": 0,
-                        "endColumnIndex": len(headers),
+        requests = [
+            {
+                "setBasicFilter": {
+                    "filter": {
+                        "range": {
+                            "sheetId": worksheet.id,
+                            "startRowIndex": 0,
+                            "endRowIndex": len(devices) + 1,  # Include all data rows
+                            "startColumnIndex": 0,
+                            "endColumnIndex": len(headers),
+                        }
                     }
                 }
             }
-        }]
+        ]
         spreadsheet.batch_update({"requests": requests})
         print("✅ Filters added - columns are now sortable and filterable")
     except Exception as e:
         print(f"⚠️  Warning: Could not add filters automatically: {e}")
         print("   You can add filters manually: Select header row > Data > Create a filter")
         print("   This will enable sorting and filtering on all columns")
-    
+
     # Auto-resize columns
     try:
         worksheet.columns_auto_resize(0, len(headers))
     except Exception:
         pass  # Auto-resize might not be available in all versions
-    
+
     # Format specific columns for better readability
     if len(devices) > 0:
         # Status column - bold
-        worksheet.format(f"B2:B{len(devices) + 1}", {
-            "textFormat": {"bold": True},
-        })
-        
+        worksheet.format(
+            f"B2:B{len(devices) + 1}",
+            {
+                "textFormat": {"bold": True},
+            },
+        )
+
         # Up-to-Date column - bold
-        worksheet.format(f"F2:F{len(devices) + 1}", {
-            "textFormat": {"bold": True},
-        })
-    
+        worksheet.format(
+            f"F2:F{len(devices) + 1}",
+            {
+                "textFormat": {"bold": True},
+            },
+        )
+
     print(f"✅ Exported {len(devices)} devices to sheet '{worksheet.title}'")
-    print(f"📊 Filters enabled on header row - click filter icons to filter/sort")
+    print("📊 Filters enabled on header row - click filter icons to filter/sort")
 
 
 def main():
-    parser = argparse.ArgumentParser(
-        description="Export Foundries devices to Google Sheets"
-    )
+    parser = argparse.ArgumentParser(description="Export Foundries devices to Google Sheets")
     parser.add_argument(
         "--spreadsheet-id",
         help="Google Spreadsheet ID (if not provided, creates a new spreadsheet)",
@@ -267,24 +276,24 @@ def main():
         "--title",
         help="Title for new spreadsheet (if creating new)",
     )
-    
+
     args = parser.parse_args()
-    
+
     # Get devices data
     print(f"Fetching devices from factory '{args.factory}'...")
     result = list_foundries_devices(factory=args.factory)
-    
+
     if not result.get("success"):
         print(f"ERROR: Failed to fetch devices: {result.get('error', 'Unknown error')}")
         sys.exit(1)
-    
+
     devices = result.get("devices", [])
     print(f"✅ Retrieved {len(devices)} devices")
-    
+
     if not devices:
         print("No devices to export")
         return
-    
+
     # Authenticate with Google Sheets
     print("Authenticating with Google Sheets...")
     try:
@@ -298,36 +307,40 @@ def main():
         print("2. Create a project and enable Google Sheets API")
         print("3. Create a service account and download credentials JSON")
         print("4. Share your spreadsheet with the service account email")
-        print("5. Set GOOGLE_SHEETS_CREDENTIALS environment variable or place credentials.json in project root")
+        print(
+            "5. Set GOOGLE_SHEETS_CREDENTIALS environment variable or place credentials.json in project root"
+        )
         sys.exit(1)
-    
+
     # Create or get spreadsheet
     if args.spreadsheet_id:
         print(f"Opening spreadsheet with ID: {args.spreadsheet_id}")
         spreadsheet = create_or_get_spreadsheet(gc, spreadsheet_id=args.spreadsheet_id)
     else:
-        title = args.title or f"Foundries Devices - {args.factory} - {datetime.now().strftime('%Y-%m-%d')}"
+        title = (
+            args.title
+            or f"Foundries Devices - {args.factory} - {datetime.now().strftime('%Y-%m-%d')}"
+        )
         print(f"Creating new spreadsheet: {title}")
         spreadsheet = create_or_get_spreadsheet(gc, title=title)
         print(f"✅ Created spreadsheet: {spreadsheet.url}")
-    
+
     # Get or create worksheet
     try:
         worksheet = spreadsheet.worksheet(args.sheet_name)
         print(f"Using existing sheet: {args.sheet_name}")
     except gspread.exceptions.WorksheetNotFound:
         worksheet = spreadsheet.add_worksheet(title=args.sheet_name, rows=1000, cols=20)
         print(f"Created new sheet: {args.sheet_name}")
-    
+
     # Export data
     print(f"Exporting {len(devices)} devices to sheet...")
     export_devices_to_sheet(devices, worksheet, args.factory)
-    
-    print(f"\n✅ Export complete!")
+
+    print("\n✅ Export complete!")
     print(f"📊 Spreadsheet URL: {spreadsheet.url}")
     print(f"📋 Sheet name: {worksheet.title}")
 
 
 if __name__ == "__main__":
     main()
-
diff --git a/lab_testing/server/tool_handlers.py b/lab_testing/server/tool_handlers.py
@@ -61,6 +61,7 @@ def reload_lab_testing_modules():
     copy_files_to_device_parallel,
     sync_directory_to_device,
 )
+from lab_testing.tools.foundries_devices import list_foundries_devices
 from lab_testing.tools.foundries_vpn import (
     check_client_peer_registered,
     check_foundries_vpn_client_config,
@@ -76,7 +77,6 @@ def reload_lab_testing_modules():
     setup_foundries_vpn,
     verify_foundries_vpn_connection,
 )
-from lab_testing.tools.foundries_devices import list_foundries_devices
 from lab_testing.tools.ota_manager import (
     check_ota_status,
     deploy_container,
diff --git a/lab_testing/tools/foundries_devices.py b/lab_testing/tools/foundries_devices.py
@@ -160,18 +160,18 @@ def list_foundries_devices(factory: Optional[str] = None) -> Dict[str, Any]:
                 # Fixed positions: name[0], target[1], status[2], apps[3], up-to-date[4], is-prod[5]
                 # created-at[6], last-seen[7], then variable: device-group[8] (may be empty), tag[8 or 9],
                 # owner[9 or 10], updated-at[10 or 11] (may be empty), ostree-hash[10 or 11], uuid[11 or 12]
-                
+
                 if len(parts) >= 6:
                     # At minimum: name, target, status, apps, up-to-date, is-prod
                     up_to_date = parts[4].strip() if len(parts) > 4 else "unknown"
                     is_prod = parts[5].strip() if len(parts) > 5 else "unknown"
                     apps = parts[3].strip() if len(parts) > 3 else ""
-                
+
                 if len(parts) >= 8:
                     # Has: name, target, status, apps, up-to-date, is-prod, created-at, last-seen
                     created_at = parts[6].strip() if len(parts) > 6 else None
                     last_seen = parts[7].strip() if len(parts) > 7 else None
-                
+
                 # For remaining fields, parse from the end (most reliable)
                 # UUID is always last (if present), ostree-hash is second-to-last, etc.
                 if len(parts) >= 12:
@@ -300,4 +300,3 @@ def list_foundries_devices(factory: Optional[str] = None) -> Dict[str, Any]:
                 "Verify you have access to the factory",
             ],
         }
-
diff --git a/lab_testing/tools/foundries_vpn.py b/lab_testing/tools/foundries_vpn.py
@@ -1628,6 +1628,7 @@ def enable_foundries_device_to_device(
         # Get device IP if not provided
         if not device_ip:
             from lab_testing.tools.foundries_devices import list_foundries_devices
+
             devices = list_foundries_devices()
             if not devices.get("success"):
                 return {
