pysportbot 0.0.12__py3-none-any.whl → 0.0.14__py3-none-any.whl

pysportbot/activities.py

@@ -32,13 +32,27 @@ class Activities:
         """
         logger.info("Fetching activities...")
         response = self.session.post(Endpoints.ACTIVITIES, headers=self.headers)
+
         if response.status_code != 200:
             error_msg = ErrorMessages.failed_fetch("activities")
             logger.error(error_msg)
             raise RuntimeError(error_msg)
+
+        try:
+            activities = response.json().get("activities", {})
+        except json.JSONDecodeError as err:
+            error_msg = "Invalid JSON response while fetching activities."
+            logger.error(error_msg)
+            raise RuntimeError(error_msg) from err
+
+        if not activities:
+            logger.warning("No activities found in the response.")
+
+        df_activities = pd.DataFrame.from_dict(activities, orient="index")
+        df_activities.index = df_activities.index.astype(int)  # Ensure index is integer for consistency
+
         logger.info("Activities fetched successfully.")
-        activities = json.loads(response.content.decode("utf-8"))["activities"]
-        return pd.DataFrame.from_dict(activities, orient="index")
+        return df_activities
 
     def daily_slots(self, df_activities: DataFrame, activity_name: str, day: str) -> DataFrame:
         """
@@ -67,9 +81,10 @@ class Activities:
             logger.error(error_msg)
             raise ValueError(error_msg)
 
-        # Extract activity ID
-        activity_id = str(activity_match.id_activity.iloc[0])
-        id_category_activity = df_activities.loc[activity_id].activityCategoryId
+        # Extract activity ID and category ID
+        # Ensures activity_id is an integer
+        activity_id = activity_match.index[0]
+        id_category_activity = activity_match.at[activity_id, "activityCategoryId"]
 
         # Get Unix timestamp bounds for the day
         unix_day_bounds = get_unix_day_bounds(day)
@@ -81,12 +96,19 @@ class Activities:
             "end": unix_day_bounds[1],
         }
         response = self.session.get(Endpoints.SLOTS, headers=self.headers, params=params)
+
         if response.status_code != 200:
             error_msg = ErrorMessages.failed_fetch("slots")
             logger.error(error_msg)
             raise RuntimeError(error_msg)
 
-        slots = json.loads(response.content.decode("utf-8"))
+        try:
+            slots = response.json()
+        except json.JSONDecodeError as err:
+            error_msg = "Invalid JSON response while fetching slots."
+            logger.error(error_msg)
+            raise RuntimeError(error_msg) from err
+
         if not slots:
             warning_msg = ErrorMessages.no_slots(activity_name, day)
             logger.warning(warning_msg)
@@ -110,10 +132,12 @@ class Activities:
             "trainer",
         ]
         df_slots = pd.DataFrame(slots)
-        df_slots = df_slots[df_slots.columns.intersection(columns)]  # Ensure no KeyError
+
+        # Ensure only desired columns are selected without KeyError
+        df_slots = df_slots.loc[:, df_slots.columns.intersection(columns)]
 
         # Only select rows of the specified activity
-        df_slots = df_slots[df_slots.id_activity == activity_id]
+        df_slots = df_slots[df_slots["id_activity"] == activity_id]
         if df_slots.empty:
             warning_msg = ErrorMessages.no_matching_slots(activity_name, day)
             logger.warning(warning_msg)

pysportbot/authenticator.py

@@ -51,7 +51,11 @@ class Authenticator:
             logger.error(f"Failed to fetch login popup: {response.status_code}")
             raise RuntimeError(ErrorMessages.failed_fetch("login popup"))
         logger.debug("Login popup fetched successfully.")
