hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-03-11 13:24:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

add new format 'raw' for CLI commands

Browse Source 
This dumps the original results with all details available.
This commit is contained in:
Sarah Hoffmann
2024-09-28 10:10:58 +02:00
parent b2dc01ad81
commit 15eb7f0bb1
1 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/nominatim_db/clicmd/api.py
View File

@@ -12,6 +12,7 @@ import argparse
import logging import logging
import json import json
import sys import sys
import pprint
from functools import reduce from functools import reduce
import nominatim_api as napi import nominatim_api as napi
@@ -113,24 +114,29 @@ def _list_formats(formatter: napi.FormatDispatcher, rtype: Type[Any]) -> int:
for fmt in formatter.list_formats(rtype): for fmt in formatter.list_formats(rtype):
print(fmt) print(fmt)
print('debug') print('debug')
print('raw')
return 0 return 0
def _print_output(formatter: napi.FormatDispatcher, result: Any, def _print_output(formatter: napi.FormatDispatcher, result: Any,
fmt: str, options: Mapping[str, Any]) -> None: fmt: str, options: Mapping[str, Any]) -> None:
output = formatter.format_result(result, fmt, options)
if formatter.get_content_type(fmt) == CONTENT_JSON: if fmt == 'raw':
# reformat the result, so it is pretty-printed pprint.pprint(result)
try:
json.dump(json.loads(output), sys.stdout, indent=4, ensure_ascii=False)
except json.decoder.JSONDecodeError as err:
# Catch the error here, so that data can be debugged,
# when people are developping custom result formatters.
LOG.fatal("Parsing json failed: %s\nUnformatted output:\n%s", err, output)
else: else:
sys.stdout.write(output) output = formatter.format_result(result, fmt, options)
sys.stdout.write('\n') if formatter.get_content_type(fmt) == CONTENT_JSON:
# reformat the result, so it is pretty-printed
try:
json.dump(json.loads(output), sys.stdout, indent=4, ensure_ascii=False)
except json.decoder.JSONDecodeError as err:
# Catch the error here, so that data can be debugged,
# when people are developping custom result formatters.
LOG.fatal("Parsing json failed: %s\nUnformatted output:\n%s", err, output)
else:
sys.stdout.write(output)
sys.stdout.write('\n')
class APISearch: class APISearch:
@@ -174,7 +180,7 @@ class APISearch:
if args.list_formats: if args.list_formats:
return _list_formats(formatter, napi.SearchResults) return _list_formats(formatter, napi.SearchResults)
if args.format == 'debug': if args.format in ('debug', 'raw'):
loglib.set_log_output('text') loglib.set_log_output('text')
elif not formatter.supports_format(napi.SearchResults, args.format): elif not formatter.supports_format(napi.SearchResults, args.format):
raise UsageError(f"Unsupported format '{args.format}'. " raise UsageError(f"Unsupported format '{args.format}'. "
@@ -254,7 +260,7 @@ class APIReverse:
if args.list_formats: if args.list_formats:
return _list_formats(formatter, napi.ReverseResults) return _list_formats(formatter, napi.ReverseResults)
if args.format == 'debug': if args.format in ('debug', 'raw'):
loglib.set_log_output('text') loglib.set_log_output('text')
elif not formatter.supports_format(napi.ReverseResults, args.format): elif not formatter.supports_format(napi.ReverseResults, args.format):
raise UsageError(f"Unsupported format '{args.format}'. " raise UsageError(f"Unsupported format '{args.format}'. "
@@ -320,7 +326,7 @@ class APILookup:
if args.list_formats: if args.list_formats:
return _list_formats(formatter, napi.ReverseResults) return _list_formats(formatter, napi.ReverseResults)
if args.format == 'debug': if args.format in ('debug', 'raw'):
loglib.set_log_output('text') loglib.set_log_output('text')
elif not formatter.supports_format(napi.ReverseResults, args.format): elif not formatter.supports_format(napi.ReverseResults, args.format):
raise UsageError(f"Unsupported format '{args.format}'. " raise UsageError(f"Unsupported format '{args.format}'. "
@@ -402,7 +408,7 @@ class APIDetails:
if args.list_formats: if args.list_formats:
return _list_formats(formatter, napi.DetailedResult) return _list_formats(formatter, napi.DetailedResult)
if args.format == 'debug': if args.format in ('debug', 'raw'):
loglib.set_log_output('text') loglib.set_log_output('text')
elif not formatter.supports_format(napi.DetailedResult, args.format): elif not formatter.supports_format(napi.DetailedResult, args.format):
raise UsageError(f"Unsupported format '{args.format}'. " raise UsageError(f"Unsupported format '{args.format}'. "
@@ -473,7 +479,7 @@ class APIStatus:
if args.list_formats: if args.list_formats:
return _list_formats(formatter, napi.StatusResult) return _list_formats(formatter, napi.StatusResult)
if args.format == 'debug': if args.format in ('debug', 'raw'):
loglib.set_log_output('text') loglib.set_log_output('text')
elif not formatter.supports_format(napi.StatusResult, args.format): elif not formatter.supports_format(napi.StatusResult, args.format):
raise UsageError(f"Unsupported format '{args.format}'. " raise UsageError(f"Unsupported format '{args.format}'. "