From 72283e61843bd557436c39fc0fa598be630f4ba1 Mon Sep 17 00:00:00 2001 From: Marek Wolan Date: Mon, 15 Apr 2024 12:40:50 +0100 Subject: [PATCH] #2459 Align whitespace and typing --- src/primaite/game/agent/rewards.py | 3 ++- src/primaite/game/game.py | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/primaite/game/agent/rewards.py b/src/primaite/game/agent/rewards.py index f3398631..726afaa4 100644 --- a/src/primaite/game/agent/rewards.py +++ b/src/primaite/game/agent/rewards.py @@ -26,7 +26,7 @@ the structure: ``` """ from abc import abstractmethod -from typing import Callable, Dict, List, Optional, Tuple, Type, TYPE_CHECKING +from typing import Callable, Dict, Iterable, List, Optional, Tuple, Type, TYPE_CHECKING from typing_extensions import Never @@ -37,6 +37,7 @@ if TYPE_CHECKING: from primaite.game.agent.interface import AgentActionHistoryItem _LOGGER = getLogger(__name__) +WhereType = Iterable[str | int] | None class AbstractReward: diff --git a/src/primaite/game/game.py b/src/primaite/game/game.py index 27fd452d..a1f9cb58 100644 --- a/src/primaite/game/game.py +++ b/src/primaite/game/game.py @@ -411,6 +411,7 @@ class PrimaiteGame: for link_cfg in links_cfg: node_a = net.get_node_by_hostname(link_cfg["endpoint_a_hostname"]) node_b = net.get_node_by_hostname(link_cfg["endpoint_b_hostname"]) + if isinstance(node_a, Switch): endpoint_a = node_a.network_interface[link_cfg["endpoint_a_port"]] else: @@ -460,6 +461,7 @@ class PrimaiteGame: reward_function=reward_function, settings=settings, ) + elif agent_type == "ProxyAgent": agent_settings = AgentSettings.from_config(agent_cfg.get("agent_settings")) new_agent = ProxyAgent(