qoherent/ria-toolkit-oss
19
6
Fork 0
Code Issues Pull Requests 1 Workflows Packages Projects Releases 6 Wiki Activity

two-machine TX/RX
All checks were successful
Build Sphinx Docs Set / Build Docs (pull_request) Successful in 17m1s
Details
Test with tox / Test with tox (3.10) (pull_request) Successful in 17m10s
Details
Build Project / Build Project (3.10) (pull_request) Successful in 17m31s
Details
Test with tox / Test with tox (3.11) (pull_request) Successful in 17m38s
Details
Build Project / Build Project (3.11) (pull_request) Successful in 17m48s
Details
Build Project / Build Project (3.12) (pull_request) Successful in 17m47s
Details
Test with tox / Test with tox (3.12) (pull_request) Successful in 3m12s
Details

Browse Source
This commit is contained in:
ben 2026-04-21 14:09:36 -04:00
parent 4c2c9c0288
commit 4aea2841be
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/ria_toolkit_oss/agent/legacy_executor.py
View File

@ -261,9 +261,10 @@ class NodeAgent:
if command == "run_campaign": if command == "run_campaign":
campaign_id: str = cmd.get("campaign_id") or str(uuid.uuid4()) campaign_id: str = cmd.get("campaign_id") or str(uuid.uuid4())
config_dict: dict = cmd.get("payload") or {} config_dict: dict = cmd.get("payload") or {}
skip_local_tx: bool = bool(cmd.get("skip_local_tx", False))
threading.Thread( threading.Thread(
target=self._run_campaign, target=self._run_campaign,
args=(campaign_id, config_dict), args=(campaign_id, config_dict, skip_local_tx),
daemon=True, daemon=True,
name=f"campaign-{campaign_id[:8]}", name=f"campaign-{campaign_id[:8]}",
).start() ).start()
@ -303,7 +304,7 @@ class NodeAgent:
# Campaign execution # Campaign execution
# ------------------------------------------------------------------ # ------------------------------------------------------------------
def _run_campaign(self, campaign_id: str, config_dict: dict) -> None: def _run_campaign(self, campaign_id: str, config_dict: dict, skip_local_tx: bool = False) -> None:
try: try:
from ria_toolkit_oss.orchestration.campaign import CampaignConfig from ria_toolkit_oss.orchestration.campaign import CampaignConfig
from ria_toolkit_oss.orchestration.executor import CampaignExecutor from ria_toolkit_oss.orchestration.executor import CampaignExecutor
@ -315,10 +316,10 @@ class NodeAgent:
) )
return return
logger.info("Campaign %s starting", campaign_id[:8]) logger.info("Campaign %s starting (skip_local_tx=%s)", campaign_id[:8], skip_local_tx)
try: try:
config = CampaignConfig.from_dict(config_dict) config = CampaignConfig.from_dict(config_dict)
executor = CampaignExecutor(config) executor = CampaignExecutor(config, skip_local_tx=skip_local_tx)
result = executor.run() result = executor.run()
logger.info("Campaign %s completed — uploading recordings", campaign_id[:8]) logger.info("Campaign %s completed — uploading recordings", campaign_id[:8])
self._upload_recordings(campaign_id, config, result) self._upload_recordings(campaign_id, config, result)

5
src/ria_toolkit_oss/orchestration/executor.py
View File

@ -209,9 +209,11 @@ class CampaignExecutor:
config: CampaignConfig, config: CampaignConfig,
progress_cb: Optional[Callable[[int, int, StepResult], None]] = None, progress_cb: Optional[Callable[[int, int, StepResult], None]] = None,
verbose: bool = False, verbose: bool = False,
skip_local_tx: bool = False,
): ):
self.config = config self.config = config
self.progress_cb = progress_cb self.progress_cb = progress_cb
self.skip_local_tx = skip_local_tx
self._sdr = None self._sdr = None
self._remote_tx_controllers: dict = {} self._remote_tx_controllers: dict = {}
self._tx_executors: dict[str, tuple] = {} # tx_id → (TxExecutor, stop_event, thread) self._tx_executors: dict[str, tuple] = {} # tx_id → (TxExecutor, stop_event, thread)
@ -464,6 +466,9 @@ class CampaignExecutor:
ctrl.transmit_async(step.duration + 1.0) ctrl.transmit_async(step.duration + 1.0)
elif transmitter.control_method == "sdr_agent": elif transmitter.control_method == "sdr_agent":
if self.skip_local_tx:
logger.debug(f"skip_local_tx — TX for '{transmitter.id}' delegated to TX agent node")
return
if not transmitter.sdr_agent: if not transmitter.sdr_agent:
logger.warning(f"Transmitter '{transmitter.id}' has no sdr_agent config — skipping") logger.warning(f"Transmitter '{transmitter.id}' has no sdr_agent config — skipping")
return return