pierrejeambrun commented on code in PR #46827:
URL: https://github.com/apache/airflow/pull/46827#discussion_r1967301350
##########
providers/elasticsearch/src/airflow/providers/elasticsearch/log/es_task_handler.py:
##########
@@ -358,12 +371,31 @@ def _read(
# If we hit the end of the log, remove the actual end_of_log message
# to prevent it from showing in the UI.
- def concat_logs(hits: list[Hit]):
+ def concat_logs(hits: list[Hit]) -> str:
log_range = (len(hits) - 1) if hits[-1].message ==
self.end_of_log_mark else len(hits)
return "\n".join(self._format_msg(hits[i]) for i in
range(log_range))
if logs_by_host:
- message = [(host, concat_logs(hits)) for host, hits in
logs_by_host.items()]
+ if AIRFLOW_V_3_0_PLUS:
+ from airflow.utils.log.file_task_handler import
StructuredLogMessage
+
+ header = [
+ StructuredLogMessage.model_construct(
Review Comment:
Why are we skipping the validation whe instanciating `StructuredLogMessage` ?
##########
airflow/api_fastapi/core_api/datamodels/log.py:
##########
@@ -16,11 +16,29 @@
# under the License.
from __future__ import annotations
-from pydantic import BaseModel
+from datetime import datetime
+from typing import Annotated
+
+from pydantic import BaseModel, ConfigDict, WithJsonSchema
+
+
+class StructuredLogMessage(BaseModel):
+ """An individual log message."""
+
+ # Not every message has a timestamp.
+ timestamp: Annotated[
+ datetime | None,
+ # Schema level, say this is always a datetime if it exists
+ WithJsonSchema({"type": "string", "format": "date-time"}),
Review Comment:
I'm not sure the `WithJsonSchema` is necessary. This is automatically
generated when the type is `datetime` in the final openapi spec file.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
