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

Create param hide_filter #90

Merged
merged 5 commits into from
Jun 18, 2024
Merged

Create param hide_filter #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
74b739e
add hide_filter param
edulauer Jun 18, 2024
6804aee
format html report based on hide_filters
edulauer Jun 18, 2024
9866c57
add hide_filters in json schema
edulauer Jun 18, 2024
24f5ecd
create example for hide_filters
edulauer Jun 18, 2024
db095eb
modify yaml parser test
edulauer Jun 18, 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
22 changes: 22 additions & 0 deletions dag_confs/examples_and_tests/hide_filters_example.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
dag:
id: hide_filters_example
description: DAG de teste
tags:
- inlabs
schedule: 0 8 * * MON-FRI
search:
header: HEADER TEXT
sources:
- INLABS
terms:
- tecnologia
- informação
department:
- Ministério da Gestão e da Inovação em Serviços Públicos
- Ministério da Defesa
report:
emails:
- [email protected]
attach_csv: True
subject: "Teste do Ro-dou"
hide_filters: True
4 changes: 4 additions & 0 deletions schemas/ro-dou.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,10 @@
"skip_null": {
"type": "boolean",
"description": "description"
},
"hide_filters": {
"type": "boolean",
"description": "description"
}
},
"additionalProperties": false
Expand Down
55 changes: 33 additions & 22 deletions src/notification/email_sender.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,16 @@ def generate_email_content(self) -> str:

if search["header"]:
blocks.append(f"<h1>{search['header']}</h1>")
if search["department"]:
blocks.append(
"""<p class="secao-marker">Filtrando resultados somente para:</p>"""
)
blocks.append("<ul>")
for dpt in search["department"]:
blocks.append(f"<li>{dpt}</li>")
blocks.append("</ul>")

if not self.specs.hide_filters:
if search["department"]:
blocks.append(
"""<p class="secao-marker">Filtrando resultados somente para:</p>"""
)
blocks.append("<ul>")
for dpt in search["department"]:
blocks.append(f"<li>{dpt}</li>")
blocks.append("</ul>")

for group, results in search["result"].items():

Expand All @@ -90,25 +92,34 @@ def generate_email_content(self) -> str:
"Nenhum dos termos pesquisados foi encontrado nesta consulta."
)
else:
if group != "single_group":
blocks.append("\n")
blocks.append(f"**Grupo: {group}**")
blocks.append("\n\n")
if not self.specs.hide_filters:
if group != "single_group":
blocks.append("\n")
blocks.append(f"**Grupo: {group}**")
blocks.append("\n\n")

for term, items in results.items():
blocks.append("\n")
blocks.append(f"* # Resultados para: {term}")
if not self.specs.hide_filters:
blocks.append(f"* # Resultados para: {term}")

for item in items:
sec_desc = item["section"]
item_html = f"""
<p class="secao-marker">{sec_desc}</p>
### [{item['title']}]({item['href']})
<p class='abstract-marker'>{item['abstract']}</p>
<p class='date-marker'>{item['date']}</p>"""
blocks.append(
textwrap.indent(textwrap.dedent(item_html), " " * 4)
)

if not self.specs.hide_filters:
sec_desc = item["section"]
item_html = f"""
<p class="secao-marker">{sec_desc}</p>
### [{item['title']}]({item['href']})
<p class='abstract-marker'>{item['abstract']}</p>
<p class='date-marker'>{item['date']}</p>"""
blocks.append(
textwrap.indent(textwrap.dedent(item_html), " " * 4)
)
else:
item_html = f"### [{item['title']}]({item['href']})"
item_html += f"<p class='abstract-marker'>{item['abstract']}</p><br><br>"
blocks.append(textwrap.dedent(item_html))

blocks.append("---")

return markdown.markdown("\n".join(blocks))
Expand Down
3 changes: 3 additions & 0 deletions src/parsers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ class DAGConfig:
doc_md: str
dag_tags: Set[str]
owner: str
hide_filters: bool


class FileParser(ABC):
Expand Down Expand Up @@ -152,6 +153,7 @@ def _parse_yaml(self) -> DAGConfig:
emails = report.get("emails")
subject = report.get("subject", "Extraçao do DOU")
attach_csv = report.get("attach_csv", False)
hide_filters = report.get("hide_filters", False)

