dronefly-core 0.3.9.dev1__tar.gz → 0.3.9.dev2__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (28) hide show
  1. {dronefly_core-0.3.9.dev1 → dronefly_core-0.3.9.dev2}/PKG-INFO +1 -1
  2. {dronefly_core-0.3.9.dev1 → dronefly_core-0.3.9.dev2}/dronefly/core/parsers/constants.py +5 -3
  3. {dronefly_core-0.3.9.dev1 → dronefly_core-0.3.9.dev2}/dronefly/core/parsers/natural.py +8 -0
  4. {dronefly_core-0.3.9.dev1 → dronefly_core-0.3.9.dev2}/dronefly/core/query/query.py +8 -4
  5. {dronefly_core-0.3.9.dev1 → dronefly_core-0.3.9.dev2}/pyproject.toml +1 -1
  6. {dronefly_core-0.3.9.dev1 → dronefly_core-0.3.9.dev2}/LICENSE +0 -0
  7. {dronefly_core-0.3.9.dev1 → dronefly_core-0.3.9.dev2}/README.md +0 -0
  8. {dronefly_core-0.3.9.dev1 → dronefly_core-0.3.9.dev2}/dronefly/core/__init__.py +0 -0
  9. {dronefly_core-0.3.9.dev1 → dronefly_core-0.3.9.dev2}/dronefly/core/clients/__init__.py +0 -0
  10. {dronefly_core-0.3.9.dev1 → dronefly_core-0.3.9.dev2}/dronefly/core/clients/inat.py +0 -0
  11. {dronefly_core-0.3.9.dev1 → dronefly_core-0.3.9.dev2}/dronefly/core/commands/__init__.py +0 -0
  12. {dronefly_core-0.3.9.dev1 → dronefly_core-0.3.9.dev2}/dronefly/core/constants.py +0 -0
  13. {dronefly_core-0.3.9.dev1 → dronefly_core-0.3.9.dev2}/dronefly/core/formatters/__init__.py +0 -0
  14. {dronefly_core-0.3.9.dev1 → dronefly_core-0.3.9.dev2}/dronefly/core/formatters/constants.py +0 -0
  15. {dronefly_core-0.3.9.dev1 → dronefly_core-0.3.9.dev2}/dronefly/core/formatters/generic.py +0 -0
  16. {dronefly_core-0.3.9.dev1 → dronefly_core-0.3.9.dev2}/dronefly/core/menus/__init__.py +0 -0
  17. {dronefly_core-0.3.9.dev1 → dronefly_core-0.3.9.dev2}/dronefly/core/menus/menu.py +0 -0
  18. {dronefly_core-0.3.9.dev1 → dronefly_core-0.3.9.dev2}/dronefly/core/menus/source.py +0 -0
  19. {dronefly_core-0.3.9.dev1 → dronefly_core-0.3.9.dev2}/dronefly/core/menus/taxon_list.py +0 -0
  20. {dronefly_core-0.3.9.dev1 → dronefly_core-0.3.9.dev2}/dronefly/core/models/__init__.py +0 -0
  21. {dronefly_core-0.3.9.dev1 → dronefly_core-0.3.9.dev2}/dronefly/core/models/config.py +0 -0
  22. {dronefly_core-0.3.9.dev1 → dronefly_core-0.3.9.dev2}/dronefly/core/models/controlled_terms.py +0 -0
  23. {dronefly_core-0.3.9.dev1 → dronefly_core-0.3.9.dev2}/dronefly/core/models/user.py +0 -0
  24. {dronefly_core-0.3.9.dev1 → dronefly_core-0.3.9.dev2}/dronefly/core/parsers/__init__.py +0 -0
  25. {dronefly_core-0.3.9.dev1 → dronefly_core-0.3.9.dev2}/dronefly/core/parsers/unixlike.py +0 -0
  26. {dronefly_core-0.3.9.dev1 → dronefly_core-0.3.9.dev2}/dronefly/core/parsers/url.py +0 -0
  27. {dronefly_core-0.3.9.dev1 → dronefly_core-0.3.9.dev2}/dronefly/core/query/__init__.py +0 -0
  28. {dronefly_core-0.3.9.dev1 → dronefly_core-0.3.9.dev2}/dronefly/core/utils/__init__.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: dronefly-core
3
- Version: 0.3.9.dev1
3
+ Version: 0.3.9.dev2
4
4
  Summary: Core dronefly components
5
5
  License: AGPL-3.0-or-later
6
6
  Author: Ben Armstrong
@@ -27,14 +27,16 @@ REMAINING_ARGS = list(ARGPARSE_ARGS)[1:]
27
27
  MACROS = {
28
28
  "rg": {"opt": ["quality_grade=research"]},
29
29
  "nid": {"opt": ["quality_grade=needs_id"]},
30
- "oldest": {"order": "asc", "sort_by": "observed"},
31
- "newest": {"order": "desc", "sort_by": "observed"},
30
+ "oldest": {"asc": None, "sort by": "observed"},
31
+ "newest": {"desc": None, "sort by": "observed"},
32
32
  "my": {"by": "me"},
33
33
  "home": {"from": "home"},
34
- "faves": {"sort_by": "votes", "opt": ["popular"]},
34
+ "faves": {"sort by": "votes", "opt": ["popular"]},
35
35
  "spp": {"opt": ["hrank=species"]},
36
36
  "species": {"opt": ["hrank=species"]},
37
37
  "unseen": {"not by": "me", "from": "home"},
38
+ "most": {"per": "species", "sort by": "obs"},
39
+ "least": {"per": "species", "sort by": "obs", "asc": None},
38
40
  }
39
41
  # Groups of taxa:
40
42
  # - can't function in place of a single taxon, and are typically only used in
@@ -208,6 +208,14 @@ class NaturalParser(UnixlikeParser):
208
208
  expanded_tokens.extend(["--from", params["from"]])
209
209
  if "of" in params:
210
210
  expanded_tokens.extend(["--of", params["of"]])
211
+ if "sort by" in params:
212
+ expanded_tokens.extend(["--sort-by", params["sort by"]])
213
+ if "asc" in params:
214
+ expanded_tokens.extend(["--asc"])
215
+ if "desc" in params:
216
+ expanded_tokens.extend(["--desc"])
217
+ if "per" in params:
218
+ expanded_tokens.extend(["--per", params["per"]])
211
219
  if opts:
212
220
  expanded_tokens.extend(["--opt", *opts])
213
221
 
@@ -523,10 +523,14 @@ class QueryResponse:
523
523
  with_or_and, lrank, hrank
524
524
  )
525
525
  else:
526
- higher_or_lower = "higher" if lrank else "lower"
527
- message += " {} rank {} or {}".format(
528
- with_or_and, hrank or lrank, higher_or_lower
529
- )
526
+ # For some commands "species and higher" filter is added only to
527
+ # make it match results on the web. Including this in the description
528
+ # would just be confusing.
529
+ if lrank != "species":
530
+ higher_or_lower = "higher" if lrank else "lower"
531
+ message += " {} rank {} or {}".format(
532
+ with_or_and, hrank or lrank, higher_or_lower
533
+ )
530
534
  order_by = kwargs.get("order_by")
531
535
  order = kwargs.get("order")
532
536
  if order:
@@ -7,7 +7,7 @@ extend-ignore = "E203"
7
7
 
8
8
  [tool.poetry]
9
9
  name = "dronefly-core"
10
- version = "0.3.9.dev1"
10
+ version = "0.3.9.dev2"
11
11
  description = "Core dronefly components"
12
12
  authors = ["Ben Armstrong <synrg@debian.org>"]
13
13
  license = "AGPL-3.0-or-later"