das-cli 1.2.21__tar.gz → 1.2.22__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 (38) hide show
  1. {das_cli-1.2.21/das_cli.egg-info → das_cli-1.2.22}/PKG-INFO +1 -1
  2. {das_cli-1.2.21 → das_cli-1.2.22}/das/managers/entries_manager.py +4 -9
  3. {das_cli-1.2.21 → das_cli-1.2.22/das_cli.egg-info}/PKG-INFO +1 -1
  4. {das_cli-1.2.21 → das_cli-1.2.22}/pyproject.toml +1 -1
  5. {das_cli-1.2.21 → das_cli-1.2.22}/LICENSE +0 -0
  6. {das_cli-1.2.21 → das_cli-1.2.22}/MANIFEST.in +0 -0
  7. {das_cli-1.2.21 → das_cli-1.2.22}/README.md +0 -0
  8. {das_cli-1.2.21 → das_cli-1.2.22}/das/__init__.py +0 -0
  9. {das_cli-1.2.21 → das_cli-1.2.22}/das/ai/plugins/dasai.py +0 -0
  10. {das_cli-1.2.21 → das_cli-1.2.22}/das/ai/plugins/entries/entries_plugin.py +0 -0
  11. {das_cli-1.2.21 → das_cli-1.2.22}/das/app.py +0 -0
  12. {das_cli-1.2.21 → das_cli-1.2.22}/das/authentication/auth.py +0 -0
  13. {das_cli-1.2.21 → das_cli-1.2.22}/das/authentication/secure_input.py +0 -0
  14. {das_cli-1.2.21 → das_cli-1.2.22}/das/cli.py +0 -0
  15. {das_cli-1.2.21 → das_cli-1.2.22}/das/common/api.py +0 -0
  16. {das_cli-1.2.21 → das_cli-1.2.22}/das/common/config.py +0 -0
  17. {das_cli-1.2.21 → das_cli-1.2.22}/das/common/entry_fields_constants.py +0 -0
  18. {das_cli-1.2.21 → das_cli-1.2.22}/das/common/enums.py +0 -0
  19. {das_cli-1.2.21 → das_cli-1.2.22}/das/common/file_utils.py +0 -0
  20. {das_cli-1.2.21 → das_cli-1.2.22}/das/managers/__init__.py +0 -0
  21. {das_cli-1.2.21 → das_cli-1.2.22}/das/managers/digital_objects_manager.py +0 -0
  22. {das_cli-1.2.21 → das_cli-1.2.22}/das/managers/download_manager.py +0 -0
  23. {das_cli-1.2.21 → das_cli-1.2.22}/das/managers/search_manager.py +0 -0
  24. {das_cli-1.2.21 → das_cli-1.2.22}/das/services/attributes.py +0 -0
  25. {das_cli-1.2.21 → das_cli-1.2.22}/das/services/cache.py +0 -0
  26. {das_cli-1.2.21 → das_cli-1.2.22}/das/services/digital_objects.py +0 -0
  27. {das_cli-1.2.21 → das_cli-1.2.22}/das/services/downloads.py +0 -0
  28. {das_cli-1.2.21 → das_cli-1.2.22}/das/services/entries.py +0 -0
  29. {das_cli-1.2.21 → das_cli-1.2.22}/das/services/entry_fields.py +0 -0
  30. {das_cli-1.2.21 → das_cli-1.2.22}/das/services/hangfire.py +0 -0
  31. {das_cli-1.2.21 → das_cli-1.2.22}/das/services/search.py +0 -0
  32. {das_cli-1.2.21 → das_cli-1.2.22}/das/services/users.py +0 -0
  33. {das_cli-1.2.21 → das_cli-1.2.22}/das_cli.egg-info/SOURCES.txt +0 -0
  34. {das_cli-1.2.21 → das_cli-1.2.22}/das_cli.egg-info/dependency_links.txt +0 -0
  35. {das_cli-1.2.21 → das_cli-1.2.22}/das_cli.egg-info/entry_points.txt +0 -0
  36. {das_cli-1.2.21 → das_cli-1.2.22}/das_cli.egg-info/requires.txt +0 -0
  37. {das_cli-1.2.21 → das_cli-1.2.22}/das_cli.egg-info/top_level.txt +0 -0
  38. {das_cli-1.2.21 → das_cli-1.2.22}/setup.cfg +0 -0
{das_cli-1.2.21/das_cli.egg-info → das_cli-1.2.22}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: das-cli
3
- Version: 1.2.21
3
+ Version: 1.2.22
4
4
  Summary: DAS api client.
