rda-python-common 3.0.2__tar.gz → 3.0.5__tar.gz

{rda_python_common-3.0.2/src/rda_python_common.egg-info → rda_python_common-3.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_common
-Version: 3.0.2
+Version: 3.0.5
 Summary: RDA Python common library codes shared by other RDA python packages
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-common

{rda_python_common-3.0.2 → rda_python_common-3.0.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rda_python_common"
-version = "3.0.2"
+version = "3.0.5"
 authors = [
   { name="Zaihua Ji", email="zji@ucar.edu" },
 ]

{rda_python_common-3.0.2 → rda_python_common-3.0.5}/src/rda_python_common/pg_dbi.py

@@ -2624,15 +2624,17 @@ class PgDBI(PgLOG):
    def get_pgpass_password(self):
       """Return the database password for the current connection settings.
 
-      Checks PGDBI['PWNAME'] first, then tries OpenBao (get_baopassword()), and
-      finally falls back to the .pgpass file (get_pgpassword()).
+      Checks PGDBI['PWNAME'] first, then tries the .pgpass file (get_pgpassword()),
+      and finally falls back to OpenBao (get_baopassword()).
 
       Returns:
          str | None: Password string, or None when no credential is found.
       """
       if self.PGDBI['PWNAME']: return self.PGDBI['PWNAME']
-      pwname = self.get_baopassword()
-      if not pwname: pwname = self.get_pgpassword()
+      pwname = self.get_pgpassword()
+      if not pwname: pwname = self.get_baopassword()
+      if not pwname:
+         self.pglog("Unable to find password for {} in .pgpass or OpenBao".format(self.PGDBI['DBNAME']), self.PGDBI['ERRLOG'])
       return pwname
 
    def get_pgpassword(self):
@@ -2677,8 +2679,8 @@ class PgDBI(PgLOG):
                if not line or line.startswith("#"): continue
                dbhost, dbport, dbname, lnname, pwname = line.split(":")
                self.DBPASS[(dbhost, dbport, dbname, lnname)] = pwname
-      except Exception as e:
-          self.pglog(str(e), self.PGDBI['ERRLOG'])
+      except Exception:
+          pass
 
    def read_openbao(self):
       """Read OpenBao secrets and populate DBBAOS with credentials for DBNAME.
@@ -2703,8 +2705,8 @@ class PgDBI(PgLOG):
              mount_point='kv',
              raise_on_deleted_version=False
          )
-      except Exception as e:
-         return self.pglog(str(e), self.PGDBI['ERRLOG'])
+      except Exception:
+         return
       baos = read_response['data']['data']
       for key in baos:
          ms = re.match(r'^(\w*)pass(\w*)$', key)

{rda_python_common-3.0.2 → rda_python_common-3.0.5}/src/rda_python_common/pg_file.py

@@ -411,7 +411,7 @@ class PgFile(PgUtil, PgSIG):
    # fromfiles - source file name list, the same format as the tofiles
    #   topoint - target endpoint name, 'gdex-glade', 'gdex-quasar' or 'gdex-quasar-dgdexta'
    # frompoint - source endpoint name, the same choices as the topoint
-   def quasar_multiple_trasnfer(self, tofiles, fromfiles, topoint, frompoint, logact = 0):
+   def quasar_multiple_transfer(self, tofiles, fromfiles, topoint, frompoint, logact = 0):
       """Transfer multiple files between two Globus endpoints in a single batch task.
 
       Builds a JSON batch-transfer spec from parallel source/destination lists
@@ -454,6 +454,9 @@ class PgFile(PgUtil, PgSIG):
          ret = self.FINISH
       return ret
 
+   # backward-compatible alias for the former misspelled name
+   quasar_multiple_trasnfer = quasar_multiple_transfer
+
    # Copy a file from a Globus endpoint to another
    #    tofile - target file name, leading with /dsnnn.n/ on Quasar and
    #             leading with /data/ or /decsdata/ on local glade disk

{rda_python_common-3.0.2 → rda_python_common-3.0.5}/src/rda_python_common/pg_log.py

@@ -262,22 +262,23 @@ class PgLOG:
                   msg += " with 1 Error:\n"
                else:
                   msg += " with {} Errors:\n".format(self.PGLOG['ERRCNT'])
+               msg += "\nERROR MESSAGE:\n"
                msg +=  self.break_long_string(self.PGLOG['ERRMSG'], 512, None, self.PGLOG['EMLMAX']/2, None, 50, 25)
                self.PGLOG['ERRCNT'] = 0
                self.PGLOG['ERRMSG'] = ''
             if self.PGLOG['SUMMSG']:
-               msg += self.PGLOG['SEPLINE']
-               if self.PGLOG['SUMMSG']: msg += "Summary:\n"
+               msg += "\nSUMMARY:\n"
                msg += self.break_long_string(self.PGLOG['SUMMSG'], 512, None, self.PGLOG['EMLMAX']/2, None, 50, 25)
             if self.PGLOG['EMLMSG']:
-               msg += self.PGLOG['SEPLINE']
-               if self.PGLOG['SUMMSG']: msg += "Detail Information:\n"
+               msg += "\nDETAIL INFORMATION:\n"
             self.PGLOG['EMLMSG'] = msg + self.break_long_string(self.PGLOG['EMLMSG'], 512, None, self.PGLOG['EMLMAX'], None, 50, 40)
             self.PGLOG['SUMMSG'] = ""   # in case not
          else:
             if logact&self.ERRLOG:      # record error for email summary
                self.PGLOG['ERRCNT'] += 1
-               if logact&self.BRKLIN: self.PGLOG['ERRMSG'] += "\n"
+               if self.PGLOG['ERRMSG']:      # blank line between consecutive errors
+                  if not self.PGLOG['ERRMSG'].endswith('\n'): self.PGLOG['ERRMSG'] += "\n"
+                  self.PGLOG['ERRMSG'] += "\n"
                self.PGLOG['ERRMSG'] += "{}. {}".format(self.PGLOG['ERRCNT'], msg)
             elif logact&self.EMLSUM:
                if self.PGLOG['SUMMSG']:

{rda_python_common-3.0.2 → rda_python_common-3.0.5/src/rda_python_common.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_common
-Version: 3.0.2
+Version: 3.0.5
 Summary: RDA Python common library codes shared by other RDA python packages
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-common