scratchattach 2.1.12__py3-none-any.whl → 2.1.14__py3-none-any.whl

scratchattach/utils/requests.py

@@ -1,67 +1,93 @@
 from __future__ import annotations
 
-import requests
-from . import exceptions
+from collections.abc import MutableMapping, Iterator
+from typing import Optional
+from contextlib import contextmanager
+
+from typing_extensions import override
+from requests import Session as HTTPSession
+from requests import Response
 
-proxies = None
+from . import exceptions
 
+proxies: Optional[MutableMapping[str, str]] = None
 
-class Requests:
+class Requests(HTTPSession):
     """
     Centralized HTTP request handler (for better error handling and proxies)
     """
+    error_handling: bool = True
 
-    @staticmethod
-    def check_response(r: requests.Response):
+    def check_response(self, r: Response):
         if r.status_code == 403 or r.status_code == 401:
-            raise exceptions.Unauthorized(f"Request content: {r.content}")
+            raise exceptions.Unauthorized(f"Request content: {r.content!r}")
         if r.status_code == 500:
             raise exceptions.APIError("Internal Scratch server error")
         if r.status_code == 429:
             raise exceptions.Response429("You are being rate-limited (or blocked) by Scratch")
-        if r.text == '{"code":"BadRequest","message":""}':
-            raise exceptions.BadRequest("Make sure all provided arguments are valid")
-        if r.text == '{"code":"BadRequest","message":""}':
+        if r.json() == {"code":"BadRequest","message":""}:
             raise exceptions.BadRequest("Make sure all provided arguments are valid")
 
-    @staticmethod
-    def get(url, *, data=None, json=None, headers=None, cookies=None, timeout=None, params=None):
+    @override
+    def get(self, *args, **kwargs):
+        kwargs.setdefault("proxies", proxies)
         try:
-            r = requests.get(url, data=data, json=json, headers=headers, cookies=cookies, params=params,
-                             timeout=timeout, proxies=proxies)
+            r = super().get(*args, **kwargs)
         except Exception as e:
             raise exceptions.FetchError(e)
-        Requests.check_response(r)
+        if self.error_handling:
+            self.check_response(r)
         return r
 
-    @staticmethod
-    def post(url, *, data=None, json=None, headers=None, cookies=None, timeout=None, params=None, files=None, errorhandling=True, ):
+    @override
+    def post(self, *args, **kwargs):
+        kwargs.setdefault("proxies", proxies)
         try:
-            r = requests.post(url, data=data, json=json, headers=headers, cookies=cookies, params=params,
-                              timeout=timeout, proxies=proxies, files=files)
+            r = super().post(*args, **kwargs)
         except Exception as e:
             raise exceptions.FetchError(e)
-        if errorhandling:
-            Requests.check_response(r)
+        if self.error_handling:
+            self.check_response(r)
         return r
 
-    @staticmethod
-    def delete(url, *, data=None, json=None, headers=None, cookies=None, timeout=None, params=None):
+    @override
+    def delete(self, *args, **kwargs):
+        kwargs.setdefault("proxies", proxies)
         try:
-            r = requests.delete(url, data=data, json=json, headers=headers, cookies=cookies, params=params,
-                                timeout=timeout, proxies=proxies)
+            r = super().delete(*args, **kwargs)
         except Exception as e:
             raise exceptions.FetchError(e)
-        Requests.check_response(r)
+        if self.error_handling:
+            self.check_response(r)
         return r
 
-    @staticmethod
-    def put(url, *, data=None, json=None, headers=None, cookies=None, timeout=None, params=None):
+    @override
+    def put(self, *args, **kwargs):
+        kwargs.setdefault("proxies", proxies)
         try:
-            r = requests.put(url, data=data, json=json, headers=headers, cookies=cookies, params=params,
-                             timeout=timeout, proxies=proxies)
+            r = super().put(*args, **kwargs)
         except Exception as e:
             raise exceptions.FetchError(e)
-        Requests.check_response(r)
+        if self.error_handling:
+            self.check_response(r)
         return r
