Merge branch 'main' of https://github.com/TimMcCool/scratchattach

Author: TheCommCraft

.github/workflows/python-app.yml

@@ -0,0 +1,55 @@
+# This workflow will install Python dependencies, run tests and lint with a single version of Python
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python
+
+# This workflow will upload a Python Package using Twine when a release is created
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python#publishing-to-package-registries
+
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+
+name: Python application
+
+
+on:
+  release:
+    types: [published]
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    environment: release
+    permissions:
+      id-token: write
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Python 3.12
+      uses: actions/setup-python@v3
+      with:
+        python-version: "3.12"
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install flake8 pytest
+        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+    - name: Lint with flake8
+      run: |
+        # stop the build if there are Python syntax errors or undefined names
+        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
+        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+    - name: Test with pytest
+      run: |
+        pytest tests/
+    - run: pip install -U wheel build
+    - name: Build a binary wheel and a source tarball
+      run: python -m build
+    - name: Publish package distributions to PyPI
+      uses: pypa/gh-action-pypi-publish@release/v1

requirements.txt

@@ -0,0 +1,4 @@
+websocket-client
+requests
+bs4
+SimpleWebSocketServer

scratchattach/cloud/_base.py

@@ -97,9 +97,9 @@ def events(self) -> CloudEvents:
         return CloudEvents(self)
 
     def requests(self, *, no_packet_loss: bool = False, used_cloud_vars: list[str] = ["1", "2", "3", "4", "5", "6", "7", "8", "9"],
-                 respond_order="receive") -> CloudRequests:
+                 respond_order="receive", debug: bool = False) -> CloudRequests:
         return CloudRequests(self, used_cloud_vars=used_cloud_vars, no_packet_loss=no_packet_loss,
-                             respond_order=respond_order)
+                             respond_order=respond_order, debug=debug)
 
     def storage(self, *, no_packet_loss: bool = False, used_cloud_vars: list[str] = ["1", "2", "3", "4", "5", "6", "7", "8", "9"]) -> CloudStorage:
         return CloudStorage(self, used_cloud_vars=used_cloud_vars, no_packet_loss=no_packet_loss)
@@ -365,6 +365,7 @@ def set_var(self, variable, value):
         self._assert_valid_value(value)
         if not isinstance(variable, str):
             raise ValueError("cloud var name must be a string")
+        variable = variable.removeprefix("☁ ")
         if not self.active_connection:
             self.connect()
         self._enforce_ratelimit(n=1)
@@ -401,6 +402,7 @@ def set_vars(self, var_value_dict, *, intelligent_waits=True):
         packet_list = []
         for variable in var_value_dict:
             value = var_value_dict[variable]
+            variable = variable.removeprefix("☁ ")
             self._assert_valid_value(value)
             if not isinstance(variable, str):
                 raise ValueError("cloud var name must be a string")
@@ -416,6 +418,7 @@ def set_vars(self, var_value_dict, *, intelligent_waits=True):
         self.last_var_set = time.time()
 
     def get_var(self, var, *, recorder_initial_values={}):
+        var = "☁ "+var.removeprefix("☁ ")
         if self.recorder is None:
             self.recorder = cloud_recorder.CloudRecorder(self, initial_values=recorder_initial_values)
             self.recorder.start()

scratchattach/cloud/cloud.py

