Skip to content
This repository was archived by the owner on Mar 19, 2026. It is now read-only.

Commit bb047cc

Browse files
committed
Remove references to formerly external URLs
The referenced repositories have been copied into this repository, so local links should be used where possible. This commit is largely based on the similar commit I made for the previous release: 20fcb46
1 parent 7838847 commit bb047cc

File tree

9 files changed

+19
-18
lines changed

9 files changed

+19
-18
lines changed

diplomacy_cicero/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ RUN pip install --no-cache-dir -e ./thirdparty/github/fairinternal/postman/nest/
4545
&& pip install --no-cache-dir -e ./thirdparty/github/fairinternal/postman/postman/
4646

4747
# Install application requirements
48+
COPY chiron-utils/ chiron-utils/
4849
COPY requirements-lock.txt .
4950
RUN pip install --no-cache-dir -r requirements-lock.txt \
5051
&& spacy download en_core_web_sm

diplomacy_cicero/chiron-utils/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
# Use the command `hadolint Dockerfile` to test
55
# Adding Hadolint to `pre-commit` is non-trivial, so the command must be run manually
66

7-
FROM ghcr.io/allan-dip/chiron-utils:baseline-lr-model-2025-01-14 AS baseline-lr-model
8-
97
FROM python:3.11.13-slim-bookworm AS base
108

119
# Allow bot to detect whether running in a container
@@ -24,6 +22,8 @@ RUN pip install --no-cache-dir --upgrade pip==25.1.1 \
2422
&& pip uninstall --yes setuptools wheel
2523

2624
# Install required packages
25+
COPY baseline-models/ baseline-models/
26+
COPY baseline-models/diplomacy/ diplomacy/
2727
COPY requirements-lock.txt .
2828
COPY pyproject.toml .
2929
ARG TARGET
@@ -44,4 +44,4 @@ LABEL org.opencontainers.image.source=https://github.com/ALLAN-DIP/chiron-utils
4444

4545
FROM base AS baseline-lr
4646

47-
COPY --from=baseline-lr-model lr_model/ lr_model/
47+
COPY lr_model/ lr_model/

