pysportbot 0.0.1__tar.gz → 0.0.3__tar.gz

{pysportbot-0.0.1 → pysportbot-0.0.3}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.1
 Name: pysportbot
-Version: 0.0.1
+Version: 0.0.3
 Summary:  A python-based bot for automatic resasports slot booking
-Home-page: https://github.com/jbeirer/pysportbot
+Home-page: https://github.com/jbeirer/resasports-bot
 Author: Joshua Falco Beirer
 Author-email: jbeirer@cern.ch
 Requires-Python: >=3.9,<3.13
@@ -16,8 +16,8 @@ Requires-Dist: pandas (>=2.2.3,<3.0.0)
 Requires-Dist: pytz (>=2024.2,<2025.0)
 Requires-Dist: requests (>=2.32.3,<3.0.0)
 Requires-Dist: schedule (>=1.2.2,<2.0.0)
-Project-URL: Documentation, https://jbeirer.github.io/pysportbot/
-Project-URL: Repository, https://github.com/jbeirer/pysportbot
+Project-URL: Documentation, https://jbeirer.github.io/resasports-bot/
+Project-URL: Repository, https://github.com/jbeirer/resasports-bot
 Description-Content-Type: text/markdown
 
 # No queues. Just gains.
@@ -44,8 +44,8 @@ pip install pysportbot
 ```python
 from pysportbot import SportBot
 
-# Create bot instance, will list available centres is requested
-bot = SportBot(log_level='INFO', print_centres=False)
+# Create bot instance, will list available centres if requested
+bot = SportBot(log_level='INFO', print_centres=False, time_zone = 'Europe/Madrid')
 
 # Connect to service with email and password as well as the name of the centre
 bot.login('email', 'password', 'centre')
@@ -59,7 +59,7 @@ bot.daily_slots(activity='YourFavouriteGymClass', day = '2025-01-03', limit = 10
 # Book an activity slot on a specific day and time
 bot.book(activity='YourFavouriteGymClass', start_time = '2024-12-30 07:00:00')
 
-# Cancel an activity slot ona specific day and time
+# Cancel an activity slot on a specific day and time
 bot.cancel(activity='YourFavouriteGymClass', start_time = '2024-12-30 07:00:00')
 ```
 
@@ -139,7 +139,8 @@ 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
-3. ```--time_zone``` sets the time zone for the service
+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)
 
 ## LICENSE
 

{pysportbot-0.0.1 → pysportbot-0.0.3}/README.md

@@ -22,8 +22,8 @@ pip install pysportbot
 ```python
 from pysportbot import SportBot
 
-# Create bot instance, will list available centres is requested
-bot = SportBot(log_level='INFO', print_centres=False)
+# Create bot instance, will list available centres if requested
+bot = SportBot(log_level='INFO', print_centres=False, time_zone = 'Europe/Madrid')
 
 # Connect to service with email and password as well as the name of the centre
 bot.login('email', 'password', 'centre')
@@ -37,7 +37,7 @@ bot.daily_slots(activity='YourFavouriteGymClass', day = '2025-01-03', limit = 10
 # Book an activity slot on a specific day and time
 bot.book(activity='YourFavouriteGymClass', start_time = '2024-12-30 07:00:00')
 
-# Cancel an activity slot ona specific day and time
+# Cancel an activity slot on a specific day and time
 bot.cancel(activity='YourFavouriteGymClass', start_time = '2024-12-30 07:00:00')
 ```
 
@@ -117,7 +117,8 @@ 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
-3. ```--time_zone``` sets the time zone for the service
+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)
 
 ## LICENSE
 

{pysportbot-0.0.1 → pysportbot-0.0.3}/pyproject.toml

@@ -1,10 +1,10 @@
 [tool.poetry]
 name = "pysportbot"
-version = "v0.0.1"
+version = "v0.0.3"
 description = " A python-based bot for automatic resasports slot booking"
 authors = ["Joshua Falco Beirer <jbeirer@cern.ch>"]
-repository = "https://github.com/jbeirer/pysportbot"
-documentation = "https://jbeirer.github.io/pysportbot/"
+repository = "https://github.com/jbeirer/resasports-bot"
+documentation = "https://jbeirer.github.io/resasports-bot/"
 readme = "README.md"
 packages = [
   {include = "pysportbot"}

{pysportbot-0.0.1 → pysportbot-0.0.3}/pysportbot/__init__.py

@@ -1,3 +1,5 @@
+# pysportbot/sportbot.py
+
 import logging
 from typing import Optional
 
@@ -15,10 +17,12 @@ from .utils.logger import set_log_level, setup_logger
 class SportBot:
     """Unified interface for interacting with the booking system."""
 
-    def __init__(self, log_level: str = "INFO", print_centres: bool = False) -> None:
+    def __init__(self, log_level: str = "INFO", print_centres: bool = False, time_zone: str = "Europe/Madrid") -> None:
         setup_logger(log_level)
         self._logger = logging.getLogger("SportBot")
         self._logger.info("Initializing SportBot...")
+        self._logger.info(f"Log level: {log_level}")
+        self._logger.info(f"Time zone: {time_zone}")
         self._centres = Centres(print_centres)
         self._session: Session = Session()
         self._auth: Optional[Authenticator] = None
@@ -32,7 +36,6 @@ class SportBot:
         self._logger.info(f"Log level changed to {log_level}.")
 
     def login(self, email: str, password: str, centre: str) -> None:
-
         # Check if the selected centre is valid
         self._centres.check_centre(centre)
         self._logger.info(f"Selected centre: {centre}")

{pysportbot-0.0.1 → pysportbot-0.0.3}/pysportbot/centres.py

@@ -33,12 +33,13 @@ class Centres:
             }
         }
         self._df_centres = self.fetch_centres()
