qums-fetch 0.4.4.dev1__tar.gz → 0.4.4.dev3__tar.gz

{qums_fetch-0.4.4.dev1 → qums_fetch-0.4.4.dev3}/PKG-INFO

@@ -1,13 +1,12 @@
 Metadata-Version: 2.3
 Name: qums-fetch
-Version: 0.4.4.dev1
+Version: 0.4.4.dev3
 Summary: Login and fetch data from QUMS-ERP Dashboard
 Author: Ishaan Gupta
 Author-email: Ishaan Gupta <ishaan.ishu@proton.me>
 Requires-Dist: beautifulsoup4>=4.15.0
 Requires-Dist: pillow>=12.3.0
 Requires-Dist: pytesseract>=0.3.13
-Requires-Dist: python-dotenv>=1.2.2
 Requires-Dist: requests>=2.34.2
 Requires-Python: >=3.14
 Description-Content-Type: text/markdown

{qums_fetch-0.4.4.dev1 → qums_fetch-0.4.4.dev3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "qums-fetch"
-version = "0.4.4.dev1"
+version = "0.4.4.dev3"
 description = "Login and fetch data from QUMS-ERP Dashboard"
 readme = "README.md"
 requires-python = ">=3.14"
@@ -12,7 +12,6 @@ dependencies = [
     "beautifulsoup4>=4.15.0",
     "pillow>=12.3.0",
     "pytesseract>=0.3.13",
-    "python-dotenv>=1.2.2",
     "requests>=2.34.2",
 ]
 
@@ -23,7 +22,9 @@ email = "ishaan.ishu@proton.me"
 [dependency-groups]
 dev = [
     "pytest>=9.1.1",
+    "python-dotenv>=1.2.3",
     "ruff>=0.16.5",
+    "ty>=0.0.78",
 ]
 
 [tool.pytest.ini_options]

{qums_fetch-0.4.4.dev1 → qums_fetch-0.4.4.dev3}/pyproject.toml.orig

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "qums-fetch"
-version = "0.4.4.dev1"
+version = "0.4.4.dev3"
 description = "Login and fetch data from QUMS-ERP Dashboard"
 readme = "README.md"
 authors = [
@@ -15,14 +15,15 @@ dependencies = [
     "beautifulsoup4>=4.15.0",
     "pillow>=12.3.0",
     "pytesseract>=0.3.13",
-    "python-dotenv>=1.2.2",
     "requests>=2.34.2",
 ]
 
 [dependency-groups]
 dev = [
     "pytest>=9.1.1",
+    "python-dotenv>=1.2.3",
     "ruff>=0.16.5",
+    "ty>=0.0.78",
 ]
 
 [tool.pytest.ini_options]

{qums_fetch-0.4.4.dev1 → qums_fetch-0.4.4.dev3}/src/qums_fetch/client.py

@@ -57,6 +57,7 @@ class Client:
         password: str,
         auto_login: bool = True,
         login_retries: int = 3,
+        cookies: dict | None = None,
     ):
         self._validate_credentials(username, password)
         self._validate_retries(login_retries)
@@ -71,43 +72,24 @@ class Client:
         self._month_attendance: dict | None = None
         self._sem_attendance: list[dict] | None = None
 
+        if cookies:
+            self._session.cookies.update(cookies)
+
         if auto_login:
-            if self._load_session() and self._is_session_valid():
+            if self._is_session_valid():
                 self._logged_in = True
                 logger.info("Session restored, login skipped.")
             else:
                 self.login(max_attempts=login_retries)
 
-    @property
-    def _cookie_path(self) -> str:
-        return f"cookies_{self.username}.json"
-
-    # Save session cookies
-    def _save_session(self) -> None:
-        with open(self._cookie_path, "w") as f:
-            cookies = self._session.cookies.get_dict()
-            json.dump(cookies, f)
-        logger.info("Session saved to %s", self._cookie_path)
-
-    # Load session cookies
-    def _load_session(self) -> bool:
-        try:
-            with open(self._cookie_path) as f:
-                data = json.load(f)
-                cookies = data
-            self._session.cookies.update(cookies)
-            return True
-        except FileNotFoundError, json.JSONDecodeError, KeyError:
-            return False
-
     # Check if the session is valid
     def _is_session_valid(self) -> bool:
         try:
-            resp = self._session.post(f"{BASE_URL}/Account/GetStudentDetail", timeout=5)
-            data = resp.json()
-            json.loads(data["state"])
-            return True
-        except requests.RequestException, json.JSONDecodeError, KeyError:
+            resp = self._session.post(
+                f"{BASE_URL}/Account/GetStudentDetail", timeout=5, allow_redirects=False
+            )
+            return resp.status_code == 200
+        except requests.RequestException:
             return False
 
     # Re-login if session is expired
@@ -179,7 +161,7 @@ class Client:
                 f"Could not find hidden input '{TOKEN_INPUT_NAME}' on the login page. "
                 "The site's markup may have changed."
             )
