diff --git a/garak/__main__.py b/garak/__main__.py index 7603c4e4c..923bbebdc 100644 --- a/garak/__main__.py +++ b/garak/__main__.py @@ -10,4 +10,5 @@ def main(): if __name__ == "__main__": + sys.stdout.reconfigure(encoding="utf-8") main() diff --git a/garak/analyze/report_digest.py b/garak/analyze/report_digest.py index 347e3fd83..06635ba19 100644 --- a/garak/analyze/report_digest.py +++ b/garak/analyze/report_digest.py @@ -15,6 +15,9 @@ from garak import _config +if not _config.loaded: + _config.load_config() + templateLoader = jinja2.FileSystemLoader( searchpath=_config.transient.basedir / "analyze" / "templates" ) @@ -174,7 +177,7 @@ def compile_digest(report_path, taxonomy=_config.reporting.taxonomy): } ) - if top_score < 100.0: + if top_score < 100.0 or _config.reporting.show_100_pass_modules: res = cursor.execute( f"select probe_module, probe_class, avg(score)*100 as s from results where probe_group='{probe_group}' group by probe_class order by s asc, probe_class asc;" ) @@ -226,9 +229,10 @@ def compile_digest(report_path, taxonomy=_config.reporting.taxonomy): if __name__ == "__main__": + sys.stdout.reconfigure(encoding="utf-8") report_path = sys.argv[1] taxonomy = None if len(sys.argv) == 3: taxonomy = sys.argv[2] digest_content = compile_digest(report_path, taxonomy=taxonomy) - print(digest_content.encode("utf-8")) + print(digest_content) diff --git a/garak/interactive.py b/garak/interactive.py index 309c3d569..5725bd168 100644 --- a/garak/interactive.py +++ b/garak/interactive.py @@ -249,4 +249,5 @@ def interactive_mode(): if __name__ == "__main__": + sys.stdout.reconfigure(encoding="utf-8") interactive_mode() diff --git a/garak/resources/garak.core.yaml b/garak/resources/garak.core.yaml index 75670a530..02d765308 100644 --- a/garak/resources/garak.core.yaml +++ b/garak/resources/garak.core.yaml @@ -34,4 +34,5 @@ plugins: reporting: report_prefix: taxonomy: - report_dir: garak_runs \ No newline at end of file + report_dir: garak_runs + show_100_pass_modules: true \ No newline at end of file diff --git a/tests/analyze/test_analyze.py b/tests/analyze/test_analyze.py index df93dd31d..6ecd4e59f 100644 --- a/tests/analyze/test_analyze.py +++ b/tests/analyze/test_analyze.py @@ -1,7 +1,6 @@ # SPDX-FileCopyrightText: Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -import os import subprocess import sys