hpde-analytics-cli 1.0.0__tar.gz → 6.0.0__tar.gz

{hpde_analytics_cli-1.0.0 → hpde_analytics_cli-6.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hpde-analytics-cli
-Version: 1.0.0
+Version: 6.0.0
 Summary: Data analysis and reporting tool for HPDE and Time Trials programs
 Author-email: Kevin Homan <homan13@gmail.com>
 License: MIT
@@ -15,13 +15,14 @@ Classifier: Intended Audience :: End Users/Desktop
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Utilities
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: requests>=2.28.0
@@ -29,6 +30,8 @@ Requires-Dist: requests-oauthlib>=1.3.0
 Requires-Dist: python-dotenv>=1.0.0
 Requires-Dist: openpyxl>=3.1.0
 Requires-Dist: keyring>=24.0.0
+Requires-Dist: gspread>=6.0.0
+Requires-Dist: google-auth>=2.22.0
 Provides-Extra: dev
 Requires-Dist: pytest>=7.0.0; extra == "dev"
 Requires-Dist: pytest-cov>=4.0.0; extra == "dev"
@@ -38,6 +41,7 @@ Requires-Dist: mypy>=1.0.0; extra == "dev"
 Requires-Dist: isort>=5.12.0; extra == "dev"
 Requires-Dist: bandit>=1.7.0; extra == "dev"
 Requires-Dist: safety>=2.3.0; extra == "dev"
+Requires-Dist: pre-commit>=3.5.0; extra == "dev"
 Dynamic: license-file
 
 # HPDE Analytics CLI
@@ -278,11 +282,11 @@ This project uses [Semantic Versioning (SemVer)](https://semver.org/):
 - **MINOR** version for new functionality in a backward compatible manner
 - **PATCH** version for backward compatible bug fixes
 
-**Current Version:** 1.0.0
+**Current Version:** 2.0.0
 
 ## Authors
 
-* **Kevin Homan** - *Initial work and project lead* - WDCR Time Trials Chief Competition Director
+* **Kevin Homan**
 
 ## License
 

{hpde_analytics_cli-1.0.0 → hpde_analytics_cli-6.0.0}/README.md

@@ -236,11 +236,11 @@ This project uses [Semantic Versioning (SemVer)](https://semver.org/):
 - **MINOR** version for new functionality in a backward compatible manner
 - **PATCH** version for backward compatible bug fixes
 
-**Current Version:** 1.0.0
+**Current Version:** 2.0.0
 
 ## Authors
 
-* **Kevin Homan** - *Initial work and project lead* - WDCR Time Trials Chief Competition Director
+* **Kevin Homan**
 
 ## License
 

{hpde_analytics_cli-1.0.0 → hpde_analytics_cli-6.0.0}/hpde_analytics_cli/api/client.py

@@ -11,6 +11,10 @@ from requests_oauthlib import OAuth1Session
 
 from hpde_analytics_cli.auth.oauth import MSROAuth
 
+# Error message constants
+ERR_EVENT_ID_REQUIRED = "Event ID is required"
+ERR_ORG_ID_REQUIRED = "Organization ID is required"
+
 
 class APIError(Exception):
     """Exception raised for API errors."""
@@ -46,6 +50,121 @@ class MSRClient:
         """Get an authenticated OAuth session."""
         return self.oauth.get_oauth_session()
 
+    def _execute_http_request(
+        self,
+        method: str,
+        session: OAuth1Session,
+        url: str,
+        params: Optional[Dict[str, Any]],
+        headers: Dict[str, str],
+    ):
+        """Execute HTTP request based on method type."""
+        if method.upper() == "GET":
+            return session.get(url, params=params, headers=headers)
+        elif method.upper() == "POST":
+            return session.post(url, data=params, headers=headers)
+        else:
+            raise APIError(f"Unsupported HTTP method: {method}")
+
+    def _handle_response_status(self, response, endpoint: str) -> Optional[Dict[str, Any]]:
+        """
+        Handle HTTP response status codes.
+
+        Returns:
+            Parsed response data if successful, None if should retry
+
+        Raises:
+            APIError: For non-retryable errors
+        """
+        if response.status_code == 200:
+            data = response.json()
+            # MSR wraps responses in {"response": {...}}
+            if isinstance(data, dict) and "response" in data:
+                data = data["response"]
+            return data
+
+        if response.status_code == 401:
+            raise APIError(
+                "Authentication failed - tokens may be invalid or expired",
+                status_code=401,
+                response_body=response.text,
+            )
+
+        if response.status_code == 403:
+            raise APIError(
+                "Access forbidden - insufficient permissions",
+                status_code=403,
+                response_body=response.text,
+            )
+
+        if response.status_code == 404:
+            raise APIError(
+                f"Resource not found: {endpoint}",
+                status_code=404,
+                response_body=response.text,
+            )
+
+        if response.status_code >= 500:
+            # Server error - signal retry
+            return None
+
+        raise APIError(
+            f"Request failed with status {response.status_code}",
+            status_code=response.status_code,
+            response_body=response.text,
+        )
+
+    def _should_retry_on_server_error(
+        self, response, endpoint: str, attempt: int, retries: int
+    ) -> APIError:
+        """
+        Handle server error response and determine if retry should occur.
+
+        Args:
+            response: HTTP response object
+            endpoint: API endpoint path
+            attempt: Current attempt number
+            retries: Maximum number of retries
+
+        Returns:
+            APIError to raise if no more retries
+
+        Raises:
+            APIError: If no more retries remain
+        """
+        error = APIError(
+            f"Server error: {response.status_code}",
+            status_code=response.status_code,
+            response_body=response.text,
+        )
+        if attempt < retries:
+            time.sleep(self.retry_delay * (attempt + 1))
+        else:
+            raise error
+        return error
+
+    def _should_retry_on_exception(self, e: Exception, attempt: int, retries: int) -> APIError:
+        """
+        Handle request exception and determine if retry should occur.
+
+        Args:
+            e: Exception that occurred
+            attempt: Current attempt number
+            retries: Maximum number of retries
+
+        Returns:
+            APIError to raise if no more retries
+
+        Raises:
+            APIError: If no more retries remain
+        """
+        error = APIError(f"Request failed: {str(e)}")
+        if attempt < retries:
+            time.sleep(self.retry_delay * (attempt + 1))
+        else:
+            raise error
+        return error
+
     def _request(
         self,
         method: str,
@@ -89,64 +208,21 @@ class MSRClient:
 
         for attempt in range(retries + 1):
             try:
-                if method.upper() == "GET":
-                    response = session.get(url, params=params, headers=headers)
-                elif method.upper() == "POST":
-                    response = session.post(url, data=params, headers=headers)
-                else:
-                    raise APIError(f"Unsupported HTTP method: {method}")
-
-                # Handle response
-                if response.status_code == 200:
-                    data = response.json()
-                    # MSR wraps responses in {"response": {...}}
-                    if isinstance(data, dict) and "response" in data:
-                        data = data["response"]
-                    return data
-                elif response.status_code == 401:
-                    raise APIError(
-                        "Authentication failed - tokens may be invalid or expired",
-                        status_code=401,
-                        response_body=response.text,
-                    )
-                elif response.status_code == 403:
-                    raise APIError(
-                        "Access forbidden - insufficient permissions",
-                        status_code=403,
-                        response_body=response.text,
-                    )
-                elif response.status_code == 404:
-                    raise APIError(
-                        f"Resource not found: {endpoint}",
-                        status_code=404,
-                        response_body=response.text,
-                    )
-                elif response.status_code >= 500:
-                    # Server error - retry
-                    last_error = APIError(
-                        f"Server error: {response.status_code}",
-                        status_code=response.status_code,
-                        response_body=response.text,
-                    )
-                    if attempt < retries:
-                        time.sleep(self.retry_delay * (attempt + 1))
-                        continue
-                    raise last_error
-                else:
-                    raise APIError(
-                        f"Request failed with status {response.status_code}",
-                        status_code=response.status_code,
-                        response_body=response.text,
-                    )
+                response = self._execute_http_request(method, session, url, params, headers)
+                result = self._handle_response_status(response, endpoint)
+
+                if result is not None:
+                    return result
+
+                # Server error - retry
+                last_error = self._should_retry_on_server_error(
+                    response, endpoint, attempt, retries
+                )
 
             except APIError:
                 raise
             except Exception as e:
-                last_error = APIError(f"Request failed: {str(e)}")
-                if attempt < retries:
-                    time.sleep(self.retry_delay * (attempt + 1))
-                    continue
-                raise last_error
+                last_error = self._should_retry_on_exception(e, attempt, retries)
 
         raise last_error
 
@@ -173,7 +249,7 @@ class MSRClient:
         """
         org_id = organization_id or self.organization_id
         if not org_id:
-            raise ValueError("Organization ID is required")
+            raise ValueError(ERR_ORG_ID_REQUIRED)
 
         return self._request("GET", f"/rest/calendars/organization/{org_id}")
 
@@ -190,7 +266,7 @@ class MSRClient:
         Endpoint: GET /rest/events/{event_id}/entrylist
         """
         if not event_id:
-            raise ValueError("Event ID is required")
+            raise ValueError(ERR_EVENT_ID_REQUIRED)
 
         return self._request("GET", f"/rest/events/{event_id}/entrylist")
 
@@ -207,7 +283,7 @@ class MSRClient:
         Endpoint: GET /rest/events/{event_id}/attendees
         """
         if not event_id:
-            raise ValueError("Event ID is required")
+            raise ValueError(ERR_EVENT_ID_REQUIRED)
 
         return self._request("GET", f"/rest/events/{event_id}/attendees")
 
@@ -224,7 +300,7 @@ class MSRClient:
         Endpoint: GET /rest/events/{event_id}/assignments
         """
         if not event_id:
-            raise ValueError("Event ID is required")
+            raise ValueError(ERR_EVENT_ID_REQUIRED)
 
         return self._request("GET", f"/rest/events/{event_id}/assignments")
 
@@ -241,10 +317,61 @@ class MSRClient:
         Endpoint: GET /rest/events/{event_id}/feeds/timing
         """
         if not event_id:
-            raise ValueError("Event ID is required")
+            raise ValueError(ERR_EVENT_ID_REQUIRED)
 
         return self._request("GET", f"/rest/events/{event_id}/feeds/timing")
 
+    def _fetch_user_profile(self, results: Dict[str, Any]) -> None:
+        """Fetch and store user profile data."""
+        print("  Fetching /rest/me...")
+        try:
+            results["me"] = self.get_me()
+            print("    [OK] User profile retrieved")
+        except APIError as e:
+            print(f"    [ERROR] {e}")
+            results["me"] = {"error": str(e)}
+
+    def _fetch_organization_calendar(
+        self, results: Dict[str, Any], event_id: Optional[str]
+    ) -> Optional[str]:
+        """
+        Fetch and store organization calendar data.
+
+        Returns:
+            Event ID if found in calendar, otherwise the input event_id
+        """
+        if not self.organization_id:
+            return event_id
+
+        print(f"  Fetching organization calendar (org: {self.organization_id})...")
+        try:
+            results["calendar"] = self.get_organization_calendar()
+            print("    [OK] Calendar retrieved")
+
+            # Get first event ID if not provided
+            if not event_id:
+                events = results["calendar"].get("events", [])
+                if events:
+                    event_id = events[0].get("id")
+                    print(f"    Using first event from calendar: {event_id}")
+        except APIError as e:
+            print(f"    [ERROR] {e}")
+            results["calendar"] = {"error": str(e)}
+
+        return event_id
+
+    def _fetch_event_endpoint(
+        self, results: Dict[str, Any], key: str, method, description: str, event_id: str
+    ) -> None:
+        """Fetch data from a single event endpoint."""
+        print(f"  Fetching {description} (event: {event_id})...")
+        try:
+            results[key] = method(event_id)
+            print(f"    [OK] {description} retrieved")
+        except APIError as e:
+            print(f"    [ERROR] {e}")
+            results[key] = {"error": str(e)}
+
     def get_all_endpoint_data(self, event_id: Optional[str] = None) -> Dict[str, Any]:
         """
         Fetch data from all available endpoints for field discovery.
@@ -255,33 +382,13 @@ class MSRClient:
         Returns:
             Dict with data from each endpoint, keyed by endpoint name
         """
-        results = {}
+        results: Dict[str, Any] = {}
 
-        # Always fetch user profile
-        print("  Fetching /rest/me...")
-        try:
-            results["me"] = self.get_me()
-            print("    [OK] User profile retrieved")
-        except APIError as e:
-            print(f"    [ERROR] {e}")
-            results["me"] = {"error": str(e)}
+        # Fetch user profile
+        self._fetch_user_profile(results)
 
-        # Fetch organization calendar
-        if self.organization_id:
-            print(f"  Fetching organization calendar (org: {self.organization_id})...")
-            try:
-                results["calendar"] = self.get_organization_calendar()
-                print("    [OK] Calendar retrieved")
-
-                # Get first event ID if not provided
-                if not event_id:
-                    events = results["calendar"].get("events", [])
-                    if events:
-                        event_id = events[0].get("id")
-                        print(f"    Using first event from calendar: {event_id}")
-            except APIError as e:
-                print(f"    [ERROR] {e}")
-                results["calendar"] = {"error": str(e)}
+        # Fetch organization calendar and potentially get event_id
+        event_id = self._fetch_organization_calendar(results, event_id)
 
         # Event-specific endpoints (require event_id)
         if event_id:
@@ -293,13 +400,7 @@ class MSRClient:
             ]
 
             for key, method, description in event_endpoints:
-                print(f"  Fetching {description} (event: {event_id})...")
-                try:
-                    results[key] = method(event_id)
-                    print(f"    [OK] {description} retrieved")
-                except APIError as e:
-                    print(f"    [ERROR] {e}")
-                    results[key] = {"error": str(e)}
+                self._fetch_event_endpoint(results, key, method, description, event_id)
         else:
             print("  [SKIP] No event ID available - skipping event-specific endpoints")
             print("         Use --event-id to specify an event, or ensure calendar has events")

{hpde_analytics_cli-1.0.0 → hpde_analytics_cli-6.0.0}/hpde_analytics_cli/auth/oauth.py

@@ -35,8 +35,8 @@ class OAuthCallbackHandler(BaseHTTPRequestHandler):
         parsed = urlparse(self.path)
         params = parse_qs(parsed.query)
 
-        # Log what we received for debugging
-        print(f"\n  [Callback] Received request: {self.path}")
+        # Log callback received (without sensitive path details)
+        print("\n  [Callback] Received OAuth callback request")
 
         # Ignore non-callback requests (favicon, root path, etc.)
         if not parsed.path.startswith("/callback"):
@@ -55,7 +55,7 @@ class OAuthCallbackHandler(BaseHTTPRequestHandler):
             self.wfile.write(response.encode())
             return
 
-        print(f"  [Callback] OAuth parameters: {params}")
+        print("  [Callback] OAuth parameters received")
 
         # Extract OAuth parameters
         OAuthCallbackHandler.oauth_verifier = params.get("oauth_verifier", [None])[0]
@@ -236,7 +236,7 @@ class MSROAuth:
         if not self.request_token:
             raise Exception("Failed to obtain request token")
 
-        print(f"  Request token obtained: {self.request_token[:20]}...")
+        print("  Request token obtained: [REDACTED]")
         return self.request_token, self.request_token_secret
 
     def get_authorization_url(self) -> str:
@@ -255,8 +255,7 @@ class MSROAuth:
 
         print("\n[Step 2/3] User authorization required")
         print("-" * 60)
-        print("Please visit this URL to authorize the application:")
-        print(f"\n  {auth_url}\n")
+        print("Opening authorization URL in browser...")
         print("-" * 60)
 
         return auth_url
@@ -294,7 +293,7 @@ class MSROAuth:
         if not self.access_token:
             raise Exception("Failed to obtain access token")
 
-        print(f"  Access token obtained: {self.access_token[:20]}...")
+        print("  Access token obtained: [REDACTED]")
         if self.profile_id:
             print(f"  Profile ID: {self.profile_id}")
 
@@ -449,24 +448,24 @@ class MSROAuth:
             # Step 2: Get authorization URL
             auth_url = self.get_authorization_url()
 
+            # Always print the URL so the user can copy/paste it if needed
+            print(f"\nAuthorization URL:\n\n  {auth_url}\n")
+
             # Open browser automatically if requested
             if auto_open_browser:
-                print("\n" + "!" * 60)
-                print("IMPORTANT: Copy and paste this URL into your browser:")
-                print(f"\n  {auth_url}\n")
-                print("!" * 60)
-                print("\nAttempting to open browser automatically...")
+                print("Attempting to open browser automatically...")
                 try:
                     webbrowser.open(auth_url)
+                    print("  Browser opened. If nothing appeared, copy the URL above.")
                 except Exception as e:
                     print(f"  Could not open browser automatically: {e}")
-                print("\nIf the wrong page opens, manually navigate to the URL above.")
+                    print("  Copy the URL above and open it in your browser manually.")
             else:
-                print("\nPlease open the URL above in your browser.")
+                print("Copy the URL above and open it in your browser.")
 
             # Step 3: Wait for callback with verifier
             verifier = self._wait_for_callback(server)
-            print(f"\n  Received verifier: {verifier[:20]}...")
+            print("\n  Received verifier: [REDACTED]")
 
             # Step 4: Exchange for access token
             self.get_access_token(verifier)

hpde_analytics_cli-6.0.0/hpde_analytics_cli/integrations/__init__.py

@@ -0,0 +1 @@
+"""Google Sheets integration module."""