5
5
  Author: Royal Netherlands Institute for Sea Research
6
6
  License-Expression: MIT
{das_cli-1.2.21 → das_cli-1.2.22}/das/managers/entries_manager.py RENAMED
@@ -377,7 +377,7 @@ class EntryManager:
377
377
 
378
378
  search_params = {
379
379
  "attributeId": attribute_id,
380
- "queryString": f"displayname({source});",
380
+ "queryString": f"displayname({source}) or code({source});",
381
381
  "maxResultCount": 1,
382
382
  "skipCount": 0
383
383
  }
@@ -385,17 +385,12 @@ class EntryManager:
385
385
  # checks if source is GUID, if so, than we search by id
386
386
  if self.is_guid(source):
387
387
  search_params['queryString'] = f"id({source});"
388
- search_response = self.search_service.search_entries(**search_params)
389
- else:
390
- search_params['queryString'] = f"displayname({source});"
391
- search_response = self.search_service.search_entries(**search_params)
392
-
388
+
393
389
  search_response = self.search_service.search_entries(**search_params)
394
390
 
395
391
  if search_response.get('totalCount', 0) == 0:
396
- search_params['queryString'] = f"code({source});"
397
- search_response = self.search_service.search_entries(**search_params)
398
-
392
+ raise ValueError(f"No results found for {field.get('displayName')}: {source}. Attribute ID: {attribute_id}")
393
+
399
394
  if search_response and 'items' in search_response and len(search_response['items']) > 0:
400
395
  result = {}
401
396
  result['id'] = search_response['items'][0].get('entry', {}).get('id')
{das_cli-1.2.21 → das_cli-1.2.22/das_cli.egg-info}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: das-cli
3
- Version: 1.2.21
3
+ Version: 1.2.22
4
4
  Summary: DAS api client.
5
5
  Author: Royal Netherlands Institute for Sea Research
6
6
  License-Expression: MIT
{das_cli-1.2.21 → das_cli-1.2.22}/pyproject.toml RENAMED
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
4
4
 
5
5
  [project]
6
6
  name = "das-cli"
7
- version = "1.2.21"
7
+ version = "1.2.22"
8
8
  authors = [
9
9
  { name="Royal Netherlands Institute for Sea Research" },
10
10
  ]
{das_cli-1.2.21 → das_cli-1.2.22}/LICENSE RENAMED
File without changes
{das_cli-1.2.21 → das_cli-1.2.22}/MANIFEST.in RENAMED
File without changes
{das_cli-1.2.21 → das_cli-1.2.22}/README.md RENAMED
File without changes
{das_cli-1.2.21 → das_cli-1.2.22}/das/__init__.py RENAMED
File without changes
{das_cli-1.2.21 → das_cli-1.2.22}/das/app.py RENAMED
File without changes
{das_cli-1.2.21 → das_cli-1.2.22}/das/cli.py RENAMED
File without changes
{das_cli-1.2.21 → das_cli-1.2.22}/das/common/api.py RENAMED
File without changes
{das_cli-1.2.21 → das_cli-1.2.22}/das/common/config.py RENAMED
File without changes
{das_cli-1.2.21 → das_cli-1.2.22}/das/common/enums.py RENAMED
File without changes
{das_cli-1.2.21 → das_cli-1.2.22}/das/services/cache.py RENAMED
File without changes
{das_cli-1.2.21 → das_cli-1.2.22}/das/services/users.py RENAMED
File without changes
{das_cli-1.2.21 → das_cli-1.2.22}/setup.cfg RENAMED
File without changes