hestia-earth-utils 0.16.16__tar.gz → 0.16.17__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 (56) hide show
  1. {hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/PKG-INFO +1 -1
  2. {hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/hestia_earth/utils/pivot/pivot_json.py +10 -3
  3. hestia_earth_utils-0.16.17/hestia_earth/utils/version.py +1 -0
  4. {hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/hestia_earth_utils.egg-info/PKG-INFO +1 -1
  5. hestia_earth_utils-0.16.16/hestia_earth/utils/version.py +0 -1
  6. {hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/MANIFEST.in +0 -0
  7. {hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/README.md +0 -0
  8. {hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/bin/hestia-format-upload +0 -0
  9. {hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/bin/hestia-pivot-csv +0 -0
  10. {hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/hestia_earth/utils/__init__.py +0 -0
  11. {hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/hestia_earth/utils/api.py +0 -0
  12. {hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/hestia_earth/utils/blank_node.py +0 -0
  13. {hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/hestia_earth/utils/calculation_status.py +0 -0
  14. {hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/hestia_earth/utils/cycle.py +0 -0
  15. {hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/hestia_earth/utils/date.py +0 -0
  16. {hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/hestia_earth/utils/descriptive_stats.py +0 -0
  17. {hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/hestia_earth/utils/emission.py +0 -0
  18. {hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/hestia_earth/utils/lookup.py +0 -0
  19. {hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/hestia_earth/utils/lookup_utils.py +0 -0
  20. {hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/hestia_earth/utils/model.py +0 -0
  21. {hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/hestia_earth/utils/pipeline.py +0 -0
  22. {hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/hestia_earth/utils/pivot/__init__.py +0 -0
  23. {hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/hestia_earth/utils/pivot/_shared.py +0 -0
  24. {hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/hestia_earth/utils/pivot/pivot_csv.py +0 -0
  25. {hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/hestia_earth/utils/request.py +0 -0
  26. {hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/hestia_earth/utils/stats.py +0 -0
  27. {hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/hestia_earth/utils/storage/__init__.py +0 -0
  28. {hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/hestia_earth/utils/storage/_azure_client.py +0 -0
  29. {hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/hestia_earth/utils/storage/_local_client.py +0 -0
  30. {hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/hestia_earth/utils/storage/_s3_client.py +0 -0
  31. {hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/hestia_earth/utils/storage/_sns_client.py +0 -0
  32. {hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/hestia_earth/utils/table.py +0 -0
  33. {hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/hestia_earth/utils/term.py +0 -0
  34. {hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/hestia_earth/utils/tools.py +0 -0
  35. {hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/hestia_earth_utils.egg-info/SOURCES.txt +0 -0
  36. {hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/hestia_earth_utils.egg-info/dependency_links.txt +0 -0
  37. {hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/hestia_earth_utils.egg-info/requires.txt +0 -0
  38. {hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/hestia_earth_utils.egg-info/top_level.txt +0 -0
  39. {hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/setup.cfg +0 -0
  40. {hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/setup.py +0 -0
  41. {hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/tests/test_api.py +0 -0
  42. {hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/tests/test_blank_node.py +0 -0
  43. {hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/tests/test_calculation_status.py +0 -0
  44. {hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/tests/test_cycle.py +0 -0
  45. {hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/tests/test_date.py +0 -0
  46. {hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/tests/test_descriptive_stats.py +0 -0
  47. {hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/tests/test_emission.py +0 -0
  48. {hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/tests/test_lookup.py +0 -0
  49. {hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/tests/test_lookup_utils.py +0 -0
  50. {hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/tests/test_model.py +0 -0
  51. {hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/tests/test_pipeline.py +0 -0
  52. {hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/tests/test_request.py +0 -0
  53. {hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/tests/test_stats.py +0 -0
  54. {hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/tests/test_table.py +0 -0
  55. {hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/tests/test_term.py +0 -0
  56. {hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/tests/test_tools.py +0 -0
{hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: hestia_earth_utils
3
- Version: 0.16.16
3
+ Version: 0.16.17
4
4
  Summary: HESTIA's utils library
5
5
  Home-page: https://gitlab.com/hestia-earth/hestia-utils
6
6
  Author: HESTIA Team
{hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/hestia_earth/utils/pivot/pivot_json.py RENAMED
@@ -51,6 +51,13 @@ def _combine_node_ids(nodes: list):
51
51
  return {"@id": ";".join([node.get("@id", node.get("id")) for node in nodes])}
52
52
 
53
53
 
54
+ _COMPACT_JSON_KEYS = ["boundary", "distribution", "covarianceMatrix"]
55
+
56
+
57
+ def _combine_json_compact(key: str, value: dict):
58
+ return json.dumps(value).replace(" ", "") if key in _COMPACT_JSON_KEYS else value
59
+
60
+
54
61
  def _base_pivoted_value(key: str, value, is_top_level: bool):
55
62
  # handle list of Nodes
56
63
  return (
@@ -58,13 +65,13 @@ def _base_pivoted_value(key: str, value, is_top_level: bool):
58
65
  _combine_node_ids(value)
59
66
  if isinstance(value[0], dict) and value[0].get("@type") in NODE_TYPES
60
67
  else (
61
- json.dumps(value, separators=(",", ":"))
62
- if any([is_top_level, key in ["distribution"]])
68
+ _combine_json_compact(key, value)
69
+ if any([is_top_level, key in _COMPACT_JSON_KEYS])
63
70
  else value
64
71
  )
65
72
  )
66
73
  if isinstance(value, list)
67
- else value
74
+ else _combine_json_compact(key, value)
68
75
  )
69
76
 
70
77
 
hestia_earth_utils-0.16.17/hestia_earth/utils/version.py ADDED
@@ -0,0 +1 @@
1
+ VERSION = "0.16.17"
{hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.17}/hestia_earth_utils.egg-info/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: hestia_earth_utils
3
- Version: 0.16.16
3
+ Version: 0.16.17
4
4
  Summary: HESTIA's utils library
5
5
  Home-page: https://gitlab.com/hestia-earth/hestia-utils
6
6
  Author: HESTIA Team
hestia_earth_utils-0.16.16/hestia_earth/utils/version.py DELETED
@@ -1 +0,0 @@
1
- VERSION = "0.16.16"