Update antares-python with new settings

Author: jsurrea

antares-python/README.md

@@ -115,7 +115,7 @@ async def main():
     async for event in client.subscribe():
         if isinstance(event, Track):
             print(
-                f"📍 Track #{event.id} - {event.name} at ({event.lat}, {event.long}) → {event.speed} knots"
+                f"📍 Track #{event.id} - {event.name} at ({event.lat}, {event.long}) → {event.speed} m/s"
             )
 
 
@@ -157,11 +157,9 @@ The client supports two configuration methods:
 The `.env` file allows you to define environment variables:
 
 ```dotenv
-ANTARES_HOST=localhost
-ANTARES_HTTP_PORT=9000
-ANTARES_TCP_PORT=9001
+ANTARES_CONTROLLER_BIND_ADDR=0.0.0.0:17394
+ANTARES_RADAR_BIND_ADDR=0.0.0.0:17396
 ANTARES_TIMEOUT=5.0
-ANTARES_AUTH_TOKEN=
 ```
 
 ➡️ See `template.env` for a complete example.
@@ -171,29 +169,42 @@ ANTARES_AUTH_TOKEN=
 To configure the client and ships via a TOML file:
 
 ```toml
-[antares]
-host = "localhost"
-http_port = 9000
-tcp_port = 9001
-timeout = 5.0
-auth_token = ""
-
-[[antares.ships.stationary]]
-initial_position = [50.0, 50.0]
+[antares.radar]
+bind_addr = "0.0.0.0:17396"
 
-[[antares.ships.random]]
-initial_position = [-20.0, 20.0]
-max_speed = 10.0
+[antares.radar.detector]
+range = 1000.0
+speed = 0.0
+angle = 0.0
+start_coordinates = [4.0, -72.0]
 
-[[antares.ships.circle]]
-initial_position = [30.0, -30.0]
-radius = 20.0
-speed = 4.0
+[antares.radar.broadcast]
+type = "tcp"
 
-[[antares.ships.line]]
+[antares.simulation]
+emission_interval = 20
+controller_bind_addr = "0.0.0.0:17394"
+
+[[antares.simulation.initial_ships]]
+type = "line"
 initial_position = [0.0, 0.0]
 angle = 0.785
 speed = 5.0
+
+[[antares.simulation.initial_ships]]
+type = "circle"
+initial_position = [30.0, -30.0]
+radius = 20.0
+speed = 4.0
+
+[[antares.simulation.initial_ships]]
+type = "random"
+initial_position = [-20.0, 20.0]
+max_speed = 10.0
+
+[[antares.simulation.initial_ships]]
+type = "stationary"
+initial_position = [50.0, 50.0]
 ```
 
 ➡️ See `config.example.toml` for a full working example.

antares-python/config.example.toml

@@ -1,32 +1,48 @@
 # ============================
 # Antares Simulation Config
-# Example TOML configuration
 # ============================
 
-[antares]
-host = "localhost"
-http_port = 9000
-tcp_port = 9001
-timeout = 5.0
-auth_token = ""
+[antares.simulation]
+emission_interval = 20
+controller_bind_addr = "0.0.0.0:17394"
 
 # ============================
 # Ships to add at startup
 # ============================
 
-[[antares.ships.line]]
+[[antares.simulation.initial_ships]]
+type = "line"
 initial_position = [0.0, 0.0]
 angle = 0.785                 # radians (approx. 45 degrees)
 speed = 5.0
 
-[[antares.ships.circle]]
+[[antares.simulation.initial_ships]]
+type = "circle"
 initial_position = [30.0, -30.0]
 radius = 20.0
 speed = 4.0
 
-[[antares.ships.random]]
+[[antares.simulation.initial_ships]]
+type = "random"
 initial_position = [-20.0, 20.0]
 max_speed = 10.0
 
-[[antares.ships.stationary]]
+[[antares.simulation.initial_ships]]
+type = "stationary"
 initial_position = [50.0, 50.0]
+
+# ============================
+# Antares Radar Config
+# ============================
+
+[antares.radar]
+bind_addr = "0.0.0.0:17396"
+
+[antares.radar.detector]
+range = 1000.0
+speed = 0.0
+angle = 0.0
+start_coordinates = [4.0, -72.0]
+
+[antares.radar.broadcast]
+type = "tcp"

antares-python/main.py

