a few fixes

Author: TheCommCraft

scratchattach/cloud/cloud.py

@@ -4,7 +4,7 @@
 
 from ._base import BaseCloud
 from typing import Type
-from ..utils.requests import Requests as requests
+from ..utils.requests import requests
 from ..utils import exceptions, commons
 from ..site import cloud_activity
 

scratchattach/eventhandlers/_base.py

@@ -5,7 +5,7 @@
 from threading import Thread
 from collections.abc import Callable
 import traceback
-from ..utils.requests import Requests as requests
+from ..utils.requests import requests
 from ..utils import exceptions
 
 class BaseEventHandler(ABC):

scratchattach/other/other_apis.py

@@ -7,7 +7,7 @@
 from ..utils import commons
 from ..utils.enums import Languages, Language, TTSVoices, TTSVoice
 from ..utils.exceptions import BadRequest, InvalidLanguage, InvalidTTSGender
-from ..utils.requests import Requests as requests
+from ..utils.requests import requests
 from typing import Optional
 
 

scratchattach/other/project_json_capabilities.py

@@ -12,7 +12,7 @@
 from abc import ABC, abstractmethod
 from ..utils import exceptions
 from ..utils.commons import empty_project_json
-from ..utils.requests import Requests as requests
+from ..utils.requests import requests
 # noinspection PyPep8Naming
 def load_components(json_data: list, ComponentClass: type, target_list: list):
     for element in json_data:

scratchattach/site/_base.py

@@ -1,27 +1,29 @@
 from __future__ import annotations
 
 from abc import ABC, abstractmethod
+from types import FunctionType
+from typing import TypeVar, Optional
 
 import requests
+from . import session
 from ..utils import exceptions, commons
-from typing import TypeVar
-from types import FunctionType
 
 C = TypeVar("C", bound="BaseSiteComponent")
 class BaseSiteComponent(ABC):
+    _session: Optional[session.Session]
+    update_api: str
+    _headers: dict[str, str]
+    _cookies: dict[str, str]
     @abstractmethod
     def __init__(self):
-        self._session = None
-        self._cookies = None
-        self._headers = None
-        self.update_API = None
+        pass
 
     def update(self):
         """
         Updates the attributes of the object by performing an API response. Returns True if the update was successful.
         """
         response = self.update_function(
-            self.update_API,
+            self.update_api,
             headers=self._headers,
             cookies=self._cookies, timeout=10
         )
@@ -45,7 +47,6 @@ def _update_from_dict(self, data) -> bool:
         """
         Parses the API response that is fetched in the update-method. Class specific, must be overridden in classes inheriting from this one.
         """
-        pass
 
     def _assert_auth(self):
         if self._session is None:

scratchattach/site/backpack_asset.py

@@ -6,7 +6,7 @@
 
 from ._base import BaseSiteComponent
 from ..utils import exceptions
-from ..utils.requests import Requests as requests
+from ..utils.requests import requests
 
 
 

scratchattach/site/classroom.py

@@ -24,9 +24,9 @@ def __init__(self, **entries):
         # NOTE: THIS DOESN'T WORK WITH CLOSED CLASSES!
         self.update_function = requests.get
         if "id" in entries:
-            self.update_API = f"https://api.scratch.mit.edu/classrooms/{entries['id']}"
+            self.update_api = f"https://api.scratch.mit.edu/classrooms/{entries['id']}"
         elif "classtoken" in entries:
-            self.update_API = f"https://api.scratch.mit.edu/classtoken/{entries['classtoken']}"
+            self.update_api = f"https://api.scratch.mit.edu/classtoken/{entries['classtoken']}"
         else:
             raise KeyError(f"No class id or token provided! Entries: {entries}")
 

scratchattach/site/forum.py

@@ -1,16 +1,21 @@
 """ForumTopic and ForumPost classes"""
 from __future__ import annotations
 
+from dataclasses import dataclass, field
+from typing import Optional
+from urllib.parse import urlparse, parse_qs
+import xml.etree.ElementTree as ET
+
+from bs4 import BeautifulSoup
+
 from . import user
+from . import session
 from ..utils.commons import headers
 from ..utils import exceptions, commons
 from ._base import BaseSiteComponent
-import xml.etree.ElementTree as ET
-from bs4 import BeautifulSoup
-from urllib.parse import urlparse, parse_qs
-
-from ..utils.requests import Requests as requests
+from ..utils.requests import requests
 
+@dataclass
 class ForumTopic(BaseSiteComponent):
     '''
     Represents a Scratch forum topic.
@@ -33,20 +38,18 @@ class ForumTopic(BaseSiteComponent):
 
     :.update(): Updates the attributes
     '''
-
-    def __init__(self, **entries):
+    id: int
+    title: str
+    category_name: str
+    last_updated: str
+    _session: Optional[session.Session] = field(default=None)
+    reply_count: Optional[int] = field(default=None)
+    view_count: Optional[int] = field(default=None)
+
+    def __post_init__(self):
         # Info on how the .update method has to fetch the data:
         self.update_function = requests.get
-        self.update_API = f"https://scratch.mit.edu/discuss/feeds/topic/{entries['id']}/"
-
-        # Set attributes every Project object needs to have:
-        self._session = None
-        self.id = 0
-        self.reply_count = None
-        self.view_count = None
-        
-        # Update attributes from entries dict:
-        self.__dict__.update(entries)
+        self.update_api = f"https://scratch.mit.edu/discuss/feeds/topic/{self.id}/"
 
         # Headers and cookies:
         if self._session is None:
@@ -65,7 +68,7 @@ def update(self):
         # As there is no JSON API for getting forum topics anymore,
         # the data has to be retrieved from the XML feed.
         response = self.update_function(
-            self.update_API,
+            self.update_api,
             headers = self._headers,
             cookies = self._cookies, timeout=20 # fetching forums can take very long
         )
