Replace RequestError for ErrorInResponseError

beekeepy/beekeepy/_interface/delay_guard.py

@@ -6,7 +6,7 @@ from datetime import datetime, timedelta, timezone
 from typing import TYPE_CHECKING, Final
 
 from helpy import ContextAsync, ContextSync
-from helpy.exceptions import RequestError
+from helpy.exceptions import ErrorInResponseError
 
 if TYPE_CHECKING:
     from types import TracebackType
@@ -24,7 +24,7 @@ class DelayGuardBase:
         return self._next_time_unlock is not None and self.__now() < self._next_time_unlock
 
     def _handle_exception_impl(self, ex: BaseException, _: TracebackType | None) -> bool:
-        self._exception_occured = isinstance(ex, RequestError)
+        self._exception_occured = isinstance(ex, ErrorInResponseError)
         self._next_time_unlock = self.__now() + self.BEEKEEPER_DELAY_TIME
         return False
 

beekeepy/beekeepy/exceptions/detectable.py

 from __future__ import annotations
 
 from beekeepy.exceptions.base import DetectableError, SchemaDetectableError
-from helpy.exceptions import RequestError
+from helpy import exceptions as helpy_errors
 
 
 class NoWalletWithSuchNameError(DetectableError):
@@ -18,7 +18,7 @@ class NoWalletWithSuchNameError(DetectableError):
 
     def _is_exception_handled(self, ex: BaseException) -> bool:
         return (
-            isinstance(ex, RequestError)
+            isinstance(ex, helpy_errors.ErrorInResponseError)
             and "Assert Exception:_new_item->load_wallet_file(): Unable to open file: " in ex.error
             and f"{self.wallet_name}.wallet" in ex.error
         )
@@ -38,7 +38,7 @@ class WalletWithSuchNameAlreadyExistsError(DetectableError):
 
     def _is_exception_handled(self, ex: BaseException) -> bool:
         return (
-            isinstance(ex, RequestError)
+            isinstance(ex, helpy_errors.ErrorInResponseError)
             and f"Assert Exception:!bfs::exists(wallet_filename): Wallet with name: '{self.wallet_name}' already exists"
             in ex.error
         )
@@ -56,7 +56,10 @@ class InvalidPrivateKeyError(DetectableError):
         super().__init__(f"given private key or keys are invalid: `{wifs}`")
 
     def _is_exception_handled(self, ex: BaseException) -> bool:
-        return isinstance(ex, RequestError) and "Assert Exception:false: Key can't be constructed" in ex.error
+        return (
+            isinstance(ex, helpy_errors.ErrorInResponseError)
+            and "Assert Exception:false: Key can't be constructed" in ex.error
+        )
 
 
 class NotExistingKeyError(DetectableError):
@@ -73,7 +76,7 @@ class NotExistingKeyError(DetectableError):
         super().__init__(f"cannot use key that does not exist: `{public_key}`")
 
     def _is_exception_handled(self, ex: BaseException) -> bool:
