Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion airflow-core/docs/img/airflow_erd.sha256
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
35e9e07930e138664fb6ff23bc299567a88946734630d84f3d7d95deacf2f4b8
35b8a7f30e44075373199a53e6634693f4254287a9ecff0582d9ae926fc7aaae
121 changes: 63 additions & 58 deletions airflow-core/docs/img/airflow_erd.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,7 @@ class HITLDetail(BaseModel):
multiple: bool = False
params: dict[str, Any] = Field(default_factory=dict)
assigned_users: list[HITLUser] = Field(default_factory=list)
created_at: datetime

# Response Content Detail
responded_by_user: HITLUser | None = None
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -1999,6 +1999,10 @@ components:
$ref: '#/components/schemas/HITLUser'
type: array
title: Assigned Users
created_at:
type: string
format: date-time
title: Created At
responded_by_user:
anyOf:
- $ref: '#/components/schemas/HITLUser'
Expand DownExpand Up@@ -2029,6 +2033,7 @@ components:
- task_instance
- options
- subject
- created_at
title: HITLDetail
description: Schema for Human-in-the-loop detail.
HITLUser:
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -8264,6 +8264,42 @@ paths:
title: Body Search
description: "SQL LIKE expression \u2014 use `%` / `_` wildcards (e.g. `%customer_%`).\
\ Regular expressions are **not** supported."
- name: created_at_gte
in: query
required: false
schema:
anyOf:
- type: string
format: date-time
- type: 'null'
title: Created At Gte
- name: created_at_gt
in: query
required: false
schema:
anyOf:
- type: string
format: date-time
- type: 'null'
title: Created At Gt
- name: created_at_lte
in: query
required: false
schema:
anyOf:
- type: string
format: date-time
- type: 'null'
title: Created At Lte
- name: created_at_lt
in: query
required: false
schema:
anyOf:
- type: string
format: date-time
- type: 'null'
title: Created At Lt
responses:
'200':
description: Successful Response
Expand DownExpand Up@@ -10885,6 +10921,10 @@ components:
$ref: '#/components/schemas/HITLUser'
type: array
title: Assigned Users
created_at:
type: string
format: date-time
title: Created At
responded_by_user:
anyOf:
- $ref: '#/components/schemas/HITLUser'
Expand DownExpand Up@@ -10915,6 +10955,7 @@ components:
- task_instance
- options
- subject
- created_at
title: HITLDetail
description: Schema for Human-in-the-loop detail.
HITLDetailCollection:
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,9 @@
QueryLimit,
QueryOffset,
QueryTIStateFilter,
RangeFilter,
SortParam,
datetime_range_filter_factory,
)
from airflow.api_fastapi.common.router import AirflowRouter
from airflow.api_fastapi.core_api.datamodels.hitl import (
Expand DownExpand Up@@ -209,6 +211,7 @@ def get_hitl_details(
"ti_id",
"subject",
"responded_at",
"created_at",
],
model=HITLDetailModel,
to_replace={
Expand All@@ -234,6 +237,7 @@ def get_hitl_details(
responded_user_name: QueryHITLDetailRespondedUserNameFilter,
subject_patten: QueryHITLDetailSubjectSearch,
body_patten: QueryHITLDetailBodySearch,
created_at: Annotated[RangeFilter, Depends(datetime_range_filter_factory("created_at", HITLDetailModel))],
) -> HITLDetailCollection:
"""Get Human-in-the-loop details."""
query = (
Expand DownExpand Up@@ -265,6 +269,7 @@ def get_hitl_details(
responded_user_name,
subject_patten,
body_patten,
created_at,
],
offset=offset,
limit=limit,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@
from sqlalchemy import Boolean, Column, ForeignKeyConstraint, String, Text
from sqlalchemy.dialects import postgresql

from airflow._shared.timezones import timezone
from airflow.settings import json
from airflow.utils.sqlalchemy import UtcDateTime

Expand DownExpand Up@@ -60,6 +61,7 @@ def upgrade():
Column("multiple", Boolean, unique=False, default=False),
Column("params", sqlalchemy_jsonfield.JSONField(json=json), nullable=False, default={}),
Column("assignees", sqlalchemy_jsonfield.JSONField(json=json), nullable=True),
Column("created_at", UtcDateTime(timezone=True), nullable=False, default=timezone.utcnow),
Column("responded_at", UtcDateTime, nullable=True),
Column("responded_by", sqlalchemy_jsonfield.JSONField(json=json), nullable=True),
Column("chosen_options", sqlalchemy_jsonfield.JSONField(json=json), nullable=True),
Expand Down
2 changes: 2 additions & 0 deletions airflow-core/src/airflow/models/hitl.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
from sqlalchemy.orm import relationship
from sqlalchemy.sql.functions import FunctionElement

from airflow._shared.timezones import timezone
from airflow.models.base import Base
from airflow.settings import json
from airflow.utils.sqlalchemy import UtcDateTime
Expand DownExpand Up@@ -97,6 +98,7 @@ class HITLDetail(Base):
multiple = Column(Boolean, unique=False, default=False)
params = Column(sqlalchemy_jsonfield.JSONField(json=json), nullable=False, default={})
assignees = Column(sqlalchemy_jsonfield.JSONField(json=json), nullable=True)
created_at = Column(UtcDateTime, default=timezone.utcnow, nullable=False)

# Response Content Detail
responded_at = Column(UtcDateTime, nullable=True)
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Add HITLDetail.created_at by Lee-W · Pull Request #55525 · apache/airflow · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion airflow-core/docs/img/airflow_erd.sha256
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
35e9e07930e138664fb6ff23bc299567a88946734630d84f3d7d95deacf2f4b8
35b8a7f30e44075373199a53e6634693f4254287a9ecff0582d9ae926fc7aaae
121 changes: 63 additions & 58 deletions airflow-core/docs/img/airflow_erd.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,7 @@ class HITLDetail(BaseModel):
multiple: bool = False
params: dict[str, Any] = Field(default_factory=dict)
assigned_users: list[HITLUser] = Field(default_factory=list)
created_at: datetime

# Response Content Detail
responded_by_user: HITLUser | None = None
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -1999,6 +1999,10 @@ components:
$ref: '#/components/schemas/HITLUser'
type: array
title: Assigned Users
created_at:
type: string
format: date-time
title: Created At
responded_by_user:
anyOf:
- $ref: '#/components/schemas/HITLUser'
Expand DownExpand Up@@ -2029,6 +2033,7 @@ components:
- task_instance
- options
- subject
- created_at
title: HITLDetail
description: Schema for Human-in-the-loop detail.
HITLUser:
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -8264,6 +8264,42 @@ paths:
title: Body Search
description: "SQL LIKE expression \u2014 use `%` / `_` wildcards (e.g. `%customer_%`).\
\ Regular expressions are **not** supported."
- name: created_at_gte
in: query
required: false
schema:
anyOf:
- type: string
format: date-time
- type: 'null'
title: Created At Gte
- name: created_at_gt
in: query
required: false
schema:
anyOf:
- type: string
format: date-time
- type: 'null'
title: Created At Gt
- name: created_at_lte
in: query
required: false
schema:
anyOf:
- type: string
format: date-time
- type: 'null'
title: Created At Lte
- name: created_at_lt
in: query
required: false
schema:
anyOf:
- type: string
format: date-time
- type: 'null'
title: Created At Lt
responses:
'200':
description: Successful Response
Expand DownExpand Up@@ -10885,6 +10921,10 @@ components:
$ref: '#/components/schemas/HITLUser'
type: array
title: Assigned Users
created_at:
type: string
format: date-time
title: Created At
responded_by_user:
anyOf:
- $ref: '#/components/schemas/HITLUser'
Expand DownExpand Up@@ -10915,6 +10955,7 @@ components:
- task_instance
- options
- subject
- created_at
title: HITLDetail
description: Schema for Human-in-the-loop detail.
HITLDetailCollection:
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,9 @@
QueryLimit,
QueryOffset,
QueryTIStateFilter,
RangeFilter,
SortParam,
datetime_range_filter_factory,
)
from airflow.api_fastapi.common.router import AirflowRouter
from airflow.api_fastapi.core_api.datamodels.hitl import (
Expand DownExpand Up@@ -209,6 +211,7 @@ def get_hitl_details(
"ti_id",
"subject",
"responded_at",
"created_at",
],
model=HITLDetailModel,
to_replace={
Expand All@@ -234,6 +237,7 @@ def get_hitl_details(
responded_user_name: QueryHITLDetailRespondedUserNameFilter,
subject_patten: QueryHITLDetailSubjectSearch,
body_patten: QueryHITLDetailBodySearch,
created_at: Annotated[RangeFilter, Depends(datetime_range_filter_factory("created_at", HITLDetailModel))],
) -> HITLDetailCollection:
"""Get Human-in-the-loop details."""
query = (
Expand DownExpand Up@@ -265,6 +269,7 @@ def get_hitl_details(
responded_user_name,
subject_patten,
body_patten,
created_at,
],
offset=offset,
limit=limit,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@
from sqlalchemy import Boolean, Column, ForeignKeyConstraint, String, Text
from sqlalchemy.dialects import postgresql

from airflow._shared.timezones import timezone
from airflow.settings import json
from airflow.utils.sqlalchemy import UtcDateTime

Expand DownExpand Up@@ -60,6 +61,7 @@ def upgrade():
Column("multiple", Boolean, unique=False, default=False),
Column("params", sqlalchemy_jsonfield.JSONField(json=json), nullable=False, default={}),
Column("assignees", sqlalchemy_jsonfield.JSONField(json=json), nullable=True),
Column("created_at", UtcDateTime(timezone=True), nullable=False, default=timezone.utcnow),
Column("responded_at", UtcDateTime, nullable=True),
Column("responded_by", sqlalchemy_jsonfield.JSONField(json=json), nullable=True),
Column("chosen_options", sqlalchemy_jsonfield.JSONField(json=json), nullable=True),
Expand Down
2 changes: 2 additions & 0 deletions airflow-core/src/airflow/models/hitl.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
from sqlalchemy.orm import relationship
from sqlalchemy.sql.functions import FunctionElement

from airflow._shared.timezones import timezone
from airflow.models.base import Base
from airflow.settings import json
from airflow.utils.sqlalchemy import UtcDateTime
Expand DownExpand Up@@ -97,6 +98,7 @@ class HITLDetail(Base):
multiple = Column(Boolean, unique=False, default=False)
params = Column(sqlalchemy_jsonfield.JSONField(json=json), nullable=False, default={})
assignees = Column(sqlalchemy_jsonfield.JSONField(json=json), nullable=True)
created_at = Column(UtcDateTime, default=timezone.utcnow, nullable=False)

# Response Content Detail
responded_at = Column(UtcDateTime, nullable=True)
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Add HITLDetail.created_at by Lee-W · Pull Request #55525 · apache/airflow · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion airflow-core/docs/img/airflow_erd.sha256
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
35e9e07930e138664fb6ff23bc299567a88946734630d84f3d7d95deacf2f4b8
35b8a7f30e44075373199a53e6634693f4254287a9ecff0582d9ae926fc7aaae
121 changes: 63 additions & 58 deletions airflow-core/docs/img/airflow_erd.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,7 @@ class HITLDetail(BaseModel):
multiple: bool = False
params: dict[str, Any] = Field(default_factory=dict)
assigned_users: list[HITLUser] = Field(default_factory=list)
created_at: datetime

# Response Content Detail
responded_by_user: HITLUser | None = None
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -1999,6 +1999,10 @@ components:
$ref: '#/components/schemas/HITLUser'
type: array
title: Assigned Users
created_at:
type: string
format: date-time
title: Created At
responded_by_user:
anyOf:
- $ref: '#/components/schemas/HITLUser'
Expand DownExpand Up@@ -2029,6 +2033,7 @@ components:
- task_instance
- options
- subject
- created_at
title: HITLDetail
description: Schema for Human-in-the-loop detail.
HITLUser:
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -8264,6 +8264,42 @@ paths:
title: Body Search
description: "SQL LIKE expression \u2014 use `%` / `_` wildcards (e.g. `%customer_%`).\
\ Regular expressions are **not** supported."
- name: created_at_gte
in: query
required: false
schema:
anyOf:
- type: string
format: date-time
- type: 'null'
title: Created At Gte
- name: created_at_gt
in: query
required: false
schema:
anyOf:
- type: string
format: date-time
- type: 'null'
title: Created At Gt
- name: created_at_lte
in: query
required: false
schema:
anyOf:
- type: string
format: date-time
- type: 'null'
title: Created At Lte
- name: created_at_lt
in: query
required: false
schema:
anyOf:
- type: string
format: date-time
- type: 'null'
title: Created At Lt
responses:
'200':
description: Successful Response
Expand DownExpand Up@@ -10885,6 +10921,10 @@ components:
$ref: '#/components/schemas/HITLUser'
type: array
title: Assigned Users
created_at:
type: string
format: date-time
title: Created At
responded_by_user:
anyOf:
- $ref: '#/components/schemas/HITLUser'
Expand DownExpand Up@@ -10915,6 +10955,7 @@ components:
- task_instance
- options
- subject
- created_at
title: HITLDetail
description: Schema for Human-in-the-loop detail.
HITLDetailCollection:
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,9 @@
QueryLimit,
QueryOffset,
QueryTIStateFilter,
RangeFilter,
SortParam,
datetime_range_filter_factory,
)
from airflow.api_fastapi.common.router import AirflowRouter
from airflow.api_fastapi.core_api.datamodels.hitl import (
Expand DownExpand Up@@ -209,6 +211,7 @@ def get_hitl_details(
"ti_id",
"subject",
"responded_at",
"created_at",
],
model=HITLDetailModel,
to_replace={
Expand All@@ -234,6 +237,7 @@ def get_hitl_details(
responded_user_name: QueryHITLDetailRespondedUserNameFilter,
subject_patten: QueryHITLDetailSubjectSearch,
body_patten: QueryHITLDetailBodySearch,
created_at: Annotated[RangeFilter, Depends(datetime_range_filter_factory("created_at", HITLDetailModel))],
) -> HITLDetailCollection:
"""Get Human-in-the-loop details."""
query = (
Expand DownExpand Up@@ -265,6 +269,7 @@ def get_hitl_details(
responded_user_name,
subject_patten,
body_patten,
created_at,
],
offset=offset,
limit=limit,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@
from sqlalchemy import Boolean, Column, ForeignKeyConstraint, String, Text
from sqlalchemy.dialects import postgresql

from airflow._shared.timezones import timezone
from airflow.settings import json
from airflow.utils.sqlalchemy import UtcDateTime

Expand DownExpand Up@@ -60,6 +61,7 @@ def upgrade():
Column("multiple", Boolean, unique=False, default=False),
Column("params", sqlalchemy_jsonfield.JSONField(json=json), nullable=False, default={}),
Column("assignees", sqlalchemy_jsonfield.JSONField(json=json), nullable=True),
Column("created_at", UtcDateTime(timezone=True), nullable=False, default=timezone.utcnow),
Column("responded_at", UtcDateTime, nullable=True),
Column("responded_by", sqlalchemy_jsonfield.JSONField(json=json), nullable=True),
Column("chosen_options", sqlalchemy_jsonfield.JSONField(json=json), nullable=True),
Expand Down
2 changes: 2 additions & 0 deletions airflow-core/src/airflow/models/hitl.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
from sqlalchemy.orm import relationship
from sqlalchemy.sql.functions import FunctionElement

from airflow._shared.timezones import timezone
from airflow.models.base import Base
from airflow.settings import json
from airflow.utils.sqlalchemy import UtcDateTime
Expand DownExpand Up@@ -97,6 +98,7 @@ class HITLDetail(Base):
multiple = Column(Boolean, unique=False, default=False)
params = Column(sqlalchemy_jsonfield.JSONField(json=json), nullable=False, default={})
assignees = Column(sqlalchemy_jsonfield.JSONField(json=json), nullable=True)
created_at = Column(UtcDateTime, default=timezone.utcnow, nullable=False)

# Response Content Detail
responded_at = Column(UtcDateTime, nullable=True)
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Add HITLDetail.created_at by Lee-W · Pull Request #55525 · apache/airflow · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion airflow-core/docs/img/airflow_erd.sha256
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
35e9e07930e138664fb6ff23bc299567a88946734630d84f3d7d95deacf2f4b8
35b8a7f30e44075373199a53e6634693f4254287a9ecff0582d9ae926fc7aaae
121 changes: 63 additions & 58 deletions airflow-core/docs/img/airflow_erd.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,7 @@ class HITLDetail(BaseModel):
multiple: bool = False
params: dict[str, Any] = Field(default_factory=dict)
assigned_users: list[HITLUser] = Field(default_factory=list)
created_at: datetime

# Response Content Detail
responded_by_user: HITLUser | None = None
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -1999,6 +1999,10 @@ components:
$ref: '#/components/schemas/HITLUser'
type: array
title: Assigned Users
created_at:
type: string
format: date-time
title: Created At
responded_by_user:
anyOf:
- $ref: '#/components/schemas/HITLUser'
Expand DownExpand Up@@ -2029,6 +2033,7 @@ components:
- task_instance
- options
- subject
- created_at
title: HITLDetail
description: Schema for Human-in-the-loop detail.
HITLUser:
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -8264,6 +8264,42 @@ paths:
title: Body Search
description: "SQL LIKE expression \u2014 use `%` / `_` wildcards (e.g. `%customer_%`).\
\ Regular expressions are **not** supported."
- name: created_at_gte
in: query
required: false
schema:
anyOf:
- type: string
format: date-time
- type: 'null'
title: Created At Gte
- name: created_at_gt
in: query
required: false
schema:
anyOf:
- type: string
format: date-time
- type: 'null'
title: Created At Gt
- name: created_at_lte
in: query
required: false
schema:
anyOf:
- type: string
format: date-time
- type: 'null'
title: Created At Lte
- name: created_at_lt
in: query
required: false
schema:
anyOf:
- type: string
format: date-time
- type: 'null'
title: Created At Lt
responses:
'200':
description: Successful Response
Expand DownExpand Up@@ -10885,6 +10921,10 @@ components:
$ref: '#/components/schemas/HITLUser'
type: array
title: Assigned Users
created_at:
type: string
format: date-time
title: Created At
responded_by_user:
anyOf:
- $ref: '#/components/schemas/HITLUser'
Expand DownExpand Up@@ -10915,6 +10955,7 @@ components:
- task_instance
- options
- subject
- created_at
title: HITLDetail
description: Schema for Human-in-the-loop detail.
HITLDetailCollection:
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,9 @@
QueryLimit,
QueryOffset,
QueryTIStateFilter,
RangeFilter,
SortParam,
datetime_range_filter_factory,
)
from airflow.api_fastapi.common.router import AirflowRouter
from airflow.api_fastapi.core_api.datamodels.hitl import (
Expand DownExpand Up@@ -209,6 +211,7 @@ def get_hitl_details(
"ti_id",
"subject",
"responded_at",
"created_at",
],
model=HITLDetailModel,
to_replace={
Expand All@@ -234,6 +237,7 @@ def get_hitl_details(
responded_user_name: QueryHITLDetailRespondedUserNameFilter,
subject_patten: QueryHITLDetailSubjectSearch,
body_patten: QueryHITLDetailBodySearch,
created_at: Annotated[RangeFilter, Depends(datetime_range_filter_factory("created_at", HITLDetailModel))],
) -> HITLDetailCollection:
"""Get Human-in-the-loop details."""
query = (
Expand DownExpand Up@@ -265,6 +269,7 @@ def get_hitl_details(
responded_user_name,
subject_patten,
body_patten,
created_at,
],
offset=offset,
limit=limit,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@
from sqlalchemy import Boolean, Column, ForeignKeyConstraint, String, Text
from sqlalchemy.dialects import postgresql

from airflow._shared.timezones import timezone
from airflow.settings import json
from airflow.utils.sqlalchemy import UtcDateTime

Expand DownExpand Up@@ -60,6 +61,7 @@ def upgrade():
Column("multiple", Boolean, unique=False, default=False),
Column("params", sqlalchemy_jsonfield.JSONField(json=json), nullable=False, default={}),
Column("assignees", sqlalchemy_jsonfield.JSONField(json=json), nullable=True),
Column("created_at", UtcDateTime(timezone=True), nullable=False, default=timezone.utcnow),
Column("responded_at", UtcDateTime, nullable=True),
Column("responded_by", sqlalchemy_jsonfield.JSONField(json=json), nullable=True),
Column("chosen_options", sqlalchemy_jsonfield.JSONField(json=json), nullable=True),
Expand Down
2 changes: 2 additions & 0 deletions airflow-core/src/airflow/models/hitl.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
from sqlalchemy.orm import relationship
from sqlalchemy.sql.functions import FunctionElement

from airflow._shared.timezones import timezone
from airflow.models.base import Base
from airflow.settings import json
from airflow.utils.sqlalchemy import UtcDateTime
Expand DownExpand Up@@ -97,6 +98,7 @@ class HITLDetail(Base):
multiple = Column(Boolean, unique=False, default=False)
params = Column(sqlalchemy_jsonfield.JSONField(json=json), nullable=False, default={})
assignees = Column(sqlalchemy_jsonfield.JSONField(json=json), nullable=True)
created_at = Column(UtcDateTime, default=timezone.utcnow, nullable=False)

# Response Content Detail
responded_at = Column(UtcDateTime, nullable=True)
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' Add HITLDetail.created_at by Lee-W · Pull Request #55525 · apache/airflow · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion airflow-core/docs/img/airflow_erd.sha256
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
35e9e07930e138664fb6ff23bc299567a88946734630d84f3d7d95deacf2f4b8
35b8a7f30e44075373199a53e6634693f4254287a9ecff0582d9ae926fc7aaae
121 changes: 63 additions & 58 deletions airflow-core/docs/img/airflow_erd.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,7 @@ class HITLDetail(BaseModel):
multiple: bool = False
params: dict[str, Any] = Field(default_factory=dict)
assigned_users: list[HITLUser] = Field(default_factory=list)
created_at: datetime

# Response Content Detail
responded_by_user: HITLUser | None = None
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -1999,6 +1999,10 @@ components:
$ref: '#/components/schemas/HITLUser'
type: array
title: Assigned Users
created_at:
type: string
format: date-time
title: Created At
responded_by_user:
anyOf:
- $ref: '#/components/schemas/HITLUser'
Expand DownExpand Up@@ -2029,6 +2033,7 @@ components:
- task_instance
- options
- subject
- created_at
title: HITLDetail
description: Schema for Human-in-the-loop detail.
HITLUser:
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -8264,6 +8264,42 @@ paths:
title: Body Search
description: "SQL LIKE expression \u2014 use `%` / `_` wildcards (e.g. `%customer_%`).\
\ Regular expressions are **not** supported."
- name: created_at_gte
in: query
required: false
schema:
anyOf:
- type: string
format: date-time
- type: 'null'
title: Created At Gte
- name: created_at_gt
in: query
required: false
schema:
anyOf:
- type: string
format: date-time
- type: 'null'
title: Created At Gt
- name: created_at_lte
in: query
required: false
schema:
anyOf:
- type: string
format: date-time
- type: 'null'
title: Created At Lte
- name: created_at_lt
in: query
required: false
schema:
anyOf:
- type: string
format: date-time
- type: 'null'
title: Created At Lt
responses:
'200':
description: Successful Response
Expand DownExpand Up@@ -10885,6 +10921,10 @@ components:
$ref: '#/components/schemas/HITLUser'
type: array
title: Assigned Users
created_at:
type: string
format: date-time
title: Created At
responded_by_user:
anyOf:
- $ref: '#/components/schemas/HITLUser'
Expand DownExpand Up@@ -10915,6 +10955,7 @@ components:
- task_instance
- options
- subject
- created_at
title: HITLDetail
description: Schema for Human-in-the-loop detail.
HITLDetailCollection:
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,9 @@
QueryLimit,
QueryOffset,
QueryTIStateFilter,
RangeFilter,
SortParam,
datetime_range_filter_factory,
)
from airflow.api_fastapi.common.router import AirflowRouter
from airflow.api_fastapi.core_api.datamodels.hitl import (
Expand DownExpand Up@@ -209,6 +211,7 @@ def get_hitl_details(
"ti_id",
"subject",
"responded_at",
"created_at",
],
model=HITLDetailModel,
to_replace={
Expand All@@ -234,6 +237,7 @@ def get_hitl_details(
responded_user_name: QueryHITLDetailRespondedUserNameFilter,
subject_patten: QueryHITLDetailSubjectSearch,
body_patten: QueryHITLDetailBodySearch,
created_at: Annotated[RangeFilter, Depends(datetime_range_filter_factory("created_at", HITLDetailModel))],
) -> HITLDetailCollection:
"""Get Human-in-the-loop details."""
query = (
Expand DownExpand Up@@ -265,6 +269,7 @@ def get_hitl_details(
responded_user_name,
subject_patten,
body_patten,
created_at,
],
offset=offset,
limit=limit,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@
from sqlalchemy import Boolean, Column, ForeignKeyConstraint, String, Text
from sqlalchemy.dialects import postgresql

from airflow._shared.timezones import timezone
from airflow.settings import json
from airflow.utils.sqlalchemy import UtcDateTime

Expand DownExpand Up@@ -60,6 +61,7 @@ def upgrade():
Column("multiple", Boolean, unique=False, default=False),
Column("params", sqlalchemy_jsonfield.JSONField(json=json), nullable=False, default={}),
Column("assignees", sqlalchemy_jsonfield.JSONField(json=json), nullable=True),
Column("created_at", UtcDateTime(timezone=True), nullable=False, default=timezone.utcnow),
Column("responded_at", UtcDateTime, nullable=True),
Column("responded_by", sqlalchemy_jsonfield.JSONField(json=json), nullable=True),
Column("chosen_options", sqlalchemy_jsonfield.JSONField(json=json), nullable=True),
Expand Down
2 changes: 2 additions & 0 deletions airflow-core/src/airflow/models/hitl.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
from sqlalchemy.orm import relationship
from sqlalchemy.sql.functions import FunctionElement

from airflow._shared.timezones import timezone
from airflow.models.base import Base
from airflow.settings import json
from airflow.utils.sqlalchemy import UtcDateTime
Expand DownExpand Up@@ -97,6 +98,7 @@ class HITLDetail(Base):
multiple = Column(Boolean, unique=False, default=False)
params = Column(sqlalchemy_jsonfield.JSONField(json=json), nullable=False, default={})
assignees = Column(sqlalchemy_jsonfield.JSONField(json=json), nullable=True)
created_at = Column(UtcDateTime, default=timezone.utcnow, nullable=False)

# Response Content Detail
responded_at = Column(UtcDateTime, nullable=True)
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Add HITLDetail.created_at by Lee-W · Pull Request #55525 · apache/airflow · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion airflow-core/docs/img/airflow_erd.sha256
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
35e9e07930e138664fb6ff23bc299567a88946734630d84f3d7d95deacf2f4b8
35b8a7f30e44075373199a53e6634693f4254287a9ecff0582d9ae926fc7aaae
121 changes: 63 additions & 58 deletions airflow-core/docs/img/airflow_erd.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,7 @@ class HITLDetail(BaseModel):
multiple: bool = False
params: dict[str, Any] = Field(default_factory=dict)
assigned_users: list[HITLUser] = Field(default_factory=list)
created_at: datetime

# Response Content Detail
responded_by_user: HITLUser | None = None
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -1999,6 +1999,10 @@ components:
$ref: '#/components/schemas/HITLUser'
type: array
title: Assigned Users
created_at:
type: string
format: date-time
title: Created At
responded_by_user:
anyOf:
- $ref: '#/components/schemas/HITLUser'
Expand DownExpand Up@@ -2029,6 +2033,7 @@ components:
- task_instance
- options
- subject
- created_at
title: HITLDetail
description: Schema for Human-in-the-loop detail.
HITLUser:
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -8264,6 +8264,42 @@ paths:
title: Body Search
description: "SQL LIKE expression \u2014 use `%` / `_` wildcards (e.g. `%customer_%`).\
\ Regular expressions are **not** supported."
- name: created_at_gte
in: query
required: false
schema:
anyOf:
- type: string
format: date-time
- type: 'null'
title: Created At Gte
- name: created_at_gt
in: query
required: false
schema:
anyOf:
- type: string
format: date-time
- type: 'null'
title: Created At Gt
- name: created_at_lte
in: query
required: false
schema:
anyOf:
- type: string
format: date-time
- type: 'null'
title: Created At Lte
- name: created_at_lt
in: query
required: false
schema:
anyOf:
- type: string
format: date-time
- type: 'null'
title: Created At Lt
responses:
'200':
description: Successful Response
Expand DownExpand Up@@ -10885,6 +10921,10 @@ components:
$ref: '#/components/schemas/HITLUser'
type: array
title: Assigned Users
created_at:
type: string
format: date-time
title: Created At
responded_by_user:
anyOf:
- $ref: '#/components/schemas/HITLUser'
Expand DownExpand Up@@ -10915,6 +10955,7 @@ components:
- task_instance
- options
- subject
- created_at
title: HITLDetail
description: Schema for Human-in-the-loop detail.
HITLDetailCollection:
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,9 @@
QueryLimit,
QueryOffset,
QueryTIStateFilter,
RangeFilter,
SortParam,
datetime_range_filter_factory,
)
from airflow.api_fastapi.common.router import AirflowRouter
from airflow.api_fastapi.core_api.datamodels.hitl import (
Expand DownExpand Up@@ -209,6 +211,7 @@ def get_hitl_details(
"ti_id",
"subject",
"responded_at",
"created_at",
],
model=HITLDetailModel,
to_replace={
Expand All@@ -234,6 +237,7 @@ def get_hitl_details(
responded_user_name: QueryHITLDetailRespondedUserNameFilter,
subject_patten: QueryHITLDetailSubjectSearch,
body_patten: QueryHITLDetailBodySearch,
created_at: Annotated[RangeFilter, Depends(datetime_range_filter_factory("created_at", HITLDetailModel))],
) -> HITLDetailCollection:
"""Get Human-in-the-loop details."""
query = (
Expand DownExpand Up@@ -265,6 +269,7 @@ def get_hitl_details(
responded_user_name,
subject_patten,
body_patten,
created_at,
],
offset=offset,
limit=limit,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@
from sqlalchemy import Boolean, Column, ForeignKeyConstraint, String, Text
from sqlalchemy.dialects import postgresql

from airflow._shared.timezones import timezone
from airflow.settings import json
from airflow.utils.sqlalchemy import UtcDateTime

Expand DownExpand Up@@ -60,6 +61,7 @@ def upgrade():
Column("multiple", Boolean, unique=False, default=False),
Column("params", sqlalchemy_jsonfield.JSONField(json=json), nullable=False, default={}),
Column("assignees", sqlalchemy_jsonfield.JSONField(json=json), nullable=True),
Column("created_at", UtcDateTime(timezone=True), nullable=False, default=timezone.utcnow),
Column("responded_at", UtcDateTime, nullable=True),
Column("responded_by", sqlalchemy_jsonfield.JSONField(json=json), nullable=True),
Column("chosen_options", sqlalchemy_jsonfield.JSONField(json=json), nullable=True),
Expand Down
2 changes: 2 additions & 0 deletions airflow-core/src/airflow/models/hitl.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
from sqlalchemy.orm import relationship
from sqlalchemy.sql.functions import FunctionElement

from airflow._shared.timezones import timezone
from airflow.models.base import Base
from airflow.settings import json
from airflow.utils.sqlalchemy import UtcDateTime
Expand DownExpand Up@@ -97,6 +98,7 @@ class HITLDetail(Base):
multiple = Column(Boolean, unique=False, default=False)
params = Column(sqlalchemy_jsonfield.JSONField(json=json), nullable=False, default={})
assignees = Column(sqlalchemy_jsonfield.JSONField(json=json), nullable=True)
created_at = Column(UtcDateTime, default=timezone.utcnow, nullable=False)

# Response Content Detail
responded_at = Column(UtcDateTime, nullable=True)
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Add HITLDetail.created_at by Lee-W · Pull Request #55525 · apache/airflow · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion airflow-core/docs/img/airflow_erd.sha256
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
35e9e07930e138664fb6ff23bc299567a88946734630d84f3d7d95deacf2f4b8
35b8a7f30e44075373199a53e6634693f4254287a9ecff0582d9ae926fc7aaae
121 changes: 63 additions & 58 deletions airflow-core/docs/img/airflow_erd.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,7 @@ class HITLDetail(BaseModel):
multiple: bool = False
params: dict[str, Any] = Field(default_factory=dict)
assigned_users: list[HITLUser] = Field(default_factory=list)
created_at: datetime

# Response Content Detail
responded_by_user: HITLUser | None = None
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -1999,6 +1999,10 @@ components:
$ref: '#/components/schemas/HITLUser'
type: array
title: Assigned Users
created_at:
type: string
format: date-time
title: Created At
responded_by_user:
anyOf:
- $ref: '#/components/schemas/HITLUser'
Expand DownExpand Up@@ -2029,6 +2033,7 @@ components:
- task_instance
- options
- subject
- created_at
title: HITLDetail
description: Schema for Human-in-the-loop detail.
HITLUser:
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -8264,6 +8264,42 @@ paths:
title: Body Search
description: "SQL LIKE expression \u2014 use `%` / `_` wildcards (e.g. `%customer_%`).\
\ Regular expressions are **not** supported."
- name: created_at_gte
in: query
required: false
schema:
anyOf:
- type: string
format: date-time
- type: 'null'
title: Created At Gte
- name: created_at_gt
in: query
required: false
schema:
anyOf:
- type: string
format: date-time
- type: 'null'
title: Created At Gt
- name: created_at_lte
in: query
required: false
schema:
anyOf:
- type: string
format: date-time
- type: 'null'
title: Created At Lte
- name: created_at_lt
in: query
required: false
schema:
anyOf:
- type: string
format: date-time
- type: 'null'
title: Created At Lt
responses:
'200':
description: Successful Response
Expand DownExpand Up@@ -10885,6 +10921,10 @@ components:
$ref: '#/components/schemas/HITLUser'
type: array
title: Assigned Users
created_at:
type: string
format: date-time
title: Created At
responded_by_user:
anyOf:
- $ref: '#/components/schemas/HITLUser'
Expand DownExpand Up@@ -10915,6 +10955,7 @@ components:
- task_instance
- options
- subject
- created_at
title: HITLDetail
description: Schema for Human-in-the-loop detail.
HITLDetailCollection:
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,9 @@
QueryLimit,
QueryOffset,
QueryTIStateFilter,
RangeFilter,
SortParam,
datetime_range_filter_factory,
)
from airflow.api_fastapi.common.router import AirflowRouter
from airflow.api_fastapi.core_api.datamodels.hitl import (
Expand DownExpand Up@@ -209,6 +211,7 @@ def get_hitl_details(
"ti_id",
"subject",
"responded_at",
"created_at",
],
model=HITLDetailModel,
to_replace={
Expand All@@ -234,6 +237,7 @@ def get_hitl_details(
responded_user_name: QueryHITLDetailRespondedUserNameFilter,
subject_patten: QueryHITLDetailSubjectSearch,
body_patten: QueryHITLDetailBodySearch,
created_at: Annotated[RangeFilter, Depends(datetime_range_filter_factory("created_at", HITLDetailModel))],
) -> HITLDetailCollection:
"""Get Human-in-the-loop details."""
query = (
Expand DownExpand Up@@ -265,6 +269,7 @@ def get_hitl_details(
responded_user_name,
subject_patten,
body_patten,
created_at,
],
offset=offset,
limit=limit,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@
from sqlalchemy import Boolean, Column, ForeignKeyConstraint, String, Text
from sqlalchemy.dialects import postgresql

from airflow._shared.timezones import timezone
from airflow.settings import json
from airflow.utils.sqlalchemy import UtcDateTime

Expand DownExpand Up@@ -60,6 +61,7 @@ def upgrade():
Column("multiple", Boolean, unique=False, default=False),
Column("params", sqlalchemy_jsonfield.JSONField(json=json), nullable=False, default={}),
Column("assignees", sqlalchemy_jsonfield.JSONField(json=json), nullable=True),
Column("created_at", UtcDateTime(timezone=True), nullable=False, default=timezone.utcnow),
Column("responded_at", UtcDateTime, nullable=True),
Column("responded_by", sqlalchemy_jsonfield.JSONField(json=json), nullable=True),
Column("chosen_options", sqlalchemy_jsonfield.JSONField(json=json), nullable=True),
Expand Down
2 changes: 2 additions & 0 deletions airflow-core/src/airflow/models/hitl.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
from sqlalchemy.orm import relationship
from sqlalchemy.sql.functions import FunctionElement

from airflow._shared.timezones import timezone
from airflow.models.base import Base
from airflow.settings import json
from airflow.utils.sqlalchemy import UtcDateTime
Expand DownExpand Up@@ -97,6 +98,7 @@ class HITLDetail(Base):
multiple = Column(Boolean, unique=False, default=False)
params = Column(sqlalchemy_jsonfield.JSONField(json=json), nullable=False, default={})
assignees = Column(sqlalchemy_jsonfield.JSONField(json=json), nullable=True)
created_at = Column(UtcDateTime, default=timezone.utcnow, nullable=False)

# Response Content Detail
responded_at = Column(UtcDateTime, nullable=True)
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); Add HITLDetail.created_at by Lee-W · Pull Request #55525 · apache/airflow · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion airflow-core/docs/img/airflow_erd.sha256
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
35e9e07930e138664fb6ff23bc299567a88946734630d84f3d7d95deacf2f4b8
35b8a7f30e44075373199a53e6634693f4254287a9ecff0582d9ae926fc7aaae
121 changes: 63 additions & 58 deletions airflow-core/docs/img/airflow_erd.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,7 @@ class HITLDetail(BaseModel):
multiple: bool = False
params: dict[str, Any] = Field(default_factory=dict)
assigned_users: list[HITLUser] = Field(default_factory=list)
created_at: datetime

# Response Content Detail
responded_by_user: HITLUser | None = None
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -1999,6 +1999,10 @@ components:
$ref: '#/components/schemas/HITLUser'
type: array
title: Assigned Users
created_at:
type: string
format: date-time
title: Created At
responded_by_user:
anyOf:
- $ref: '#/components/schemas/HITLUser'
Expand DownExpand Up@@ -2029,6 +2033,7 @@ components:
- task_instance
- options
- subject
- created_at
title: HITLDetail
description: Schema for Human-in-the-loop detail.
HITLUser:
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -8264,6 +8264,42 @@ paths:
title: Body Search
description: "SQL LIKE expression \u2014 use `%` / `_` wildcards (e.g. `%customer_%`).\
\ Regular expressions are **not** supported."
- name: created_at_gte
in: query
required: false
schema:
anyOf:
- type: string
format: date-time
- type: 'null'
title: Created At Gte
- name: created_at_gt
in: query
required: false
schema:
anyOf:
- type: string
format: date-time
- type: 'null'
title: Created At Gt
- name: created_at_lte
in: query
required: false
schema:
anyOf:
- type: string
format: date-time
- type: 'null'
title: Created At Lte
- name: created_at_lt
in: query
required: false
schema:
anyOf:
- type: string
format: date-time
- type: 'null'
title: Created At Lt
responses:
'200':
description: Successful Response
Expand DownExpand Up@@ -10885,6 +10921,10 @@ components:
$ref: '#/components/schemas/HITLUser'
type: array
title: Assigned Users
created_at:
type: string
format: date-time
title: Created At
responded_by_user:
anyOf:
- $ref: '#/components/schemas/HITLUser'
Expand DownExpand Up@@ -10915,6 +10955,7 @@ components:
- task_instance
- options
- subject
- created_at
title: HITLDetail
description: Schema for Human-in-the-loop detail.
HITLDetailCollection:
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,9 @@
QueryLimit,
QueryOffset,
QueryTIStateFilter,
RangeFilter,
SortParam,
datetime_range_filter_factory,
)
from airflow.api_fastapi.common.router import AirflowRouter
from airflow.api_fastapi.core_api.datamodels.hitl import (
Expand DownExpand Up@@ -209,6 +211,7 @@ def get_hitl_details(
"ti_id",
"subject",
"responded_at",
"created_at",
],
model=HITLDetailModel,
to_replace={
Expand All@@ -234,6 +237,7 @@ def get_hitl_details(
responded_user_name: QueryHITLDetailRespondedUserNameFilter,
subject_patten: QueryHITLDetailSubjectSearch,
body_patten: QueryHITLDetailBodySearch,
created_at: Annotated[RangeFilter, Depends(datetime_range_filter_factory("created_at", HITLDetailModel))],
) -> HITLDetailCollection:
"""Get Human-in-the-loop details."""
query = (
Expand DownExpand Up@@ -265,6 +269,7 @@ def get_hitl_details(
responded_user_name,
subject_patten,
body_patten,
created_at,
],
offset=offset,
limit=limit,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@
from sqlalchemy import Boolean, Column, ForeignKeyConstraint, String, Text
from sqlalchemy.dialects import postgresql

from airflow._shared.timezones import timezone
from airflow.settings import json
from airflow.utils.sqlalchemy import UtcDateTime

Expand DownExpand Up@@ -60,6 +61,7 @@ def upgrade():
Column("multiple", Boolean, unique=False, default=False),
Column("params", sqlalchemy_jsonfield.JSONField(json=json), nullable=False, default={}),
Column("assignees", sqlalchemy_jsonfield.JSONField(json=json), nullable=True),
Column("created_at", UtcDateTime(timezone=True), nullable=False, default=timezone.utcnow),
Column("responded_at", UtcDateTime, nullable=True),
Column("responded_by", sqlalchemy_jsonfield.JSONField(json=json), nullable=True),
Column("chosen_options", sqlalchemy_jsonfield.JSONField(json=json), nullable=True),
Expand Down
2 changes: 2 additions & 0 deletions airflow-core/src/airflow/models/hitl.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
from sqlalchemy.orm import relationship
from sqlalchemy.sql.functions import FunctionElement

from airflow._shared.timezones import timezone
from airflow.models.base import Base
from airflow.settings import json
from airflow.utils.sqlalchemy import UtcDateTime
Expand DownExpand Up@@ -97,6 +98,7 @@ class HITLDetail(Base):
multiple = Column(Boolean, unique=False, default=False)
params = Column(sqlalchemy_jsonfield.JSONField(json=json), nullable=False, default={})
assignees = Column(sqlalchemy_jsonfield.JSONField(json=json), nullable=True)
created_at = Column(UtcDateTime, default=timezone.utcnow, nullable=False)

# Response Content Detail
responded_at = Column(UtcDateTime, nullable=True)
Expand Down
Loading