PyPI - rda-python-metrics - Versions diffs - 2.0.5__tar.gz → 2.0.6__tar.gz - Mend

rda-python-metrics 2.0.5tar.gz → 2.0.6tar.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 (93) hide show

{rda_python_metrics-2.0.5/src/rda_python_metrics.egg-info → rda_python_metrics-2.0.6}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_metrics
-Version: 2.0.5
+Version: 2.0.6
 Summary: RDA Python Package to gather and view data usage metrics
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-metrics

{rda_python_metrics-2.0.5 → rda_python_metrics-2.0.6}/pyproject.toml RENAMED Viewed

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "rda_python_metrics"
-version = "2.0.5"
+version = "2.0.6"
 authors = [
   { name="Zaihua Ji",  email="zji@ucar.edu" },
 ]

{rda_python_metrics-2.0.5 → rda_python_metrics-2.0.6}/src/rda_python_metrics/fillipinfo.py RENAMED Viewed

@@ -25,12 +25,10 @@ class FillIPInfo(PgIPInfo):
       self.NDAYS = 0x08  # fix data usages in recent number of days
       self.MULTI = (self.DATES|self.MONTH|self.YEARS)
       self.SINGL = (self.NDAYS)
-      self.IPINFO = {
-         'USGTBL'  : ['ipinfo', 'wuser', 'allusage', 'codusage', 'tdsusage'],
-         'CDATE' : self.curdate(),
-      }
+      self.IPINFO['USGTBL'] = ['ipinfo', 'wuser', 'allusage', 'codusage', 'tdsusage']
+      self.IPINFO['CDATE'] = self.curdate()
       self.inputs = []  # array of input values
-      self.table = None  # table names: ipinfo, allusage, globususage, or tdsusage
+      self.table = None
       self.option = 0
    # function to read parameters

{rda_python_metrics-2.0.5 → rda_python_metrics-2.0.6}/src/rda_python_metrics/viewallusage.py RENAMED Viewed

@@ -293,11 +293,15 @@ class ViewALLUsage(PgView):
          else:
             self.condition = joins
       if 'E' in self.params or 'I' in self.params:
-         self.condition += self.notice_condition(self.params['E'], self.params['I'], self.params['t'][0])
+         self.condition += self.notice_condition(
+            self.params.get('E'),
+            self.params.get('I'),
+            self.params.get('t', [None])[0]
+         )
       if groupnames and self.sfields: self.condition += " GROUP BY " + groupnames
       if having: self.condition += " HAVING " + having
-   # exand records as needed
+   # expand records as needed
    def expand_records(self, records):
       recs = self.expand_query("TIME", records, self.params, self.EXPAND)
       trecs = self.expand_query("USER", records, self.params, self.EXPAND, self.VUSG, self.SNS, self.FLDS)

{rda_python_metrics-2.0.5 → rda_python_metrics-2.0.6}/src/rda_python_metrics/viewawsusage.py RENAMED Viewed

@@ -261,10 +261,14 @@ class ViewAWSUsage(PgView):
          else:
             self.condition = joins
       if 'E' in self.params or 'I' in self.params:
-         self.condition += self.notice_condition(self.params['E'], None, self.params['t'][0])
+         self.condition += self.notice_condition(
+            self.params.get('E'),
+            self.params.get('I'),
+            self.params.get('t', [None])[0]
+         )
       if groupnames and self.sfields: self.condition += " GROUP BY " + groupnames
-   # exand records as needed
+   # expand records as needed
    def expand_records(self, records):
       recs = self.expand_query("TIME", records, self.params, self.EXPAND)
       trecs = self.expand_query("USER", records, self.params, self.EXPAND, self.VUSG, self.SNS, self.FLDS)

{rda_python_metrics-2.0.5 → rda_python_metrics-2.0.6}/src/rda_python_metrics/viewcheckusage.py RENAMED Viewed

@@ -245,7 +245,7 @@ class ViewCheckUsage(PgView):
       if groupnames and self.sfields: self.condition += " GROUP BY " + groupnames
       if having: self.condition += " HAVING " + having
-   # exand records as needed
+   # expand records as needed
    def expand_records(self, records):
       recs = self.expand_query("TIME", records, self.params, self.EXPAND)
       trecs = self.expand_query("CHECK", records, self.params, self.EXPAND, self.VUSG, self.SNS, self.FLDS)

{rda_python_metrics-2.0.5 → rda_python_metrics-2.0.6}/src/rda_python_metrics/viewcodusage.py RENAMED Viewed

@@ -263,10 +263,14 @@ def build_query_strings(self, usgtable):
       else:
          self.condition = joins
    if 'E' in self.params or 'I' in self.params:
