Simplify webhook sending in debug mode

Author: zhiltsov-max

packages/examples/cvat/exchange-oracle/debug.py

@@ -7,16 +7,19 @@
 from typing import Any
 from unittest import mock
 
+import inspect
+import uuid
 import uvicorn
 from httpx import URL
 
 from src.chain.kvstore import register_in_kvstore
 from src.core.config import Config
 from src.db import SessionLocal
 from src.services import cloud
-from src.services import cvat as cvat_service
+from src.services import cvat as cvat_db_service
 from src.services.cloud import BucketAccessInfo
 from src.utils.logging import format_sequence, get_function_logger
+from src.utils.time import utcnow
 
 
 @contextmanager
@@ -28,7 +31,9 @@ def _mock_cvat_cloud_storage_params(logger: Logger) -> Generator[None, None, Non
     def patched_make_cvat_cloud_storage_params(bucket_info: BucketAccessInfo) -> dict:
         original_host_url = bucket_info.host_url
 
-        if Config.development_config.cvat_in_docker:
+        if Config.development_config.cvat_in_docker and (
+            "localhost" in original_host_url or "127.0.0.1" in original_host_url
+        ):
             bucket_info.host_url = str(
                 URL(original_host_url).copy_with(
                     host=Config.development_config.exchange_oracle_host
@@ -110,6 +115,8 @@ def _mock_webhook_signature_checking(_: Logger) -> Generator[None, None, None]:
     - from reputation oracle -
       encoded with Config.localhost.reputation_oracle_address wallet address
       or signature "reputation_oracle<number>"
+
+    <number> is optional in all cases.
     """
 
     from src.chain.escrow import (
@@ -133,6 +140,33 @@ def patched_get_available_webhook_types(chain_id, escrow_address):
         d[Config.localhost.reputation_oracle_address.lower()] = OracleWebhookTypes.reputation_oracle
         return d
 
+    from src.services.webhook import inbox as original_inbox
+
+    class PatchedInbox:
+        def __init__(self):
+            pass
+
+        def __getattr__(self, name: str):
+            return getattr(original_inbox, name)
+
+        def create_webhook(
+            self,
+            session,
+            escrow_address,
+            chain_id,
+            type: OracleWebhookTypes,
+            signature = None,
+            event_type = None,
+            event_data = None,
+            event = None,
+        ):
+            if signature in OracleWebhookTypes:
+                signature = f"{type.value}-{utcnow().isoformat(sep='T')}-{uuid.uuid4()}"
+
+            _orig_params = inspect.signature(original_inbox.create_webhook).parameters
+            _args = {k: v for k, v in locals().items() if k in _orig_params}
+            return original_inbox.create_webhook(**_args)
+
     with (
         mock.patch("src.schemas.webhook.validate_address", lambda x: x),
         mock.patch(
@@ -143,6 +177,7 @@ def patched_get_available_webhook_types(chain_id, escrow_address):
             "src.endpoints.webhook.validate_oracle_webhook_signature",
             patched_validate_oracle_webhook_signature,
         ),
+        mock.patch("src.services.webhook.inbox", PatchedInbox())
     ):
         yield
 
@@ -165,7 +200,7 @@ def decode_plain_json_token(self, token) -> dict[str, Any]:
 
             if (user_wallet := token_data.get("wallet_address")) and not token_data.get("email"):
                 with SessionLocal.begin() as session:
-                    user = cvat_service.get_user_by_id(session, user_wallet)
+                    user = cvat_db_service.get_user_by_id(session, user_wallet)
                     if not user:
                         raise Exception(f"Could not find user with wallet address '{user_wallet}'")
 
@@ -236,7 +271,30 @@ def apply_local_development_patches() -> Generator[None, None, None]:
         yield
 
 
-if __name__ == "__main__":
+def run_server():
+    uvicorn.run(
+        app="src:app",
+        host="0.0.0.0",  # noqa: S104
+        port=int(Config.port),
+        workers=Config.workers_amount,
+    )
+
+
+# def fix_escrow():
+#     from src.handlers.job_fixing import entrypoint
+
+#     return entrypoint()
+
+
+import sys
+from argparse import ArgumentParser
+
+
+def main(args: list[str] | None = None) -> int:
+    parser = ArgumentParser()
+    parser.add_argument("-e", "--entrypoint", default=run_server)
+    parsed_args = parser.parse_args(args)
+
     with ExitStack() as es:
         is_dev = Config.environment == "development"
         if is_dev:
@@ -245,9 +303,10 @@ def apply_local_development_patches() -> Generator[None, None, None]:
         Config.validate()
         register_in_kvstore()
 
-        uvicorn.run(
-            app="src:app",
-            host="0.0.0.0",  # noqa: S104
-            port=int(Config.port),
-            workers=Config.workers_amount,
-        )
+        parsed_args.entrypoint()
+
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main(sys.argv[1:]))

packages/examples/cvat/recording-oracle/debug.py

@@ -4,6 +4,8 @@
 from logging import Logger
 from pathlib import PurePosixPath
 from unittest import mock
+import inspect
+import uuid
 
 import uvicorn
 
@@ -12,6 +14,7 @@
 from src.services import cloud
 from src.services.cloud import BucketAccessInfo
 from src.utils.logging import format_sequence, get_function_logger
+from src.utils.time import utcnow
 
 
 @contextmanager
@@ -109,6 +112,33 @@ def patched_get_available_webhook_types(chain_id, escrow_address):
         d[Config.localhost.exchange_oracle_address.lower()] = OracleWebhookTypes.exchange_oracle
         return d
 
+    from src.services.webhook import inbox as original_inbox
+
+    class PatchedInbox:
+        def __init__(self):
+            pass
+
+        def __getattr__(self, name: str):
+            return getattr(original_inbox, name)
+
+        def create_webhook(
+            self,
+            session,
+            escrow_address,
+            chain_id,
+            type: OracleWebhookTypes,
+            signature = None,
+            event_type = None,
+            event_data = None,
+            event = None,
+        ):
+            if signature in OracleWebhookTypes:
+                signature = f"{type.value}-{utcnow().isoformat(sep='T')}-{uuid.uuid4()}"
+
+            _orig_params = inspect.signature(original_inbox.create_webhook).parameters
+            _args = {k: v for k, v in locals().items() if k in _orig_params}
+            return original_inbox.create_webhook(**_args)
+
     with (
         mock.patch("src.schemas.webhook.validate_address", lambda x: x),
         mock.patch(
@@ -119,6 +149,7 @@ def patched_get_available_webhook_types(chain_id, escrow_address):
             "src.endpoints.webhook.validate_oracle_webhook_signature",
             patched_validate_oracle_webhook_signature,
         ),
+        mock.patch("src.services.webhook.inbox", PatchedInbox())
     ):
         yield