@@ -87,15 +90,20 @@ def update(self):
                 raise exceptions.ScrapeError(str(e))
         else:
             raise exceptions.ForumContentNotFound
-
-        return self._update_from_dict(dict(
-            title = title, category_name = category_name, last_updated = last_updated
-        ))
-        
-
-    def _update_from_dict(self, data):
-        self.__dict__.update(data)
+        self.title = title
+        self.category_name = category_name
+        self.last_updated = last_updated
         return True
+    
+    @classmethod
+    def from_id(cls, id: int, session: session.Session, update: bool = False):
+        new = cls(id=id, _session=session, title="", last_updated="", category_name="")
+        if update:
+            new.update()
+        return new
+    
+    def _update_from_dict(self, data):
+        raise NotImplementedError()
 
     def posts(self, *, page=1, order="oldest"):
         """
@@ -157,7 +165,6 @@ def first_post(self):
         if len(posts) > 0:
             return posts[0]
 
-
 class ForumPost(BaseSiteComponent):
     '''
     Represents a Scratch forum post.
@@ -195,7 +202,7 @@ def __init__(self, **entries):
 
         # A forum post can't be updated the usual way as there is no API anymore
         self.update_function = None
-        self.update_API = None
+        self.update_api = None
 
         # Set attributes every Project object needs to have:
         self._session = None
@@ -225,14 +232,14 @@ def update(self):
         As there is no API for retrieving a single post anymore, this requires reloading the forum page.
         """
         page = 1
-        posts = ForumTopic(id=self.topic_id, _session=self._session).posts(page=1)
+        posts = ForumTopic.from_id(id=self.topic_id, session=self._session).posts(page=1)
         while posts != []:
             matching = list(filter(lambda x : int(x.id) == int(self.id), posts))
             if len(matching) > 0:
                 this = matching[0]
                 break
             page += 1
-            posts = ForumTopic(id=self.topic_id, _session=self._session).posts(page=page)
+            posts = ForumTopic.from_id(id=self.topic_id, session=self._session).posts(page=page)
         else:
             return False
 

scratchattach/site/project.py

@@ -12,7 +12,7 @@
 from ..utils.commons import empty_project_json, headers
 from ._base import BaseSiteComponent
 from ..other.project_json_capabilities import ProjectBody
-from ..utils.requests import Requests as requests
+from ..utils.requests import requests
 
 CREATE_PROJECT_USES: list[float] = []
 
@@ -28,7 +28,7 @@ def __init__(self, **entries):
 
         # Info on how the .update method has to fetch the data:
         self.update_function = requests.get
-        self.update_API = f"https://api.scratch.mit.edu/projects/{entries['id']}"
+        self.update_api = f"https://api.scratch.mit.edu/projects/{entries['id']}"
 
         # Set attributes every Project object needs to have:
         self._session = None

scratchattach/site/session.py

@@ -10,7 +10,7 @@
 import re
 import time
 import warnings
-from typing import Optional, TypeVar, TYPE_CHECKING, overload, Any
+from typing import Optional, TypeVar, TYPE_CHECKING, overload, Any, Union
 from contextlib import contextmanager
 from threading import local
 
@@ -38,7 +38,7 @@
 from ..utils import commons
 from ..utils import exceptions
 from ..utils.commons import headers, empty_project_json, webscrape_count, get_class_sort_mode
-from ..utils.requests import Requests as requests
+from ..utils.requests import requests
 from .browser_cookies import Browser, ANY, cookies_from_browser
 
 ratelimit_cache: dict[str, list[float]] = {}
@@ -92,7 +92,7 @@ def __str__(self) -> str:
     def __init__(self, **entries):
         # Info on how the .update method has to fetch the data:
         self.update_function = requests.post
-        self.update_API = "https://scratch.mit.edu/session"
+        self.update_api = "https://scratch.mit.edu/session"
 
         # Set attributes every Session object needs to have:
         self.id = None
@@ -650,9 +650,10 @@ def mystuff_studios(self, filter_arg: str = "all", *, page: int = 1, sort_by: st
             ascsort = sort_by
             descsort = ""
         try:
+            params: dict[str, Union[str, int]] = {"page": page, "ascsort": ascsort, "descsort": descsort}
             targets = requests.get(
                 f"https://scratch.mit.edu/site-api/galleries/{filter_arg}/",
-                params={"page": page, "ascsort": ascsort, "descsort": descsort},
+                params=params,
                 headers=headers,
                 cookies=self._cookies,
                 timeout=10
@@ -1013,6 +1014,12 @@ def connect_filterbot(self, *, log_deletions=True) -> filterbot.Filterbot:
     def get_session_string(self) -> str:
         assert self.session_string
         return self.session_string
+    
+    def get_headers(self) -> dict[str, str]:
+        return self._headers
+    
+    def get_cookies(self) -> dict[str, str]:
+        return self._cookies
 
 # ------ #
 
@@ -1119,11 +1126,12 @@ def login(username, password, *, timeout=10) -> Session:
     # Post request to login API:
     _headers = headers.copy()
     _headers["Cookie"] = "scratchcsrftoken=a;scratchlanguage=en;"
-    request = requests.post(
-        "https://scratch.mit.edu/login/", json={"username": username, "password": password}, headers=_headers,
+    with requests.no_error_handling():
+        request = requests.post(
+            "https://scratch.mit.edu/login/", json={"username": username, "password": password}, headers=_headers,
 
-        timeout=timeout, errorhandling = False
-    )
+            timeout=timeout
+        )
     try:
         result = re.search('"(.*)"', request.headers["Set-Cookie"])
         assert result is not None