return DAGConfig(
dag_id=dag_id,
Expand All @@ -167,6 +169,7 @@ def _parse_yaml(self) -> DAGConfig:
doc_md=doc_md,
dag_tags=set(dag_tags),
owner=owner,
hide_filters=hide_filters
)

def _get_terms_params(self, search) -> Tuple[List[str], str, str]:
Expand Down
48 changes: 48 additions & 0 deletions tests/parsers_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ def test_hash_dag_id(yaml_parser, dag_id, size, hashed):
"doc_md": None,
"dag_tags": {"dou", "generated_dag"},
"owner": "",
"hide_filters": False,
},
),
(
Expand Down Expand Up @@ -107,6 +108,7 @@ def test_hash_dag_id(yaml_parser, dag_id, size, hashed):
"doc_md": None,
"dag_tags": {"dou", "generated_dag", "projeto_a", "departamento_x"},
"owner": "pessoa 1, pessoa 2",
"hide_filters": False,
},
),
(
Expand Down Expand Up @@ -149,6 +151,7 @@ def test_hash_dag_id(yaml_parser, dag_id, size, hashed):
"doc_md": None,
"dag_tags": {"dou", "generated_dag"},
"owner": "",
"hide_filters": False,
},
),
(
Expand Down Expand Up @@ -184,6 +187,7 @@ def test_hash_dag_id(yaml_parser, dag_id, size, hashed):
"doc_md": None,
"dag_tags": {"dou", "generated_dag"},
"owner": "",
"hide_filters": False,
},
),
(
Expand Down Expand Up @@ -231,6 +235,7 @@ def test_hash_dag_id(yaml_parser, dag_id, size, hashed):
).strip(),
"dag_tags": {"dou", "generated_dag"},
"owner": "",
"hide_filters": False,
},
),
(
Expand Down Expand Up @@ -269,6 +274,7 @@ def test_hash_dag_id(yaml_parser, dag_id, size, hashed):
"doc_md": None,
"dag_tags": {"dou", "generated_dag"},
"owner": "",
"hide_filters": False,
},
),
(
Expand Down Expand Up @@ -304,6 +310,7 @@ def test_hash_dag_id(yaml_parser, dag_id, size, hashed):
"doc_md": None,
"dag_tags": {"dou", "generated_dag", "inlabs"},
"owner": "cdata",
"hide_filters": False,
},
),
(
Expand Down Expand Up @@ -342,6 +349,7 @@ def test_hash_dag_id(yaml_parser, dag_id, size, hashed):
"doc_md": None,
"dag_tags": {"dou", "generated_dag", "inlabs"},
"owner": "cdata",
"hide_filters": False,
},
),
(
Expand Down Expand Up @@ -401,6 +409,46 @@ def test_hash_dag_id(yaml_parser, dag_id, size, hashed):
"doc_md": None,
"dag_tags": {"dou", "generated_dag", "inlabs"},
"owner": "",
"hide_filters": False,
},
),
(
"hide_filters_example.yaml",
{
"dag_id": "hide_filters_example",
"search": [
{
"terms": ["tecnologia", "informação"],
"header": "HEADER TEXT",
"sources": ["INLABS"],
"sql": None,
"conn_id": None,
"territory_id": None,
"dou_sections": ["TODOS"],
"search_date": "DIA",
"field": "TUDO",
"is_exact_search": True,
"ignore_signature_match": False,
"force_rematch": None,
"full_text": None,
"department": [
"Ministério da Gestão e da Inovação em Serviços Públicos",
"Ministério da Defesa",
],
}
],
"emails": ["[email protected]"],
"subject": "Teste do Ro-dou",
"attach_csv": True,
"discord_webhook": None,
"slack_webhook": None,
"schedule": "0 8 * * MON-FRI",
"description": "DAG de teste",
"skip_null": True,
"doc_md": None,
"dag_tags": {"dou", "inlabs", "generated_dag"},
"owner": "",
"hide_filters": True,
},
),
],
Expand Down
Loading