+    
+    @contextmanager
+    def no_error_handling(self) -> Iterator[None]:
+        val_before = self.error_handling
+        self.error_handling = False
+        try:
+            yield
+        finally:
+            self.error_handling = val_before
+    
+    @contextmanager
+    def yes_error_handling(self) -> Iterator[None]:
+        val_before = self.error_handling
+        self.error_handling = True
+        try:
+            yield
+        finally:
+            self.error_handling = val_before
 
+requests = Requests()

{scratchattach-2.1.12.dist-info → scratchattach-2.1.14.dist-info}/METADATA

@@ -1,10 +1,11 @@
 Metadata-Version: 2.4
 Name: scratchattach
-Version: 2.1.12
+Version: 2.1.14
 Summary: A Scratch API Wrapper
-Home-page: https://scratchattach.tim1de.net
 Author: TimMcCool
 Author-email: 
+Project-URL: Source, https://github.com/timmccool/scratchattach
+Project-URL: Homepage, https://scratchattach.tim1de.net
 Keywords: scratch api,scratchattach,scratch api python,scratch python,scratch for python,scratch,scratch cloud,scratch cloud variables,scratch bot
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
@@ -18,13 +19,18 @@ Requires-Dist: websocket-client
 Requires-Dist: requests
 Requires-Dist: bs4
 Requires-Dist: SimpleWebSocketServer
+Requires-Dist: typing-extensions
+Requires-Dist: browser_cookie3
+Provides-Extra: lark
+Requires-Dist: lark; extra == "lark"
 Dynamic: author
 Dynamic: classifier
 Dynamic: description
 Dynamic: description-content-type
-Dynamic: home-page
 Dynamic: keywords
 Dynamic: license-file
+Dynamic: project-url
+Dynamic: provides-extra
 Dynamic: requires-dist
 Dynamic: summary
 

scratchattach-2.1.14.dist-info/RECORD

