rda-python-metrics 1.0.25__tar.gz → 1.0.26__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.

Potentially problematic release.


This version of rda-python-metrics might be problematic. Click here for more details.

Files changed (59) hide show
  1. {rda_python_metrics-1.0.25/src/rda_python_metrics.egg-info → rda_python_metrics-1.0.26}/PKG-INFO +1 -1
  2. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/pyproject.toml +1 -1
  3. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/src/rda_python_metrics/PgIPInfo.py +2 -2
  4. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/src/rda_python_metrics/fillipinfo.py +1 -1
  5. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26/src/rda_python_metrics.egg-info}/PKG-INFO +1 -1
  6. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/LICENSE +0 -0
  7. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/MANIFEST.in +0 -0
  8. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/README.md +0 -0
  9. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/setup.cfg +0 -0
  10. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/src/rda_python_metrics/PgView.py +0 -0
  11. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/src/rda_python_metrics/__init__.py +0 -0
  12. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/src/rda_python_metrics/fillawsusage.py +0 -0
  13. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/src/rda_python_metrics/fillawsusage.usg +0 -0
  14. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/src/rda_python_metrics/fillcdgusage.py +0 -0
  15. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/src/rda_python_metrics/fillcdgusage.usg +0 -0
  16. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/src/rda_python_metrics/fillcodusage.py +0 -0
  17. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/src/rda_python_metrics/fillcodusage.usg +0 -0
  18. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/src/rda_python_metrics/fillcountry.py +0 -0
  19. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/src/rda_python_metrics/fillendtime.py +0 -0
  20. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/src/rda_python_metrics/fillglobususage.py +0 -0
  21. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/src/rda_python_metrics/fillglobususage.usg +0 -0
  22. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/src/rda_python_metrics/fillipinfo.usg +0 -0
  23. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/src/rda_python_metrics/filloneorder.py +0 -0
  24. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/src/rda_python_metrics/filloneorder.usg +0 -0
  25. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/src/rda_python_metrics/fillosdfusage.py +0 -0
  26. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/src/rda_python_metrics/fillosdfusage.usg +0 -0
  27. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/src/rda_python_metrics/fillrdadb.py +0 -0
  28. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/src/rda_python_metrics/fillrdadb.usg +0 -0
  29. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/src/rda_python_metrics/filltdsusage.py +0 -0
  30. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/src/rda_python_metrics/filltdsusage.usg +0 -0
  31. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/src/rda_python_metrics/filluser.py +0 -0
  32. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/src/rda_python_metrics/filluser.usg +0 -0
  33. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/src/rda_python_metrics/logarch.py +0 -0
  34. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/src/rda_python_metrics/logarch.usg +0 -0
  35. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/src/rda_python_metrics/pgperson.py +0 -0
  36. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/src/rda_python_metrics/pgsyspath.py +0 -0
  37. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/src/rda_python_metrics/pgusername.py +0 -0
  38. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/src/rda_python_metrics/viewallusage.py +0 -0
  39. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/src/rda_python_metrics/viewallusage.usg +0 -0
  40. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/src/rda_python_metrics/viewcheckusage.py +0 -0
  41. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/src/rda_python_metrics/viewcheckusage.usg +0 -0
  42. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/src/rda_python_metrics/viewcodusage.py +0 -0
  43. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/src/rda_python_metrics/viewcodusage.usg +0 -0
  44. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/src/rda_python_metrics/viewordusage.py +0 -0
  45. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/src/rda_python_metrics/viewordusage.usg +0 -0
  46. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/src/rda_python_metrics/viewrqstusage.py +0 -0
  47. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/src/rda_python_metrics/viewrqstusage.usg +0 -0
  48. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/src/rda_python_metrics/viewtdsusage.py +0 -0
  49. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/src/rda_python_metrics/viewtdsusage.usg +0 -0
  50. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/src/rda_python_metrics/viewwebfile.py +0 -0
  51. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/src/rda_python_metrics/viewwebfile.usg +0 -0
  52. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/src/rda_python_metrics/viewwebusage.py +0 -0
  53. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/src/rda_python_metrics/viewwebusage.usg +0 -0
  54. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/src/rda_python_metrics.egg-info/SOURCES.txt +0 -0
  55. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/src/rda_python_metrics.egg-info/dependency_links.txt +0 -0
  56. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/src/rda_python_metrics.egg-info/entry_points.txt +0 -0
  57. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/src/rda_python_metrics.egg-info/requires.txt +0 -0
  58. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/src/rda_python_metrics.egg-info/top_level.txt +0 -0
  59. {rda_python_metrics-1.0.25 → rda_python_metrics-1.0.26}/tests/test_metrics.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: rda_python_metrics
3
- Version: 1.0.25
3
+ Version: 1.0.26
4
4
  Summary: RDA Python Package to gather and view data usage metrics
5
5
  Author-email: Zaihua Ji <zji@ucar.edu>
6
6
  Project-URL: Homepage, https://github.com/NCAR/rda-python-metrics
@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
6
6
 
7
7
  [project]
8
8
  name = "rda_python_metrics"
9
- version = "1.0.25"
9
+ version = "1.0.26"
10
10
  authors = [
11
11
  { name="Zaihua Ji", email="zji@ucar.edu" },
12
12
  ]
@@ -115,8 +115,8 @@ def get_ip_hostname(ip, iprec, record):
115
115
  record['org_type'] = PgDBI.get_org_type(None, record['hostname'])
116
116
  return
117
117
  record['hostname'] = ip
118
- if 'domain' in iprec and iprec['domain']:
119
- record['hostname'] += '.' + iprec['domain']
118
+ if 'asn' in iprec and 'domain' in iprec['asn'] and iprec['asn']['domain']:
119
+ record['hostname'] += '.' + iprec['asn']['domain']
120
120
  record['org_type'] = PgDBI.get_org_type(None, record['hostname'])
121
121
  return
122
122
 
@@ -113,7 +113,7 @@ def fill_ip_info(option, inputs, table):
113
113
  def get_next_date(date, edate):
114
114
 
115
115
  if date < edate:
116
- ndate = PgUtil.enddate(date, 'M')
116
+ ndate = PgUtil.enddate(date, 0, 'M')
117
117
  if ndate < edate: edate = ndate
118
118
  if date < edate:
119
119
  cond = f"BETWEEN '{date}' AND '{edate}'"
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: rda_python_metrics
3
- Version: 1.0.25
3
+ Version: 1.0.26
4
4
  Summary: RDA Python Package to gather and view data usage metrics
5
5
  Author-email: Zaihua Ji <zji@ucar.edu>
6
6
  Project-URL: Homepage, https://github.com/NCAR/rda-python-metrics