pysportbot 0.0.13__tar.gz → 0.0.15__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pysportbot
-Version: 0.0.13
+Version: 0.0.15
 Summary: A python-based bot for automatic resasports slot booking
 Author: Joshua Falco Beirer
 Author-email: jbeirer@cern.ch
@@ -12,7 +12,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: beautifulsoup4 (>=4.13.3,<5.0.0)
 Requires-Dist: pandas (>=2.2.3,<3.0.0)
-Requires-Dist: pytz (>=2025.1,<2026.0)
+Requires-Dist: pytz (>=2025.2,<2026.0)
 Requires-Dist: requests (>=2.32.3,<3.0.0)
 Description-Content-Type: text/markdown
 

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

@@ -1,6 +1,6 @@
 [project]
 name = "pysportbot"
-version = "v0.0.13"
+version = "v0.0.15"
 description = "A python-based bot for automatic resasports slot booking"
 authors = [
   { name = "Joshua Falco Beirer", email = "jbeirer@cern.ch" }
@@ -18,26 +18,26 @@ python = ">=3.10,<3.14"
 requests = "^2.32.3"
 beautifulsoup4 = "^4.13.3"
 pandas = "^2.2.3"
-pytz = "^2025.1"
+pytz = "^2025.2"
 
 [tool.poetry.group.dev.dependencies]
-pytest = "^8.3.4"
+pytest = "^8.3.5"
 pytest-cov = "^6.0.0"
 deptry = "^0.23.0"
 mypy = "^1.15.0"
-pre-commit = "^4.1.0"
-tox = "^4.24.1"
+pre-commit = "^4.2.0"
+tox = "^4.24.2"
 ipykernel = "^6.29.5"
-types-pytz = "^2025.1.0.20250204"
-types-requests = "^2.32.0.20241016"
+types-pytz = "^2025.1.0.20250318"
+types-requests = "^2.32.0.20250306"
 
 [tool.poetry.group.docs.dependencies]
 mkdocs = "^1.6.1"
-mkdocs-material = "^9.6.3"
-mkdocstrings = {extras = ["python"], version = "^0.28.0"}
+mkdocs-material = "^9.6.9"
+mkdocstrings = {extras = ["python"], version = "^0.29.0"}
 
 [build-system]
-requires = ["poetry-core>=2.0.1"]
+requires = ["poetry-core>=2.1.1"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.black]

{pysportbot-0.0.13 → pysportbot-0.0.15}/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)