Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

TI.log_url fix for map_index #24335

Merged
merged 6 commits into from
Jun 14, 2022
Merged

TI.log_url fix for map_index #24335

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
64db9d8
fix log_url to include map_index; happy path test fix
fritz-astronomer Jun 8, 2022
04d9806
fix static check formatting
fritz-astronomer Jun 9, 2022
0974908
fix static check formatting
fritz-astronomer Jun 9, 2022
484ce50
Merge branch 'main' into log_url
fritz-astronomer Jun 10, 2022
5bd59c0
Merge branch 'main' into log_url
fritz-astronomer Jun 13, 2022
3b43f13
Merge branch 'main' into log_url
fritz-astronomer Jun 14, 2022
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
8 changes: 7 additions & 1 deletion airflow/models/taskinstance.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -771,7 +771,13 @@ def log_url(self):
"""Log URL for TaskInstance"""
iso = quote(self.execution_date.isoformat())
base_url = conf.get('webserver', 'BASE_URL')
return base_url + f"/log?execution_date={iso}&task_id={self.task_id}&dag_id={self.dag_id}"
return (
f"{base_url}/log"
f"?execution_date={iso}"
f"&task_id={self.task_id}"
f"&dag_id={self.dag_id}"
f"&map_index={self.map_index}"
)

@property
def mark_success_url(self):
Expand Down
19 changes: 6 additions & 13 deletions tests/models/test_taskinstance.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1307,26 +1307,19 @@ def test_get_num_running_task_instances(self, create_task_instance):
assert 1 == ti2.get_num_running_task_instances(session=session)
assert 1 == ti3.get_num_running_task_instances(session=session)

# def test_log_url(self):
# now = pendulum.now('Europe/Brussels')
# dag = DAG('dag', start_date=DEFAULT_DATE)
# task = EmptyOperator(task_id='op', dag=dag)
# ti = TI(task=task, execution_date=now)
# d = urllib.parse.parse_qs(
# urllib.parse.urlparse(ti.log_url).query,
# keep_blank_values=True, strict_parsing=True)
# self.assertEqual(d['dag_id'][0], 'dag')
# self.assertEqual(d['task_id'][0], 'op')
# self.assertEqual(pendulum.parse(d['execution_date'][0]), now)

def test_log_url(self, create_task_instance):
ti = create_task_instance(dag_id='dag', task_id='op', execution_date=timezone.datetime(2018, 1, 1))
ti = create_task_instance(
fritz-astronomer marked this conversation as resolved.
Show resolved Hide resolved
dag_id='dag',
task_id='op',
execution_date=timezone.datetime(2018, 1, 1)
)

expected_url = (
'http://localhost:8080/log?'
'execution_date=2018-01-01T00%3A00%3A00%2B00%3A00'
'&task_id=op'
'&dag_id=dag'
'&map_index=-1'
)
assert ti.log_url == expected_url

Expand Down