livestatus-client: accept typed Query objects in the connection API

The typed `cmk.livestatus_client.queries.Query` could not be passed to the
low-level connection methods (`query`, `query_row`, ...): `QueryTypes` only
covered `str | livestatus.Query`, so callers had to wrap it in
`livestatus.Query(query)` first.

Add the existing `_SupportsJsonFormat` protocol to `QueryTypes`. The typed
`Query` already satisfies it (it provides `__str__` and
`supports_json_format`), so it can now be handed directly to any connection
method, which normalizes it internally while preserving the query's output
format decision (blob columns stay on the Python format). This avoids a
layer-inverting import of the high-level query builder into the low-level
connection module.

Use this in PredictionQuerier._query_prediction_files, dropping the
`livestatus.Query` wrapper.

CMK-32809

Change-Id: I081257087671400be61e271650d73b64ead7c55b

Author: CyberKatze

cmk/utils/prediction/_query.py

@@ -9,7 +9,6 @@
 
 from cmk.agent_based.prediction_backend import PredictionInfo
 from cmk.ccc.hostaddress import HostName
-from cmk.livestatus_client import Query as OldQuery
 from cmk.livestatus_client import SingleSiteConnection
 from cmk.livestatus_client.expressions import And, LqSafe
 from cmk.livestatus_client.queries import Query
@@ -56,7 +55,7 @@ def _query_prediction_files(self) -> Iterator[Path]:
         )
         yield from (
             Path(prediction_file)
-            for prediction_file in self.livestatus_connection.query_row(OldQuery(query))[0]
+            for prediction_file in self.livestatus_connection.query_row(query)[0]
         )
 
     def _query_prediction_file_content(self, relative_file_path: Path) -> bytes:

packages/cmk-livestatus-client/cmk/livestatus_client/_connection.py

@@ -525,7 +525,11 @@ def supports_json_format(self) -> bool:
         return self._query.supports_json_format()
 
 
-QueryTypes = str | Query
+# `_SupportsJsonFormat` lets high-level query builders (e.g. the typed
+# `cmk.livestatus_client.queries.Query`) be passed directly to the connection
+# without this low-level module importing them (which would invert the layer
+# dependency). `query`/`query_row`/... normalize such objects into a `Query`.
+QueryTypes = str | Query | _SupportsJsonFormat
 OnlySites = list[SiteId] | None
 DeadSite = dict[str, str | int | Exception | SiteConfiguration]