@@ -49,35 +49,35 @@ def logs(self, *, filter_by_var_named=None, limit=100, offset=0) -> list[cloud_a
         try:
             data = requests.get(f"https://clouddata.scratch.mit.edu/logs?projectid={self.project_id}&limit={limit}&offset={offset}", timeout=10).json()
             if filter_by_var_named is not None:
+                filter_by_var_named = filter_by_var_named.removeprefix("☁ ")
                 data = list(filter(lambda k: k["name"] == "☁ "+filter_by_var_named, data))
             for x in data:
                 x["cloud"] = self
-                x["name"] = x["name"][2:]
             return commons.parse_object_list(data, cloud_activity.CloudActivity, self._session, "name")
         except Exception as e:
             raise exceptions.FetchError(str(e))
 
     def get_var(self, var, *, use_logs=False):
+        var = var.removeprefix("☁ ")
         if self._session is None or use_logs:
-            logs = self.logs(limit=100)
-            filtered = list(filter(lambda k: k.name == "☁ "+var, logs))
+            filtered = self.logs(limit=100, filter_by_var_named="☁ "+var)
             if len(filtered) == 0:
                 return None
             return filtered[0].value
         else:
             if self.recorder is None:
                 initial_values = self.get_all_vars(use_logs=True)
-                return super().get_var(var, recorder_initial_values=initial_values)
+                return super().get_var("☁ "+var, recorder_initial_values=initial_values)
             else:
-                return super().get_var(var)
+                return super().get_var("☁ "+var)
 
     def get_all_vars(self, *, use_logs=False):
         if self._session is None or use_logs:
             logs = self.logs(limit=100)
             logs.reverse()
             clouddata = {}
             for activity in logs:
-                clouddata[activity.name.replace("☁ ", "")] = activity.value
+                clouddata[activity.name] = activity.value
             return clouddata
         else:
             if self.recorder is None:

scratchattach/eventhandlers/cloud_requests.py

@@ -16,13 +16,14 @@ class Request:
     Saves a request added to the request handler
     """
 
-    def __init__(self, request_name, *, on_call, cloud_requests, thread=True, enabled=True, response_priority=0):
+    def __init__(self, request_name, *, on_call, cloud_requests, thread=True, enabled=True, response_priority=0, debug=False):
         self.name = request_name
         self.on_call = on_call
         self.thread = thread
         self.enabled = enabled
         self.response_priority = response_priority
         self.cloud_requests = cloud_requests # the corresponding CloudRequests object
+        self.debug = debug
 
     def __call__(self, received_request):
         if not self.enabled:
@@ -44,7 +45,13 @@ def __call__(self, received_request):
             else:
                 print(f"Exception in request '{self.name}':")
                 raise(e)
-            self.cloud_requests.request_outputs.append({"receive":received_request.timestamp, "request_id":received_request.request_id, "output":[f"Error in request {self.name}","Check the Python console"], "priority":self.response_priority})
+            if self.debug:
+                traceback_full = traceback.format_exc().splitlines()
+                output = [f"Error in request {self.name}", "Traceback: "]
+                output.extend(traceback_full)
+                self.cloud_requests.request_outputs.append({"receive":received_request.timestamp, "request_id":received_request.request_id, "output":output, "priority":self.response_priority})
+            else:
+                self.cloud_requests.request_outputs.append({"receive":received_request.timestamp, "request_id":received_request.request_id, "output":[f"Error in request {self.name}","Check the Python console"], "priority":self.response_priority})
         self.cloud_requests.responder_event.set() # Activate the .cloud_requests._responder process so it sends back the data to Scratch
 
 class ReceivedRequest:

scratchattach/site/project.py

@@ -145,7 +145,7 @@ def create_remix(self, *, title=None, project_json=None): # not working
                 title = " remix"
         if project_json is None:
             if "title" in self.__dict__:
-                project_json = self.get_raw_json()
+                project_json = self.raw_json()
             else:
                 project_json = empty_project_json
 

scratchattach/site/session.py

@@ -1092,7 +1092,7 @@ def login(username, password, *, timeout=10) -> Session:
         session_id = str(re.search('"(.*)"', request.headers["Set-Cookie"]).group())
     except (AttributeError, Exception):
         raise exceptions.LoginFailure(
-            "Either the provided authentication data is wrong or your network is banned from Scratch.\n\nIf you're using an online IDE (like replit.com) Scratch possibly banned its IP adress. In this case, try logging in with your session id: https://github.com/TimMcCool/scratchattach/wiki#logging-in")
+            "Either the provided authentication data is wrong or your network is banned from Scratch.\n\nIf you're using an online IDE (like replit.com) Scratch possibly banned its IP address. In this case, try logging in with your session id: https://github.com/TimMcCool/scratchattach/wiki#logging-in")
 
     # Create session object:
     with suppress_login_warning():
@@ -1141,4 +1141,4 @@ def login_from_browser(browser: Browser = ANY):
     cookies = cookies_from_browser(browser)
     if "scratchsessionsid" in cookies:
         return login_by_id(cookies["scratchsessionsid"])
-    raise ValueError("Not enough data to log in.")
+    raise ValueError("Not enough data to log in.")

scratchattach/site/user.py

@@ -635,7 +635,7 @@ def report_comment(self, *, comment_id):
         Args:
             comment_id: The id of the comment that should be reported
         """
-        self._assert_permission()
+        self._assert_auth()
         return requests.post(
             f"https://scratch.mit.edu/site-api/comments/user/{self.username}/rep/",
             headers = headers,

tests/test_import.py

@@ -0,0 +1,4 @@
+import sys
+def test_import():
+  sys.path.insert(0, ".")
+  import scratchattach

website/source/css/style.css

@@ -1,11 +1,23 @@
-@media (max-width: 768px) {
+
+
+@media only screen and (max-width: 800px) {
     .nav-buttons {
         display: none; /* Hides the navigation buttons */
     }
+    #menu-button {
+        display: block!important;
+    }
+    .nav-buttons {
+        display: none!important; /* Hides the navigation buttons */
+    }
 
     /* You can also hide the logo if needed */
     .logo {
-        display: none; /* Hides the logo */
+        display: block; /* Hides the logo */
+    }
+
+    .logo img {
+        width: 100px!important;
     }
 
     /* Stack columns in section 1 */
@@ -19,19 +31,31 @@
         width: 80%; /* Make image responsive */
         margin-bottom: 20px; /* Add some space below the image */
     }
+
+    .expand-box {
+        width: 90%!important;
+    }
 }
 
 /* General Reset */
 * {
     margin: 0;
     padding: 0;
     box-sizing: border-box;
+    /* overflow-x: hidden; */
+}
+
+#menu-button {
+    background-color: rgba(107, 0, 0, 0);
+    color: white;
+    border: none;
 }
 
 body {
     font-family: 'IBM Plex Sans', sans-serif;
     background-color: #121212;
     color: #ffffff;
+    overflow-x: hidden;
 }
 
 /* Sticky Header */
@@ -44,8 +68,9 @@ header {
     border-bottom: 1px solid #333;
     position: sticky;
     top: 0;
-    z-index: 1000;
+    z-index: 10000000000000000000000000000000000000;
     box-shadow: 0 4px 8px rgba(0, 0, 0, 0.25); /* Added shadow for the header */
+    height: 65px;
 }
 
 .logo-section {
@@ -467,4 +492,20 @@ a {
     font-size: 14px; /* Font size for author */
     color: #aaa; /* Slightly lighter color for author */
     margin: 0;
-}
+}
+
+.menu {
+    top: 65px;
+    position: absolute;
+    width: 100vw;
+    height: 100vh;
+    background-color: rgba(0, 0, 0, 0.767);
+    backdrop-filter: blur(10px);
+    margin: 0;
+    left: 0;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    gap: 10%;
+}