From a2dd2d3a839ddc771990f2b5f755207ed6911a76 Mon Sep 17 00:00:00 2001 From: MatrixA <33066250+MatrixA@users.noreply.github.com> Date: Sat, 17 May 2025 16:16:13 +0800 Subject: [PATCH] Fix logging and imports --- requirements.txt | 1 + web3_data_center/clients/opensearch_client.py | 22 ++++++++++++------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/requirements.txt b/requirements.txt index 3c98acd..dfc7909 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,5 +10,6 @@ lxml pytesseract opensearch-py pymongo +pyyaml aiofiles>=23.1.0 # For async file operations diskcache>=5.6.1 # For disk-based caching \ No newline at end of file diff --git a/web3_data_center/clients/opensearch_client.py b/web3_data_center/clients/opensearch_client.py index 8ea50eb..1e2dce0 100644 --- a/web3_data_center/clients/opensearch_client.py +++ b/web3_data_center/clients/opensearch_client.py @@ -5,11 +5,16 @@ import traceback import time -from opensearchpy import AsyncOpenSearch, OpenSearch,ConnectionTimeout, OpenSearchException, NotFoundError +from opensearchpy import ( + AsyncOpenSearch, + ConnectionTimeout, + OpenSearchException, + NotFoundError, + RequestError, + TransportError, +) from tenacity import retry, stop_after_attempt, wait_exponential, retry_if_exception_type -from opensearchpy import OpenSearch, RequestError, TransportError - from .base_client import BaseClient logger = logging.getLogger(__name__) @@ -488,13 +493,14 @@ async def get_eth_change_in(self, tx_hash): response = await self.client.get(index="eth_block", id=tx_hash) return response['_source']['EthChangeIn'] except RequestError as e: - logger.error(f"OpenSearch request error: {e}") - logger.error(f"Query: {query}") - logger.error(f"Error details: {e.info}") + logger.error( + f"OpenSearch request error while fetching EthChangeIn for {tx_hash}: {e}" + ) raise except TransportError as e: - logger.error(f"OpenSearch transport error: {e}") - logger.error(f"Query: {query}") + logger.error( + f"OpenSearch transport error while fetching EthChangeIn for {tx_hash}: {e}" + ) raise @staticmethod