Skip to content

Read env vars from agent configs #119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
VirxEC wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Read env vars from agent configs #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion frontend/src/components/BotList.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,6 @@ function filterBots(
}

function scriptDuplicateAgentIdWarning(d: ToggleableScript): string | null {

const agentId = d.info.config.settings.agentId;

if (!agentId) {
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/Teams/TeamBotList.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import cannotAutoRunIcon from "../../assets/cannot_play.svg";
import defaultIcon from "../../assets/rlbot_mono.png";

import PlayerOverridesModal from "./PlayerOverridesModal.svelte";
import {Browser} from "@wailsio/runtime";
import { Browser } from "@wailsio/runtime";
import warningIcon from "../../assets/exclamation-triangle-fill.svg";

let {
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/pages/Home.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ function collectDuplicateAgentIds(
bots: DraggablePlayer[],
scripts: ToggleableScript[],
): Set<string> {
const agentIdTomlMap: { [id: string]: string } = {}
const agentIdTomlMap: { [id: string]: string } = {};
const duplicateAgentIds = new Set<string>();

for (const bot of bots) {
Expand Down
11 changes: 11 additions & 0 deletions players.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,15 @@ func (botInfo BotInfo) ToPlayerConfig(team uint32) *flat.PlayerConfigurationT {
Hivemind: botInfo.Config.Settings.Hivemind,
}

// Add environment variables from the bot's config toml first
for k, v := range botInfo.Config.Settings.Environment {
customBot.Environment = append(customBot.Environment, &flat.EnvironmentVariableT{
Name: k,
Value: v,
})
}

// Then append torch paths (if found) so they combine properly with any toml-specified paths
setTorchEnv(botInfo.TomlPath, &customBot.Environment)

return &flat.PlayerConfigurationT{
Expand Down Expand Up @@ -279,6 +288,8 @@ type BotSettings struct {
RunCommandLinux string `toml:"run_command_linux" json:"runCommandLinux"`
// If bot can handle multiple agents with one client
Hivemind bool `toml:"hivemind" json:"hivemind"`
// Additional environment variables to set for the bot process
Environment map[string]string `toml:"environment" json:"environment"`
}

type BotDetails struct {
Expand Down
9 changes: 9 additions & 0 deletions scripts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,15 @@ func (botInfo BotInfo) ToScriptConfig() *flat.ScriptConfigurationT {
ScriptId: 0, // let core do this
}

// Add environment variables from the script's config toml first
for k, v := range botInfo.Config.Settings.Environment {
scriptConfig.Environment = append(scriptConfig.Environment, &flat.EnvironmentVariableT{
Name: k,
Value: v,
})
}

// Then append torch paths (if found) so they combine properly with any toml-specified paths
setTorchEnv(botInfo.TomlPath, &scriptConfig.Environment)

return scriptConfig
Expand Down