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

[429] Fix default templates non-subscriptable problem #451

Merged
merged 6 commits into from
Jun 4, 2024
Merged

[429] Fix default templates non-subscriptable problem #451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
32c7e84
fix: adjusting discord templates
NiltonGMJunior May 16, 2024
5a6ad5f
fix: adjusting reports templates
NiltonGMJunior May 16, 2024
2dacbcc
fix: adjusting slack template
NiltonGMJunior May 16, 2024
8bec2b9
fix: adjusting telegram template
NiltonGMJunior May 16, 2024
534c7c2
test: adjusting job tags tests
NiltonGMJunior May 16, 2024
3bbea05
Merge branch 'master' into fix/429-default-templates-not-subscriptable
VMRuiz Jun 4, 2024
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 spidermon/contrib/actions/discord/templates/discord/spider/notifier/macros.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@

{% macro render_job_url() %}{% if data.job %} / [view job in Scrapy Cloud](https://app.scrapinghub.com/p/{{ data.job.key }}){% endif %}{% endmacro %}
{% macro render_url() %}{{ render_job_url() }}{% endmacro %}
{% macro render_spider_name() %}{% if data.spider %}{{ data.spider.name }}{% elif data.job %}{{ data.job.metadata['spider'] }}{% else %}??{% endif %}{% endmacro %}
{% macro render_spider_name() %}{% if data.spider %}{{ data.spider.name }}{% elif data.job %}{{ data.job.metadata.get('spider') }}{% else %}??{% endif %}{% endmacro %}
18 changes: 9 additions & 9 deletions spidermon/contrib/actions/reports/templates/reports/email/monitors/result.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
JOB
------------------------#}
{% if data.job %}
{% set is_script = data.job.metadata['spider'].startswith('py:') %}
{% set is_script = data.job.metadata.get('spider').startswith('py:') %}
{% set job_finished_time = data.job.metadata.get('finished_time', 0) %}
{% if not job_finished_time %}
{% set job_finished_time = datetime.datetime.utcnow().strftime('%s')|int*1000 %}
Expand All @@ -142,10 +142,10 @@
{% set running_time = job_finished_time - job_running_time %}

{% if is_script %}
{{ render_header_data('Script', data.job.metadata['spider'][3:], 'label label-blue') }}
{{ render_header_data('Script', data.job.metadata.get('spider')[3:], 'label label-blue') }}
{% else %}
{{ render_header_data('Spider', data.job.metadata['spider'], 'label label-blue') }}
{{ render_header_data('Version', data.job.metadata['version']) }}
{{ render_header_data('Spider', data.job.metadata.get('spider'), 'label label-blue') }}
{{ render_header_data('Version', data.job.metadata.get('version')) }}
{{ render_header_data('Items', items_count, "badge badge-green") }}
{{ render_header_data('Requests', requests_count, "badge") }}
{% endif %}
Expand Down Expand Up @@ -190,11 +190,11 @@
{% if data.job %}
{{ render_header_data_separator() }}
{{ render_header_data('Job', data.job.key, classes='label label-blue') }}
{{ render_header_data('State', data.job.metadata['state']) }}
{{ render_header_data('Outcome', data.job.metadata['close_reason']) }}
{{ render_header_data('Priority', data.job.metadata['priority']) }}
{{ render_header_data('Bot Group', data.job.metadata['botgroup']) }}
{{ render_header_data_list('Tags', data.job.metadata['tags'], 'label label-gray') }}
{{ render_header_data('State', data.job.metadata.get('state')) }}
{{ render_header_data('Outcome', data.job.metadata.get('close_reason')) }}
{{ render_header_data('Priority', data.job.metadata.get('priority')) }}
{{ render_header_data('Bot Group', data.job.metadata.get('botgroup')) }}
{{ render_header_data_list('Tags', data.job.metadata.get('tags'), 'label label-gray') }}
{% endif %}
</table>
</td>
Expand Down
2 changes: 1 addition & 1 deletion spidermon/contrib/actions/slack/templates/slack/spider/notifier/macros.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@
{% macro render_job_url() %}{% if data.job %} / <https://app.zyte.com/p/{{ data.job.key }}|view job in Scrapy Cloud>{% endif %}{% endmacro %}
{% macro render_report_url() %}{% if include_report_link and data.meta.reports_links %} / <{{ data.meta.reports_links[report_index] }}|report>{% endif %}{% endmacro %}
{% macro render_url() %}{{ render_report_url() }}{{ render_job_url() }}{% endmacro %}
{% macro render_spider_name() %}{% if data.spider %}{{ data.spider.name }}{% elif data.job %}{{ data.job.metadata['spider'] }}{% else %}??{% endif %}{% endmacro %}
{% macro render_spider_name() %}{% if data.spider %}{{ data.spider.name }}{% elif data.job %}{{ data.job.metadata.get('spider') }}{% else %}??{% endif %}{% endmacro %}
2 changes: 1 addition & 1 deletion spidermon/contrib/actions/telegram/templates/telegram/spider/notifier/macros.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@

{% macro render_job_url() %}{% if data.job %} / [view job in Scrapy Cloud](https://app.zyte.com/p/{{ data.job.key }}){% endif %}{% endmacro %}
{% macro render_url() %}{{ render_job_url() }}{% endmacro %}
{% macro render_spider_name() %}{% if data.spider %}{{ data.spider.name }}{% elif data.job %}{{ data.job.metadata['spider'] }}{% else %}??{% endif %}{% endmacro %}
{% macro render_spider_name() %}{% if data.spider %}{{ data.spider.name }}{% elif data.job %}{{ data.job.metadata.get('spider') }}{% else %}??{% endif %}{% endmacro %}
4 changes: 2 additions & 2 deletions tests/contrib/actions/jobs/test_tags.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def test_add_job_tags(test_settings):
add_job_tags.data = MagicMock()
add_job_tags.data.job.metadata = SettableDict({"tags": []})
add_job_tags.run_action()
assert add_job_tags.data.job.metadata["tags"] == ["add_foo", "add_bar"]
assert add_job_tags.data.job.metadata.get("tags") == ["add_foo", "add_bar"]
VMRuiz marked this conversation as resolved.
Show resolved Hide resolved


def test_remove_job_tags(test_settings):
Expand All @@ -58,4 +58,4 @@ def test_remove_job_tags(test_settings):
{"tags": ["remove_foo", "remove_bar"]}
)
remove_job_tags.run_action()
assert remove_job_tags.data.job.metadata["tags"] == []
assert remove_job_tags.data.job.metadata.get("tags") == []
Loading