@@ -0,0 +1,66 @@
+scratchattach/__init__.py,sha256=2iiV0SghFUyJJrJYt668cSoDrxSjLCWNtzMdhttnMdA,1532
+scratchattach/cloud/__init__.py,sha256=MN7s4grQcciqUO7TiFjTbU2sC69m6XXlwOHNRbN3FKo,41
+scratchattach/cloud/_base.py,sha256=wQDBIjrEtGSleKnAghluvZGX1L7U0wpUry_3MD8-VkY,18060
+scratchattach/cloud/cloud.py,sha256=f3qGy7rhpyuhOlVfki3l8FdMpyFtcVTBg9ql6l0J-jI,8167
+scratchattach/editor/__init__.py,sha256=gfTQrtyQ-oZJBanp-5eNae72cwm4WoKHzNtZ4rn1dqg,727
+scratchattach/editor/asset.py,sha256=8rQmaZCO4tMjnohutfvVha2t5x_ct2Rxn_Q9Dz6DCYI,7734
+scratchattach/editor/backpack_json.py,sha256=PZGNIFNf0MS3hn8cKZEp9ZeQWdBE-xWq5PEwiN8IzWM,3900
+scratchattach/editor/base.py,sha256=AP_JktO6NLxpsh00twnKHkXmzLmATFabfmw1tmWh98c,5412
+scratchattach/editor/block.py,sha256=B7II4ICOLxdN_D_rn3LH4njRmkZLisxcPzg4WAyNIXA,18786
+scratchattach/editor/blockshape.py,sha256=DN9aKjd22OdvS4ulThJPFGq9uBAA8DNGwnq5Dv2cLNo,25284
+scratchattach/editor/build_defaulting.py,sha256=BkD81lTaR1LTv8HwwkxGtQ040G2Y6mh1R6fCZIkfkYM,1386
+scratchattach/editor/comment.py,sha256=G_eFxeaC_vKbCFpDfw4oZxIReUBoBUaCA5q35O-AW6Y,2403
+scratchattach/editor/commons.py,sha256=RWynsm3LhPMRRbcFd2kT_CRgsvPx6uvKyK3ISYpNoDg,7638
+scratchattach/editor/extension.py,sha256=PFVl5SrS66M4Md98I_dsfeL9BLeWwvyWezmhnTRseIQ,1541
+scratchattach/editor/field.py,sha256=3JUBwj-Mun36Yb7KDeQIWZcuj0e4kjkVAwk_9cKfQPY,3002
+scratchattach/editor/inputs.py,sha256=JGFKry9m8IHNw9zoyM6iViEbPp1VlHlVPI9fYoiTk3M,4391
+scratchattach/editor/meta.py,sha256=aTP5Imz2cFI_RDA4Lufa5UV64lgk3-TP3B4fd7t0zio,3202
+scratchattach/editor/monitor.py,sha256=q-RrycEpYa3rHZ0_9RZobIS8Sfbmpx7_cdUFEaoA7Yk,5788
+scratchattach/editor/mutation.py,sha256=NKLVae0A6J0CKl1Xm7jpdNNoyGFtwcmU-LiBfYpvtlU,10399
+scratchattach/editor/pallete.py,sha256=-CbTRHsgpiVomal1ohW0ouuSP-hCsPTApgRohfxRPfI,2348
+scratchattach/editor/prim.py,sha256=WAXMQ5C5FYIk-gNLwH1cnhsMQJpxH0yl_YH0Tcju9IU,5877
+scratchattach/editor/project.py,sha256=D6gtmfGu0y3_Wzyhq-bjPRzVERFGH_b1DCUVHS9HBtY,9138
+scratchattach/editor/sprite.py,sha256=BG8--SNvj2HYre3pGKEpvnq2Qpl3h_qDseKxIxfWL38,20862
+scratchattach/editor/twconfig.py,sha256=iE6ylAsZzniAfhL09GkZSFn1XacYtCQPzRCUSPIBzDA,3324
+scratchattach/editor/vlb.py,sha256=ZUlrA52ZoK5znGkBUw10UGejpvBlpkH635pTl9sUAmM,4170
+scratchattach/editor/code_translation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+scratchattach/editor/code_translation/parse.py,sha256=FjuHVg_tNzkGcGSNwgH6MzAHcf5YCvaEUSYukyJkwbk,4932
+scratchattach/eventhandlers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+scratchattach/eventhandlers/_base.py,sha256=XGsGzsmUBy5IV3Cl0akEmwBsaSyfVNs0YbNS7lktxrw,3099
+scratchattach/eventhandlers/cloud_events.py,sha256=B0Ce0y8HKP2fOJ3zIUdJg8tHGYoGpc42e4ktuLL_bRw,4108
+scratchattach/eventhandlers/cloud_recorder.py,sha256=o4wcWJFCddpcSsPx5YU2DFFMFoKUknKM2RQ36HLpheQ,800
+scratchattach/eventhandlers/cloud_requests.py,sha256=B_ybgcQ3S861KUNIYv3kOc0siO8BP1Ez57zE1GypTJg,22121
+scratchattach/eventhandlers/cloud_server.py,sha256=rgY0lcXO-E_iAu4oVvbshIfG7eMw0Ekz4_GOLTxCzmM,12302
+scratchattach/eventhandlers/cloud_storage.py,sha256=9dvKPxbPZ_hBhw1HYlTl72YJmBo2OMwrSrMQ7kQwwOE,4660
+scratchattach/eventhandlers/combine.py,sha256=YiWI6WI1BySioXpfYaMv8noBM14EjZa7dtsJsMTshEU,894
+scratchattach/eventhandlers/filterbot.py,sha256=RvGCm-2iaC8SAC4nDMlDv0MPp80CsRr4CFGmnIuEfg8,7462
+scratchattach/eventhandlers/message_events.py,sha256=KvznXAeNGk1WWCxd7PI95yovX-58TyCBNDdXbrYgb8Q,1776
+scratchattach/other/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+scratchattach/other/other_apis.py,sha256=iJXytVgAIARWQ_z7t99Lv2oB6DdwrFBmkFxiaHQRKLI,9095
+scratchattach/other/project_json_capabilities.py,sha256=07t1iMgWm4Qd06jHyQ3vK7tROguvc2RQCo78enrdSlA,22646
+scratchattach/site/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+scratchattach/site/_base.py,sha256=v2U0V-2T5QnDGtUDVPR1e4qg9R7rpNYmO8YKA5fIXfg,2249
+scratchattach/site/activity.py,sha256=4fohsjeVJFaMnKE6_Ew8DcDpFfDzwPeZ7XGp5NnCMW8,13786
+scratchattach/site/alert.py,sha256=TX_Py5L7IKmXEPFGIOFIGvqlT8aSigywsR5nODkvwFY,9277
+scratchattach/site/backpack_asset.py,sha256=8AKvDTvaTvN2ntqE3Ygkl0mvu6-ZR-DbLkCszv2h70o,3298
+scratchattach/site/browser_cookie3_stub.py,sha256=codk0knOP5C0YThaRazvqsqX7X7WnrD2UwFd1nFG7mg,1422
+scratchattach/site/browser_cookies.py,sha256=uQyjJJ4HCu46R4tPWCcTUqDMXSXhQ4KQUobqCSxScSA,1864
+scratchattach/site/classroom.py,sha256=2IDLDljEDLp8Vj5ab94Ti_VVBCv8OPS7qNVr1zFBCME,16884
+scratchattach/site/cloud_activity.py,sha256=x0kbd9Zx1dI4s0lJXWNixQCJeKG1CchXK-9867RiK1A,4207
+scratchattach/site/comment.py,sha256=733CDTV7227MxrhRM0dQYF06aDbHVFK-_rECz--grvA,9135
+scratchattach/site/forum.py,sha256=Y7sh3-wcEjRBfKEHOcusudSudCJFe4MuQFd-EB4FccQ,16417
+scratchattach/site/project.py,sha256=jc6NpzCdC4ATTfCvsAKWlRqj-cTv_B7ZnWHxOn2-qyI,31602
+scratchattach/site/session.py,sha256=SQd6om7jxTrmQ5BjFrwGucYAWaBspn24rVunnepf760,50868
+scratchattach/site/studio.py,sha256=a20fzNq2GGN0SbyC7_d6UqmCqDgofZjdiMucp9KHnYE,22942
+scratchattach/site/user.py,sha256=v6cLI1t465DHTT2xuWd-pXThL1QPDT7GGDcXgOBxaLE,39483
+scratchattach/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+scratchattach/utils/commons.py,sha256=BKH-zz2A5e1d5qEtvZvAmK5fXyVq-FGRRw3Wx-StG5E,8213
+scratchattach/utils/encoder.py,sha256=rqJfQ5gmjf7s8aTiGhR0W1ejYN5tHbAgJlxv7JhGqZQ,2479
+scratchattach/utils/enums.py,sha256=GFLI3F0ZWGqicKV_QJwhyz4MiPDdstAJaUBxYDYT9to,11091
+scratchattach/utils/exceptions.py,sha256=AyM9lU009irxaJvMPB0N0kQaVAJeWHjlmQIS6Njgo78,6528
+scratchattach/utils/requests.py,sha256=vf7OaASbC9_qp4ygOGcU2PjWvf7dwgGbsluZiKGyRMg,2832
+scratchattach-2.1.14.dist-info/licenses/LICENSE,sha256=1PRKLhZU4wYt5M-C9f7q0W3go3u_ojnZMNOdR3g3J-E,1080
+scratchattach-2.1.14.dist-info/METADATA,sha256=gFk55C4GbrDmgPuq7qfJel_qezQF5jtydFt8T_zO_co,5687
+scratchattach-2.1.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+scratchattach-2.1.14.dist-info/top_level.txt,sha256=gIwCwW39ohXn0JlnvSzAjV7VtL3qPlRnHiRqBbxsEUE,14
+scratchattach-2.1.14.dist-info/RECORD,,

{scratchattach-2.1.12.dist-info → scratchattach-2.1.14.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any