Skip to content

Commit bf0ca77

Browse files
Shawclaude
andcommitted
fix(cloud/patches): correct hunk header in @brighter/storage-adapter-s3 patch
The patch covered 4 source/4 target lines but the hunk header claimed @@ -1,5 +1,5 @@. bun is strict about hunk header integrity and rejected the patchfile during install, breaking Cloud Tests setup-test-env across every job (lint-and-types, integration, unit-db, runtime, build, property-tests): error: failed to parse patchfile: hunk_header_integrity_check_failed error: failed to apply patchfile ( packages/patches/@brighter+storage-adapter-s3@1.6.3.patch ) `patch -p1 --dry-run` warns ("No such line 5 in input file") but proceeds; bun fails closed. Corrected to @@ -1,4 +1,4 @@ — verified clean apply. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
1 parent 7f5f88f commit bf0ca77

11 files changed

Lines changed: 1657 additions & 36 deletions

File tree

cloud/packages/patches/@brighter+storage-adapter-s3@1.6.3.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ diff --git a/src/storage.js b/src/storage.js
22
index f0bfa30af6aa43be5e889e56357f4fa516e85e72..49486d92b8ded341c88feeecd31b9ba5296809e7 100644
33
--- a/src/storage.js
44
+++ b/src/storage.js
5-
@@ -1,5 +1,5 @@
5+
@@ -1,4 +1,4 @@
66
-import S3 from '@aws-sdk/client-s3'
77
-import S3Presign from '@aws-sdk/s3-request-presigner'
88
+import * as S3 from '@aws-sdk/client-s3'

packages/benchmarks/adhdbench/scripts/run_benchmark.py

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,15 @@ def parse_args() -> argparse.Namespace:
3838
# -- run --
3939
run_parser = sub.add_parser("run", help="Run the benchmark")
4040
run_parser.add_argument("--model", default="gpt-4o-mini", help="Model name (default: gpt-4o-mini)")
41-
run_parser.add_argument("--provider", default="openai", help="Model provider (default: openai)")
41+
run_parser.add_argument(
42+
"--provider",
43+
default="openai",
44+
help=(
45+
"Model provider. Default 'openai' uses the in-process Python "
46+
"AgentRuntime. Use 'eliza' to route through the elizaOS TypeScript "
47+
"benchmark bridge (requires the bridge server to be running)."
48+
),
49+
)
4250
run_parser.add_argument("--levels", nargs="+", type=int, default=[0, 1, 2], help="Levels to run (0, 1, 2)")
4351
run_parser.add_argument("--tags", nargs="+", default=[], help="Filter by scenario tags")
4452
run_parser.add_argument("--ids", nargs="+", default=[], help="Filter by scenario IDs")
@@ -106,9 +114,18 @@ def cmd_run(args: argparse.Namespace) -> None:
106114
def progress(config_name: str, scale: str, current: int, total: int) -> None:
107115
print(f" [{config_name}/{scale}] {current}/{total}", end="\r", flush=True)
108116

109-
from elizaos_adhdbench.runner import ADHDBenchRunner
110-
runner = ADHDBenchRunner(config)
111-
results = asyncio.run(runner.run(progress_callback=progress))
117+
if (config.model_provider or "").strip().lower() == "eliza":
118+
# Route through the elizaOS TypeScript benchmark bridge instead of
119+
# the in-process Python AgentRuntime. This requires the TS bench
120+
# server to be reachable via ELIZA_BENCH_URL / ELIZA_BENCH_TOKEN.
121+
from eliza_adapter.adhdbench import ElizaADHDBenchRunner
122+
123+
runner = ElizaADHDBenchRunner(config)
124+
results = asyncio.run(runner.run(progress_callback=progress))
125+
else:
126+
from elizaos_adhdbench.runner import ADHDBenchRunner
127+
runner = ADHDBenchRunner(config)
128+
results = asyncio.run(runner.run(progress_callback=progress))
112129

113130
print(f"\nBenchmark complete. {len(results.results)} scenario results.")
114131
print(f"Results saved to: {config.output_dir}/")

packages/benchmarks/eliza-adapter/eliza_adapter/__init__.py

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,34 @@
2525
__all__.append("ElizaREALMAgent")
2626
except ImportError:
2727
pass
28+
29+
# Optional: ADHDBench bridge — only loaded when elizaos_adhdbench is on sys.path.
30+
try:
31+
from eliza_adapter.adhdbench import ElizaADHDBenchRunner # noqa: F401
32+
__all__.append("ElizaADHDBenchRunner")
33+
except ImportError:
34+
pass
35+
36+
# Optional: EVM bridge — only loaded when benchmarks.evm is on sys.path.
37+
try:
38+
from eliza_adapter.evm import ElizaBridgeEVMExplorer # noqa: F401
39+
__all__.append("ElizaBridgeEVMExplorer")
40+
except ImportError:
41+
pass
42+
43+
# Optional: Experience bridge — only loaded when elizaos_experience_bench is on sys.path.
44+
try:
45+
from eliza_adapter.experience import ( # noqa: F401
46+
ElizaBridgeExperienceRunner,
47+
ElizaExperienceConfig,
48+
)
49+
__all__.extend(["ElizaBridgeExperienceRunner", "ElizaExperienceConfig"])
50+
except ImportError:
51+
pass
52+
53+
# Optional: Gauntlet bridge — only loaded when gauntlet.sdk is on sys.path.
54+
try:
55+
from eliza_adapter.gauntlet import Agent as ElizaGauntletAgent # noqa: F401
56+
__all__.append("ElizaGauntletAgent")
57+
except ImportError:
58+
pass

0 commit comments

Comments
 (0)