From 726df7606d3ee4466a53ecf86208983efbd80e87 Mon Sep 17 00:00:00 2001 From: Adamantios Date: Fri, 3 Jan 2025 19:27:19 +0200 Subject: [PATCH 01/11] feat: remove all unused docker networks --- run_service.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/run_service.sh b/run_service.sh index 2d24238b..64417084 100755 --- a/run_service.sh +++ b/run_service.sh @@ -840,6 +840,8 @@ if [[ -n "$containers" ]]; then docker rm -f $containers fi +docker network prune + try_read_storage if [ "$ATTENDED" = true ]; then From 74c9ec01d4a33d4a74dbdc2fd5fbc3e57e2940a1 Mon Sep 17 00:00:00 2001 From: Anna Sambrook Date: Wed, 8 Jan 2025 14:12:11 +0000 Subject: [PATCH 02/11] chore: bump trader version --- run_service.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run_service.sh b/run_service.sh index 64417084..c8e715cf 100755 --- a/run_service.sh +++ b/run_service.sh @@ -737,7 +737,7 @@ directory="trader" service_repo=https://github.com/$org_name/$directory.git # This is a tested version that works well. # Feel free to replace this with a different version of the repo, but be careful as there might be breaking changes -service_version="v0.21.4" +service_version="v0.22.0" # Define constants for on-chain interaction gnosis_chain_id=100 From 448e4dd365b7e1ac9f42dd1f6b19560bed3897ee Mon Sep 17 00:00:00 2001 From: Anna Sambrook Date: Wed, 8 Jan 2025 14:27:54 +0000 Subject: [PATCH 03/11] update: delete mech chain id --- run_service.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/run_service.sh b/run_service.sh index c8e715cf..549dea67 100755 --- a/run_service.sh +++ b/run_service.sh @@ -1280,7 +1280,6 @@ export DISABLE_TRADING=false export STOP_TRADING_IF_STAKING_KPI_MET=true export RESET_PAUSE_DURATION=45 export MECH_WRAPPED_NATIVE_TOKEN_ADDRESS=$WXDAI_ADDRESS -export MECH_CHAIN_ID=ethereum export TOOLS_ACCURACY_HASH=QmebjcPizAdVFSUAfMBgAGFJhLPVBMvV68LxhSq4LPvv9d if [ -n "$SUBGRAPH_API_KEY" ]; then From 37e7944d23c92bb1e80261ae29ba7221b369d8b9 Mon Sep 17 00:00:00 2001 From: Anna Sambrook Date: Wed, 8 Jan 2025 17:20:54 +0000 Subject: [PATCH 04/11] add: analyse agent logs script --- analyse_agent_logs.py | 87 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) create mode 100644 analyse_agent_logs.py diff --git a/analyse_agent_logs.py b/analyse_agent_logs.py new file mode 100644 index 00000000..a0e032fa --- /dev/null +++ b/analyse_agent_logs.py @@ -0,0 +1,87 @@ +import os +import subprocess +import sys +import argparse + + +def _parse_args(): + """Parse the script arguments.""" + parser = argparse.ArgumentParser(description="Analyse agent logs.") + + parser.add_argument( + "--service-dir", + default="trader_service", + help="The service directory containing build directories (default: 'trader_service')." + ) + parser.add_argument( + "--agent", + default="aea_0", + help="The agent name to analyze (default: 'aea_0')." + ) + parser.add_argument( + "--reset-db", + action="store_true", + help="Reset the database before running analysis." + ) + parser.add_argument( + "--from-dir", + help="Path to the logs directory (if not provided, will auto-detect)." + ) + return parser.parse_args() + + +def find_build_directory(service_dir): + """Find the appropriate build directory within the service directory.""" + try: + build_dirs = [ + d for d in os.listdir(service_dir) + if d.startswith("abci_build_") and os.path.isdir(os.path.join(service_dir, d)) + ] + return os.path.join(service_dir, build_dirs[0]) if build_dirs else os.path.join(service_dir, "abci_build") + except FileNotFoundError: + print(f"Service directory '{service_dir}' not found") + sys.exit(1) + + +def run_analysis(logs_dir, agent, reset_db): + """Run the log analysis command.""" + command = [ + "poetry", "run", "autonomy", "analyse", "logs", + "--from-dir", logs_dir, + "--agent", agent, + "--fsm", + ] + if reset_db: + command.append("--reset-db") + + try: + subprocess.run(command, check=True) + print("Analysis completed successfully.") + except subprocess.CalledProcessError as e: + print(f"Command failed with exit code {e.returncode}") + sys.exit(e.returncode) + except FileNotFoundError: + print("Poetry or autonomy not found. Ensure they are installed and accessible.") + sys.exit(1) + + +if __name__ == "__main__": + # Parse user arguments + args = _parse_args() + + # Determine the logs directory + if args.from_dir: + logs_dir = args.from_dir + if not os.path.exists(logs_dir): + print(f"Specified logs directory '{logs_dir}' not found.") + sys.exit(1) + else: + # Auto-detect the logs directory + build_dir = find_build_directory(args.service_dir) + logs_dir = os.path.join(build_dir, "persistent_data", "logs") + if not os.path.exists(logs_dir): + print(f"Logs directory '{logs_dir}' not found.") + sys.exit(1) + + # Run the analysis + run_analysis(logs_dir, args.agent, args.reset_db) From b1c403b688ade6902d7a7a96ac01d138c14b3459 Mon Sep 17 00:00:00 2001 From: Anna Sambrook Date: Thu, 9 Jan 2025 09:54:25 +0000 Subject: [PATCH 05/11] enhance: add all analyse logs options --- analyse_agent_logs.py => analyse_logs.py | 76 +++++++++++++++++++++--- 1 file changed, 67 insertions(+), 9 deletions(-) rename analyse_agent_logs.py => analyse_logs.py (52%) diff --git a/analyse_agent_logs.py b/analyse_logs.py similarity index 52% rename from analyse_agent_logs.py rename to analyse_logs.py index a0e032fa..9dd9625b 100644 --- a/analyse_agent_logs.py +++ b/analyse_logs.py @@ -13,6 +13,10 @@ def _parse_args(): default="trader_service", help="The service directory containing build directories (default: 'trader_service')." ) + parser.add_argument( + "--from-dir", + help="Path to the logs directory." + ) parser.add_argument( "--agent", default="aea_0", @@ -21,12 +25,48 @@ def _parse_args(): parser.add_argument( "--reset-db", action="store_true", - help="Reset the database before running analysis." + help="Use this flag to disable resetting the log database." ) parser.add_argument( - "--from-dir", - help="Path to the logs directory (if not provided, will auto-detect)." + "--start-time", + help="Start time in `YYYY-MM-DD H:M:S,MS` format." + ) + parser.add_argument( + "--end-time", + help="End time in `YYYY-MM-DD H:M:S,MS` format." + ) + parser.add_argument( + "--log-level", + choices=["INFO", "DEBUG", "WARNING", "ERROR", "CRITICAL"], + help="Logging level." + ) + parser.add_argument( + "--period", + type=int, + help="Period ID." + ) + parser.add_argument( + "--round", + help="Round name." ) + parser.add_argument( + "--behaviour", + help="Behaviour name filter." + ) + parser.add_argument( + "--fsm", + action="store_true", + help="Print only the FSM execution path." + ) + parser.add_argument( + "--include-regex", + help="Regex pattern to include in the result." + ) + parser.add_argument( + "--exclude-regex", + help="Regex pattern to exclude from the result." + ) + return parser.parse_args() @@ -43,16 +83,34 @@ def find_build_directory(service_dir): sys.exit(1) -def run_analysis(logs_dir, agent, reset_db): +def run_analysis(logs_dir, **kwargs): """Run the log analysis command.""" command = [ "poetry", "run", "autonomy", "analyse", "logs", "--from-dir", logs_dir, - "--agent", agent, - "--fsm", ] - if reset_db: - command.append("--reset-db") + if kwargs.get("agent"): + command.extend(["--agent", kwargs.get("agent")]) + if kwargs.get("reset_db"): + command.extend(["--reset-db"]) + if kwargs.get("start_time"): + command.extend(["--start-time", kwargs.get("start_time")]) + if kwargs.get("end_time"): + command.extend(["--end-time", kwargs.get("end_time")]) + if kwargs.get("log_level"): + command.extend(["--log-level", kwargs.get("log_level")]) + if kwargs.get("period"): + command.extend(["--period", kwargs.get("period")]) + if kwargs.get("round"): + command.extend(["--round", kwargs.get("round")]) + if kwargs.get("behaviour"): + command.extend(["--behaviour", kwargs.get("behaviour")]) + if kwargs.get("fsm"): + command.extend(["--fsm"]) + if kwargs.get("include_regex"): + command.extend(["--include-regex", kwargs.get("include_regex")]) + if kwargs.get("exclude_regex"): + command.extend(["--exclude-regex", kwargs.get("exclude_regex")]) try: subprocess.run(command, check=True) @@ -84,4 +142,4 @@ def run_analysis(logs_dir, agent, reset_db): sys.exit(1) # Run the analysis - run_analysis(logs_dir, args.agent, args.reset_db) + run_analysis(logs_dir, **vars(args)) From e56814590e4f4b27bcca0381882090483dcb3c14 Mon Sep 17 00:00:00 2001 From: Anna Sambrook Date: Thu, 9 Jan 2025 09:54:40 +0000 Subject: [PATCH 06/11] update: readme --- README.md | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index ec33dfcc..4fb344c5 100644 --- a/README.md +++ b/README.md @@ -153,24 +153,16 @@ Note: In this case, if the service is staked, then it will not update the on-cha cd trader; poetry run python ../report.py; cd .. ``` -3. Use the following set of commands to investigate your agent's logs: +3. Use the `analyse_logs` to investigate your agent's logs: ```bash - cd trader - service_dir="trader_service" - build_dir=$(ls -d "$service_dir"/abci_build_???? 2>/dev/null || echo "$service_dir/abci_build") - poetry run autonomy analyse logs --from-dir "$build_dir/persistent_data/logs/" --agent aea_0 --reset-db - cd .. + cd trader; poetry run python ../analyse_logs.py --agent aea_0 --reset-db; cd .. ``` - For example, inspect the state transitions using the following set of commands: + For example, inspect the state transitions using the following command: ```bash - cd trader - service_dir="trader_service" - build_dir=$(ls -d "$service_dir"/abci_build_???? 2>/dev/null || echo "$service_dir/abci_build") - poetry run autonomy analyse logs --from-dir "$build_dir/persistent_data/logs/" --agent aea_0 --fsm --reset-db - cd .. + cd trader; poetry run python ../analyse_logs.py --agent aea_0 --fsm --reset-db; cd .. ``` This will output the different state transitions of your agent per period, for example: From e6a2fba92c8ebdf0a447aa3e8fe376e556e67ab2 Mon Sep 17 00:00:00 2001 From: Anna Sambrook <83281726+annasambrook@users.noreply.github.com> Date: Thu, 9 Jan 2025 11:00:13 +0000 Subject: [PATCH 07/11] Update analyse_logs.py Co-authored-by: Adamantios Zaras --- analyse_logs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/analyse_logs.py b/analyse_logs.py index 9dd9625b..faf180b8 100644 --- a/analyse_logs.py +++ b/analyse_logs.py @@ -15,7 +15,7 @@ def _parse_args(): ) parser.add_argument( "--from-dir", - help="Path to the logs directory." + help="Path to the logs directory. If not provided, it is auto-detected." ) parser.add_argument( "--agent", From 403f318f7927e7b06fb82f587c919acddb7f5662 Mon Sep 17 00:00:00 2001 From: Anna Sambrook <83281726+annasambrook@users.noreply.github.com> Date: Thu, 9 Jan 2025 11:00:40 +0000 Subject: [PATCH 08/11] Update README.md Co-authored-by: Adamantios Zaras --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4fb344c5..d5e431db 100644 --- a/README.md +++ b/README.md @@ -153,7 +153,7 @@ Note: In this case, if the service is staked, then it will not update the on-cha cd trader; poetry run python ../report.py; cd .. ``` -3. Use the `analyse_logs` to investigate your agent's logs: +3. Use the `analyse_logs.py` script to investigate your agent's logs: ```bash cd trader; poetry run python ../analyse_logs.py --agent aea_0 --reset-db; cd .. From f1f3d57836273c9c88e004118d831bf8fab4d02d Mon Sep 17 00:00:00 2001 From: Anna Sambrook Date: Thu, 9 Jan 2025 11:02:08 +0000 Subject: [PATCH 09/11] Revert "chore: bump trader version" This reverts commit 74c9ec01d4a33d4a74dbdc2fd5fbc3e57e2940a1. --- run_service.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run_service.sh b/run_service.sh index 549dea67..a186c87c 100755 --- a/run_service.sh +++ b/run_service.sh @@ -737,7 +737,7 @@ directory="trader" service_repo=https://github.com/$org_name/$directory.git # This is a tested version that works well. # Feel free to replace this with a different version of the repo, but be careful as there might be breaking changes -service_version="v0.22.0" +service_version="v0.21.4" # Define constants for on-chain interaction gnosis_chain_id=100 From 430f5dee9459c38feda9c9d4fd9d879e62c34bf1 Mon Sep 17 00:00:00 2001 From: Anna Sambrook Date: Thu, 9 Jan 2025 11:02:54 +0000 Subject: [PATCH 10/11] Revert "update: delete mech chain id" This reverts commit 448e4dd365b7e1ac9f42dd1f6b19560bed3897ee. --- run_service.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/run_service.sh b/run_service.sh index a186c87c..64417084 100755 --- a/run_service.sh +++ b/run_service.sh @@ -1280,6 +1280,7 @@ export DISABLE_TRADING=false export STOP_TRADING_IF_STAKING_KPI_MET=true export RESET_PAUSE_DURATION=45 export MECH_WRAPPED_NATIVE_TOKEN_ADDRESS=$WXDAI_ADDRESS +export MECH_CHAIN_ID=ethereum export TOOLS_ACCURACY_HASH=QmebjcPizAdVFSUAfMBgAGFJhLPVBMvV68LxhSq4LPvv9d if [ -n "$SUBGRAPH_API_KEY" ]; then From 41c026c78836cc87509ae37ac2e88bed75b37406 Mon Sep 17 00:00:00 2001 From: Anna Sambrook Date: Thu, 9 Jan 2025 11:17:04 +0000 Subject: [PATCH 11/11] Revert "feat: remove all unused docker networks" This reverts commit 726df7606d3ee4466a53ecf86208983efbd80e87. --- run_service.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/run_service.sh b/run_service.sh index 64417084..2d24238b 100755 --- a/run_service.sh +++ b/run_service.sh @@ -840,8 +840,6 @@ if [[ -n "$containers" ]]; then docker rm -f $containers fi -docker network prune - try_read_storage if [ "$ATTENDED" = true ]; then