Add timedout and canceled errors

Also changing out error codes to two digits to avoid confusion
with http error codes.

Author: dfarr

resonate/errors/errors.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import datetime
 import json
 from typing import Any
 
@@ -20,17 +21,31 @@ def __str__(self) -> str:
 
 class ResonateValidationError(ResonateError):
     def __init__(self, mesg: str) -> None:
-        super().__init__(mesg, "100")
+        super().__init__(mesg, "10")
 
 
 class ResonateShutdownError(ResonateError):
     def __init__(self, mesg: str) -> None:
-        super().__init__(mesg, "200")
+        super().__init__(mesg, "20")
 
 
 class ResonateStoreError(ResonateError):
     def __init__(self, *args: Any, **kwargs: Any) -> None:
         mesg = kwargs.pop("message", "Unknown store error")
         code = kwargs.pop("code", "0")
         details = kwargs.pop("details", [])
-        super().__init__(mesg, f"300.{code}", details)
+        super().__init__(mesg, f"30.{code}", details)
+
+
+class ResonateCanceledError(ResonateError):
+    def __init__(self, promise_id: str) -> None:
+        super().__init__(f"Promise {promise_id} canceled", "40")
+        self.promise_id = promise_id
+
+
+class ResonateTimedoutError(ResonateError):
+    def __init__(self, promise_id: str, timeout: float) -> None:
+        formatted = datetime.datetime.fromtimestamp(timeout, tz=datetime.UTC).isoformat()
+        super().__init__(f"Promise {promise_id} timedout at {formatted}", "41")
+        self.promise_id = promise_id
+        self.timeout = timeout

resonate/models/durable_promise.py

@@ -3,6 +3,7 @@
 from dataclasses import dataclass, field
 from typing import TYPE_CHECKING, Any, Literal
 
+from resonate.errors.errors import ResonateCanceledError, ResonateTimedoutError
 from resonate.models.result import Ko, Ok, Result
 
 if TYPE_CHECKING:
@@ -32,7 +33,15 @@ def params(self) -> Any:
     @property
     def result(self) -> Result:
         assert self.completed, "Promise must be completed"
-        return Ok(self.value.data) if self.resolved else Ko(self.value.data)
+
+        if self.rejected:
+            return Ko(self.value.data)
+        if self.canceled:
+            return Ko(ResonateCanceledError(self.id))
+        if self.timedout:
+            return Ko(ResonateTimedoutError(self.id, self.abs_timeout))
+
+        return Ok(self.value.data)
 
     @property
     def pending(self) -> bool:

resonate/stores/remote.py

@@ -72,18 +72,16 @@ def call(self, req: PreparedRequest) -> Any:
                         error = {"message": e.response.text, "code": 0}
 
                     # Only a 500 response code should be retried
-                    if e.response.status_code == 500 and not delay:
-                        continue
-
-                    raise ResonateStoreError(**error) from e
+                    if delay is None or e.response.status_code != 500:
+                        raise ResonateStoreError(**error) from e
                 except requests.exceptions.Timeout as e:
-                    if not delay:
+                    if delay is None:
                         raise ResonateStoreError(message="Request timed out", code=0) from e
                 except requests.exceptions.ConnectionError as e:
-                    if not delay:
+                    if delay is None:
                         raise ResonateStoreError(message="Failed to connect", code=0) from e
                 except Exception as e:
-                    if not delay:
+                    if delay is None:
                         raise ResonateStoreError(message="Unknown exception", code=0) from e
                 else:
                     return data