-        csrf_token = BeautifulSoup(response.text, "html.parser").find("input", {"name": "_csrf_token"})["value"]
+        soup = BeautifulSoup(response.text, "html.parser")
+        csrf_tag = soup.find("input", {"name": "_csrf_token"})
+        if csrf_tag is None:
+            raise ValueError("CSRF token input not found on the page")
+        csrf_token = csrf_tag["value"]  # type: ignore[index]
 
         # Step 2: Perform login
         payload = {

pysportbot/service/scheduling.py

@@ -56,6 +56,7 @@ def calculate_class_day(class_day: str, time_zone: str = "Europe/Madrid") -> dat
     now = datetime.now(tz)
     target_weekday = DAY_MAP[class_day.lower().strip()]
     days_ahead = target_weekday - now.weekday()
-    if days_ahead < 0:
+    # Ensure we always book for the upcoming week
+    if days_ahead <= 0:
         days_ahead += 7
     return now + timedelta(days=days_ahead)

{pysportbot-0.0.12.dist-info → pysportbot-0.0.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pysportbot
-Version: 0.0.12
+Version: 0.0.14
 Summary: A python-based bot for automatic resasports slot booking
 Author: Joshua Falco Beirer
 Author-email: jbeirer@cern.ch
@@ -10,9 +10,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
-Requires-Dist: beautifulsoup4 (>=4.12.3,<5.0.0)
+Requires-Dist: beautifulsoup4 (>=4.13.3,<5.0.0)
 Requires-Dist: pandas (>=2.2.3,<3.0.0)
-Requires-Dist: pytz (>=2024.2,<2025.0)
+Requires-Dist: pytz (>=2025.1,<2026.0)
 Requires-Dist: requests (>=2.32.3,<3.0.0)
 Description-Content-Type: text/markdown
 
@@ -109,7 +109,11 @@ Let's say you would like to book Yoga next Monday at 18:00:00, but the execution
 }
 ```
 
-**Note:** By default, PySportBot will attempt to execute *N* bookings in parallel, where *N* is the number of available cores on your machine.
+**Note:**
+1. Bookings are always scheduled for the following week. For example, if your booking execution is set for Friday at 07:30:00 and your class is on Friday at 18:00:00, the system will schedule the booking for **next Friday** at 18:00:00, not the same day.
+2. PySportBot automatically attempts to execute up to *N* bookings in parallel, where *N* corresponds to the number of available CPU cores on your machine.
+3. If the number of bookings exceeds the available parallel slots, they will be processed sequentially in the exact order specified in your JSON configuration file.
+
 
 The service also provides various other options that can be inspected with
 
@@ -125,6 +129,63 @@ Currently supported options include:
 5. `--log-level`: sets the log-level of the service [default: INFO]
 6. `--max-threads`: limits the number of used threads for parallel bookings [default: -1]
 
+## Automating Weekly Bookings with GitHub Actions
+
+While you can use PySportBot as a continuously running service, doing so often becomes cumbersome because it requires a server (or similar machine) that is always online.
+
+Using **[GitHub Actions](https://docs.github.com/en/actions)** is one of the most reliable ways to schedule **automated weekly bookings**. With a simple workflow file, you can ensure your bookings run at a specific time each week — no manual intervention required.
+
+For example, if you have a **Yoga** class on **Monday at 18:00:00**, and you want the **booking** to be executed on **Friday at 07:30:00**, you can automate the process by configuring a **[GitHub Actions workflow](https://docs.github.com/en/actions/writing-workflows)**. Below is a sample workflow file that triggers every **Friday at 06:00 UTC (07:00 CET)**, ensuring there is enough time before the actual booking execution at 07:30:00:
+
+```yml
+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
+  schedule:
+    - cron: '0 6 * * 5'
+
+jobs:
+  book:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v2
+
+      - name: Set up Python 3.12
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.12'
+
+      - name: Install pysportbot
+        run: |
+          pip install pysportbot
+
+      - name: Create config file
+        run: |
+          echo '{
+            "email": "your-email",
+            "password": "your-password",
+            "centre": "your-gym",
+            "booking_execution": "Friday 07:30:00",
+            "classes": [
+              {
+                "activity": "Yoga",
+                "class_day": "Monday",
+                "class_time": "18:00:00"
+              }
+            ]
+          }' > config.json
+
+      - name: Run pysportbot
+        run: |
+          python -m pysportbot.service --config config.json --log-level INFO --booking-delay 1 --retry-attempts 3 --retry-delay 5
+```
+**Note:** Make sure the workflow starts early enough — before your booking execution time (e.g., 07:30 CET) — to allow for potential delays in job startup or execution.
+
+
 ## LICENSE
 
 pysportbot is free of use and open-source. All versions are

{pysportbot-0.0.12.dist-info → pysportbot-0.0.14.dist-info}/RECORD

@@ -1,6 +1,6 @@
 pysportbot/__init__.py,sha256=tZwOIuLO1-a3d4KKA5nNfXfN6PjJxem_hxyuff9utk4,6425
-pysportbot/activities.py,sha256=Aq8l570sxqEAKplsEMVkuDoPJJjoaZlIwPh6i64_SJ8,4252
-pysportbot/authenticator.py,sha256=xEU9O6W6Yp9DCueoUD0ASMkm17yvdUZqTvV4h6WlSnI,5012
+pysportbot/activities.py,sha256=MATA0feSsDSoeFnHa4Y_dLv3gw4P6MFg-0kAEybqVIY,4991
+pysportbot/authenticator.py,sha256=t_5x9anmsfh0SwpN9JSemzqKv72Hwt__Q8mQBowIOIo,5183
 pysportbot/bookings.py,sha256=W91AYGPu0sCpGliuiVdlENsoGYzH8P6v-SyKisbSb7g,3127
 pysportbot/centres.py,sha256=FTK-tXUOxiJvLCHP6Bk9XEQKODQZOwwkYLlioSJPBEk,3399
 pysportbot/endpoints.py,sha256=ANh5JAbdzyZQ-i4ODrhYlskPpU1gkBrw9UhMC7kRSvU,1353
@@ -9,7 +9,7 @@ pysportbot/service/__main__.py,sha256=gsKfDMOmsVC3LHCQs0Dmp7YWJBlZeGcTsX-Mx4mk6r
 pysportbot/service/booking.py,sha256=oNLdY3nhs3ulAD-yFoc6YhgohbSN16xRYjEL8iyHkZg,5695
 pysportbot/service/config_loader.py,sha256=t086yaAyAKkCJTpxedwhyJ7QqSf5XROGDzjrFLsUxJE,179
 pysportbot/service/config_validator.py,sha256=0P_pcXU7s3T3asODqFtv3mSp1HyPoVBphE4Qe1mxcps,2615
-pysportbot/service/scheduling.py,sha256=bwqbiQQ9y4ss4UXZkWuOVCgCa9XlZt1n4TT_8z9bD7M,1973
+pysportbot/service/scheduling.py,sha256=trz4zweZB2W9rwWAnW9Y6YkCo-f4dqtKyhaY_yqpJ-Y,2024
 pysportbot/service/service.py,sha256=eW-roFozDzkK7kTzYbSzNwZhbZpBr-22yUrAHVnrD-0,1933
 pysportbot/service/threading.py,sha256=j0tHgGty8iWDjpZtTzIu-5TUnDb9S6SJErm3QBpG-nY,1947
 pysportbot/session.py,sha256=pTQrz3bGzLYBtzVOgKv04l4UXDSgtA3Infn368bjg5I,1529
@@ -17,7 +17,7 @@ pysportbot/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 pysportbot/utils/errors.py,sha256=IRarfGtk1tETxUGAhPAIbeits_u2tJvVCGTtkHIdYFQ,5146
 pysportbot/utils/logger.py,sha256=ANayMEeeAIVGKvITAxOFm2EdCbzBBTpNywuytAr4Z90,5366
 pysportbot/utils/time.py,sha256=VZSW8AxFIoFD5ZSmLUPcwawp6PmpkcxNjP3Db-Hl_fw,1244
-pysportbot-0.0.12.dist-info/LICENSE,sha256=6ov3DypdEVYpp2pn_B1MniKWO5C9iDA4O6PGcbork6c,1077
-pysportbot-0.0.12.dist-info/METADATA,sha256=cnKqqZ72iDoVjPrnqrOxEy46gcNu0DsBdXr7BzbDIe8,5161
-pysportbot-0.0.12.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
-pysportbot-0.0.12.dist-info/RECORD,,
+pysportbot-0.0.14.dist-info/LICENSE,sha256=6ov3DypdEVYpp2pn_B1MniKWO5C9iDA4O6PGcbork6c,1077
+pysportbot-0.0.14.dist-info/METADATA,sha256=aUx264Y6n5fGY4GvpK0tClB03Gm_XyJd0cBboTWzJ1c,7837
+pysportbot-0.0.14.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+pysportbot-0.0.14.dist-info/RECORD,,

{pysportbot-0.0.12.dist-info → pysportbot-0.0.14.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.0.0
+Generator: poetry-core 2.0.1
 Root-Is-Purelib: true
 Tag: py3-none-any