-        return isinstance(ex, RequestError) and any(
+        return isinstance(ex, helpy_errors.ErrorInResponseError) and any(
             error_message in ex.error
             for error_message in [
                 "Assert Exception:false: Key not in wallet",
@@ -96,7 +99,7 @@ class MissingSTMPrefixError(DetectableError):
 
     def _is_exception_handled(self, ex: BaseException) -> bool:
         return (
-            isinstance(ex, RequestError)
+            isinstance(ex, helpy_errors.ErrorInResponseError)
             and (
                 "Assert Exception:source.substr( 0, prefix.size() ) == prefix: "
                 "public key requires STM prefix, but was given "
@@ -118,7 +121,7 @@ class InvalidPublicKeyError(DetectableError):
         super().__init__(f"Given public key or keys are invalid: `{public_keys}`")
 
     def _is_exception_handled(self, ex: BaseException) -> bool:
-        return isinstance(ex, RequestError) and "Assert Exception:s == sizeof(data):" in ex.error
+        return isinstance(ex, helpy_errors.ErrorInResponseError) and "Assert Exception:s == sizeof(data):" in ex.error
 
 
 class InvalidWalletError(DetectableError):
@@ -136,7 +139,7 @@ class InvalidWalletError(DetectableError):
         )
 
     def _is_exception_handled(self, ex: BaseException) -> bool:
-        return isinstance(ex, RequestError) and any(
+        return isinstance(ex, helpy_errors.ErrorInResponseError) and any(
             error_message in ex.error
             for error_message in [
                 "Name of wallet is incorrect. Is empty."
@@ -160,7 +163,7 @@ class InvalidPasswordError(DetectableError):
 
     def _is_exception_handled(self, ex: BaseException) -> bool:
         return (
-            isinstance(ex, RequestError)
+            isinstance(ex, helpy_errors.ErrorInResponseError)
             and "Assert Exception:false: Invalid password for wallet:" in ex.error
             and f"{self.wallet_name}.walletrethrow" in ex.error
         )

helpy/helpy/exceptions.py

@@ -51,34 +51,6 @@ class BlockWaitTimeoutError(HelpyError):
         )
 
 
-class RequestError(HelpyError):
-    """Raised if error field is in the response."""
-
-    def __init__(self, send: str, error: str | JsonT) -> None:
-        """
-        Initialize a RequestError.
-
-        Parameters:
-        - send (str): The request sent.
-        - error (str | JsonT): The error received in response.
-
-        Returns:
-        None
-        """
-        self.send = send
-        self.error = self.__try_extract_exception_message(error)
-        super().__init__(f"{send=} | {self.error=}")
-
-    def __try_extract_exception_message(self, error: str | JsonT) -> str | JsonT:
-        try:
-            parsed_error = json.loads(error) if isinstance(error, str) else error
-            if not isinstance(error, dict):
-                return error
-            return parsed_error.get("message", error)  # type: ignore[no-any-return]
-        except json.JSONDecodeError:
-            return error
-
-
 class BatchRequestError(HelpyError):
     """Base class for batch related errors."""
 
@@ -289,9 +261,9 @@ class ErrorInResponseError(OverseerError):
         request_id: int | None,
     ) -> None:
         super().__init__(
-            url,
-            request,
-            response,
+            url=url,
+            request=request,
+            response=response,
             message=message,
             request_id=request_id,
             whole_response=whole_response,
@@ -301,6 +273,23 @@ class ErrorInResponseError(OverseerError):
     def retry(self) -> bool:
         return False
 
+    @property
+    def error(self) -> str:
+        if self.__error is None:
+            result = self._extract_error_messages(response=self.__get_suitable_response())
+            self.__error = (result or [""])[0]
+        return self.__error
+
+    def __get_suitable_response(self) -> Json | str | None:
+        if isinstance(self.response, list):
+            if self.request_id is None:
+                return None
+            for item in self.response:
+                if item.get("id", {}) == self.request_id:
+                    return item
+            return None
+        return self.response
+
 
 class GroupedErrorsError(HelpyError):
     def __init__(self, exceptions: Sequence[Exception]) -> None:

tests/beekeepy_test/handle/api_tests/test_api_close.py

@@ -6,7 +6,7 @@ import pytest
 from local_tools.beekeepy.generators import generate_wallet_name, generate_wallet_password
 from local_tools.beekeepy.models import WalletInfo
 
-from helpy.exceptions import RequestError
+from helpy.exceptions import ErrorInResponseError
 
 if TYPE_CHECKING:
     from beekeepy._handle import Beekeeper
@@ -35,7 +35,7 @@ def test_api_close_import_key_to_closed_wallet(
     beekeeper.api.close(wallet_name=wallet.name)
 
     # ACT & ASSERT
-    with pytest.raises(RequestError, match=f"Wallet not found: {wallet.name}"):
+    with pytest.raises(ErrorInResponseError, match=f"Wallet not found: {wallet.name}"):
         beekeeper.api.import_key(wif_key=keys_to_import[0].private_key, wallet_name=wallet.name)
 
 
@@ -50,7 +50,7 @@ def test_api_close_double_close(
     beekeeper.api.close(wallet_name=wallet.name)
 
     # ASSERT
-    with pytest.raises(RequestError, match=f"Wallet not found: {wallet.name}"):
+    with pytest.raises(ErrorInResponseError, match=f"Wallet not found: {wallet.name}"):
         beekeeper.api.close(wallet_name=wallet.name)
 
 
@@ -60,5 +60,5 @@ def test_api_close_not_existing_wallet(beekeeper: Beekeeper) -> None:
     wallet = WalletInfo(password=generate_wallet_password(), name=generate_wallet_name())
 
     # ACT & ASSERT
-    with pytest.raises(RequestError, match=f"Wallet not found: {wallet.name}"):
+    with pytest.raises(ErrorInResponseError, match=f"Wallet not found: {wallet.name}"):
         beekeeper.api.close(wallet_name=wallet.name)

tests/beekeepy_test/handle/api_tests/test_api_close_session.py

@@ -5,7 +5,7 @@ from typing import TYPE_CHECKING, Final
 import pytest
 from local_tools.beekeepy import checkers, waiters
 
-from helpy.exceptions import CommunicationError, RequestError
+from helpy.exceptions import CommunicationError, ErrorInResponseError
 
 if TYPE_CHECKING:
     from beekeepy._handle import Beekeeper
@@ -24,7 +24,7 @@ def test_api_close_session(beekeeper: Beekeeper) -> None:
         f'"params":{{"token":"{beekeeper.session.token}"}}'
     )
     with pytest.raises(
-        RequestError,
+        ErrorInResponseError,
         match=f"A session attached to {beekeeper.session.token} doesn't exist",
     ):
         beekeeper.api.close_session()
@@ -58,7 +58,7 @@ def test_api_close_session_double(beekeeper: Beekeeper) -> None:
 
     # ASSERT
     with pytest.raises(
-        RequestError,
+        ErrorInResponseError,
         match=f"A session attached to {beekeeper.session.token} doesn't exist",
     ):
         beekeeper.api.close_session()
@@ -77,5 +77,5 @@ def test_api_close_session_not_existing(create_session: bool, beekeeper: Beekeep
 
     # ACT & ASSERT
     beekeeper.set_session_token(WRONG_TOKEN)
-    with pytest.raises(RequestError, match=f"A session attached to {WRONG_TOKEN} doesn't exist"):
+    with pytest.raises(ErrorInResponseError, match=f"A session attached to {WRONG_TOKEN} doesn't exist"):
         beekeeper.api.close_session()

tests/beekeepy_test/handle/api_tests/test_api_create.py

@@ -6,7 +6,7 @@ import pytest
 from local_tools.beekeepy.generators import generate_wallet_name, generate_wallet_password
 from local_tools.beekeepy.models import WalletInfo
 
-from helpy.exceptions import RequestError
+from helpy.exceptions import ErrorInResponseError
 
 if TYPE_CHECKING:
     from beekeepy._handle import Beekeeper
@@ -42,7 +42,7 @@ def test_api_create_double_same_wallet(beekeeper: Beekeeper) -> None:
 
     # ACT & ASSERT
     beekeeper.api.create(wallet_name=wallet.name, password=wallet.password)
-    with pytest.raises(RequestError, match=f"Wallet with name: '{wallet.name}' already exists"):
+    with pytest.raises(ErrorInResponseError, match=f"Wallet with name: '{wallet.name}' already exists"):
         beekeeper.api.create(wallet_name=wallet.name, password=wallet.password)
 
     # ASSERT
@@ -80,7 +80,7 @@ def test_api_create_correct_wallet_name(beekeeper: Beekeeper, name: str) -> None
 def test_api_create_verify_not_allowed_chars(beekeeper: Beekeeper, name: str) -> None:
     """Test test_api_create will test beekeeper_api.create will check all not allowed wallet name chars."""
     # ARRANGE & ACT & ASSERT
-    with pytest.raises(RequestError, match="Name of wallet is incorrect."):
+    with pytest.raises(ErrorInResponseError, match="Name of wallet is incorrect."):
         beekeeper.api.create(wallet_name=name)
 
     # ASSERT
@@ -95,7 +95,7 @@ def test_api_create_verify_not_allowed_chars(beekeeper: Beekeeper, name: str) ->
 def test_api_create_not_correct_wallet_name(beekeeper: Beekeeper, name: str) -> None:
     """Test test_api_create will test beekeeper_api.create will try to create wallet with wrong name."""
     # ARRANGE & ACT & ASSERT
-    with pytest.raises(RequestError, match="Name of wallet is incorrect."):
+    with pytest.raises(ErrorInResponseError, match="Name of wallet is incorrect."):
         beekeeper.api.create(wallet_name=name)
 
     # ASSERT

tests/beekeepy_test/handle/api_tests/test_api_create_session.py

@@ -6,7 +6,7 @@ import pytest
 from local_tools.beekeepy import checkers
 from local_tools.beekeepy.constants import MAX_BEEKEEPER_SESSION_AMOUNT
 
-from helpy.exceptions import RequestError
+from helpy.exceptions import ErrorInResponseError
 
 if TYPE_CHECKING:
     from beekeepy._handle import Beekeeper
@@ -53,7 +53,7 @@ def test_api_create_session_max_sessions(beekeeper: Beekeeper) -> None:
 
     # ASSERT
     with pytest.raises(
-        RequestError,
+        ErrorInResponseError,
         match=f"Number of concurrent sessions reached a limit ==`{MAX_BEEKEEPER_SESSION_AMOUNT}`",
     ):
         create_session(beekeeper, salt)

tests/beekeepy_test/handle/api_tests/test_api_get_public_keys.py

@@ -4,7 +4,7 @@ from typing import TYPE_CHECKING
 
 import pytest
 
-from helpy.exceptions import RequestError
+from helpy.exceptions import ErrorInResponseError
 
 if TYPE_CHECKING:
     from local_tools.beekeepy.models import WalletInfo, WalletsGeneratorT
@@ -44,7 +44,7 @@ def test_api_get_public_keys_with_different_wallet_name(beekeeper: Beekeeper, wa
     not_existing_wallet_name = "not-existing"
 
     # ACT & ASSERT
-    with pytest.raises(RequestError, match=f"Wallet {not_existing_wallet_name} is locked"):
+    with pytest.raises(ErrorInResponseError, match=f"Wallet {not_existing_wallet_name} is locked"):
         beekeeper.api.get_public_keys(wallet_name=not_existing_wallet_name)
 
 
@@ -80,7 +80,7 @@ def test_api_get_public_keys_with_many_wallets(beekeeper: Beekeeper, setup_walle
     # Lock wallet 1
     beekeeper.api.lock(wallet_name=wallet_1.name)
     # Now all wallet are closed, so that no key should be available
-    with pytest.raises(RequestError, match="You don't have any unlocked wallet"):
+    with pytest.raises(ErrorInResponseError, match="You don't have any unlocked wallet"):
         beekeeper.api.get_public_keys()
 
 
@@ -116,5 +116,5 @@ def test_api_get_public_keys_with_many_wallets_closed(beekeeper: Beekeeper, setu
     # Close wallet 1,
     beekeeper.api.close(wallet_name=wallet_1.name)
     # There is no wallet
-    with pytest.raises(RequestError, match="You don't have any wallet"):
+    with pytest.raises(ErrorInResponseError, match="You don't have any wallet"):
         beekeeper.api.get_public_keys()

tests/beekeepy_test/handle/api_tests/test_api_import_key.py

@@ -4,7 +4,7 @@ from typing import TYPE_CHECKING
 
 import pytest
 
-from helpy.exceptions import RequestError
+from helpy.exceptions import ErrorInResponseError
 
 if TYPE_CHECKING:
     from local_tools.beekeepy.models import WalletInfo, WalletsGeneratorT
@@ -34,7 +34,7 @@ def test_api_import_key_to_locked(
     beekeeper.api.lock(wallet_name=wallet.name)
 
     # ASSERT
-    with pytest.raises(RequestError, match=f"Wallet is locked: {wallet.name}"):
+    with pytest.raises(ErrorInResponseError, match=f"Wallet is locked: {wallet.name}"):
         beekeeper.api.import_key(wallet_name=wallet.name, wif_key=keys_to_import[0].private_key)
 
 
@@ -46,5 +46,5 @@ def test_api_import_key_to_closed(
     beekeeper.api.close(wallet_name=wallet.name)
 
     # ASSERT
-    with pytest.raises(RequestError, match=f"Wallet not found: {wallet.name}"):
+    with pytest.raises(ErrorInResponseError, match=f"Wallet not found: {wallet.name}"):
         beekeeper.api.import_key(wallet_name=wallet.name, wif_key=keys_to_import[0].private_key)

tests/beekeepy_test/handle/api_tests/test_api_lock.py

@@ -4,7 +4,7 @@ from typing import TYPE_CHECKING
 
 import pytest
 
-from helpy.exceptions import RequestError
+from helpy.exceptions import ErrorInResponseError
 
 if TYPE_CHECKING:
     from local_tools.beekeepy.models import WalletInfo, WalletsGeneratorT
@@ -36,14 +36,14 @@ def test_api_lock_locked_wallet(beekeeper: Beekeeper, wallet: WalletInfo) -> Non
     beekeeper.api.lock(wallet_name=wallet.name)
 
     # ASSERT
-    with pytest.raises(RequestError, match="Unable to lock a locked wallet"):
+    with pytest.raises(ErrorInResponseError, match="Unable to lock a locked wallet"):
         beekeeper.api.lock(wallet_name=wallet.name)
 
 
 def test_api_lock_unknown_wallet(beekeeper: Beekeeper) -> None:
     """Test test_api_lock_unknown_wallet will try to lock unknown wallet."""
     # ARRANGE & ACT & ASSERT
-    with pytest.raises(RequestError, match="Wallet not found"):
+    with pytest.raises(ErrorInResponseError, match="Wallet not found"):
         beekeeper.api.lock(wallet_name="name")
 
 

tests/beekeepy_test/handle/api_tests/test_api_remove_key.py

@@ -5,7 +5,7 @@ from typing import TYPE_CHECKING
 import pytest
 
 from helpy import AccountCredentials
-from helpy.exceptions import RequestError
+from helpy.exceptions import ErrorInResponseError
 from schemas.fields.basic import PublicKey
 
 if TYPE_CHECKING:
@@ -39,7 +39,7 @@ def test_api_remove_key_from_locked(beekeeper: Beekeeper, wallet: WalletInfo, ac
     beekeeper.api.lock(wallet_name=wallet.name)
 
     # ASSERT
-    with pytest.raises(RequestError, match=f"Wallet is locked: {wallet.name}"):
+    with pytest.raises(ErrorInResponseError, match=f"Wallet is locked: {wallet.name}"):
         beekeeper.api.remove_key(
             wallet_name=wallet.name,
             public_key=account.public_key,
@@ -52,7 +52,7 @@ def test_api_remove_key_from_closed(beekeeper: Beekeeper, wallet: WalletInfo, ac
     beekeeper.api.close(wallet_name=wallet.name)
 
     # ASSERT
-    with pytest.raises(RequestError, match=f"Wallet not found: {wallet.name}"):
+    with pytest.raises(ErrorInResponseError, match=f"Wallet not found: {wallet.name}"):
         beekeeper.api.remove_key(
             wallet_name=wallet.name,
             public_key=account.public_key,

tests/beekeepy_test/handle/api_tests/test_api_sign_digest.py

@@ -5,7 +5,7 @@ from typing import TYPE_CHECKING, Final
 import pytest
 from local_tools.beekeepy.constants import DIGEST_TO_SIGN
 
-from helpy.exceptions import RequestError
+from helpy.exceptions import ErrorInResponseError
 
 if TYPE_CHECKING:
     from local_tools.beekeepy.models import WalletInfo
@@ -46,7 +46,7 @@ def test_api_sign_digest_with_different_wallet_name(beekeeper: Beekeeper, wallet
 
     # ACT & ASSERT
     with pytest.raises(
-        RequestError,
+        ErrorInResponseError,
         match=f"Public key {PUBLIC_KEY} not found in {not_existing_wallet_name} wallet",
     ):
         beekeeper.api.sign_digest(
@@ -73,7 +73,7 @@ def test_api_sign_digest_with_deleted_key(beekeeper: Beekeeper, wallet: WalletIn
     )
 
     # ACT & ASSERT
-    with pytest.raises(RequestError, match=f"Public key {PUBLIC_KEY} not found in unlocked wallets"):
+    with pytest.raises(ErrorInResponseError, match=f"Public key {PUBLIC_KEY} not found in unlocked wallets"):
         beekeeper.api.sign_digest(sig_digest=DIGEST_TO_SIGN, public_key=PUBLIC_KEY)
 
 
@@ -91,7 +91,7 @@ def test_api_sign_digest_with_closed_wallet(beekeeper: Beekeeper, wallet: Wallet
     beekeeper.api.close(wallet_name=wallet.name)
 
     # ACT & ASSERT
-    with pytest.raises(RequestError, match=f"Public key {PUBLIC_KEY} not found in unlocked wallets"):
+    with pytest.raises(ErrorInResponseError, match=f"Public key {PUBLIC_KEY} not found in unlocked wallets"):
         beekeeper.api.sign_digest(sig_digest=DIGEST_TO_SIGN, public_key=PUBLIC_KEY)
 
 
@@ -131,5 +131,5 @@ def test_api_sign_digest_with_locked_wallet(beekeeper: Beekeeper, wallet: Wallet
     beekeeper.api.lock(wallet_name=wallet.name)
 
     # ACT & ASSERT
-    with pytest.raises(RequestError, match=f"Public key {PUBLIC_KEY} not found in unlocked wallets"):
+    with pytest.raises(ErrorInResponseError, match=f"Public key {PUBLIC_KEY} not found in unlocked wallets"):
         beekeeper.api.sign_digest(sig_digest=DIGEST_TO_SIGN, public_key=PUBLIC_KEY)

tests/beekeepy_test/handle/api_tests/test_api_unlock.py

@@ -5,8 +5,7 @@ from typing import TYPE_CHECKING
 import pytest
 from local_tools.beekeepy.generators import generate_wallet_name, generate_wallet_password
 
-from helpy.exceptions import RequestError
-from helpy.exceptions import InvalidPasswordError
+from helpy.exceptions import InvalidPasswordError, ErrorInResponseError
 
 if TYPE_CHECKING:
     from local_tools.beekeepy.models import WalletInfo, WalletsGeneratorT
@@ -37,7 +36,7 @@ def test_api_unlock_already_unclocked_wallet(beekeeper: Beekeeper, wallet: Walle
     assert bk_wallet.unlocked is True, "Wallet should be unlocked."
 
     # ACT & ASSERT
-    with pytest.raises(RequestError, match=f"Wallet is already unlocked: {wallet.name}"):
+    with pytest.raises(ErrorInResponseError, match=f"Wallet is already unlocked: {wallet.name}"):
         beekeeper.api.unlock(wallet_name=wallet.name, password=wallet.password)
 
 
@@ -58,7 +57,7 @@ def test_api_unlock_created_but_closed_wallet(beekeeper: Beekeeper, wallet: Wall
 def test_api_unlock_unknown_wallet(beekeeper: Beekeeper) -> None:
     """Test test_api_unlock_unknown_wallet will try to unlock unknown wallet."""
     # ARRANGE & ACT & ASSERT
-    with pytest.raises(RequestError, match="Unable to open file"):
+    with pytest.raises(ErrorInResponseError, match="Unable to open file"):
         beekeeper.api.unlock(password=generate_wallet_password(99), wallet_name=generate_wallet_name(99))
 
 

tests/beekeepy_test/handle/basic/test_wallet.py

@@ -6,7 +6,7 @@ from typing import TYPE_CHECKING, Final
 
 import pytest
 
-from helpy.exceptions import RequestError
+from helpy.exceptions import ErrorInResponseError
 
 if TYPE_CHECKING:
     from local_tools.beekeepy.models import WalletInfo
@@ -37,7 +37,7 @@ def test_create_wallet(beekeeper: Beekeeper, wallet_name: str) -> None:
 )
 def test_invalid_wallet_names(beekeeper: Beekeeper, invalid_wallet_name: str) -> None:
     # ARRANGE, ACT & ASSERT
-    with pytest.raises(RequestError):
+    with pytest.raises(ErrorInResponseError):
         beekeeper.api.create(wallet_name=invalid_wallet_name)