pysportbot 0.0.13__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-0.0.13.dist-info → pysportbot-0.0.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pysportbot
-Version: 0.0.13
+Version: 0.0.14
 Summary: A python-based bot for automatic resasports slot booking
 Author: Joshua Falco Beirer
 Author-email: jbeirer@cern.ch

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

@@ -1,5 +1,5 @@
 pysportbot/__init__.py,sha256=tZwOIuLO1-a3d4KKA5nNfXfN6PjJxem_hxyuff9utk4,6425
-pysportbot/activities.py,sha256=Aq8l570sxqEAKplsEMVkuDoPJJjoaZlIwPh6i64_SJ8,4252
+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
@@ -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.13.dist-info/LICENSE,sha256=6ov3DypdEVYpp2pn_B1MniKWO5C9iDA4O6PGcbork6c,1077
-pysportbot-0.0.13.dist-info/METADATA,sha256=ZksqiMoatQ6qOYaKy0QWGj_E1lUkWxx6ly4fVCHFhXM,7837
-pysportbot-0.0.13.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
-pysportbot-0.0.13.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.13.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