pysportbot 0.0.15__tar.gz → 0.0.17__tar.gz

{pysportbot-0.0.15 → pysportbot-0.0.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pysportbot
-Version: 0.0.15
+Version: 0.0.17
 Summary: A python-based bot for automatic resasports slot booking
 Author: Joshua Falco Beirer
 Author-email: jbeirer@cern.ch
@@ -141,10 +141,12 @@ For example, if you have a **Yoga** class on **Monday at 18:00:00**, and you wan
 name: Weekly Booking
 
 on:
-  # Runs at 06:00 UTC (07:00 CET) on Fridays
-  # Ensure enough time for the job to start well before 07:30 CET
+  # Runs at 05:00 UTC (07:00 Madrid time during daylight saving time) on Fridays
+  # Note: Update to '0 6 * * 5' for winter (standard) time when Madrid shifts to UTC+1
+  # GitHub Actions cron expressions are always in UTC and do not support time zones
+  # Reference: https://github.com/orgs/community/discussions/13454
   schedule:
-    - cron: '0 6 * * 5'
+    - cron: '0 5 * * 5'
 
 jobs:
   book:

{pysportbot-0.0.15 → pysportbot-0.0.17}/README.md

@@ -123,10 +123,12 @@ For example, if you have a **Yoga** class on **Monday at 18:00:00**, and you wan
 name: Weekly Booking
 
 on:
-  # Runs at 06:00 UTC (07:00 CET) on Fridays
-  # Ensure enough time for the job to start well before 07:30 CET
+  # Runs at 05:00 UTC (07:00 Madrid time during daylight saving time) on Fridays
+  # Note: Update to '0 6 * * 5' for winter (standard) time when Madrid shifts to UTC+1
+  # GitHub Actions cron expressions are always in UTC and do not support time zones
+  # Reference: https://github.com/orgs/community/discussions/13454
   schedule:
-    - cron: '0 6 * * 5'
+    - cron: '0 5 * * 5'
 
 jobs:
   book:

{pysportbot-0.0.15 → pysportbot-0.0.17}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pysportbot"
-version = "v0.0.15"
+version = "v0.0.17"
 description = "A python-based bot for automatic resasports slot booking"
 authors = [
   { name = "Joshua Falco Beirer", email = "jbeirer@cern.ch" }
@@ -37,7 +37,7 @@ mkdocs-material = "^9.6.9"
 mkdocstrings = {extras = ["python"], version = "^0.29.0"}
 
 [build-system]
-requires = ["poetry-core>=2.1.1"]
+requires = ["poetry-core>=2.1.3"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.black]

{pysportbot-0.0.15 → pysportbot-0.0.17}/pysportbot/authenticator.py

@@ -30,6 +30,27 @@ class Authenticator:
         self.user_id = None
         # Centre selected by the user
         self.centre = centre
+        # Timeout of requests
+        self.timeout = (5, 10)
+
+    def is_session_valid(self) -> bool:
+        """
+        Check if the current session is still valid.
+
+        Returns:
+            bool: True if session is valid, False otherwise.
+        """
+        try:
+            response = self.session.post(Endpoints.USER, headers=self.headers, timeout=self.timeout)
+            if response.status_code == 200:
+                response_dict = json.loads(response.content.decode("utf-8"))
+                return bool(response_dict.get("user"))
+            else:
+                logger.debug(f"Session validation failed with status code: {response.status_code}")
+                return False
+        except Exception as e:
+            logger.debug(f"Session validation failed with exception: {e}")
+            return False
 
     def login(self, email: str, password: str) -> None:
         """
@@ -46,11 +67,12 @@ class Authenticator:
 
         # Step 1: Fetch CSRF token
         logger.debug(f"GET {Endpoints.USER_LOGIN} | Headers: {json.dumps(self.headers, indent=2)}")
-        response = self.session.get(Endpoints.USER_LOGIN, headers=self.headers)
+        response = self.session.get(Endpoints.USER_LOGIN, headers=self.headers, timeout=self.timeout)
         if response.status_code != 200:
             logger.error(f"Failed to fetch login popup: {response.status_code}")
             raise RuntimeError(ErrorMessages.failed_fetch("login popup"))
         logger.debug("Login popup fetched successfully.")
+
         soup = BeautifulSoup(response.text, "html.parser")
         csrf_tag = soup.find("input", {"name": "_csrf_token"})
         if csrf_tag is None:
@@ -70,7 +92,7 @@ class Authenticator:
             f"POST {Endpoints.LOGIN_CHECK} | Headers: {json.dumps(self.headers, indent=2)} | "
             f"Payload: {json.dumps(payload, indent=2)}"
         )
-        response = self.session.post(Endpoints.LOGIN_CHECK, data=payload, headers=self.headers)
+        response = self.session.post(Endpoints.LOGIN_CHECK, data=payload, headers=self.headers, timeout=self.timeout)
         if response.status_code != 200:
             logger.error(f"Login failed: {response.status_code}, {response.text}")
             raise ValueError(ErrorMessages.failed_login())
@@ -79,7 +101,7 @@ class Authenticator:
         # Step 3: Retrieve credentials for Nubapp
         cred_endpoint = Endpoints.get_cred_endpoint(self.centre)
         logger.debug(f"GET {cred_endpoint} | Headers: {json.dumps(self.headers, indent=2)}")
-        response = self.session.get(cred_endpoint, headers=self.headers)
+        response = self.session.get(cred_endpoint, headers=self.headers, timeout=self.timeout)
         if response.status_code != 200:
             logger.error(f"Failed to retrieve Nubapp credentials: {response.status_code}")
             raise RuntimeError(ErrorMessages.failed_fetch("credentials"))
@@ -94,14 +116,16 @@ class Authenticator:
             f"GET {Endpoints.NUBAP_LOGIN} | Headers: {json.dumps(self.headers, indent=2)} | "
             f"Params: {json.dumps(nubapp_creds, indent=2)}"
         )
-        response = self.session.get(Endpoints.NUBAP_LOGIN, headers=self.headers, params=nubapp_creds)
+        response = self.session.get(
+            Endpoints.NUBAP_LOGIN, headers=self.headers, params=nubapp_creds, timeout=self.timeout
+        )
         if response.status_code != 200:
             logger.error(f"Login to Nubapp failed: {response.status_code}, {response.text}")
             raise ValueError(ErrorMessages.failed_login_nubapp())
         logger.info("Login to Nubapp successful!")
 
         # Step 5: Get user information
-        response = self.session.post(Endpoints.USER, headers=self.headers, allow_redirects=True)
+        response = self.session.post(Endpoints.USER, headers=self.headers, allow_redirects=True, timeout=self.timeout)
 
         if response.status_code == 200:
             response_dict = json.loads(response.content.decode("utf-8"))

{pysportbot-0.0.15 → pysportbot-0.0.17}/pysportbot/service/booking.py

@@ -117,19 +117,23 @@ def schedule_bookings(
             logger.debug(f"Re-authenticating in {reauth_time:.2f} seconds.")
             time.sleep(reauth_time)
 
-        # Re-authenticate before booking
-        logger.info("Re-authenticating before booking.")
+        # Re-authenticate before booking if necessary
         try:
-            bot.login(config["email"], config["password"], config["centre"])
-        except Exception:
-            logger.warning("Re-authentication failed before booking execution.")
+            if bot._auth and bot._auth.is_session_valid():
+                logger.info("Session still valid. Skipping re-authentication.")
+            else:
+                logger.info("Attempting re-authenticating before booking.")
+                bot.login(config["email"], config["password"], config["centre"])
+
+        except Exception as e:
+            logger.warning(f"Re-authentication failed before booking execution with {e}.")
 
         # Wait the remaining time until execution
         now = datetime.now(pytz.timezone(time_zone))
         remaining_time = (execution_time - now).total_seconds()
         if remaining_time > 0:
             logger.info(f"Waiting {remaining_time:.2f} seconds until booking execution.")
-            time.sleep(remaining_time)
+        time.sleep(max(0, remaining_time))
 
     # Global booking delay
     if booking_delay > 0: