das-cli 1.0.10__tar.gz → 1.0.12__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 (36) hide show
  1. {das_cli-1.0.10/das_cli.egg-info → das_cli-1.0.12}/PKG-INFO +1 -1
  2. {das_cli-1.0.10 → das_cli-1.0.12}/das/cli.py +1 -0
  3. {das_cli-1.0.10 → das_cli-1.0.12}/das/managers/search_manager.py +14 -9
  4. {das_cli-1.0.10 → das_cli-1.0.12/das_cli.egg-info}/PKG-INFO +1 -1
  5. {das_cli-1.0.10 → das_cli-1.0.12}/pyproject.toml +1 -1
  6. {das_cli-1.0.10 → das_cli-1.0.12}/LICENSE +0 -0
  7. {das_cli-1.0.10 → das_cli-1.0.12}/MANIFEST.in +0 -0
  8. {das_cli-1.0.10 → das_cli-1.0.12}/README.md +0 -0
  9. {das_cli-1.0.10 → das_cli-1.0.12}/das/__init__.py +0 -0
  10. {das_cli-1.0.10 → das_cli-1.0.12}/das/ai/plugins/dasai.py +0 -0
  11. {das_cli-1.0.10 → das_cli-1.0.12}/das/ai/plugins/entries/entries_plugin.py +0 -0
  12. {das_cli-1.0.10 → das_cli-1.0.12}/das/app.py +0 -0
  13. {das_cli-1.0.10 → das_cli-1.0.12}/das/authentication/auth.py +0 -0
  14. {das_cli-1.0.10 → das_cli-1.0.12}/das/authentication/secure_input.py +0 -0
  15. {das_cli-1.0.10 → das_cli-1.0.12}/das/common/api.py +0 -0
  16. {das_cli-1.0.10 → das_cli-1.0.12}/das/common/config.py +0 -0
  17. {das_cli-1.0.10 → das_cli-1.0.12}/das/common/entry_fields_constants.py +0 -0
  18. {das_cli-1.0.10 → das_cli-1.0.12}/das/common/enums.py +0 -0
  19. {das_cli-1.0.10 → das_cli-1.0.12}/das/common/file_utils.py +0 -0
  20. {das_cli-1.0.10 → das_cli-1.0.12}/das/managers/__init__.py +0 -0
  21. {das_cli-1.0.10 → das_cli-1.0.12}/das/managers/download_manager.py +0 -0
  22. {das_cli-1.0.10 → das_cli-1.0.12}/das/managers/entries_manager.py +0 -0
  23. {das_cli-1.0.10 → das_cli-1.0.12}/das/services/attributes.py +0 -0
  24. {das_cli-1.0.10 → das_cli-1.0.12}/das/services/cache.py +0 -0
  25. {das_cli-1.0.10 → das_cli-1.0.12}/das/services/downloads.py +0 -0
  26. {das_cli-1.0.10 → das_cli-1.0.12}/das/services/entries.py +0 -0
  27. {das_cli-1.0.10 → das_cli-1.0.12}/das/services/entry_fields.py +0 -0
  28. {das_cli-1.0.10 → das_cli-1.0.12}/das/services/hangfire.py +0 -0
  29. {das_cli-1.0.10 → das_cli-1.0.12}/das/services/search.py +0 -0
  30. {das_cli-1.0.10 → das_cli-1.0.12}/das/services/users.py +0 -0
  31. {das_cli-1.0.10 → das_cli-1.0.12}/das_cli.egg-info/SOURCES.txt +0 -0
  32. {das_cli-1.0.10 → das_cli-1.0.12}/das_cli.egg-info/dependency_links.txt +0 -0
  33. {das_cli-1.0.10 → das_cli-1.0.12}/das_cli.egg-info/entry_points.txt +0 -0
  34. {das_cli-1.0.10 → das_cli-1.0.12}/das_cli.egg-info/requires.txt +0 -0
  35. {das_cli-1.0.10 → das_cli-1.0.12}/das_cli.egg-info/top_level.txt +0 -0
  36. {das_cli-1.0.10 → das_cli-1.0.12}/setup.cfg +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: das-cli
3
- Version: 1.0.10
3
+ Version: 1.0.12
4
4
  Summary: DAS api client.
5
5
  Author: Royal Netherlands Institute for Sea Research
6
6
  License-Expression: MIT
@@ -80,6 +80,7 @@ class DasCLI:
80
80
  pass_das_context = click.make_pass_decorator(DasCLI, ensure=True)
81
81
 
82
82
  @click.group()
83
+ @click.version_option(package_name="das-cli")
83
84
  @click.pass_context
84
85
  def cli(ctx):
85
86
  """DAS Python CLI - Data Archive System client tool"""
@@ -60,16 +60,21 @@ class SearchManager:
60
60
  }
61
61
  results = self.search_service.search_entries(**search_params)
62
62
 
63
- # now we get the results we create a json with the fields in a user friendly format
64
- results_json = []
65
- for result in results['items']:
66
- result_json = {}
63
+ # Build user-friendly items list while preserving totalCount
64
+ friendly_items = []
65
+ for result in results.get('items', []):
66
+ entry = result.get('entry', {}) if isinstance(result, dict) else {}
67
+ friendly_item = {}
67
68
  for field in entry_fields:
68
- result_json[field['displayName']] = result.get('entry').get(f"{field['column']}")
69
- results_json.append(result_json)
69
+ display_name = field.get('displayName')
70
+ column_name = field.get('column')
71
+ if display_name and column_name:
72
+ friendly_item[display_name] = entry.get(column_name)
73
+ friendly_items.append(friendly_item)
70
74
 
71
- result_json['totalCount'] = results['totalCount']
72
-
73
- return results_json
75
+ return {
76
+ 'items': friendly_items,
77
+ 'totalCount': results.get('totalCount', len(friendly_items))
78
+ }
74
79
  except Exception as e:
75
80
  raise ValueError(f"Search failed: {str(e)}")
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: das-cli
3
- Version: 1.0.10
3
+ Version: 1.0.12
4
4
  Summary: DAS api client.
5
5
  Author: Royal Netherlands Institute for Sea Research
6
6
  License-Expression: MIT
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
4
4
 
5
5
  [project]
6
6
  name = "das-cli"
7
- version = "1.0.10"
7
+ version = "1.0.12"
8
8
  authors = [
9
9
  { name="Royal Netherlands Institute for Sea Research" },
10
10
  ]
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes