pysportbot 0.0.6__tar.gz → 0.0.7__tar.gz

{pysportbot-0.0.6 → pysportbot-0.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pysportbot
-Version: 0.0.6
+Version: 0.0.7
 Summary:  A python-based bot for automatic resasports slot booking
 Home-page: https://github.com/jbeirer/resasports-bot
 Author: Joshua Falco Beirer
@@ -119,7 +119,7 @@ python -m pysportbot.service --help
 ```
 Currently supported options include
 1.  ```--retry-attempts``` sets the number of retries attempted in case a booking attempt fails
-2. ```--retry-delay-minutes``` sets the delay in minutes between retries for weekly bookings
+2. ```--retry-delay``` sets the delay in seconds between retries booking retries
 3. ```--time-zone``` sets the time zone for the service (e.g. Europe/Madrid)
 4. ```--log-level``` sets the log-level of the service (e.g. DEBUG, INFO, WARNING, ERROR)
 

{pysportbot-0.0.6 → pysportbot-0.0.7}/README.md

@@ -98,7 +98,7 @@ python -m pysportbot.service --help
 ```
 Currently supported options include
 1.  ```--retry-attempts``` sets the number of retries attempted in case a booking attempt fails
-2. ```--retry-delay-minutes``` sets the delay in minutes between retries for weekly bookings
+2. ```--retry-delay``` sets the delay in seconds between retries booking retries
 3. ```--time-zone``` sets the time zone for the service (e.g. Europe/Madrid)
 4. ```--log-level``` sets the log-level of the service (e.g. DEBUG, INFO, WARNING, ERROR)
 

{pysportbot-0.0.6 → pysportbot-0.0.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pysportbot"
-version = "v0.0.6"
+version = "v0.0.7"
 description = " A python-based bot for automatic resasports slot booking"
 authors = ["Joshua Falco Beirer <jbeirer@cern.ch>"]
 repository = "https://github.com/jbeirer/resasports-bot"

{pysportbot-0.0.6 → pysportbot-0.0.7}/pysportbot/service/__main__.py

@@ -10,11 +10,9 @@ from .service import run_service
 def main() -> None:
     parser = argparse.ArgumentParser(description="Run the pysportbot as a service.")
     parser.add_argument("--config", type=str, required=True, help="Path to the JSON configuration file.")
-    parser.add_argument("--offset-seconds", type=int, default=5, help="Time offset in seconds before booking.")
-    parser.add_argument("--retry-attempts", type=int, default=3, help="Number of retry attempts for weekly bookings.")
-    parser.add_argument(
-        "--retry-delay-minutes", type=int, default=1, help="Delay in minutes between retries for weekly bookings."
-    )
+    parser.add_argument("--booking-delay", type=int, default=5, help="Global booking delay in seconds before booking.")
+    parser.add_argument("--retry-attempts", type=int, default=3, help="Number of retry attempts for bookings.")
+    parser.add_argument("--retry-delay", type=int, default=30, help="Delay in seconds between retries for bookings.")
     parser.add_argument("--time-zone", type=str, default="Europe/Madrid", help="Timezone for the service.")
     parser.add_argument("--log-level", type=str, default="INFO", help="Logging level for the service.")
     args = parser.parse_args()
@@ -22,9 +20,9 @@ def main() -> None:
     config: Dict[str, Any] = load_config(args.config)
     run_service(
         config,
-        offset_seconds=args.offset_seconds,
+        booking_delay=args.booking_delay,
         retry_attempts=args.retry_attempts,
-        retry_delay_minutes=args.retry_delay_minutes,
+        retry_delay=args.retry_delay,
         time_zone=args.time_zone,
         log_level=args.log_level,
     )

{pysportbot-0.0.6 → pysportbot-0.0.7}/pysportbot/service/booking.py

@@ -44,9 +44,9 @@ def attempt_booking(
     activity: str,
     class_day: str,
     class_time: str,
-    offset_seconds: int,
+    booking_delay: int,
     retry_attempts: int = 1,
-    retry_delay_minutes: int = 0,
+    retry_delay: int = 0,
     time_zone: str = "Europe/Madrid",
 ) -> None:
     """
@@ -57,9 +57,9 @@ def attempt_booking(
         activity (str): Activity name.
         class_day (str): Day of the class.
         class_time (str): Time of the class.
-        offset_seconds (int): Delay before attempting booking.
+        booking_delay (int): Delay before attempting booking.
         retry_attempts (int): Number of retry attempts.
-        retry_delay_minutes (int): Delay between retries.
+        retry_delay (int): Delay between retries.
         time_zone (str): Time zone for execution.
     """
     for attempt_num in range(1, retry_attempts + 1):
@@ -73,9 +73,6 @@ def attempt_booking(
             if matching_slots.empty:
                 _raise_no_matching_slots_error(activity, class_time, booking_date)
 
-            logger.info(f"Waiting {offset_seconds} seconds before attempting booking.")
-            time.sleep(offset_seconds)
-
             slot_id = matching_slots.iloc[0]["start_timestamp"]
             logger.info(f"Attempting to book '{activity}' at {slot_id} (Attempt {attempt_num}/{retry_attempts}).")
             bot.book(activity=activity, start_time=slot_id)
@@ -89,8 +86,8 @@ def attempt_booking(
                 return
 
             if attempt_num < retry_attempts:
-                logger.info(f"Retrying in {retry_delay_minutes} minutes...")
-                time.sleep(retry_delay_minutes * 60)
+                logger.info(f"Retrying in {retry_delay} seconds...")
+                time.sleep(retry_delay)
         else:
             # If the booking attempt succeeds, log and exit
             logger.info(f"Successfully booked '{activity}' at {slot_id}.")
@@ -100,13 +97,13 @@ def attempt_booking(
     logger.error(f"Failed to book '{activity}' after {retry_attempts} attempts.")
 
 
-def schedule_bookings_parallel(
+def schedule_bookings(
     bot: SportBot,
     classes: List[Dict[str, Any]],
     booking_execution: str,
-    offset_seconds: int,
+    booking_delay: int,
     retry_attempts: int,
-    retry_delay_minutes: int,
+    retry_delay: int,
     time_zone: str,
     max_threads: int,
 ) -> None:
@@ -117,9 +114,9 @@ def schedule_bookings_parallel(
         bot (SportBot): The SportBot instance.
         classes (list): List of class configurations.
         booking_execution (str): Global execution time for all bookings.
-        offset_seconds (int): Delay before each booking attempt.
+        booking_delay (int): Delay before each booking attempt.
         retry_attempts (int): Number of retry attempts.
-        retry_delay_minutes (int): Delay between retries.
+        retry_delay (int): Delay between retries.
         time_zone (str): Timezone for booking.
         max_threads (int): Maximum number of threads to use.
     """
@@ -130,6 +127,10 @@ def schedule_bookings_parallel(
     # Wait globally before starting bookings
     wait_for_execution(booking_execution, time_zone)
 
+    # Global booking delay
+    logger.info(f"Waiting {booking_delay} seconds before attempting booking.")
+    time.sleep(booking_delay)
+
     with ThreadPoolExecutor(max_workers=max_threads) as executor:
         future_to_class = {
             executor.submit(
@@ -138,9 +139,9 @@ def schedule_bookings_parallel(
                 cls["activity"],
                 cls["class_day"],
                 cls["class_time"],
-                offset_seconds,
+                booking_delay,
                 retry_attempts,
-                retry_delay_minutes,
+                retry_delay,
                 time_zone,
             ): cls
             for cls in classes

{pysportbot-0.0.6 → pysportbot-0.0.7}/pysportbot/service/service.py

@@ -2,16 +2,16 @@ import os
 from typing import Any, Dict
 
 from pysportbot import SportBot
-from pysportbot.service.booking import schedule_bookings_parallel
+from pysportbot.service.booking import schedule_bookings
 from pysportbot.service.config_validator import validate_activities, validate_config
 from pysportbot.utils.logger import get_logger
 
 
 def run_service(
     config: Dict[str, Any],
-    offset_seconds: int,
+    booking_delay: int,
     retry_attempts: int,
-    retry_delay_minutes: int,
+    retry_delay: int,
     time_zone: str = "Europe/Madrid",
     log_level: str = "INFO",
 ) -> None:
@@ -20,9 +20,9 @@ def run_service(
 
     Args:
         config (dict): Configuration dictionary for booking service.
-        offset_seconds (int): Delay before each booking attempt.
+        booking_delay (int): Delay before each booking attempt.
         retry_attempts (int): Number of retry attempts.
-        retry_delay_minutes (int): Delay between retry attempts in minutes.
+        retry_delay (int): Delay between retry attempts in minutes.
         time_zone (str): Time zone for the booking.
         log_level (str): Logging level for the service.
     """
@@ -45,13 +45,13 @@ def run_service(
     logger.info(f"Using up to {max_threads} threads for booking {len(config['classes'])} activities.")
 
     # Schedule bookings in parallel
-    schedule_bookings_parallel(
+    schedule_bookings(
         bot,
         config["classes"],
         config["booking_execution"],
-        offset_seconds,
+        booking_delay,
         retry_attempts,
-        retry_delay_minutes,
+        retry_delay,
         time_zone,
         max_threads,
     )

{pysportbot-0.0.6 → pysportbot-0.0.7}/pysportbot/utils/errors.py

@@ -20,11 +20,7 @@ class ErrorMessages:
 
     @staticmethod
     def invalid_class_definition() -> str:
-        return "Each class must include 'activity', 'class_day', " "'class_time', 'booking_execution', and 'weekly'."
-
-    @staticmethod
-    def invalid_weekly_now() -> str:
-        return "Invalid combination: cannot use weekly=True with booking_execution='now'."
+        return "Each class must include 'activity', 'class_day', " "'class_time'"
 
     @staticmethod
     def invalid_booking_execution_format() -> str: