fixup! [2/2] [a] Fix: Can't use curl to download a single manifest in one invocation (#5918)

Author: dsotirho-ucsc

lambdas/service/app.py

@@ -739,9 +739,9 @@ def validate_json_param(name: str, value: str) -> MutableJSON:
         raise BRE(f'The {name!r} parameter is not valid JSON')
 
 
-def validate_wait(wait: str):
+def validate_wait(wait: str | None):
     valid_values = ['0', '1']
-    if wait not in valid_values:
+    if wait not in [None, *valid_values]:
         raise BRE(f'Invalid wait value `{wait}`. Must be one of {valid_values}')
 
 
@@ -1709,8 +1709,6 @@ def _file_manifest(fetch: bool, token_or_key: Optional[str] = None):
         default_format = app.metadata_plugin.manifest_formats[0].value
         query_params.setdefault('format', default_format)
     else:
-        if not fetch:
-            query_params.setdefault('wait', '0')
         validate_params(query_params,
                         # If the initial request was a POST to the non-fetch
                         # endpoint, the 'wait' param will be carried over to

src/azul/service/manifest_controller.py

@@ -1,6 +1,9 @@
 from collections.abc import (
     Mapping,
 )
+from math import (
+    ceil,
+)
 from typing import (
     Optional,
     TypedDict,
@@ -234,8 +237,8 @@ def get_manifest_async(self,
             elif wait == '1':
                 retry_after = body.get('Retry-After')
                 if retry_after is not None:
-                    time_slept = self.server_side_sleep(retry_after)
-                    body['Retry-After'] = round(retry_after - time_slept)
+                    time_slept = self.server_side_sleep(float(retry_after))
+                    body['Retry-After'] = ceil(retry_after - time_slept)
             else:
                 assert False, wait