Skip to content

Commit

Permalink
Fix bug where --max-results could not be set with --no-context-annota…
Browse files Browse the repository at this point in the history
…tions

Previously this command:

`twarc2 search --archive --max-results 200 --no-context-annotations banana --limit 100`

Would fail with the error:

```
Error: Invalid value for '--max-results': --max-results cannot be greater
than 100 when using context annotations. Set --no-context-annotations to
remove them, or don't specify them in --tweet-fields.
```

This was occuring because _validate_max_results is called before
applying --no-context-annotations, this change just checks
no_context_annotations as well.
  • Loading branch information
SamHames committed Jul 18, 2022
1 parent e215d89 commit 73f0e07
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion twarc/command2.py
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ def _validate_max_results(context, parameter, value):
)
if value < 10 or value > 500:
raise click.BadParameter("--max-results must be between 10 and 500")
if value > 100 and has_context_annotations:
if value > 100 and (has_context_annotations and not no_context_annotations_set):
raise click.BadParameter(
"--max-results cannot be greater than 100 when using context annotations. Set --no-context-annotations to remove them, or don't specify them in --tweet-fields."
)
Expand Down

0 comments on commit 73f0e07

Please sign in to comment.