rda-python-metrics 1.0.20__tar.gz → 1.0.21__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.20/src/rda_python_metrics.egg-info → rda_python_metrics-1.0.21}/PKG-INFO +1 -1
  2. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/pyproject.toml +1 -1
  3. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/src/rda_python_metrics/PgIPInfo.py +2 -2
  4. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/src/rda_python_metrics/fillipinfo.py +2 -3
  5. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21/src/rda_python_metrics.egg-info}/PKG-INFO +1 -1
  6. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/LICENSE +0 -0
  7. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/MANIFEST.in +0 -0
  8. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/README.md +0 -0
  9. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/setup.cfg +0 -0
  10. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/src/rda_python_metrics/PgView.py +0 -0
  11. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/src/rda_python_metrics/__init__.py +0 -0
  12. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/src/rda_python_metrics/fillawsusage.py +0 -0
  13. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/src/rda_python_metrics/fillawsusage.usg +0 -0
  14. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/src/rda_python_metrics/fillcdgusage.py +0 -0
  15. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/src/rda_python_metrics/fillcdgusage.usg +0 -0
  16. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/src/rda_python_metrics/fillcodusage.py +0 -0
  17. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/src/rda_python_metrics/fillcodusage.usg +0 -0
  18. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/src/rda_python_metrics/fillcountry.py +0 -0
  19. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/src/rda_python_metrics/fillendtime.py +0 -0
  20. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/src/rda_python_metrics/fillglobususage.py +0 -0
  21. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/src/rda_python_metrics/fillglobususage.usg +0 -0
  22. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/src/rda_python_metrics/fillipinfo.usg +0 -0
  23. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/src/rda_python_metrics/filloneorder.py +0 -0
  24. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/src/rda_python_metrics/filloneorder.usg +0 -0
  25. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/src/rda_python_metrics/fillosdfusage.py +0 -0
  26. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/src/rda_python_metrics/fillosdfusage.usg +0 -0
  27. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/src/rda_python_metrics/fillrdadb.py +0 -0
  28. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/src/rda_python_metrics/fillrdadb.usg +0 -0
  29. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/src/rda_python_metrics/filltdsusage.py +0 -0
  30. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/src/rda_python_metrics/filltdsusage.usg +0 -0
  31. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/src/rda_python_metrics/filluser.py +0 -0
  32. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/src/rda_python_metrics/filluser.usg +0 -0
  33. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/src/rda_python_metrics/logarch.py +0 -0
  34. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/src/rda_python_metrics/logarch.usg +0 -0
  35. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/src/rda_python_metrics/pgperson.py +0 -0
  36. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/src/rda_python_metrics/pgsyspath.py +0 -0
  37. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/src/rda_python_metrics/pgusername.py +0 -0
  38. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/src/rda_python_metrics/viewallusage.py +0 -0
  39. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/src/rda_python_metrics/viewallusage.usg +0 -0
  40. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/src/rda_python_metrics/viewcheckusage.py +0 -0
  41. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/src/rda_python_metrics/viewcheckusage.usg +0 -0
  42. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/src/rda_python_metrics/viewcodusage.py +0 -0
  43. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/src/rda_python_metrics/viewcodusage.usg +0 -0
  44. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/src/rda_python_metrics/viewordusage.py +0 -0
  45. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/src/rda_python_metrics/viewordusage.usg +0 -0
  46. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/src/rda_python_metrics/viewrqstusage.py +0 -0
  47. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/src/rda_python_metrics/viewrqstusage.usg +0 -0
  48. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/src/rda_python_metrics/viewtdsusage.py +0 -0
  49. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/src/rda_python_metrics/viewtdsusage.usg +0 -0
  50. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/src/rda_python_metrics/viewwebfile.py +0 -0
  51. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/src/rda_python_metrics/viewwebfile.usg +0 -0
  52. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/src/rda_python_metrics/viewwebusage.py +0 -0
  53. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/src/rda_python_metrics/viewwebusage.usg +0 -0
  54. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/src/rda_python_metrics.egg-info/SOURCES.txt +0 -0
  55. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/src/rda_python_metrics.egg-info/dependency_links.txt +0 -0
  56. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/src/rda_python_metrics.egg-info/entry_points.txt +0 -0
  57. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/src/rda_python_metrics.egg-info/requires.txt +0 -0
  58. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/src/rda_python_metrics.egg-info/top_level.txt +0 -0
  59. {rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/tests/test_metrics.py +0 -0
{rda_python_metrics-1.0.20/src/rda_python_metrics.egg-info → rda_python_metrics-1.0.21}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: rda_python_metrics
3
- Version: 1.0.20
3
+ Version: 1.0.21
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
{rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/pyproject.toml RENAMED
@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
6
6
 
7
7
  [project]
8
8
  name = "rda_python_metrics"
9
- version = "1.0.20"
9
+ version = "1.0.21"
10
10
  authors = [
11
11
  { name="Zaihua Ji", email="zji@ucar.edu" },
12
12
  ]
{rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/src/rda_python_metrics/PgIPInfo.py RENAMED
@@ -192,8 +192,8 @@ def object_to_dict(obj):
192
192
  #
193
193
  def update_wuser_email(nhost, ohost):
194
194
 
195
- pgrec = PgDBI.pgget('wuser', 'widx', "email = 'unknown@{}'".format(ohost))
196
- if pgrec: PgDBI.pgexec("UPDATE wuser SET email = 'unknown@{}' WHERE widx = {}".format(nhost, pgrec['widx']))
195
+ pgrec = PgDBI.pgget('wuser', 'wuid', "email = 'unknown@{}'".format(ohost))
196
+ if pgrec: PgDBI.pgexec("UPDATE wuser SET email = 'unknown@{}' WHERE wuid = {}".format(nhost, pgrec['wuid']))
197
197
 
198
198
  #
199
199
  # update a ipinfo record; add a new one if not exists yet
{rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21}/src/rda_python_metrics/fillipinfo.py RENAMED
@@ -196,15 +196,14 @@ def fix_wuser_records(date):
196
196
  def fix_ipinfo_records(date):
197
197
 
198
198
  table = 'ipinfo'
199
- cond = "date = '{}' AND region IS NULL".format(date)
199
+ cond = "adddate = '{}' AND region IS NULL".format(date)
200
200
  pgrecs = PgDBI.pgmget(table, 'ip', cond, PgLOG.LGEREX)
201
201
  if not pgrecs: return 0
202
202
  cnt = len(pgrecs['ip']) if pgrecs else 0
203
203
  mcnt = 0
204
204
  for i in range(cnt):
205
- PgIPInfo.set_ipinfo(pgrecs['ip'][i])
205
+ if PgIPInfo.set_ipinfo(pgrecs['ip'][i]): mcnt +=1
206
206
 
207
- mcnt = PgIPInfo.IPINFO['IPUPDT']
208
207
  s = 's' if cnt > 1 else ''
209
208
  PgLOG.pglog("{}: {} of {} record{} updated".format(table, mcnt, cnt, s), PgLOG.LOGWRN)
210
209
 
{rda_python_metrics-1.0.20 → rda_python_metrics-1.0.21/src/rda_python_metrics.egg-info}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: rda_python_metrics
3
- Version: 1.0.20
3
+ Version: 1.0.21
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