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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_common
-Version: 3.0.0
+Version: 3.0.2
 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.0 → rda_python_common-3.0.2}/pyproject.toml

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

{rda_python_common-3.0.0 → rda_python_common-3.0.2}/src/rda_python_common/PgDBI.py

@@ -328,8 +328,12 @@ def starttran():
       pgconnect(0, 0, False)
    else:
       try:
-         pgdb.isolation_level
-      except PgSQL.OperationalError as e:
+         # Liveness probe: psycopg2's isolation_level getter could raise on a
+         # dead connection, but psycopg3's is a cached attribute that never
+         # touches the server.  A trivial round-trip detects a broken
+         # connection under either driver.
+         pgdb.cursor().execute("SELECT 1")
+      except PgSQL.Error as e:
          pgconnect(0, 0, False)
       if pgdb.closed:
          pgconnect(0, 0, False)
@@ -1714,25 +1718,6 @@ def reset_rdadb_version(dsid):
 
    pgexec("UPDATE dataset SET version = version + 1 WHERE dsid = '{}'".format(dsid), PGDBI['ERRLOG'])
 
-#
-# check the use rdadb flag in table dataset for a given dataset and given values
-#
-def use_rdadb(dsid, logact = 0, vals = None):
-
-   ret = ''   # default to empty in case dataset not in RDADB
-   if dsid:
-      pgrec = pgget("dataset", "use_rdadb", "dsid = '{}'".format(dsid), PGDBI['EXITLG'])
-      if pgrec:
-         ret = 'N'   # default to 'N' if dataset record in RDADB already
-         if pgrec['use_rdadb']:
-            if not vals: vals = "IPYMW"  # default to Internal; Publishable; Yes RDADB
-            if vals.find(pgrec['use_rdadb']) > -1:
-               ret = pgrec['use_rdadb']
-      elif logact:
-         PgLOG.pglog("Dataset '{}' is not in RDADB!".format(dsid), logact)
-
-   return ret
-
 #
 #   fld: field name for querry condition
 #  vals: reference to aaray of values

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

@@ -410,8 +410,12 @@ class PgDBI(PgLOG):
          self.pgconnect(0, 0, False)
       else:
          try:
-            self.pgdb.isolation_level
-         except PgSQL.OperationalError as e:
+            # Liveness probe: psycopg2's isolation_level getter could raise on a
+            # dead connection, but psycopg3's is a cached attribute that never
+            # touches the server.  A trivial round-trip detects a broken
+            # connection under either driver.
+            self.pgdb.cursor().execute("SELECT 1")
+         except PgSQL.Error as e:
             self.pgconnect(0, 0, False)
          if self.pgdb.closed:
             self.pgconnect(0, 0, False)
@@ -533,7 +537,11 @@ class PgDBI(PgLOG):
          dberror (str): Full database error string to inspect.
          logact (int): Logging action flags forwarded to add_new_table().
       """
-      ms = re.match(r'^42P01 ERROR:  relation "(.+)" does not exist', dberror)
+      # The caller (check_dberror) only invokes this after pgcode == '42P01', so
+      # match just the relation message.  psycopg2's pgerror includes the
+      # 'ERROR:  ' severity prefix while psycopg3's message_primary does not, so
+      # anchoring on that prefix only matched under psycopg2.
+      ms = re.search(r'relation "(.+)" does not exist', dberror)
       if ms:
          tname = ms.group(1)
          self.add_new_table(tname, logact = logact)
@@ -1986,32 +1994,6 @@ class PgDBI(PgLOG):
       """
       self.pgexec("UPDATE dataset SET version = version + 1 WHERE dsid = '{}'".format(dsid), self.PGDBI['ERRLOG'])
    
-   def use_rdadb(self, dsid, logact = 0, vals = None):
-      """Return the use_rdadb flag for a dataset if it matches an allowed set.
-
-      Args:
-         dsid (str | None): Dataset ID to query.
-         logact (int): Logging action flags for missing-dataset warnings; default 0.
-         vals (str | None): Accepted flag characters; defaults to 'IPYMW' when None.
-
-      Returns:
-         str: The use_rdadb flag character when found and in vals; 'N' when the
-              dataset exists but the flag is not in vals; '' when dsid is falsy
-              or the dataset is not in RDADB.
-      """
-      ret = ''   # default to empty in case dataset not in RDADB
-      if dsid:
-         pgrec = self.pgget("dataset", "use_rdadb", "dsid = '{}'".format(dsid), self.PGDBI['EXITLG'])
-         if pgrec:
-            ret = 'N'   # default to 'N' if dataset record in RDADB already
-            if pgrec['use_rdadb']:
-               if not vals: vals = "IPYMW"  # default to Internal; Publishable; Yes RDADB
-               if vals.find(pgrec['use_rdadb']) > -1:
-                  ret = pgrec['use_rdadb']
-         elif logact:
-            self.pglog("Dataset '{}' is not in RDADB!".format(dsid), logact)
-      return ret
-
    def get_field_condition(self, fld, vals, isstr = 0, noand = 0):
       """Build a SQL condition fragment for a field given a list of values.
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_common
-Version: 3.0.0
+Version: 3.0.2
 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