-      self.condition += self.notice_condition(self.params['E'], self.params['I'], self.params['t'][0])
+      self.condition += self.notice_condition(
+         self.params.get('E'),
+         self.params.get('I'),
+         self.params.get('t', [None])[0]
+      )
    if groupnames and self.sfields: self.condition += " GROUP BY " + groupnames
-# exand records as needed
+# expand records as needed
 def expand_records(self, records):
    recs = self.expand_query("TIME", records, self.params, self.EXPAND)
    trecs = self.expand_query("USER", records, self.params, self.EXPAND, self.VUSG, self.SNS, self.FLDS)

{rda_python_metrics-2.0.5 → rda_python_metrics-2.0.6}/src/rda_python_metrics/viewordusage.py RENAMED Viewed

@@ -282,7 +282,7 @@ class ViewORDUsage(PgView):
       if groupnames and self.sfields: self.condition += " GROUP BY " + groupnames
       if having: self.condition += " HAVING " + having
-   # exand records as needed
+   # expand records as needed
    def expand_records(self, records):
       recs = self.expand_query("TIME", records, self.params, self.EXPAND)
       trecs = self.expand_query("USER", records, self.params, self.EXPAND, self.VUSG, self.SNS, self.FLDS)

{rda_python_metrics-2.0.5 → rda_python_metrics-2.0.6}/src/rda_python_metrics/viewosdfusage.py RENAMED Viewed

@@ -253,18 +253,22 @@ class ViewOSDFUsage(PgView):
                self.condition += cnd
                (self.tablenames, joins) = self.join_query_tables(fld[3], self.tablenames, joins, usgtable)
       # append joins, group by, order by, and having strings to condition string
-      if 'E' in self.params or 'I' in self.self.params:
+      if 'E' in self.params or 'I' in self.params:
          (self.tablenames, joins) = self.join_query_tables("emreceive", self.tablenames, joins, usgtable)
       if joins:
          if self.condition:
             self.condition = "{} AND {}".format(joins, self.condition)
          else:
             self.condition = joins
-      if 'E' in self.self.params or 'I' in self.params:
-         self.condition += self.notice_condition(self.params['E'], None, self.params['t'][0])
+      if 'E' in self.params or 'I' in self.params:
+         self.condition += self.notice_condition(
+            self.params.get('E'),
+            self.params.get('I'),
+            self.params.get('t', [None])[0]
+         )
       if groupnames and self.sfields: self.condition += " GROUP BY " + groupnames
-   # exand records as needed
+   # expand records as needed
    def expand_records(self, records):
       recs = self.expand_query("TIME", records, self.params, self.EXPAND)
       trecs = self.expand_query("USER", records, self.params, self.EXPAND, self.VUSG, self.SNS, self.FLDS)

{rda_python_metrics-2.0.5 → rda_python_metrics-2.0.6}/src/rda_python_metrics/viewrqstusage.py RENAMED Viewed

@@ -301,11 +301,15 @@ class ViewRQSTUsage(PgView):
             self.condition = joins
       if 'n' in self.params: self.condition += " AND location > ' '"
       if 'E' in self.params or 'I' in self.params:
-         self.condition += self.notice_condition(self.params['E'], self.params['I'], self.params['t'][0])
+         self.condition += self.notice_condition(
+            self.params.get('E'),
+            self.params.get('I'),
+            self.params.get('t', [None])[0]
+         )
       if groupnames and self.sfields: self.condition += " GROUP BY " + groupnames
       if having: self.condition += " HAVING " + having
-   # exand records as needed
+   # expand records as needed
    def expand_records(self, records):
       recs = self.expand_query("TIME", records, self.params, self.EXPAND)
       trecs = self.expand_query("USER", records, self.params, self.EXPAND, self.VUSG, self.SNS, self.FLDS)

{rda_python_metrics-2.0.5 → rda_python_metrics-2.0.6}/src/rda_python_metrics/viewtdsusage.py RENAMED Viewed

@@ -266,10 +266,14 @@ class ViewTDSUsage(PgView):
          else:
             self.condition = joins
       if 'E' in self.params or 'I' in self.params:
-         self.condition += self.notice_condition(self.params['E'], None, self.params['t'][0])
+         self.condition += self.notice_condition(
+            self.params.get('E'),
+            self.params.get('I'),
+            self.params.get('t', [None])[0]
+         )
       if groupnames and self.sfields: self.condition += " GROUP BY " + groupnames
-   # exand records as needed
+   # expand records as needed
    def expand_records(self, records):
       recs = self.expand_query("TIME", records, self.params, self.EXPAND)
       trecs = self.expand_query("USER", records, self.params, self.EXPAND, self.VUSG, self.SNS, self.FLDS)

{rda_python_metrics-2.0.5 → rda_python_metrics-2.0.6/src/rda_python_metrics.egg-info}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_metrics
-Version: 2.0.5
+Version: 2.0.6
 Summary: RDA Python Package to gather and view data usage metrics
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-metrics