Skip to content

Commit cc55218

Browse files
authored
chore: rename to itbench-utilities (#4)
Signed-off-by: Takumi Yanagawa <yana@jp.ibm.com>
1 parent 7340e36 commit cc55218

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+123
-123
lines changed

docker/agent-harness/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM python:3.11.10-slim
22

33
RUN apt update -y && apt install -y curl gnupg2
44
RUN mkdir /etc/agent-benchmark
5-
COPY itbench_tools /etc/agent-benchmark/itbench_tools
5+
COPY itbench_utilities /etc/agent-benchmark/itbench_utilities
66
COPY pyproject.toml /etc/agent-benchmark/pyproject.toml
77
COPY docker/agent-harness/entrypoint.sh /etc/entrypoint.sh
88
RUN chmod +x /etc/entrypoint.sh

docker/agent-harness/entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ while [[ $# -gt 0 ]]; do
1616
esac
1717
done
1818

19-
python itbench_tools/agent_harness/main.py \
19+
python itbench_utilities/agent_harness/main.py \
2020
--agent_directory /etc/ciso-agent \
2121
-i /tmp/agent-manifest.json \
2222
-c /etc/ciso-agent/agent-harness.yaml \

docker/agent-harness/sre_agent_harness/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ WORKDIR /app
44

55
RUN apt update -y && apt install -y curl gnupg2 jq
66
RUN mkdir /app/agent-benchmark
7-
COPY itbench_tools /app/agent-benchmark/itbench_tools
7+
COPY itbench_utilities /app/agent-benchmark/itbench_utilities
88
COPY pyproject.toml /app/agent-benchmark/pyproject.toml
99
RUN pip install -e /app/agent-benchmark --no-cache-dir
1010
RUN ln -sf /bin/bash /bin/sh

docker/agent-harness/sre_agent_harness/entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ fi
1515
curl -k -s -X GET -H "Authorization: Bearer $agent_token" "$endpoint/registry/agent-manifest/$agent_id" > /tmp/agent-manifest.json
1616
echo "Agent manifest has been obtained."
1717

18-
python -u itbench_tools/agent_harness/main.py \
18+
python -u itbench_utilities/agent_harness/main.py \
1919
--host $remote_host \
2020
--port $remote_port \
2121
--agent_directory $agent_directory \

docker/bench-runner/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM python:3.11.10-slim
22

33
RUN apt update -y && apt install -y curl gnupg2 unzip
44
RUN mkdir /etc/agent-benchmark
5-
COPY itbench_tools /etc/agent-benchmark/itbench_tools
5+
COPY itbench_utilities /etc/agent-benchmark/itbench_utilities
66
COPY pyproject.toml /etc/agent-benchmark/pyproject.toml
77
COPY docker/bench-runner/entrypoint.sh /etc/entrypoint.sh
88
COPY docker/bench-runner/config.yaml /etc/config.yaml

docker/bench-runner/entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ sed -i "s/^port: .*/port: $port/" /etc/config.yaml
1818

1919
token=`jq -r .token /tmp/agent-manifest.json`
2020

21-
python itbench_tools/bench_runner/main.py runner \
21+
python itbench_utilities/bench_runner/main.py runner \
2222
-c /etc/config.yaml \
2323
--runner_id $runner_id \
2424
--token $token \

docker/bench-runner/sre_bench/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ FROM python:3.11.10-slim
22

33
RUN apt update -y && apt install -y curl gnupg2 unzip
44
RUN mkdir /etc/agent-benchmark
5-
COPY itbench_tools /etc/agent-benchmark/itbench_tools
5+
COPY itbench_utilities /etc/agent-benchmark/itbench_utilities
66
COPY pyproject.toml /etc/agent-benchmark/pyproject.toml
77
RUN pip install -e /etc/agent-benchmark --no-cache-dir
8-
RUN pip install -r /etc/agent-benchmark/itbench_tools/bench_runner/sre_bench/requirements.txt --no-cache-dir
9-
RUN ansible-galaxy install -r /etc/agent-benchmark/itbench_tools/bench_runner/sre_bench/requirements.yaml
8+
RUN pip install -r /etc/agent-benchmark/itbench_utilities/bench_runner/sre_bench/requirements.txt --no-cache-dir
9+
RUN ansible-galaxy install -r /etc/agent-benchmark/itbench_utilities/bench_runner/sre_bench/requirements.yaml
1010
RUN ln -sf /bin/bash /bin/sh
1111

1212
# TODO: consider how to handle deps dynamically

docker/bench-runner/sre_bench/entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ PATH_TO_CONFIG=$1
44

55
kops export kubecfg --admin --name=$AWX_CLUSTERNAME --state=s3://$S3_BUCKET_NAME --kubeconfig /tmp/$AWX_CLUSTERNAME.yaml
66
cd /etc/agent-benchmark
7-
python itbench_tools/main.py runner \
7+
python itbench_utilities/main.py runner \
88
-c $PATH_TO_CONFIG \
99
--runner_id runner1 \
1010
--service_type SRE

itbench_tools/app/models/__init__.py

Lines changed: 0 additions & 7 deletions
This file was deleted.

itbench_tools/agent_harness/agent.py renamed to itbench_utilities/agent_harness/agent.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,21 @@
2222
import yaml
2323
from pydantic import BaseModel
2424

25-
from itbench_tools.agent_operator import AgentOperator
26-
from itbench_tools.app.models.agent import (
25+
from itbench_utilities.agent_operator import AgentOperator
26+
from itbench_utilities.app.models.agent import (
2727
Agent,
2828
AgentBenchmarkEntry,
2929
AgentManifest,
3030
)
31-
from itbench_tools.app.models.base import (
31+
from itbench_utilities.app.models.base import (
3232
AgentPhaseEnum,
3333
BundlePhaseEnum,
3434
Status,
3535
)
36-
from itbench_tools.app.models.bundle import Bundle
37-
from itbench_tools.app.utils import get_timestamp_iso
38-
from itbench_tools.common.rest_client import RestClient
39-
from itbench_tools.models.agent import AgentInfo, AgentRunCommand
36+
from itbench_utilities.app.models.bundle import Bundle
37+
from itbench_utilities.app.utils import get_timestamp_iso
38+
from itbench_utilities.common.rest_client import RestClient
39+
from itbench_utilities.models.agent import AgentInfo, AgentRunCommand
4040

4141
logger = logging.getLogger(__name__)
4242

0 commit comments

Comments
 (0)