Added caller for REPORT_ADDR to backend.py

Redis subscriber queue patch

lib/backend.py

@@ -66,6 +66,9 @@ class Backend:
     unsecured: bool = dataclasses.field(
         default_factory=lambda: bool(strtobool(os.environ.get("UNSECURED", "false"))),
     )
+    report_addr: str = dataclasses.field(
+        default_factory=lambda: os.environ.get("REPORT_ADDR", "https://run.vast.ai")
+    )
 
     def __post_init__(self):
         self.metrics = Metrics()
@@ -104,23 +107,19 @@ class Backend:
 
     #######################################Private#######################################
     def _fetch_pubkey(self):
-        command = ["curl", "-X", "GET", "https://run.vast.ai/pubkey/"]
+        report_addr = self.report_addr.rstrip("/")
-        result = subprocess.check_output(command, universal_newlines=True)
+        command = ["curl", "-X", "GET", f"{report_addr}/pubkey/"]
-        log.debug("public key:")
+        try:
-        log.debug(result)
+            result = subprocess.check_output(command, universal_newlines=True)
-        key = None
+            log.debug("public key:")
-        for _ in range(5):
+            log.debug(result)
-            try:
+            key = RSA.import_key(result)
-                key = RSA.import_key(result)
+            if key is not None:
-                break
+                return key
-            except ValueError as e:
+        except (ValueError , subprocess.CalledProcessError) as e:
-                log.debug(f"Error downloading key: {e}")
+            log.debug(f"Error downloading key: {e}")
-                time.sleep(15)
+        self.backend_errored("Failed to get autoscaler pubkey")
-        if key is None:
+       
-            self._total_pubkey_fetch_errors += 1
-            if self._total_pubkey_fetch_errors >= MAX_PUBKEY_FETCH_ATTEMPTS:
-                self.backend_errored("Failed to get autoscaler pubkey")
-        return key
 
     async def __handle_request(
         self,
@@ -286,7 +285,7 @@ class Backend:
         message = {
             key: value
             for (key, value) in (dataclasses.asdict(auth_data).items())
-            if key != "signature"
+            if key != "signature" and key != "__request_id"
         }
         if auth_data.reqnum < (self.reqnum - MSG_HISTORY_LEN):
             log.debug(
@@ -296,7 +295,7 @@ class Backend:
         elif message in self.msg_history:
             log.debug(f"message: {message} already in message history")
             return False
-        elif verify_signature(json.dumps(message, indent=4), auth_data.signature):
+        elif verify_signature(json.dumps(message, indent=4, sort_keys=True), auth_data.signature):
             self.reqnum = max(auth_data.reqnum, self.reqnum)
             self.msg_history.append(message)
             self.msg_history = self.msg_history[-MSG_HISTORY_LEN:]

lib/data_types.py

@@ -65,12 +65,12 @@ class ApiPayload(ABC):
 class AuthData:
     """data used to authenticate requester"""
 
-    signature: str
     cost: str
     endpoint: str
     reqnum: int
-    url: str
     request_idx: int
+    signature: str
+    url: str
 
     @classmethod
     def from_json_msg(cls, json_msg: Dict[str, Any]):

lib/metrics.py

@@ -180,6 +180,10 @@ class Metrics:
             return  # nothing to do
 
         for report_addr in self.report_addr:
+            # TODO: Add a Redis subscriber queue for delete_requests
+            if report_addr == "https://cloud.vast.ai/api/v0":
+                # Patch: ignore the Redis API report_addr
+                continue
             sent_success = True
             sent_failed  = True