diplomacy_cicero/chiron-utils/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ Most bots require specific instructions to build and run them properly:
6565
- `LrProbsTextVisualAdvisor`: Provides textual and visual advice about all powers
6666
- `LrProbsVisualAdvisor`: Provides visual advice about all powers
6767
- To build the bot, run `make build-baseline-lr` to generate the OCI image to run with Docker
68-
- When running the bot outside of a container, download the latest model file from [`large-file-storage/lr_models/`](https://github.com/ALLAN-DIP/large-file-storage/tree/main/lr_models). The filename includes the model release date in `YYYYMMDD` format).
68+
- When running the bot outside of a container, use the files from [`lr_model/`](lr_model/)
6969
- Edit the `MODEL_PATH` constant in `lr_bot.py` to point to the unzipped model folder.
70-
- Code for model training can be found at <https://github.com/ALLAN-DIP/baseline-models>
70+
- Code for model training can be found in [`baseline-models/`](baseline-models/)
7171
- LLM advisor bots:
7272
- A family of bots containing the following types:
7373
- [`FaafAdvisor`](src/chiron_utils/bots/csu_faaf_advisor_bot.py): A large language model using the FAAF model from the CSU team to provide commentary advice given board states, recommended orders for current player and predicted orders of opponents from Cicero.
@@ -79,8 +79,8 @@ Most bots require specific instructions to build and run them properly:
7979
- Request access on the page for the following model:
8080
- [Llama3.1-8b-instruct](https://huggingface.co/meta-llama/Meta-Llama-3.1-8B-Instruct)
8181
- Once your request has been approved, authenticate on your local machine using a user access token, using the official [User access tokens](https://huggingface.co/docs/hub/security-tokens) documentation as a guide.
82-
- When using `LlmAdvisor`, one needs to run another advisor to provide `OPPONENT_MOVE` advice to the same power. For example, one can run the [Cicero advisor](https://github.com/ALLAN-DIP/diplomacy_cicero) with the argument `--advice_levels OPPONENT_MOVE`.
83-
- When using `FaafAdvisor` or `LlmNewAdvisor`, one needs to run another advisor to provide `MOVE|OPPONENT_MOVE` advice to the same power. For example, one can run the [Cicero advisor](https://github.com/ALLAN-DIP/diplomacy_cicero) with the argument `--advice_levels 'MOVE|OPPONENT_MOVE'`.
82+
- When using `LlmAdvisor`, one needs to run another advisor to provide `OPPONENT_MOVE` advice to the same power. For example, one can run the [Cicero advisor](../) with the argument `--advice_levels OPPONENT_MOVE`.
83+
- When using `FaafAdvisor` or `LlmNewAdvisor`, one needs to run another advisor to provide `MOVE|OPPONENT_MOVE` advice to the same power. For example, one can run the [Cicero advisor](../) with the argument `--advice_levels 'MOVE|OPPONENT_MOVE'`.
8484
- To use the bot, run the following command from the repository root, replacing `[bot_type]` with the bot's name:
8585
```shell
8686
# Set communication stage to 10 minutes (in seconds) to give enough time
@@ -90,7 +90,7 @@ Most bots require specific instructions to build and run them properly:
9090
- [`ElasticAdvisor`](src/chiron_utils/bots/elastic_advisor.py):
9191
- This bot does not return orders, and is only intended to be a message advisor.
9292
- Messages are retrieved from an Elasticsearch database using similarity search based on game state.
93-
- Running the bot requires a populated Elasticsearch instance. See [`baseline-models`](https://github.com/ALLAN-DIP/baseline-models/blob/main/README.md#message_advisor_coderestore_snapshotpy) on how to run a Dockerized Elasticsearch instance locally.
93+
- Running the bot requires a populated Elasticsearch instance. See [`baseline-models/README.md`](baseline-models/README.md#message_advisor_coderestore_snapshotpy) on how to run a Dockerized Elasticsearch instance locally.
9494

9595
## Contributing
9696

diplomacy_cicero/chiron-utils/baseline-models/requirements-lock.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ certifi==2024.8.30
33
charset-normalizer==3.4.0
44
colorama==0.4.6
55
coloredlogs==15.0.1
6-
diplomacy @ git+https://git@github.com/ALLAN-DIP/diplomacy.git@33b28982ba2b294e0508a263662ec92f7cff89b9
6+
diplomacy @ file:///baseline-models/diplomacy/
77
elastic-transport==8.17.1
88
elasticsearch==8.15.1
99
humanfriendly==10.0
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Pinned `diplomacy` to `main`
2-
diplomacy @ git+https://git@github.com/ALLAN-DIP/diplomacy.git@33b28982ba2b294e0508a263662ec92f7cff89b9
2+
diplomacy
33
elasticsearch==8.15.1
44
numpy==1.26.4
55
scikit-learn==1.4.1.post1

diplomacy_cicero/chiron-utils/pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ dependencies = [
3030
# Pinned `daidepp` to `main`
3131
"daidepp @ git+https://git@github.com/SHADE-AI/daidepp.git@fd027bcbcf7fa3956adcae2ea12493051c8e279e",
3232
# Pinned `diplomacy` to `main`
33-
"diplomacy @ git+https://git@github.com/ALLAN-DIP/diplomacy.git@33b28982ba2b294e0508a263662ec92f7cff89b9",
33+
"diplomacy",
3434
# `importlib-metadata` `3.7.0` introduced `packages_distributions()`
3535
'importlib-metadata>=3.7.0 ; python_version < "3.10"',
3636
# `tornado` `3.1` introduced `ASYNC_TEST_TIMEOUT` environment variable
@@ -50,7 +50,7 @@ all = [
5050
# Default extra to make OCI image builds easier
5151
base = []
5252
baseline-lr = [
53-
"baseline-models @ git+https://git@github.com/ALLAN-DIP/baseline-models.git@39e8478d2ad47166694b07e1c6ab250ea627e1e4",
53+
"baseline-models",
5454
]
5555
dev = [
5656
# Use older `mypy` version to keep code compatible with Python 3.7

diplomacy_cicero/chiron-utils/requirements-lock.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
accelerate==1.7.0
22
astroid==3.3.11
3-
baseline_models @ git+https://git@github.com/ALLAN-DIP/baseline-models.git@39e8478d2ad47166694b07e1c6ab250ea627e1e4
3+
baseline_models @ file:///bot/baseline-models/
44
bcrypt==4.3.0
55
certifi==2025.7.14
66
cfgv==3.4.0
77
charset-normalizer==3.4.2
88
daidepp @ git+https://git@github.com/SHADE-AI/daidepp.git@fd027bcbcf7fa3956adcae2ea12493051c8e279e
99
dill==0.4.0
10-
diplomacy @ git+https://git@github.com/ALLAN-DIP/diplomacy.git@33b28982ba2b294e0508a263662ec92f7cff89b9
10+
diplomacy @ file:///bot/baseline-models/diplomacy/
1111
distlib==0.3.9
1212
elastic-transport==8.17.1
1313
elasticsearch==8.15.1

diplomacy_cicero/requirements-lock.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ botocore==1.33.13
2323
cachetools==5.5.0
2424
catalogue==2.0.10
2525
cfgv==3.3.1
26-
chiron-utils @ git+https://github.com/ALLAN-DIP/chiron-utils.git@9f6303f104d3949b91e4a381698eb5d3733be1a8
26+
chiron-utils @ file:///diplomacy_cicero/chiron-utils/
2727
click==7.1.2
2828
cloudpathlib==0.18.1
2929
cloudpickle==2.2.1
@@ -44,7 +44,7 @@ decorator==5.1.1
4444
defusedxml==0.7.1
4545
Deprecated==1.2.14
4646
dill==0.3.7
47-
diplomacy @ git+https://github.com/ALLAN-DIP/diplomacy.git@33b28982ba2b294e0508a263662ec92f7cff89b9
47+
diplomacy @ file:///diplomacy_cicero/chiron-utils/baseline-models/diplomacy/
4848
discordwebhook==1.0.3
4949
distlib==0.3.8
5050
docformatter==1.4

diplomacy_cicero/requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
attrs==20.2.0
55
black==19.10b0
66
# Pinned `chiron-utils` to `main`
7-
chiron_utils @ git+https://github.com/ALLAN-DIP/chiron-utils.git@9f6303f104d3949b91e4a381698eb5d3733be1a8
7+
chiron_utils
88
colored==1.4.3
99
datasets==1.18.4
1010
dacite==1.6.0
1111
# Pinned `diplomacy` to `main`
12-
diplomacy @ git+https://github.com/ALLAN-DIP/diplomacy.git@33b28982ba2b294e0508a263662ec92f7cff89b9
12+
diplomacy
1313
discordwebhook==1.0.3
1414
ephemeral-port-reserve==1.1.4
1515
fairseq==0.10.2

0 commit comments

Comments
 (0)