format: cometics for all code

This commit is contained in:
Ilgiz Kalmetyev 2026-04-17 11:41:14 +05:00
parent 87b407005d
commit 7c319c8cbf
22 changed files with 159 additions and 73 deletions

View File

@ -200,7 +200,9 @@ class AgentApplication:
now_mono_ns_value: int | None = None,
) -> DirectorOutcome:
now = now_mono_ns() if now_mono_ns_value is None else now_mono_ns_value
collector = str(envelope.attributes.labels.get("collector", "") or envelope.source)
collector = str(
envelope.attributes.labels.get("collector", "") or envelope.source
)
self.ingest_trace.record(
"runtime.ingest.begin",
origin=origin,
@ -632,17 +634,21 @@ class AgentApplication:
now_mono_ns_value=command_now if command_now > 0 else None,
)
def _command_result_source(
self, result: CommandResult
) -> tuple[str, str, str]:
if result.executor_name == "wpa_ctrl" or result.target_kind == CommandTargetKind.WPA_CTRL:
def _command_result_source(self, result: CommandResult) -> tuple[str, str, str]:
if (
result.executor_name == "wpa_ctrl"
or result.target_kind == CommandTargetKind.WPA_CTRL
):
config = WpaCtrlExecutorConfig.from_toml(
self.settings.config,
executor_name="wpa_ctrl",
)
interface = result.target_id or config.interface
return config.source_name, interface, "wpa_ctrl"
if result.executor_name == "system" or result.target_kind == CommandTargetKind.SYSTEM:
if (
result.executor_name == "system"
or result.target_kind == CommandTargetKind.SYSTEM
):
config = SystemExecutorConfig.from_toml(
self.settings.config,
executor_name="system",
@ -707,7 +713,9 @@ class AgentApplication:
sender = self._sender_loop_or_none()
sender_stats = sender.stats() if sender is not None else None
sender_transport_type = (
sender.transport_type if sender is not None else self.sender_config().transport_type
sender.transport_type
if sender is not None
else self.sender_config().transport_type
)
cache_ring_stats = self.cache.ring_buffer.stats()
ingest_stats = self.ingest_trace.stats()
@ -727,12 +735,14 @@ class AgentApplication:
"commands_executed_total": command_stats.dispatched_total,
"webhook_sent_total": (
sender_stats.send_success_total
if sender_stats is not None and sender_transport_type == TransportType.WEBHOOK
if sender_stats is not None
and sender_transport_type == TransportType.WEBHOOK
else 0
),
"webhook_send_failed_total": (
sender_stats.send_failed_total
if sender_stats is not None and sender_transport_type == TransportType.WEBHOOK
if sender_stats is not None
and sender_transport_type == TransportType.WEBHOOK
else 0
),
"collector_supervisor_collectors_total": supervisor_stats.collectors_total,

View File

@ -450,6 +450,7 @@ def _emit_cache_snapshot_from_dict(
)
return 0
def _emit_ingest_trace_snapshot_from_dict(
snapshot: dict, *, json_output: bool, title: str
) -> int:
@ -526,6 +527,7 @@ def _emit_ingest_trace_snapshot_from_dict(
previous_wall_ns = wall_ns if isinstance(wall_ns, int) else previous_wall_ns
return 0
def _handle_cache_head(args: argparse.Namespace) -> int:
try:
snapshot = _daemon_request(
@ -1288,5 +1290,3 @@ def _handle_derivator_run_once(args: argparse.Namespace) -> int:
if __name__ == "__main__": # pragma: no cover - module entrypoint
raise SystemExit(main())

View File

@ -658,7 +658,9 @@ class DbusCollector(CollectorBase):
self._clear_error()
if outcome.envelope is not None:
if self.event_sink is None:
raise RuntimeError("dbus collector requires event_sink for accepted envelopes")
raise RuntimeError(
"dbus collector requires event_sink for accepted envelopes"
)
self.event_sink(outcome.envelope)
else:
if outcome.stage == "prefilter":

View File

@ -65,7 +65,9 @@ class JournalEntry:
return cls(
message=str(data.get("message", data.get("MESSAGE", "")) or ""),
fields=dict(fields),
cursor=str(data.get("cursor", data.get("_CURSOR", data.get("__CURSOR", ""))) or ""),
cursor=str(
data.get("cursor", data.get("_CURSOR", data.get("__CURSOR", ""))) or ""
),
realtime_ns=_coerce_timestamp_ns(
data.get("realtime_ns", data.get("__REALTIME_TIMESTAMP", 0))
),
@ -720,7 +722,9 @@ class JournalCollector(CollectorBase):
)
if outcome.envelope is not None:
if self.event_sink is None:
raise RuntimeError("journal collector requires event_sink for accepted envelopes")
raise RuntimeError(
"journal collector requires event_sink for accepted envelopes"
)
if unit != "wf-agent2.service":
print(
f"JOURNAL SINK type={outcome.envelope.type} "
@ -763,7 +767,9 @@ class JournalCollector(CollectorBase):
def reconnect(self) -> bool:
self._trace(
"journal.reconnect.begin", mode=self.config.mode, cursor=self.current_cursor()
"journal.reconnect.begin",
mode=self.config.mode,
cursor=self.current_cursor(),
)
self._increment_stats(reconnect_attempt_total=1)
self._set_lifecycle_state(CollectorLifecycleState.RECONNECTING)
@ -935,6 +941,3 @@ def _coerce_timestamp_ns(value: Any) -> int:
return int(value)
except (TypeError, ValueError):
return 0

View File

@ -447,7 +447,9 @@ class NavigationCollector(CollectorBase):
self._clear_error()
if outcome.envelope is not None:
if self.event_sink is None:
raise RuntimeError("navigation collector requires event_sink for accepted envelopes")
raise RuntimeError(
"navigation collector requires event_sink for accepted envelopes"
)
self.event_sink(outcome.envelope)
else:
if outcome.stage == "prefilter":

View File

@ -551,7 +551,9 @@ class WpaCtrlCollector(CollectorBase):
self._clear_error()
if outcome.envelope is not None:
if self.event_sink is None:
raise RuntimeError("wpa_ctrl collector requires event_sink for accepted envelopes")
raise RuntimeError(
"wpa_ctrl collector requires event_sink for accepted envelopes"
)
self.event_sink(outcome.envelope)
else:
if outcome.stage == "prefilter":

View File

@ -340,4 +340,3 @@ def _format_bssid(value: bytes) -> str:
if len(value) != 6:
return ""
return ":".join(f"{byte:02x}" for byte in value)

View File

@ -7,7 +7,12 @@ from .policies import (
DirectorRouteHints,
DirectorRoutingState,
)
from .routing import DirectorRouteDecision, DirectorRouteStats, requires_cache, route_envelope
from .routing import (
DirectorRouteDecision,
DirectorRouteStats,
requires_cache,
route_envelope,
)
__all__ = [
"Director",

View File

@ -119,7 +119,9 @@ class Director:
if self.outbox is None:
raise RuntimeError("director requires outbox for routed event")
if cached_record is None:
raise RuntimeError("director requires cached record before outbox enqueue")
raise RuntimeError(
"director requires cached record before outbox enqueue"
)
enqueue_result = self.outbox.enqueue(
int(cached_record.seq_no),
int(cached_record.event_id),
@ -160,7 +162,8 @@ class Director:
derivator_interest_total=self._stats.derivator_interest_total
+ (1 if decision.derivator_interest else 0),
routed_total=self._stats.routed_total + 1,
dropped_total=self._stats.dropped_total + (1 if not decision.any else 0),
dropped_total=self._stats.dropped_total
+ (1 if not decision.any else 0),
last_route_mono_ns=now,
)
self._last_decision = decision

View File

@ -22,6 +22,7 @@ from .base import (
ExecutorPipelineState,
)
class SystemCommandBackend(Protocol):
def connect(self, config: "SystemExecutorConfig") -> None: ...

View File

@ -20,6 +20,7 @@ from .base import (
ExecutorPipelineState,
)
class WpaCtrlCommandBackend(Protocol):
def connect(self, config: "WpaCtrlExecutorConfig") -> None: ...

View File

@ -98,7 +98,9 @@ class BatchBuilder:
)
return result.json or ""
def _record_to_envelope(self, record: EventRecord) -> events_pb2.EventEnvelope | None:
def _record_to_envelope(
self, record: EventRecord
) -> events_pb2.EventEnvelope | None:
payload = self._payload_from_record(record)
if self._payload_required(record) and payload is None:
return None

View File

@ -81,7 +81,9 @@ def _build_record_missing_payload():
def test_batch_builder_materializes_batch_envelope_from_outbox_refs() -> None:
cache, stored, outbox_item, _envelope, _payload, _payload_bytes = _build_cached_record()
cache, stored, outbox_item, _envelope, _payload, _payload_bytes = (
_build_cached_record()
)
builder = BatchBuilder(cache)
result = builder.build(
@ -107,7 +109,9 @@ def test_batch_builder_materializes_batch_envelope_from_outbox_refs() -> None:
def test_batch_builder_supports_json_projection_and_missing_refs() -> None:
cache, stored, outbox_item, _envelope, _payload, _payload_bytes = _build_cached_record()
cache, stored, outbox_item, _envelope, _payload, _payload_bytes = (
_build_cached_record()
)
builder = BatchBuilder(cache)
missing = OutboxItem(seq_no=999, event_id=999, priority=1, enqueue_mono_ns=1)
@ -145,7 +149,9 @@ def test_batch_builder_reports_missing_payload_bytes_for_payload_records() -> No
def test_batch_builder_uses_payload_message_bytes_not_full_envelope_bytes() -> None:
cache, stored, outbox_item, envelope, payload, payload_bytes = _build_cached_record()
cache, stored, outbox_item, envelope, payload, payload_bytes = (
_build_cached_record()
)
builder = BatchBuilder(cache)
entry = cache.payload_store.peek(stored.payload_ref)

View File

@ -53,7 +53,9 @@ def test_status_reports_daemon_summary(monkeypatch) -> None:
}
import agent.cli as cli_module
monkeypatch.setattr(cli_module, "_daemon_request", lambda args, action, params=None: status)
monkeypatch.setattr(
cli_module, "_daemon_request", lambda args, action, params=None: status
)
code, stdout, stderr = _run_cli(
["--config", str(config_file), "--no-env-file", "status"]
@ -88,7 +90,9 @@ def test_stats_reports_runtime_counters(monkeypatch) -> None:
}
import agent.cli as cli_module
monkeypatch.setattr(cli_module, "_daemon_request", lambda args, action, params=None: stats)
monkeypatch.setattr(
cli_module, "_daemon_request", lambda args, action, params=None: stats
)
code, stdout, stderr = _run_cli(
["--config", str(config_file), "--no-env-file", "stats"]
@ -135,7 +139,9 @@ def test_collectors_list_reports_configured_collectors(monkeypatch) -> None:
]
import agent.cli as cli_module
monkeypatch.setattr(cli_module, "_daemon_request", lambda args, action, params=None: payload)
monkeypatch.setattr(
cli_module, "_daemon_request", lambda args, action, params=None: payload
)
code, stdout, stderr = _run_cli(
["--config", str(config_file), "--no-env-file", "collectors", "list"]
@ -173,7 +179,9 @@ def test_collectors_show_reports_config_details(monkeypatch) -> None:
}
import agent.cli as cli_module
monkeypatch.setattr(cli_module, "_daemon_request", lambda args, action, params=None: payload)
monkeypatch.setattr(
cli_module, "_daemon_request", lambda args, action, params=None: payload
)
code, stdout, stderr = _run_cli(
[
@ -211,7 +219,9 @@ def test_run_reports_bootstrap_ok(monkeypatch) -> None:
)
import agent.cli as cli_module
monkeypatch.setattr(cli_module, "_load_application_from_args", lambda args: dummy_app)
monkeypatch.setattr(
cli_module, "_load_application_from_args", lambda args: dummy_app
)
code, stdout, stderr = _run_cli(
["--config", str(config_file), "--no-env-file", "run"]

View File

@ -133,7 +133,9 @@ def test_extract_and_serialize_payload_message_use_payload_oneof_only() -> None:
assert serialized != envelope.SerializeToString()
def test_event_envelope_to_record_with_payload_returns_record_and_payload_bytes() -> None:
def test_event_envelope_to_record_with_payload_returns_record_and_payload_bytes() -> (
None
):
interner = StringInterner()
payload = events_pb2.RawJournalPayload(
cursor="cursor-2",
@ -166,7 +168,9 @@ def test_event_envelope_to_record_with_payload_returns_record_and_payload_bytes(
assert payload_bytes == serialize_message(payload)
def test_event_envelope_to_record_with_payload_returns_none_for_payloadless_envelope() -> None:
def test_event_envelope_to_record_with_payload_returns_none_for_payloadless_envelope() -> (
None
):
record, payload_bytes = event_envelope_to_record_with_payload(
make_event_envelope(
id="evt-4",

View File

@ -60,9 +60,7 @@ def test_dbus_collector_processes_signals_through_pipeline_and_sends_envelopes()
]
)
sink: list[object] = []
collector = DbusCollector.from_toml(
config, backend=backend, event_sink=sink.append
)
collector = DbusCollector.from_toml(config, backend=backend, event_sink=sink.append)
collector.start()
outcomes = collector.drain_pending()
@ -119,9 +117,7 @@ def test_dbus_collector_reconnects_after_backend_read_failure() -> None:
fail_first_read=True,
)
sink: list[object] = []
collector = DbusCollector.from_toml(
config, backend=backend, event_sink=sink.append
)
collector = DbusCollector.from_toml(config, backend=backend, event_sink=sink.append)
collector.start()
first = collector.poll_once()

View File

@ -3,7 +3,12 @@ from __future__ import annotations
import pytest
from agent.cache import build_default_cache
from agent.director import Director, DirectorPolicyConfig, requires_cache, route_envelope
from agent.director import (
Director,
DirectorPolicyConfig,
requires_cache,
route_envelope,
)
from agent.proto_generated import common_pb2, events_pb2
from agent.proto_helpers import make_event_envelope
from agent.sender import OutboxQueue

View File

@ -6,7 +6,13 @@ from pathlib import Path
from types import SimpleNamespace
from agent.app import load_application
from agent.commands import CommandOriginKind, CommandRequest, CommandResult, CommandState, CommandTargetKind
from agent.commands import (
CommandOriginKind,
CommandRequest,
CommandResult,
CommandState,
CommandTargetKind,
)
from agent.collectors import FakeJournalBackend, JournalCollector
from agent.control.dispatcher import ControlDispatcher
from agent.control.service import ControlService
@ -17,7 +23,8 @@ from agent.sender import TransportType
from agent.utils.toml_loader import loads_toml
ROOT = Path(__file__).resolve().parents[2]
FIXTURES = ROOT / 'tests' / 'fixtures'
FIXTURES = ROOT / "tests" / "fixtures"
def _run_cli(argv: list[str]) -> tuple[int, str, str]:
from agent import cli
@ -30,8 +37,7 @@ def _run_cli(argv: list[str]) -> tuple[int, str, str]:
def _journal_config() -> dict[str, object]:
return loads_toml(
"""
return loads_toml("""
[collectors.journal]
enabled = true
mode = "head"
@ -43,8 +49,7 @@ def _journal_config() -> dict[str, object]:
value = "wpa_supplicant"
action = "keep"
reason = "keep wpa_supplicant journal messages"
"""
)
""")
def test_ingest_trace_recorder_keeps_bounded_tail() -> None:
@ -154,7 +159,9 @@ def test_control_dispatcher_routes_ingest_trace() -> None:
],
}
service = ControlService(SimpleNamespace(ingest_trace_tail=lambda limit=None: snapshot))
service = ControlService(
SimpleNamespace(ingest_trace_tail=lambda limit=None: snapshot)
)
dispatcher = ControlDispatcher(service)
result = dispatcher.dispatch("ingest.trace", {"limit": 10})
@ -324,9 +331,13 @@ def test_application_stats_aggregate_director_command_sender_and_derivator(
) -> None:
app = load_application(config_path=FIXTURES / "cli-basic.toml", load_env_file=False)
director = SimpleNamespace(stats=lambda: SimpleNamespace(routed_total=7, cache_total=5, outbox_total=3))
director = SimpleNamespace(
stats=lambda: SimpleNamespace(routed_total=7, cache_total=5, outbox_total=3)
)
command_coordinator = SimpleNamespace(
stats=lambda: SimpleNamespace(received_total=4, rejected_total=1, dispatched_total=3)
stats=lambda: SimpleNamespace(
received_total=4, rejected_total=1, dispatched_total=3
)
)
derivator_worker = SimpleNamespace(
state=lambda: SimpleNamespace(stats=SimpleNamespace(derived_total=6))
@ -337,8 +348,12 @@ def test_application_stats_aggregate_director_command_sender_and_derivator(
)
monkeypatch.setattr(type(app), "director", lambda self: director)
monkeypatch.setattr(type(app), "command_coordinator", lambda self: command_coordinator)
monkeypatch.setattr(type(app), "_ensure_derivator_worker", lambda self: derivator_worker)
monkeypatch.setattr(
type(app), "command_coordinator", lambda self: command_coordinator
)
monkeypatch.setattr(
type(app), "_ensure_derivator_worker", lambda self: derivator_worker
)
monkeypatch.setattr(type(app), "_sender_loop_or_none", lambda self: sender)
app.ingest_trace.record("runtime.ingest.begin")
@ -431,7 +446,9 @@ def test_ingest_trace_cli_renders_recent_records(monkeypatch) -> None:
}
import agent.cli as cli_module
monkeypatch.setattr(cli_module, "_daemon_request", lambda args, action, params=None: snapshot)
monkeypatch.setattr(
cli_module, "_daemon_request", lambda args, action, params=None: snapshot
)
code, stdout, stderr = _run_cli(["ingest", "trace", "--limit", "2"])
@ -457,8 +474,6 @@ def test_ingest_trace_cli_renders_recent_records(monkeypatch) -> None:
assert "delta_mono_ns=5" in stdout
def test_journal_collector_emits_nop_trace_when_no_entries_exist() -> None:
config = _journal_config()
backend = FakeJournalBackend(entries=[])
@ -494,7 +509,9 @@ def test_runtime_tick_emits_ingest_trace(monkeypatch) -> None:
monkeypatch.setattr(type(app), "_poll_collectors", lambda self, **kwargs: None)
monkeypatch.setattr(type(app), "scheduler", lambda self: DummyScheduler())
monkeypatch.setattr(type(app), "_ensure_derivator_worker", lambda self: DummyWorker())
monkeypatch.setattr(
type(app), "_ensure_derivator_worker", lambda self: DummyWorker()
)
monkeypatch.setattr(type(app), "derivator_run_once", lambda self, **kwargs: None)
monkeypatch.setattr(type(app), "_sender_loop_or_none", lambda self: None)
monkeypatch.setattr(app.collector_supervisor, "watchdog_check", lambda: None)
@ -505,5 +522,3 @@ def test_runtime_tick_emits_ingest_trace(monkeypatch) -> None:
assert records[0]["stage"] == "runtime.tick"
assert records[0]["tick_total"] == 0
assert app.runtime_state.tick_total == 1

View File

@ -49,6 +49,7 @@ def test_journal_entry_reads_private_systemd_cursor_field() -> None:
assert entry.as_mapping()["__CURSOR"] == "s=abc;i=42"
assert entry.as_mapping()["_CURSOR"] == "s=abc;i=42"
def test_journal_collector_processes_entries_through_pipeline_and_sends_envelopes() -> (
None
):
@ -118,7 +119,9 @@ def test_journal_collector_processes_entries_through_pipeline_and_sends_envelope
assert collector.connection_state() == CollectorConnectionState.STOPPED
def test_journal_collector_tail_starts_from_current_cursor_and_advances_on_new_entries() -> None:
def test_journal_collector_tail_starts_from_current_cursor_and_advances_on_new_entries() -> (
None
):
config = _journal_config()
config["collectors"]["journal"]["mode"] = "tail"
backend = FakeJournalBackend(
@ -404,13 +407,20 @@ def test_systemd_backend_tail_waits_and_reports_nop(monkeypatch) -> None:
assert entry is None
assert backend.current_cursor() == ""
assert backend._reader.calls[:4] == ["this_boot", "log_level:7", "seek_tail", "get_previous"]
assert backend._reader.calls[:4] == [
"this_boot",
"log_level:7",
"seek_tail",
"get_previous",
]
stages = [record["stage"] for record in traces]
assert stages == ["journal.backend.wait.begin", "journal.backend.wait.end"]
assert traces[0]["event_mono_ns"] <= traces[1]["event_mono_ns"]
def test_systemd_backend_tail_anchors_to_current_cursor_and_drains_pending_entries(monkeypatch) -> None:
def test_systemd_backend_tail_anchors_to_current_cursor_and_drains_pending_entries(
monkeypatch,
) -> None:
from agent.collectors import journal as journal_module
class DummyReader:
@ -509,7 +519,12 @@ def test_systemd_backend_tail_anchors_to_current_cursor_and_drains_pending_entri
drained = backend.read()
idle = backend.read()
assert backend._reader.calls[:4] == ["this_boot", "log_level:7", "seek_tail", "get_previous"]
assert backend._reader.calls[:4] == [
"this_boot",
"log_level:7",
"seek_tail",
"get_previous",
]
assert backend.current_cursor() == "cursor-3"
assert first is not None
assert first.cursor == "cursor-2"
@ -518,8 +533,12 @@ def test_systemd_backend_tail_anchors_to_current_cursor_and_drains_pending_entri
assert drained is None
assert idle is None
wait_indices = [i for i, call in enumerate(backend._reader.calls) if call == "wait:1000"]
get_next_indices = [i for i, call in enumerate(backend._reader.calls) if call == "get_next"]
wait_indices = [
i for i, call in enumerate(backend._reader.calls) if call == "wait:1000"
]
get_next_indices = [
i for i, call in enumerate(backend._reader.calls) if call == "get_next"
]
assert wait_indices == [4, 9]
assert get_next_indices == [6, 7, 8]
@ -542,7 +561,3 @@ def test_systemd_backend_tail_anchors_to_current_cursor_and_drains_pending_entri
assert traces[5]["cursor"] == "cursor-2"
assert traces[7]["cursor"] == "cursor-3"
assert traces[-1]["is_nop"] is True

View File

@ -81,7 +81,9 @@ def test_system_executor_supports_configured_future_actions() -> None:
assert result.details["command_action"] == "sync_state"
def test_system_executor_rejects_disallowed_regdomain_and_returns_rejection_result() -> None:
def test_system_executor_rejects_disallowed_regdomain_and_returns_rejection_result() -> (
None
):
config = SystemExecutorConfig(
name="system", enabled=True, allow_set_regdomain=False
)

View File

@ -212,7 +212,6 @@ def test_derivator_worker_emits_derived_envelopes_through_sink() -> None:
assert sink[0].attributes.labels["workflow"] == "test"
def test_derivator_worker_submits_workflow_commands_through_command_sink() -> None:
cache = build_default_cache(
ring_capacity=8, payload_capacity_items=8, payload_capacity_bytes=4096

View File

@ -36,7 +36,9 @@ def _request(
)
def test_wpa_ctrl_executor_executes_supported_commands_and_returns_command_results() -> None:
def test_wpa_ctrl_executor_executes_supported_commands_and_returns_command_results() -> (
None
):
config = WpaCtrlExecutorConfig(
name="wpa_ctrl",
enabled=True,
@ -94,7 +96,9 @@ def test_wpa_ctrl_executor_executes_supported_commands_and_returns_command_resul
assert status_result.executor_name == "wpa_ctrl"
def test_wpa_ctrl_executor_rejects_unsupported_commands_and_returns_rejection_result() -> None:
def test_wpa_ctrl_executor_rejects_unsupported_commands_and_returns_rejection_result() -> (
None
):
config = WpaCtrlExecutorConfig(name="wpa_ctrl", enabled=True, interface="wlp3s0")
backend = FakeWpaCtrlBackend(default_response="OK")
executor = WpaCtrlExecutor(config, backend=backend)