Merge pull request #681 from TimMcCool/semver2_fix_656

Semver2 fix 656

Author: TheCommCraft

scratchattach/cloud/_base.py

@@ -109,6 +109,12 @@ def requests(self, *, no_packet_loss: bool = False, used_cloud_vars: list[str] =
     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)
 
+    def shortterm_ratelimit_hint(self) -> float:
+        return 0.06667
+    
+    def longterm_ratelimit_hint(self) -> float:
+        return 0.1
+    
     @abstractmethod
     def create_event_stream(self) -> EventStream:
         pass
@@ -121,7 +127,7 @@ def __init__(self, cloud: BaseCloud):
         super().__init__()
         # NOTE: maybe consider using copy.copy here (copy.deepcopy doesn't work as you cannot deepcopy a Thread)
         cloud_type = type(cloud)
-        if cloud_type is cloud_module.CustomCloud:
+        if issubclass(cloud_type, cloud_module.CustomCloud):
             self.source_cloud = cloud_type(project_id=cloud.project_id, cloud_host=cloud.cloud_host)
         else:
             self.source_cloud = cloud_type(project_id=cloud.project_id)
@@ -247,6 +253,7 @@ class BaseCloud(AnyCloud[Union[str, int]]):
     ws_timeout: Optional[int]
     websocket: websocket.WebSocket
     event_stream: Optional[EventStream] = None
+    recorder: Optional[cloud_recorder.CloudRecorder]
 
     def __init__(self, *, project_id: Optional[Union[int, str]] = None, _session=None):
 
@@ -276,6 +283,16 @@ def __init__(self, *, project_id: Optional[Union[int, str]] = None, _session=Non
         self.print_connect_message = False
 
         self.project_id = project_id
+    
+    def shortterm_ratelimit_hint(self) -> float:
+        return self.ws_shortterm_ratelimit
+    
+    def longterm_ratelimit_hint(self) -> float:
+        return self.ws_longterm_ratelimit
+
+    @property
+    def var_sets_since_first(self) -> int:
+        return self.var_stets_since_first
 
     def _assert_auth(self):
         if self._session is None:
@@ -462,7 +479,7 @@ def set_vars(self, var_value_dict, *, intelligent_waits=True):
         self._send_packet_list(packet_list)
         self.last_var_set = time.time()
 
-    def get_var(self, var, *, recorder_initial_values={}):
+    def get_var(self, var, *, recorder_initial_values: Optional[dict] = None):
         var = "☁ "+var.removeprefix("☁ ")
         if self.recorder is None:
             self.recorder = cloud_recorder.CloudRecorder(self, initial_values=recorder_initial_values)
@@ -472,7 +489,7 @@ def get_var(self, var, *, recorder_initial_values={}):
                 time.sleep(0.01)
         return self.recorder.get_var(var)
 
-    def get_all_vars(self, *, recorder_initial_values={}):
+    def get_all_vars(self, *, recorder_initial_values: Optional[dict] = None):
         if self.recorder is None:
             self.recorder = cloud_recorder.CloudRecorder(self, initial_values=recorder_initial_values)
             self.recorder.start()

scratchattach/cloud/cloud.py

@@ -5,14 +5,14 @@
 
 from websocket import WebSocketBadStatusException
 
-from ._base import BaseCloud
-from typing import Type
+from ._base import BaseCloud, LogCloud
+from typing import Type, Optional
 from scratchattach.utils.requests import requests
 from scratchattach.utils import exceptions, commons
 from scratchattach.site import cloud_activity
 
 
-class ScratchCloud(BaseCloud):
+class ScratchCloud(LogCloud):
     def __init__(self, *, project_id, _session=None):
         super().__init__()
 
@@ -63,7 +63,7 @@ def logs(self, *, filter_by_var_named=None, limit=100, offset=0) -> list[cloud_a
         except Exception as e:
             raise exceptions.FetchError(str(e))
 
-    def get_var(self, var, *, use_logs=False):
+    def get_var(self, var, *, recorder_initial_values: Optional[dict] = None, use_logs=False):
         var = var.removeprefix("☁ ")
         if self._session is None or use_logs:
             filtered = self.logs(limit=100, filter_by_var_named="☁ "+var)
@@ -77,7 +77,7 @@ def get_var(self, var, *, use_logs=False):
             else:
                 return super().get_var("☁ "+var)
 
-    def get_all_vars(self, *, use_logs=False):
+    def get_all_vars(self, *, recorder_initial_values: Optional[dict] = None, use_logs=False):
         if self._session is None or use_logs:
             logs = self.logs(limit=100)
             logs.reverse()