refactor: Move files into src directory
Refactored project structure: Moved all Python modules to a src/ directory, updated imports accordingly. Added new environment variables to Dockerfile and docker-compose.yml. Removed Dockerfile.test and TODO file.
This commit is contained in:
0
src/__init__.py
Normal file
0
src/__init__.py
Normal file
116
src/auth.py
Normal file
116
src/auth.py
Normal file
@@ -0,0 +1,116 @@
|
||||
# Native modules
|
||||
import logging
|
||||
import os
|
||||
from typing import Dict, Any, Optional
|
||||
|
||||
# Third-party modules
|
||||
import requests
|
||||
from urllib.parse import urlencode
|
||||
|
||||
# Configuration constants (will be moved from crossfit_booker.py)
|
||||
APPLICATION_ID = "81560887"
|
||||
DEVICE_TYPE = "3"
|
||||
APP_VERSION = "5.09.21"
|
||||
|
||||
class AuthHandler:
|
||||
"""
|
||||
A class for handling authentication with the CrossFit booking system.
|
||||
This class is responsible for performing login, retrieving auth tokens,
|
||||
and providing authentication headers.
|
||||
"""
|
||||
|
||||
def __init__(self, username: str, password: str) -> None:
|
||||
"""
|
||||
Initialize the AuthHandler with credentials.
|
||||
|
||||
Args:
|
||||
username (str): The username for authentication.
|
||||
password (str): The password for authentication.
|
||||
"""
|
||||
self.username = username
|
||||
self.password = password
|
||||
self.auth_token: Optional[str] = None
|
||||
self.user_id: Optional[str] = None
|
||||
self.session = requests.Session()
|
||||
self.base_headers: Dict[str, str] = {
|
||||
"User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:140.0) Gecko/20100101 Firefox/140.0",
|
||||
"Content-Type": "application/x-www-form-urlencoded",
|
||||
"Nubapp-Origin": "user_apps",
|
||||
}
|
||||
self.session.headers.update(self.base_headers)
|
||||
|
||||
def get_auth_headers(self) -> Dict[str, str]:
|
||||
"""
|
||||
Return headers with authorization if available.
|
||||
|
||||
Returns:
|
||||
Dict[str, str]: Headers dictionary with authorization if available.
|
||||
"""
|
||||
headers: Dict[str, str] = self.base_headers.copy()
|
||||
if self.auth_token:
|
||||
headers["Authorization"] = f"Bearer {self.auth_token}"
|
||||
return headers
|
||||
|
||||
def login(self) -> bool:
|
||||
"""
|
||||
Authenticate and get the bearer token.
|
||||
|
||||
Returns:
|
||||
bool: True if login is successful, False otherwise.
|
||||
"""
|
||||
try:
|
||||
# First login endpoint
|
||||
login_params: Dict[str, str] = {
|
||||
"app_version": APP_VERSION,
|
||||
"device_type": DEVICE_TYPE,
|
||||
"username": self.username,
|
||||
"password": self.password
|
||||
}
|
||||
|
||||
response: requests.Response = self.session.post(
|
||||
"https://sport.nubapp.com/api/v4/users/checkUser.php",
|
||||
headers={"Content-Type": "application/x-www-form-urlencoded"},
|
||||
data=urlencode(login_params))
|
||||
|
||||
if not response.ok:
|
||||
logging.error(f"First login step failed: {response.status_code} - {response.text[:100]}")
|
||||
return False
|
||||
|
||||
try:
|
||||
login_data: Dict[str, Any] = response.json()
|
||||
self.user_id = str(login_data["data"]["user"]["id_user"])
|
||||
except (KeyError, ValueError) as e:
|
||||
logging.error(f"Error during login: {str(e)} - Response: {response.text}")
|
||||
return False
|
||||
|
||||
# Second login endpoint
|
||||
response: requests.Response = self.session.post(
|
||||
"https://sport.nubapp.com/api/v4/login",
|
||||
headers={"Content-Type": "application/x-www-form-urlencoded;charset=UTF-8"},
|
||||
data=urlencode({
|
||||
"device_type": DEVICE_TYPE,
|
||||
"username": self.username,
|
||||
"password": self.password
|
||||
}))
|
||||
|
||||
if response.ok:
|
||||
try:
|
||||
login_data: Dict[str, Any] = response.json()
|
||||
self.auth_token = login_data.get("token")
|
||||
except (KeyError, ValueError) as e:
|
||||
logging.error(f"Error during login: {str(e)} - Response: {response.text}")
|
||||
return False
|
||||
|
||||
if self.auth_token and self.user_id:
|
||||
logging.info("Successfully logged in")
|
||||
return True
|
||||
else:
|
||||
logging.error(f"Login failed: {response.status_code} - {response.text[:100]}")
|
||||
return False
|
||||
|
||||
except requests.exceptions.RequestException as e:
|
||||
logging.error(f"Request error during login: {str(e)}")
|
||||
return False
|
||||
except Exception as e:
|
||||
logging.error(f"Unexpected error during login: {str(e)}")
|
||||
return False
|
||||
35
src/book_crossfit.py
Executable file
35
src/book_crossfit.py
Executable file
@@ -0,0 +1,35 @@
|
||||
#!/usr/bin/env python3
|
||||
|
||||
import logging
|
||||
import traceback
|
||||
import asyncio
|
||||
from crossfit_booker import CrossFitBooker
|
||||
|
||||
if __name__ == "__main__":
|
||||
# Configure logging once at script startup
|
||||
logging.basicConfig(
|
||||
level=logging.DEBUG, # Change to DEBUG for more detailed logs
|
||||
format='%(asctime)s - %(levelname)s - %(message)s',
|
||||
handlers=[
|
||||
logging.FileHandler("log/crossfit_booking.log"),
|
||||
logging.StreamHandler()
|
||||
]
|
||||
)
|
||||
|
||||
# Reduce the verbosity of the requests library's logging
|
||||
logging.getLogger("requests").setLevel(logging.WARNING)
|
||||
logging.info("Logging enhanced with request library noise reduction")
|
||||
|
||||
# Create an instance of the CrossFitBooker class
|
||||
booker = CrossFitBooker()
|
||||
|
||||
# Attempt to log in to the CrossFit booking system
|
||||
# TODO: Make a authentication during running request to not get kicked out
|
||||
if not booker.login():
|
||||
# If login fails, log the error and exit the script
|
||||
logging.error("Failed to login - Traceback: %s", traceback.format_exc())
|
||||
exit(1)
|
||||
|
||||
# Start the continuous booking loop
|
||||
booker.run()
|
||||
logging.info("Script completed")
|
||||
307
src/booker.py
Normal file
307
src/booker.py
Normal file
@@ -0,0 +1,307 @@
|
||||
# Native modules
|
||||
import logging
|
||||
import traceback
|
||||
import os
|
||||
import time
|
||||
from datetime import datetime, timedelta, date
|
||||
|
||||
# Third-party modules
|
||||
import requests
|
||||
from dateutil.parser import parse
|
||||
import pytz
|
||||
from dotenv import load_dotenv
|
||||
from urllib.parse import urlencode
|
||||
from typing import List, Dict, Optional, Any, Tuple
|
||||
|
||||
# Import the SessionNotifier class
|
||||
from src.session_notifier import SessionNotifier
|
||||
|
||||
# Import the preferred sessions from the session_config module
|
||||
from src.session_config import PREFERRED_SESSIONS
|
||||
|
||||
# Import the AuthHandler class
|
||||
from src.auth import AuthHandler
|
||||
|
||||
# Import SessionManager
|
||||
from src.session_manager import SessionManager
|
||||
|
||||
load_dotenv()
|
||||
|
||||
# Configuration
|
||||
USERNAME = os.environ.get("CROSSFIT_USERNAME")
|
||||
PASSWORD = os.environ.get("CROSSFIT_PASSWORD")
|
||||
|
||||
if not all([USERNAME, PASSWORD]):
|
||||
raise ValueError("Missing environment variables: CROSSFIT_USERNAME and/or CROSSFIT_PASSWORD")
|
||||
|
||||
APPLICATION_ID = "81560887"
|
||||
CATEGORY_ID = "677" # Activity category ID for CrossFit
|
||||
TIMEZONE = "Europe/Paris" # Adjust to your timezone
|
||||
# Booking window configuration (can be overridden by environment variables)
|
||||
# TARGET_RESERVATION_TIME: string "HH:MM" local time when bookings open (default 20:01)
|
||||
# BOOKING_WINDOW_END_DELTA_MINUTES: int minutes after target time to stop booking (default 10)
|
||||
TARGET_RESERVATION_TIME = os.environ.get("TARGET_RESERVATION_TIME", "20:01")
|
||||
BOOKING_WINDOW_END_DELTA_MINUTES = int(os.environ.get("BOOKING_WINDOW_END_DELTA_MINUTES", "10"))
|
||||
DEVICE_TYPE = "3"
|
||||
|
||||
# Retry configuration
|
||||
RETRY_MAX = 3
|
||||
RETRY_BACKOFF = 1
|
||||
APP_VERSION = "5.09.21"
|
||||
|
||||
class Booker:
|
||||
"""
|
||||
A class for handling the main booking logic.
|
||||
This class is designed to be used as a standalone component
|
||||
that can be initialized with authentication and session management
|
||||
and used to perform the booking process.
|
||||
"""
|
||||
|
||||
def __init__(self, auth_handler: AuthHandler, notifier: SessionNotifier) -> None:
|
||||
"""
|
||||
Initialize the Booker with necessary attributes.
|
||||
|
||||
Args:
|
||||
auth_handler (AuthHandler): AuthHandler instance for authentication.
|
||||
notifier (SessionNotifier): SessionNotifier instance for sending notifications.
|
||||
"""
|
||||
self.auth_handler = auth_handler
|
||||
self.notifier = notifier
|
||||
|
||||
# Initialize the session and headers
|
||||
self.session: requests.Session = requests.Session()
|
||||
self.base_headers: Dict[str, str] = {
|
||||
"User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:140.0) Gecko/20100101 Firefox/140.0",
|
||||
"Content-Type": "application/x-www-form-urlencoded",
|
||||
"Nubapp-Origin": "user_apps",
|
||||
}
|
||||
self.session.headers.update(self.base_headers)
|
||||
|
||||
# Define mandatory parameters for API calls
|
||||
self.mandatory_params: Dict[str, str] = {
|
||||
"app_version": APP_VERSION,
|
||||
"device_type": DEVICE_TYPE,
|
||||
"id_application": APPLICATION_ID,
|
||||
"id_category_activity": CATEGORY_ID
|
||||
}
|
||||
|
||||
def get_auth_headers(self) -> Dict[str, str]:
|
||||
"""
|
||||
Return headers with authorization from the AuthHandler.
|
||||
|
||||
Returns:
|
||||
Dict[str, str]: Headers dictionary with authorization if available.
|
||||
"""
|
||||
return self.auth_handler.get_auth_headers()
|
||||
|
||||
async def booker(self, current_time: datetime) -> None:
|
||||
"""
|
||||
Run one cycle of checking and booking sessions.
|
||||
|
||||
Args:
|
||||
current_time (datetime): Current time for comparison.
|
||||
"""
|
||||
# Calculate date range to check (current day, day + 1, and day + 2)
|
||||
start_date: date = current_time.date()
|
||||
end_date: date = start_date + timedelta(days=2) # Only go up to day + 2
|
||||
|
||||
# Get available sessions
|
||||
sessions_data: Optional[Dict[str, Any]] = self.get_available_sessions(start_date, end_date)
|
||||
if not sessions_data or not sessions_data.get("success", False):
|
||||
logging.error("No sessions available or error fetching sessions")
|
||||
return
|
||||
|
||||
activities: List[Dict[str, Any]] = sessions_data.get("data", {}).get("activities_calendar", [])
|
||||
|
||||
# Display all available sessions within the date range
|
||||
self.display_upcoming_sessions(activities, current_time)
|
||||
|
||||
# Find sessions to book (preferred only) within allowed date range
|
||||
found_preferred_sessions: List[Dict[str, Any]] = []
|
||||
|
||||
for session in activities:
|
||||
session_time: datetime = parse(session["start_timestamp"])
|
||||
if not session_time.tzinfo:
|
||||
session_time = pytz.timezone(TIMEZONE).localize(session_time)
|
||||
|
||||
# Check if session is within allowed date range (current day, day + 1, or day + 2)
|
||||
days_diff = (session_time.date() - current_time.date()).days
|
||||
if not (0 <= days_diff <= 2):
|
||||
continue # Skip sessions outside the allowed date range
|
||||
|
||||
# Check if session is preferred and bookable
|
||||
if self.is_session_bookable(session, current_time):
|
||||
if self.matches_preferred_session(session, current_time):
|
||||
found_preferred_sessions.append(session)
|
||||
|
||||
# Display preferred sessions found
|
||||
if found_preferred_sessions:
|
||||
logging.info("Preferred sessions found:")
|
||||
for session in found_preferred_sessions:
|
||||
session_time: datetime = parse(session["start_timestamp"])
|
||||
if not session_time.tzinfo:
|
||||
session_time = pytz.timezone(TIMEZONE).localize(session_time)
|
||||
logging.info(f"ID: {session['id_activity_calendar']}, Name: {session['name_activity']}, Time: {session_time.strftime('%Y-%m-%d %H:%M')}")
|
||||
else:
|
||||
logging.info("No matching preferred sessions found")
|
||||
|
||||
# Book preferred sessions
|
||||
if not found_preferred_sessions:
|
||||
logging.info("No matching sessions found to book")
|
||||
return
|
||||
|
||||
# Book sessions (preferred first)
|
||||
sessions_to_book = [("Preferred", session) for session in found_preferred_sessions]
|
||||
sessions_to_book.sort(key=lambda x: 0 if x[0] == "Preferred" else 1)
|
||||
booked_sessions = []
|
||||
|
||||
for session_type, session in sessions_to_book:
|
||||
session_time: datetime = parse(session["start_timestamp"])
|
||||
logging.info(f"Attempting to book {session_type} session at {session_time} ({session['name_activity']})")
|
||||
if self.book_session(session["id_activity_calendar"]):
|
||||
# Display booked session
|
||||
booked_sessions.append(session)
|
||||
logging.info(f"Successfully booked {session_type} session at {session_time}")
|
||||
|
||||
# Notify about booked session
|
||||
session_details = f"{session['name_activity']} at {session_time.strftime('%Y-%m-%d %H:%M')}"
|
||||
await self.notifier.notify_session_booking(session_details)
|
||||
else:
|
||||
logging.error(f"Failed to book {session_type} session at {session_time}")
|
||||
|
||||
# Notify about failed booking
|
||||
session_details = f"{session['name_activity']} at {session_time.strftime('%Y-%m-%d %H:%M')}"
|
||||
await self.notifier.notify_impossible_booking(session_details)
|
||||
logging.info(f"Notified about impossible booking for {session_type} session at {session_time}")
|
||||
|
||||
# Display all booked session(s)
|
||||
if booked_sessions:
|
||||
logging.info("Booked sessions:")
|
||||
for session in booked_sessions:
|
||||
session_time: datetime = parse(session["start_timestamp"])
|
||||
if not session_time.tzinfo:
|
||||
session_time = pytz.timezone(TIMEZONE).localize(session_time)
|
||||
logging.info(f"ID: {session['id_activity_calendar']}, Name: {session['name_activity']}, Time: {session_time.strftime('%Y-%m-%d %H:%M')}")
|
||||
else:
|
||||
logging.info("No sessions were booked")
|
||||
|
||||
async def run(self) -> None:
|
||||
"""
|
||||
Main execution loop.
|
||||
"""
|
||||
# Set up timezone
|
||||
tz: pytz.timezone = pytz.timezone(TIMEZONE)
|
||||
|
||||
# Parse TARGET_RESERVATION_TIME to get the target hour and minute
|
||||
target_hour, target_minute = map(int, TARGET_RESERVATION_TIME.split(":"))
|
||||
target_time = datetime.now(tz).replace(hour=target_hour, minute=target_minute, second=0, microsecond=0)
|
||||
booking_window_end = target_time + timedelta(minutes=BOOKING_WINDOW_END_DELTA_MINUTES)
|
||||
|
||||
# Initial login
|
||||
if not self.auth_handler.login():
|
||||
logging.error("Authentication failed - exiting program")
|
||||
return
|
||||
|
||||
try:
|
||||
while True:
|
||||
try:
|
||||
current_time: datetime = datetime.now(tz)
|
||||
logging.info(f"Current time: {current_time}")
|
||||
|
||||
# Only book sessions if current time is within the booking window
|
||||
if target_time <= current_time <= booking_window_end:
|
||||
# Run booking cycle to check for preferred sessions and book
|
||||
await self.booker(current_time)
|
||||
# Wait for a short time before next check
|
||||
time.sleep(60)
|
||||
else:
|
||||
# Check again in 5 minutes if outside booking window
|
||||
time.sleep(300)
|
||||
except Exception as e:
|
||||
logging.error(f"Unexpected error in booking cycle: {str(e)} - Traceback: {traceback.format_exc()}")
|
||||
time.sleep(60) # Wait before retrying after error
|
||||
except KeyboardInterrupt:
|
||||
self.quit()
|
||||
|
||||
def quit(self) -> None:
|
||||
"""
|
||||
Clean up resources and exit the script.
|
||||
"""
|
||||
logging.info("Script interrupted by user. Quitting...")
|
||||
exit(0)
|
||||
|
||||
def get_available_sessions(self, start_date: date, end_date: date) -> Optional[Dict[str, Any]]:
|
||||
"""
|
||||
Fetch available sessions from the API.
|
||||
|
||||
Args:
|
||||
start_date (date): Start date for fetching sessions.
|
||||
end_date (date): End date for fetching sessions.
|
||||
|
||||
Returns:
|
||||
Optional[Dict[str, Any]]: Dictionary containing available sessions if successful, None otherwise.
|
||||
"""
|
||||
session_manager = SessionManager(self.auth_handler)
|
||||
return session_manager.get_available_sessions(start_date, end_date)
|
||||
|
||||
def book_session(self, session_id: str) -> bool:
|
||||
"""
|
||||
Book a specific session.
|
||||
|
||||
Args:
|
||||
session_id (str): ID of the session to book.
|
||||
|
||||
Returns:
|
||||
bool: True if booking is successful, False otherwise.
|
||||
"""
|
||||
session_manager = SessionManager(self.auth_handler)
|
||||
return session_manager.book_session(session_id)
|
||||
|
||||
def get_booked_sessions(self) -> List[Dict[str, Any]]:
|
||||
"""
|
||||
Get a list of booked sessions.
|
||||
|
||||
Returns:
|
||||
A list of dictionaries containing information about the booked sessions.
|
||||
"""
|
||||
session_manager = SessionManager(self.auth_handler)
|
||||
return session_manager.get_booked_sessions()
|
||||
|
||||
def is_session_bookable(self, session: Dict[str, Any], current_time: datetime) -> bool:
|
||||
"""
|
||||
Check if a session is bookable based on user_info.
|
||||
|
||||
Args:
|
||||
session (Dict[str, Any]): Session data.
|
||||
current_time (datetime): Current time for comparison.
|
||||
|
||||
Returns:
|
||||
bool: True if the session is bookable, False otherwise.
|
||||
"""
|
||||
session_manager = SessionManager(self.auth_handler)
|
||||
return session_manager.is_session_bookable(session, current_time)
|
||||
|
||||
def matches_preferred_session(self, session: Dict[str, Any], current_time: datetime) -> bool:
|
||||
"""
|
||||
Check if session matches one of your preferred sessions with exact matching.
|
||||
|
||||
Args:
|
||||
session (Dict[str, Any]): Session data.
|
||||
current_time (datetime): Current time for comparison.
|
||||
|
||||
Returns:
|
||||
bool: True if the session matches a preferred session, False otherwise.
|
||||
"""
|
||||
session_manager = SessionManager(self.auth_handler)
|
||||
return session_manager.matches_preferred_session(session, current_time)
|
||||
|
||||
def display_upcoming_sessions(self, sessions: List[Dict[str, Any]], current_time: datetime) -> None:
|
||||
"""
|
||||
Display upcoming sessions with ID, name, date, and time.
|
||||
|
||||
Args:
|
||||
sessions (List[Dict[str, Any]]): List of session data.
|
||||
current_time (datetime): Current time for comparison.
|
||||
"""
|
||||
session_manager = SessionManager(self.auth_handler)
|
||||
session_manager.display_upcoming_sessions(sessions, current_time)
|
||||
80
src/crossfit_booker.py
Normal file
80
src/crossfit_booker.py
Normal file
@@ -0,0 +1,80 @@
|
||||
# Native modules
|
||||
import logging
|
||||
import os
|
||||
from typing import Dict, Any, Optional
|
||||
|
||||
# Import the AuthHandler class
|
||||
from src.auth import AuthHandler
|
||||
|
||||
# Import the SessionManager class
|
||||
from src.session_manager import SessionManager
|
||||
|
||||
# Import the Booker class
|
||||
from src.booker import Booker
|
||||
|
||||
# Import the SessionNotifier class
|
||||
from src.session_notifier import SessionNotifier
|
||||
|
||||
# Load environment variables
|
||||
from dotenv import load_dotenv
|
||||
load_dotenv()
|
||||
|
||||
# Configuration
|
||||
USERNAME = os.environ.get("CROSSFIT_USERNAME")
|
||||
PASSWORD = os.environ.get("CROSSFIT_PASSWORD")
|
||||
|
||||
if not all([USERNAME, PASSWORD]):
|
||||
raise ValueError("Missing environment variables: CROSSFIT_USERNAME and/or CROSSFIT_PASSWORD")
|
||||
|
||||
class CrossFitBooker:
|
||||
"""
|
||||
A simple orchestrator class for the CrossFit booking system.
|
||||
|
||||
This class is responsible for initializing and coordinating the other components
|
||||
(AuthHandler, SessionManager, and Booker) but does not implement the actual functionality.
|
||||
"""
|
||||
|
||||
def __init__(self) -> None:
|
||||
"""
|
||||
Initialize the CrossFitBooker with necessary components.
|
||||
"""
|
||||
# Initialize the AuthHandler with credentials from environment variables
|
||||
self.auth_handler = AuthHandler(USERNAME, PASSWORD)
|
||||
|
||||
# Initialize the SessionManager with the AuthHandler
|
||||
self.session_manager = SessionManager(self.auth_handler)
|
||||
|
||||
# Initialize the SessionNotifier with credentials from environment variables
|
||||
email_credentials = {
|
||||
"from": os.environ.get("EMAIL_FROM"),
|
||||
"to": os.environ.get("EMAIL_TO"),
|
||||
"password": os.environ.get("EMAIL_PASSWORD")
|
||||
}
|
||||
|
||||
telegram_credentials = {
|
||||
"token": os.environ.get("TELEGRAM_TOKEN"),
|
||||
"chat_id": os.environ.get("TELEGRAM_CHAT_ID")
|
||||
}
|
||||
|
||||
# Get notification settings from environment variables
|
||||
enable_email = os.environ.get("ENABLE_EMAIL_NOTIFICATIONS", "true").lower() in ("true", "1", "yes")
|
||||
enable_telegram = os.environ.get("ENABLE_TELEGRAM_NOTIFICATIONS", "true").lower() in ("true", "1", "yes")
|
||||
|
||||
self.notifier = SessionNotifier(
|
||||
email_credentials,
|
||||
telegram_credentials,
|
||||
enable_email=enable_email,
|
||||
enable_telegram=enable_telegram
|
||||
)
|
||||
|
||||
# Initialize the Booker with the AuthHandler and SessionNotifier
|
||||
self.booker = Booker(self.auth_handler, self.notifier)
|
||||
|
||||
def run(self) -> None:
|
||||
"""
|
||||
Start the booking process.
|
||||
|
||||
This method initiates the booking process by running the Booker's main execution loop.
|
||||
"""
|
||||
import asyncio
|
||||
asyncio.run(self.booker.run())
|
||||
57
src/session_config.py
Normal file
57
src/session_config.py
Normal file
@@ -0,0 +1,57 @@
|
||||
import json
|
||||
import logging
|
||||
|
||||
# Class to handle session configuration
|
||||
class SessionConfig:
|
||||
"""
|
||||
Class to handle loading and managing preferred sessions configuration.
|
||||
"""
|
||||
|
||||
@staticmethod
|
||||
def load_preferred_sessions(config_file="preferred_sessions.json"):
|
||||
"""
|
||||
Load preferred sessions from a JSON file.
|
||||
|
||||
Args:
|
||||
config_file (str): Path to the JSON file containing preferred sessions.
|
||||
|
||||
Returns:
|
||||
List[Tuple[int, str, str]]: List of preferred sessions in the format
|
||||
(day_of_week, start_time, session_name_contains)
|
||||
"""
|
||||
preferred_sessions = []
|
||||
|
||||
try:
|
||||
# Attempt to open and read the JSON file
|
||||
with open(config_file, "r") as f:
|
||||
data = json.load(f)
|
||||
|
||||
# Validate and parse each item in the JSON data
|
||||
for item in data:
|
||||
day_of_week = item.get("day_of_week", 0) # Default to Monday if not specified
|
||||
start_time = item.get("start_time", "00:00") # Default to midnight if not specified
|
||||
session_name_contains = item.get("session_name_contains", "") # Default to empty string if not specified
|
||||
|
||||
# Append the parsed session to the list
|
||||
preferred_sessions.append((day_of_week, start_time, session_name_contains))
|
||||
|
||||
except FileNotFoundError:
|
||||
# Log a warning if the file is not found
|
||||
logging.warning(f"Configuration file '{config_file}' not found. Falling back to default settings.")
|
||||
|
||||
except json.JSONDecodeError:
|
||||
# Log a warning if the file is not a valid JSON
|
||||
logging.warning(f"Failed to decode JSON from file '{config_file}'. Falling back to default settings.")
|
||||
|
||||
# Fallback to default hardcoded sessions if no valid sessions were loaded
|
||||
if not preferred_sessions:
|
||||
preferred_sessions = [
|
||||
(2, "18:30", "CONDITIONING"), # Wednesday 18:30 CONDITIONING
|
||||
(4, "17:00", "WEIGHTLIFTING"), # Friday 17:00 WEIGHTLIFTING
|
||||
(5, "12:30", "HYROX"), # Saturday 12:30 HYROX
|
||||
]
|
||||
|
||||
return preferred_sessions
|
||||
|
||||
# Load preferred sessions using the SessionConfig class
|
||||
PREFERRED_SESSIONS = SessionConfig.load_preferred_sessions()
|
||||
295
src/session_manager.py
Normal file
295
src/session_manager.py
Normal file
@@ -0,0 +1,295 @@
|
||||
# Native modules
|
||||
import logging
|
||||
import pytz
|
||||
import time
|
||||
from datetime import date
|
||||
from typing import List, Dict, Optional, Any
|
||||
from datetime import datetime, timedelta, date
|
||||
|
||||
# Third-party modules
|
||||
import requests
|
||||
from dateutil.parser import parse
|
||||
|
||||
# Import the preferred sessions from the session_config module
|
||||
from src.session_config import PREFERRED_SESSIONS
|
||||
|
||||
# Import the AuthHandler class
|
||||
from src.auth import AuthHandler
|
||||
|
||||
class SessionManager:
|
||||
"""
|
||||
A class for managing CrossFit sessions.
|
||||
This class handles session availability checking, booking,
|
||||
and session-related operations.
|
||||
"""
|
||||
|
||||
def __init__(self, auth_handler: AuthHandler) -> None:
|
||||
"""
|
||||
Initialize the SessionManager with necessary attributes.
|
||||
|
||||
Args:
|
||||
auth_handler (AuthHandler): AuthHandler instance for authentication.
|
||||
"""
|
||||
self.auth_handler = auth_handler
|
||||
self.session = requests.Session()
|
||||
self.base_headers = {
|
||||
"User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:140.0) Gecko/20100101 Firefox/140.0",
|
||||
"Content-Type": "application/x-www-form-urlencoded",
|
||||
"Nubapp-Origin": "user_apps",
|
||||
}
|
||||
self.session.headers.update(self.base_headers)
|
||||
|
||||
# Define mandatory parameters for API calls
|
||||
self.mandatory_params = {
|
||||
"app_version": "5.09.21",
|
||||
"device_type": "3",
|
||||
"id_application": "81560887",
|
||||
"id_category_activity": "677"
|
||||
}
|
||||
|
||||
def get_auth_headers(self) -> Dict[str, str]:
|
||||
"""
|
||||
Return headers with authorization from the AuthHandler.
|
||||
|
||||
Returns:
|
||||
Dict[str, str]: Headers dictionary with authorization if available.
|
||||
"""
|
||||
return self.auth_handler.get_auth_headers()
|
||||
|
||||
def get_available_sessions(self, start_date: date, end_date: date) -> Optional[Dict[str, Any]]:
|
||||
"""
|
||||
Fetch available sessions from the API.
|
||||
|
||||
Args:
|
||||
start_date (date): Start date for fetching sessions.
|
||||
end_date (date): End date for fetching sessions.
|
||||
|
||||
Returns:
|
||||
Optional[Dict[str, Any]]: Dictionary containing available sessions if successful, None otherwise.
|
||||
"""
|
||||
if not self.auth_handler.auth_token or not self.auth_handler.user_id:
|
||||
logging.error("Authentication required - missing token or user ID")
|
||||
return None
|
||||
|
||||
url = "https://sport.nubapp.com/api/v4/activities/getActivitiesCalendar.php"
|
||||
|
||||
# Prepare request with mandatory parameters
|
||||
request_data = self.mandatory_params.copy()
|
||||
request_data.update({
|
||||
"id_user": self.auth_handler.user_id,
|
||||
"start_timestamp": start_date.strftime("%d-%m-%Y"),
|
||||
"end_timestamp": end_date.strftime("%d-%m-%Y")
|
||||
})
|
||||
|
||||
# Add retry logic
|
||||
for retry in range(3):
|
||||
try:
|
||||
response = self.session.post(
|
||||
url,
|
||||
headers=self.get_auth_headers(),
|
||||
data=request_data,
|
||||
timeout=10
|
||||
)
|
||||
|
||||
if response.status_code == 200:
|
||||
return response.json()
|
||||
elif response.status_code == 401:
|
||||
logging.error("401 Unauthorized - token may be expired or invalid")
|
||||
return None
|
||||
elif 500 <= response.status_code < 600:
|
||||
logging.error(f"Server error {response.status_code}")
|
||||
raise requests.exceptions.ConnectionError(f"Server error {response.status_code}")
|
||||
else:
|
||||
logging.error(f"Unexpected status code: {response.status_code} - {response.text[:100]}")
|
||||
return None
|
||||
|
||||
except requests.exceptions.RequestException as e:
|
||||
if retry == 2:
|
||||
logging.error(f"Final retry failed: {str(e)}")
|
||||
raise
|
||||
wait_time = 1 * (2 ** retry)
|
||||
logging.warning(f"Request failed (attempt {retry+1}/3): {str(e)}. Retrying in {wait_time}s...")
|
||||
time.sleep(wait_time)
|
||||
|
||||
return None
|
||||
|
||||
def book_session(self, session_id: str) -> bool:
|
||||
"""
|
||||
Book a specific session.
|
||||
|
||||
Args:
|
||||
session_id (str): ID of the session to book.
|
||||
|
||||
Returns:
|
||||
bool: True if booking is successful, False otherwise.
|
||||
"""
|
||||
url = "https://sport.nubapp.com/api/v4/activities/bookActivityCalendar.php"
|
||||
data = {
|
||||
**self.mandatory_params,
|
||||
"id_activity_calendar": session_id,
|
||||
"id_user": self.auth_handler.user_id,
|
||||
"action_by": self.auth_handler.user_id,
|
||||
"n_guests": "0",
|
||||
"booked_on": "1",
|
||||
"device_type": self.mandatory_params["device_type"],
|
||||
"token": self.auth_handler.auth_token
|
||||
}
|
||||
|
||||
for retry in range(3):
|
||||
try:
|
||||
response = self.session.post(
|
||||
url,
|
||||
headers=self.get_auth_headers(),
|
||||
data=data,
|
||||
timeout=10
|
||||
)
|
||||
|
||||
if response.status_code == 200:
|
||||
json_response = response.json()
|
||||
if json_response.get("success", False):
|
||||
logging.info(f"Successfully booked session {session_id}")
|
||||
return True
|
||||
else:
|
||||
logging.error(f"API returned success:false: {json_response} - Session ID: {session_id}")
|
||||
return False
|
||||
|
||||
logging.error(f"HTTP {response.status_code}: {response.text[:100]}")
|
||||
return False
|
||||
|
||||
except requests.exceptions.RequestException as e:
|
||||
if retry == 2:
|
||||
logging.error(f"Final retry failed: {str(e)}")
|
||||
raise
|
||||
wait_time = 1 * (2 ** retry)
|
||||
logging.warning(f"Request failed (attempt {retry+1}/3): {str(e)}. Retrying in {wait_time}s...")
|
||||
time.sleep(wait_time)
|
||||
|
||||
logging.error(f"Failed to complete request after 3 attempts")
|
||||
return False
|
||||
|
||||
def get_booked_sessions(self) -> List[Dict[str, Any]]:
|
||||
"""
|
||||
Get a list of booked sessions.
|
||||
|
||||
Returns:
|
||||
A list of dictionaries containing information about the booked sessions.
|
||||
"""
|
||||
url = "https://sport.nubapp.com/api/v4/activities/getBookedActivities.php"
|
||||
data = {
|
||||
**self.mandatory_params,
|
||||
"id_user": self.auth_handler.user_id,
|
||||
"action_by": self.auth_handler.user_id
|
||||
}
|
||||
|
||||
for retry in range(3):
|
||||
try:
|
||||
response = self.session.post(
|
||||
url,
|
||||
headers=self.get_auth_headers(),
|
||||
data=data,
|
||||
timeout=10
|
||||
)
|
||||
|
||||
if response.status_code == 200:
|
||||
json_response = response.json()
|
||||
if json_response.get("success", False):
|
||||
return json_response.get("data", [])
|
||||
logging.error(f"API returned success:false: {json_response}")
|
||||
return []
|
||||
|
||||
logging.error(f"HTTP {response.status_code}: {response.text[:100]}")
|
||||
return []
|
||||
|
||||
except requests.exceptions.RequestException as e:
|
||||
if retry == 2:
|
||||
logging.error(f"Final retry failed: {str(e)}")
|
||||
raise
|
||||
wait_time = 1 * (2 ** retry)
|
||||
logging.warning(f"Request failed (attempt {retry+1}/3): {str(e)}. Retrying in {wait_time}s...")
|
||||
time.sleep(wait_time)
|
||||
|
||||
logging.error(f"Failed to complete request after 3 attempts")
|
||||
return []
|
||||
|
||||
def is_session_bookable(self, session: Dict[str, Any], current_time: datetime) -> bool:
|
||||
"""
|
||||
Check if a session is bookable based on user_info.
|
||||
|
||||
Args:
|
||||
session (Dict[str, Any]): Session data.
|
||||
current_time (datetime): Current time for comparison.
|
||||
|
||||
Returns:
|
||||
bool: True if the session is bookable, False otherwise.
|
||||
"""
|
||||
user_info = session.get("user_info", {})
|
||||
|
||||
# First check if can_join is true (primary condition)
|
||||
if user_info.get("can_join", False):
|
||||
return True
|
||||
|
||||
# Default case: not bookable
|
||||
return False
|
||||
|
||||
def matches_preferred_session(self, session: Dict[str, Any], current_time: datetime) -> bool:
|
||||
"""
|
||||
Check if session matches one of your preferred sessions with exact matching.
|
||||
|
||||
Args:
|
||||
session (Dict[str, Any]): Session data.
|
||||
current_time (datetime): Current time for comparison.
|
||||
|
||||
Returns:
|
||||
bool: True if the session matches a preferred session, False otherwise.
|
||||
"""
|
||||
try:
|
||||
session_time = parse(session["start_timestamp"])
|
||||
if not session_time.tzinfo:
|
||||
session_time = pytz.timezone("Europe/Paris").localize(session_time)
|
||||
|
||||
day_of_week = session_time.weekday()
|
||||
session_time_str = session_time.strftime("%H:%M")
|
||||
session_name = session.get("name_activity", "").upper()
|
||||
|
||||
for preferred_day, preferred_time, preferred_name in PREFERRED_SESSIONS:
|
||||
# Exact match
|
||||
if (day_of_week == preferred_day and
|
||||
session_time_str == preferred_time and
|
||||
preferred_name in session_name):
|
||||
return True
|
||||
|
||||
return False
|
||||
|
||||
except Exception as e:
|
||||
logging.error(f"Failed to check session: {str(e)} - Session: {session}")
|
||||
return False
|
||||
|
||||
def display_upcoming_sessions(self, sessions: List[Dict[str, Any]], current_time: datetime) -> None:
|
||||
"""
|
||||
Display upcoming sessions with ID, name, date, and time.
|
||||
|
||||
Args:
|
||||
sessions (List[Dict[str, Any]]): List of session data.
|
||||
current_time (datetime): Current time for comparison.
|
||||
"""
|
||||
if not sessions:
|
||||
logging.info("No sessions to display")
|
||||
return
|
||||
|
||||
logging.info("Upcoming sessions:")
|
||||
logging.info("ID\t\tName\t\tDate\t\tTime")
|
||||
logging.info("="*50)
|
||||
|
||||
for session in sessions:
|
||||
session_time = parse(session["start_timestamp"])
|
||||
if not session_time.tzinfo:
|
||||
session_time = pytz.timezone("Europe/Paris").localize(session_time)
|
||||
|
||||
# Format session details
|
||||
session_id = session.get("id_activity_calendar", "N/A")
|
||||
session_name = session.get("name_activity", "N/A")
|
||||
session_date = session_time.strftime("%Y-%m-%d")
|
||||
session_time_str = session_time.strftime("%H:%M")
|
||||
|
||||
# Display session details
|
||||
logging.info(f"{session_id}\t{session_name}\t{session_date}\t{session_time_str}")
|
||||
156
src/session_notifier.py
Normal file
156
src/session_notifier.py
Normal file
@@ -0,0 +1,156 @@
|
||||
import smtplib
|
||||
import os
|
||||
import logging
|
||||
from email.message import EmailMessage
|
||||
from telegram import Bot
|
||||
|
||||
|
||||
class SessionNotifier:
|
||||
"""
|
||||
A class to handle notifications for session bookings.
|
||||
Supports sending notifications via email and Telegram.
|
||||
|
||||
Attributes:
|
||||
email_credentials (dict): Dictionary containing email credentials
|
||||
(e.g., 'from', 'to', 'password')
|
||||
telegram_credentials (dict): Dictionary containing Telegram credentials
|
||||
(e.g., 'token', 'chat_id')
|
||||
enable_email (bool): Whether to enable email notifications
|
||||
enable_telegram (bool): Whether to enable Telegram notifications
|
||||
"""
|
||||
|
||||
def __init__(self, email_credentials, telegram_credentials, enable_email=True, enable_telegram=True):
|
||||
"""
|
||||
Initialize the SessionNotifier with email and Telegram credentials.
|
||||
|
||||
Args:
|
||||
email_credentials (dict): Email credentials for authentication
|
||||
telegram_credentials (dict): Telegram credentials for authentication
|
||||
enable_email (bool): Whether to enable email notifications
|
||||
enable_telegram (bool): Whether to enable Telegram notifications
|
||||
"""
|
||||
self.email_credentials = email_credentials
|
||||
self.telegram_credentials = telegram_credentials
|
||||
self.enable_email = enable_email
|
||||
self.enable_telegram = enable_telegram
|
||||
|
||||
# Check environment variable for impossible booking notifications
|
||||
self.notify_impossible = os.environ.get("NOTIFY_IMPOSSIBLE_BOOKING", "true").lower() in ("true", "1", "yes")
|
||||
|
||||
def send_email_notification(self, message):
|
||||
"""
|
||||
Send an email notification with the given message.
|
||||
|
||||
Args:
|
||||
message (str): The message content to be sent in the email
|
||||
"""
|
||||
logging.debug("Sending email notification")
|
||||
logging.debug(f"Email credentials: {self.email_credentials}")
|
||||
|
||||
# Create an EmailMessage object
|
||||
email = EmailMessage()
|
||||
email.set_content(message)
|
||||
|
||||
# Set the email sender and recipient
|
||||
email["From"] = self.email_credentials["from"]
|
||||
email["To"] = self.email_credentials["to"]
|
||||
|
||||
# Set the email subject
|
||||
email["Subject"] = "Session Booking Notification"
|
||||
|
||||
# Send the email using smtplib
|
||||
try:
|
||||
smtp_server = os.environ.get("SMTP_SERVER")
|
||||
if not smtp_server:
|
||||
logging.error("SMTP server not configured in environment variables")
|
||||
raise ValueError("SMTP server not configured")
|
||||
|
||||
with smtplib.SMTP_SSL(smtp_server, 465) as smtp:
|
||||
logging.debug(f"Connecting to SMTP server: {smtp_server}")
|
||||
smtp.login(self.email_credentials["from"], self.email_credentials['password'])
|
||||
logging.debug("Logged in to SMTP server")
|
||||
smtp.send_message(email)
|
||||
logging.debug("Email sent successfully")
|
||||
except Exception as e:
|
||||
logging.error(f"Failed to send email: {str(e)}")
|
||||
raise
|
||||
|
||||
async def send_telegram_notification(self, message):
|
||||
"""
|
||||
Send a Telegram notification with the given message.
|
||||
|
||||
Args:
|
||||
message (str): The message content to be sent in the Telegram chat
|
||||
"""
|
||||
# Create a Bot instance with the provided token
|
||||
bot = Bot(token=self.telegram_credentials["token"])
|
||||
# Send the message to the specified chat ID and await the result
|
||||
await bot.send_message(chat_id=self.telegram_credentials["chat_id"], text=message)
|
||||
|
||||
async def notify_session_booking(self, session_details):
|
||||
"""
|
||||
Notify about a session booking via email and Telegram.
|
||||
|
||||
Args:
|
||||
session_details (str): Details about the booked session
|
||||
"""
|
||||
# Create messages for both email and Telegram
|
||||
email_message = f"Session booked: {session_details}"
|
||||
telegram_message = f"Session booked: {session_details}"
|
||||
|
||||
# Send notifications through enabled channels
|
||||
if self.enable_email:
|
||||
self.send_email_notification(email_message)
|
||||
|
||||
if self.enable_telegram:
|
||||
await self.send_telegram_notification(telegram_message)
|
||||
|
||||
async def notify_upcoming_session(self, session_details, days_until):
|
||||
"""
|
||||
Notify about an upcoming session via email and Telegram.
|
||||
|
||||
Args:
|
||||
session_details (str): Details about the upcoming session
|
||||
days_until (int): Number of days until the session
|
||||
"""
|
||||
# Create messages for both email and Telegram
|
||||
email_message = f"Session available soon: {session_details} (in {days_until} days)"
|
||||
telegram_message = f"Session available soon: {session_details} (in {days_until} days)"
|
||||
|
||||
# Send notifications through enabled channels
|
||||
if self.enable_email:
|
||||
self.send_email_notification(email_message)
|
||||
|
||||
if self.enable_telegram:
|
||||
await self.send_telegram_notification(telegram_message)
|
||||
|
||||
async def notify_impossible_booking(self, session_details, notify_if_impossible=None):
|
||||
"""
|
||||
Notify about an impossible session booking via email and Telegram.
|
||||
|
||||
Args:
|
||||
session_details (str): Details about the session that couldn't be booked
|
||||
notify_if_impossible (bool, optional): Whether to send notifications for impossible bookings.
|
||||
If None, uses the value from the NOTIFY_IMPOSSIBLE_BOOKING
|
||||
environment variable.
|
||||
"""
|
||||
# Determine if notifications should be sent
|
||||
# First check the method parameter (if provided), then the environment variable
|
||||
should_notify = (
|
||||
notify_if_impossible if notify_if_impossible is not None else self.notify_impossible
|
||||
)
|
||||
|
||||
# Only proceed if notifications for impossible bookings are enabled
|
||||
if not should_notify:
|
||||
return
|
||||
|
||||
# Create messages for both email and Telegram
|
||||
email_message = f"Failed to book session: {session_details}"
|
||||
telegram_message = f"Failed to book session: {session_details}"
|
||||
|
||||
# Send notifications through enabled channels
|
||||
if self.enable_email:
|
||||
self.send_email_notification(email_message)
|
||||
|
||||
if self.enable_telegram:
|
||||
await self.send_telegram_notification(telegram_message)
|
||||
Reference in New Issue
Block a user