@@ -11,13 +11,7 @@ async def main() -> None:
     """
 
     # Initialize the Antares client
-    client = AntaresClient(
-        host="localhost",
-        http_port=9000,
-        tcp_port=9001,
-        timeout=5.0,
-        auth_token="my_secret_auth_token",
-    )
+    client = AntaresClient()
 
     # Add ships
     ships = [
@@ -36,7 +30,7 @@ async def main() -> None:
     try:
         async for track in client.subscribe():
             print(
-                f"📍 Track #{track.id} - {track.name} @ ({track.lat}, {track.long}) → {track.speed} knots"  # noqa: E501
+                f"📍 Track #{track.id} - {track.name} @ ({track.lat}, {track.long}) → {track.speed} m/s"  # noqa: E501
             )
     except KeyboardInterrupt:
         print("\n🛑 Subscription interrupted by user.")

antares-python/pyproject.toml

@@ -17,7 +17,16 @@ dependencies = [
 ]
 
 [project.optional-dependencies]
-dev = ["pytest-asyncio>=0.26.0"]
+dev = [
+    "taskipy==1.14.1",
+    "build==1.2.2.post1",
+    "mypy==1.15.0",
+    "pytest==8.3.5",
+    "pytest-cov==6.1.1",
+    "pytest-mock==3.14.0",
+    "pytest-asyncio>=0.26.0",
+    "ruff==0.11.8",
+]
 
 [project.scripts]
 antares-cli = "antares.cli:app"

antares-python/src/antares/cli.py

@@ -150,9 +150,9 @@ async def _sub() -> None:
         try:
             async for event in client.subscribe():
                 if json_output:
-                    typer.echo(json.dumps(event))
+                    typer.echo(event.model_dump_json())
                 else:
-                    console.print_json(data=event)
+                    console.print(f"[info]Received event: {event}")
                 logger.debug("Received event: %s", event)
         except SubscriptionError as e:
             handle_error(str(e), code=3, json_output=json_output)
@@ -183,11 +183,9 @@ def build_client(config_path: str | None, verbose: bool, json_output: bool) -> A
         if verbose:
             console.print(f"[info]Using settings: {settings.model_dump()}")
         return AntaresClient(
-            host=settings.host,
-            http_port=settings.http_port,
-            tcp_port=settings.tcp_port,
+            controller_bind_addr=settings.controller_bind_addr,
+            radar_bind_addr=settings.radar_bind_addr,
             timeout=settings.timeout,
-            auth_token=settings.auth_token,
         )
     except Exception as e:
         handle_error(f"Failed to load configuration: {e}", code=1, json_output=json_output)

antares-python/src/antares/client/__init__.py

@@ -25,15 +25,15 @@ def __init__(
         # Merge provided arguments with environment/.env via AntaresSettings
         self._settings = AntaresSettings(**filtered_kwargs)
 
-        base_url = f"http://{self._settings.host}:{self._settings.http_port}"
+        base_url = f"http://{self._settings.controller_bind_addr}"
+        host, tcp_port = self._settings.radar_bind_addr.split(":")
         self._rest = RestClient(
             base_url=base_url,
             timeout=self._settings.timeout,
-            auth_token=self._settings.auth_token,
         )
         self._tcp = TCPSubscriber(
-            host=self._settings.host,
-            port=self._settings.tcp_port,
+            host=host,
+            port=int(tcp_port),
         )
 
     def reset_simulation(self) -> None:

antares-python/src/antares/client/rest.py

@@ -9,7 +9,7 @@ class RestClient:
     Internal client for interacting with the Antares simulation REST API.
     """
 
-    def __init__(self, base_url: str, timeout: float = 5.0, auth_token: str | None = None) -> None:
+    def __init__(self, base_url: str, timeout: float = 5.0) -> None:
         """
         Initializes the REST client.
 
@@ -20,7 +20,6 @@ def __init__(self, base_url: str, timeout: float = 5.0, auth_token: str | None =
         """
         self.base_url = base_url.rstrip("/")
         self.timeout = timeout
-        self.headers = {"Authorization": f"Bearer {auth_token}"} if auth_token else {}
 
     def reset_simulation(self) -> None:
         """
@@ -29,7 +28,6 @@ def reset_simulation(self) -> None:
         try:
             response = httpx.post(
                 f"{self.base_url}/simulation/reset",
-                headers=self.headers,
                 timeout=self.timeout,
             )
             response.raise_for_status()
@@ -49,7 +47,6 @@ def add_ship(self, ship: ShipConfig) -> None:
             response = httpx.post(
                 f"{self.base_url}/simulation/ships",
                 json=ship.model_dump(),
-                headers=self.headers,
                 timeout=self.timeout,
             )
             response.raise_for_status()

antares-python/src/antares/config.py

@@ -7,11 +7,9 @@ class AntaresSettings(BaseSettings):
     Supports environment variables and `.env` file loading.
     """
 
-    host: str = "localhost"
-    http_port: int = 9000
-    tcp_port: int = 9001
+    controller_bind_addr: str = "0.0.0.0:17394"
+    radar_bind_addr: str = "0.0.0.0:17396"
     timeout: float = 5.0
-    auth_token: str | None = None
 
     model_config = SettingsConfigDict(
         env_file=".env",

antares-python/template.env

@@ -6,18 +6,11 @@
 #   cp template.env .env
 # ========================
 
-# Host where the Antares simulation engine is running
-ANTARES_HOST=localhost
+# Controller bind address
+ANTARES_CONTROLLER_BIND_ADDR=0.0.0.0:17394
 
-# Port for the HTTP API
-ANTARES_HTTP_PORT=9000
-
-# Port for the TCP stream
-ANTARES_TCP_PORT=9001
+# Radar bind address
+ANTARES_RADAR_BIND_ADDR=0.0.0.0:17396
 
 # Request timeout in seconds
 ANTARES_TIMEOUT=5.0
-
-# Optional: Authentication token for the API
-# Leave empty if not required
-ANTARES_AUTH_TOKEN=