-        if print_centres:
-            self.print_centres()
 
         # list of centre (slugs)
         self.centre_list = self._df_centres["slug"].tolist()
 
+        if print_centres:
+            self.print_centres()
+
     def check_centre(self, centre: str) -> None:
         """
         Set the user selected centre.

{pysportbot-0.0.1 → pysportbot-0.0.3}/pysportbot/service/__main__.py

@@ -15,7 +15,8 @@ def main() -> None:
     parser.add_argument(
         "--retry-delay-minutes", type=int, default=2, help="Delay in minutes between retries for weekly bookings."
     )
-    parser.add_argument("--time_zone", type=str, default="Europe/Madrid", help="Timezone for the service.")
+    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()
 
     config: Dict[str, Any] = load_config(args.config)
@@ -25,6 +26,7 @@ def main() -> None:
         retry_attempts=args.retry_attempts,
         retry_delay_minutes=args.retry_delay_minutes,
         time_zone=args.time_zone,
+        log_level=args.log_level,
     )
 
 

{pysportbot-0.0.1 → pysportbot-0.0.3}/pysportbot/service/service.py

@@ -9,8 +9,6 @@ from pysportbot.utils.logger import get_logger
 from .booking import schedule_bookings
 from .config_validator import validate_activities, validate_config
 
-logger = get_logger(__name__)
-
 
 def run_service(
     config: Dict[str, Any],
@@ -18,12 +16,16 @@ def run_service(
     retry_attempts: int,
     retry_delay_minutes: int,
     time_zone: str = "Europe/Madrid",
+    log_level: str = "INFO",
 ) -> None:
+    # Initialize service logger
+    logger = get_logger(__name__)
+    logger.setLevel(log_level)
 
     # Validate the configuration file
     validate_config(config)
-
-    bot = SportBot()
+    # Initialize the SportBot instance
+    bot = SportBot(log_level=log_level, time_zone=time_zone)
     bot.login(config["email"], config["password"], config["centre"])
 
     # Validate the activities in the configuration file

{pysportbot-0.0.1 → pysportbot-0.0.3}/pysportbot/utils/logger.py

@@ -1,5 +1,8 @@
 import logging
-from typing import ClassVar
+from datetime import datetime
+from typing import ClassVar, Optional
+
+import pytz
 
 from .errors import ErrorMessages
 
@@ -15,6 +18,32 @@ class ColorFormatter(logging.Formatter):
         "RESET": "\033[0m",  # Reset
     }
 
+    def __init__(self, fmt: str, datefmt: str, tz: pytz.BaseTzInfo) -> None:
+        """
+        Initialize the formatter with a specific timezone.
+
+        Args:
+            fmt (str): The log message format.
+            datefmt (str): The date format.
+            tz (pytz.BaseTzInfo): The timezone for log timestamps.
+        """
+        super().__init__(fmt, datefmt)
+        self.timezone = tz
+
+    def formatTime(self, record: logging.LogRecord, datefmt: Optional[str] = None) -> str:
+        """
+        Override to format the time in the desired timezone.
+
+        Args:
+            record (logging.LogRecord): The log record.
+            datefmt (Optional[str]): The date format.
+
+        Returns:
+            str: The formatted timestamp.
+        """
+        record_time = datetime.fromtimestamp(record.created, self.timezone)
+        return record_time.strftime(datefmt or self.default_time_format)
+
     def format(self, record: logging.LogRecord) -> str:
         """
         Format the log record with color-coded log levels.
@@ -30,12 +59,13 @@ class ColorFormatter(logging.Formatter):
         return super().format(record)
 
 
-def setup_logger(level: str = "INFO") -> None:
+def setup_logger(level: str = "INFO", timezone: str = "Europe/Madrid") -> None:
     """
-    Configure the root logger with color-coded output.
+    Configure the root logger with color-coded output in the specified timezone.
 
     Args:
         level (str): The desired logging level (DEBUG, INFO, WARNING, ERROR, CRITICAL).
+        timezone (str): The desired timezone for log timestamps (e.g., Europe/Madrid).
     """
     root_logger = logging.getLogger()
     root_logger.setLevel(logging._nameToLevel[level.upper()])
@@ -43,7 +73,12 @@ def setup_logger(level: str = "INFO") -> None:
     if not root_logger.hasHandlers():  # Avoid duplicate handlers
         handler = logging.StreamHandler()
         handler.setLevel(logging._nameToLevel[level.upper()])
-        formatter = ColorFormatter("[%(asctime)s] [%(levelname)s] %(message)s", datefmt="%Y-%m-%d %H:%M:%S")
+        tz = pytz.timezone(timezone)
+        formatter = ColorFormatter(
+            "[%(asctime)s] [%(levelname)s] %(message)s",
+            datefmt="%Y-%m-%d %H:%M:%S",
+            tz=tz,
+        )
         handler.setFormatter(formatter)
         root_logger.addHandler(handler)