-        token = token_input["value"]
+        token = str(token_input["value"])
 
         img_tag = soup.select_one(CAPTCHA_IMG_SELECTOR)
         if not img_tag or not img_tag.get("src"):
@@ -188,7 +170,7 @@ class Client:
                 "The site's markup may have changed."
             )
 
-        src = img_tag["src"]
+        src = str(img_tag["src"])
         match = re.match(r"data:(image/\w+);base64,(.+)", src, re.DOTALL)
         if not match:
             raise LoginPageParseError(
@@ -234,7 +216,6 @@ class Client:
             if FEEDBACK_PATH in resp.url:
                 logger.info("Skipped the course feedback survey")
             self._logged_in = True
-            self._save_session()
             return True
 
         soup = BeautifulSoup(resp.text, "html.parser")
@@ -245,7 +226,7 @@ class Client:
 
     # Check if login was successful
     def _looks_like_login_success(self, resp: requests.Response) -> bool:
-        if resp.url == BASE_URL:
+        if resp.url.rstrip("/") == BASE_URL:
             soup = BeautifulSoup(resp.text, "html.parser")
             still_has_captcha = soup.select_one(CAPTCHA_IMG_SELECTOR) is not None
             return not still_has_captcha
@@ -255,17 +236,14 @@ class Client:
     # Extract error message from the login page
     @staticmethod
     def _extract_error_message(soup: BeautifulSoup) -> str | None:
-        captcha_error = soup.select_one(".field-validation-error")
-        if captcha_error:
-            text = captcha_error.get_text(strip=True)
-            if text:
-                raise CaptchaError(text)
-
-        credentials_error = soup.select_one(".validation-summary-errors")
-        if credentials_error:
-            text = credentials_error.get_text(strip=True)
-            if text:
-                raise CredentialsError(text)
+        error_div = soup.select_one(".validation-summary-errors")
+        if error_div:
+            list_item = error_div.select_one("li")
+            error_text = list_item.get_text(strip=True) if list_item else ""
+            if "password" and "incorrect" in error_text:
+                raise CredentialsError(error_text)
+            else:
+                raise CaptchaError(error_text)
 
         return None
 
@@ -273,10 +251,16 @@ class Client:
     def is_logged_in(self) -> bool:
         return self._logged_in
 
+    @property
+    def get_cookies(self) -> dict:
+        return self._session.cookies.get_dict()
+
     @property
     def student_details(self) -> dict:
         if not self._details:
             self.get_student_details()
+
+        assert self._details is not None
         return self._details
 
     @property
@@ -285,6 +269,8 @@ class Client:
             if not self._details:
                 self.get_student_details()
             self.get_tile_data()
+
+        assert self._tile_data is not None
         return self._tile_data
 
     @property
@@ -293,6 +279,8 @@ class Client:
             if not self._details:
                 self.get_student_details()
             self.get_today_attendance()
+
+        assert self._today_attendance is not None
         return self._today_attendance
 
     @property
@@ -301,6 +289,8 @@ class Client:
             if not self._details:
                 self.get_student_details()
             self.get_month_attendance()
+
+        assert self._month_attendance is not None
         return self._month_attendance
 
     @property
@@ -309,6 +299,8 @@ class Client:
             if not self._details:
                 self.get_student_details()
             self.get_sem_attendance()
+
+        assert self._sem_attendance is not None
         return self._sem_attendance
 
     # Authenticated data fetches
@@ -333,6 +325,8 @@ class Client:
 
     def get_tile_data(self) -> int:
         self._ensure_session()
+        assert self._details is not None
+
         payload = {
             "RegID": self._details.get("RegID"),
         }
@@ -357,6 +351,8 @@ class Client:
 
     def get_today_attendance(self) -> int:
         self._ensure_session()
+        assert self._details is not None
+
         today = datetime.now(tz=UTC).strftime("%d/%m/%Y")
         payload = {
             "RegID": self._details.get("RegID"),
@@ -383,6 +379,8 @@ class Client:
 
     def get_month_attendance(self, month: int | None = None) -> int:
         self._ensure_session()
+        assert self._details is not None
+
         if month is None:
             month = datetime.now(tz=UTC).month
         payload = {
@@ -413,6 +411,8 @@ class Client:
 
     def get_sem_attendance(self, sem: int | None = None) -> int:
         self._ensure_session()
+        assert self._details is not None
+
         if sem is None:
             sem = self._details.get("YearSem")
         payload = {