DIRAC 9.0.0a42__py3-none-any.whl → 9.0.7__py3-none-any.whl

DIRAC/Core/Utilities/List.py

@@ -1,124 +1 @@
-"""Collection of DIRAC useful list related modules.
-   By default on Error they return None.
-"""
-import random
-import sys
-from typing import Any
-
-
-def uniqueElements(aList: list) -> list:
-    """Utility to retrieve list of unique elements in a list (order is kept)."""
-
-    # Use dict.fromkeys instead of set ensure the order is preserved
-    return list(dict.fromkeys(aList))
-
-
-def appendUnique(aList: list, anObject: Any):
-    """Append to list if object does not exist.
-
-    :param aList: list of elements
-    :param anObject: object you want to append
-    """
-    if anObject not in aList:
-        aList.append(anObject)
-
-
-def fromChar(inputString: str, sepChar: str = ","):
-    """Generates a list splitting a string by the required character(s)
-    resulting string items are stripped and empty items are removed.
-
-    :param inputString: list serialised to string
-    :param sepChar: separator
-    :return: list of strings or None if sepChar has a wrong type
-    """
-    # to prevent getting an empty String as argument
-    if not (isinstance(inputString, str) and isinstance(sepChar, str) and sepChar):
-        return None
-    return [fieldString.strip() for fieldString in inputString.split(sepChar) if len(fieldString.strip()) > 0]
-
-
-def randomize(aList: list) -> list:
-    """Return a randomly sorted list.
-
-    :param aList: list to permute
-    """
-    tmpList = list(aList)
-    random.shuffle(tmpList)
-    return tmpList
-
-
-def pop(aList, popElement):
-    """Pop the first element equal to popElement from the list.
-
-    :param aList: list
-    :type aList: python:list
-    :param popElement: element to pop
-    """
-    if popElement in aList:
-        return aList.pop(aList.index(popElement))
-
-
-def stringListToString(aList: list) -> str:
-    """This function is used for making MySQL queries with a list of string elements.
-
-    :param aList: list to be serialized to string for making queries
-    """
-    return ",".join(f"'{x}'" for x in aList)
-
-
-def intListToString(aList: list) -> str:
-    """This function is used for making MySQL queries with a list of int elements.
-
-    :param aList: list to be serialized to string for making queries
-    """
-    return ",".join(str(x) for x in aList)
-
-
-def getChunk(aList: list, chunkSize: int):
-    """Generator yielding chunk from a list of a size chunkSize.
-
-    :param aList: list to be splitted
-    :param chunkSize: lenght of one chunk
-    :raise: StopIteration
-
-    Usage:
-
-    >>> for chunk in getChunk( aList, chunkSize=10):
-          process( chunk )
-
-    """
-    chunkSize = int(chunkSize)
-    for i in range(0, len(aList), chunkSize):
-        yield aList[i : i + chunkSize]
-
-
-def breakListIntoChunks(aList: list, chunkSize: int):
-    """This function takes a list as input and breaks it into list of size 'chunkSize'.
-       It returns a list of lists.
-
-    :param aList: list of elements
-    :param chunkSize: len of a single chunk
-    :return: list of lists of length of chunkSize
-    :raise: RuntimeError if numberOfFilesInChunk is less than 1
-    """
-    if chunkSize < 1:
-        raise RuntimeError("chunkSize cannot be less than 1")
-    if isinstance(aList, (set, dict, tuple, {}.keys().__class__, {}.items().__class__, {}.values().__class__)):
-        aList = list(aList)
-    return [chunk for chunk in getChunk(aList, chunkSize)]
-
-
-def getIndexInList(anItem: Any, aList: list) -> int:
-    """Return the index of the element x in the list l
-    or sys.maxint if it does not exist
-
-    :param anItem: element to look for
-    :param aList: list to look into
-
-    :return: the index or sys.maxint
-    """
-    # try:
-    if anItem in aList:
-        return aList.index(anItem)
-    else:
-        return sys.maxsize
+from DIRACCommon.Core.Utilities.List import *  # noqa: F401,F403

DIRAC/Core/Utilities/MySQL.py

@@ -1,151 +1,152 @@
-""" DIRAC Basic MySQL Class
-    It provides access to the basic MySQL methods in a multithread-safe mode
-    keeping used connections in a python Queue for further reuse.
+"""DIRAC Basic MySQL Class
+It provides access to the basic MySQL methods in a multithread-safe mode
+keeping used connections in a python Queue for further reuse.
 
-    These are the coded methods:
+These are the coded methods:
 
 
-    __init__( host, user, passwd, name, [maxConnsInQueue=10] )
+__init__( host, user, passwd, name, [maxConnsInQueue=10] )
 
-    Initializes the Queue and tries to connect to the DB server,
-    using the _connect method.
-    "maxConnsInQueue" defines the size of the Queue of open connections
-    that are kept for reuse. It also defined the maximum number of open
-    connections available from the object.
-    maxConnsInQueue = 0 means unlimited and it is not supported.
+Initializes the Queue and tries to connect to the DB server,
+using the _connect method.
+"maxConnsInQueue" defines the size of the Queue of open connections
+that are kept for reuse. It also defined the maximum number of open
+connections available from the object.
+maxConnsInQueue = 0 means unlimited and it is not supported.
 
 
-    _except( methodName, exception, errorMessage )
+_except( methodName, exception, errorMessage )
 
-    Helper method for exceptions: the "methodName" and the "errorMessage"
-    are printed with ERROR level, then the "exception" is printed (with
-    full description if it is a MySQL Exception) and S_ERROR is returned
-    with the errorMessage and the exception.
+Helper method for exceptions: the "methodName" and the "errorMessage"
+are printed with ERROR level, then the "exception" is printed (with
+full description if it is a MySQL Exception) and S_ERROR is returned
+with the errorMessage and the exception.
 
 
-    _connect()
+_connect()
 
-    Attempts connection to DB and sets the _connected flag to True upon success.
-    Returns S_OK or S_ERROR.
+Attempts connection to DB and sets the _connected flag to True upon success.
+Returns S_OK or S_ERROR.
 
 
-    _query( cmd, [conn=conn] )
+_query( cmd, [conn=conn] )
 
-    Executes SQL command "cmd".
-    Gets a connection from the Queue (or open a new one if none is available),
-    the used connection is  back into the Queue.
-    If a connection to the the DB is passed as second argument this connection
-    is used and is not  in the Queue.
-    Returns S_OK with fetchall() out in Value or S_ERROR upon failure.
+Executes SQL command "cmd".
+Gets a connection from the Queue (or open a new one if none is available),
+the used connection is  back into the Queue.
+If a connection to the the DB is passed as second argument this connection
+is used and is not  in the Queue.
+Returns S_OK with fetchall() out in Value or S_ERROR upon failure.
 
 
-    _update( cmd, [conn=conn] )
+_update( cmd, [conn=conn] )
 
-    Executes SQL command "cmd" and issue a commit
-    Gets a connection from the Queue (or open a new one if none is available),
-    the used connection is  back into the Queue.
-    If a connection to the the DB is passed as second argument this connection
-    is used and is not  in the Queue
-    Returns S_OK with number of updated registers in Value or S_ERROR upon failure.
+Executes SQL command "cmd" and issue a commit
+Gets a connection from the Queue (or open a new one if none is available),
+the used connection is  back into the Queue.
+If a connection to the the DB is passed as second argument this connection
+is used and is not  in the Queue
+Returns S_OK with number of updated registers in Value or S_ERROR upon failure.
 
 
-    _createTables( tableDict )
+_createTables( tableDict )
 
-    Create a new Table in the DB
+Create a new Table in the DB
 
 
-    _getConnection()
+_getConnection()
 
-    Gets a connection from the Queue (or open a new one if none is available)
-    Returns S_OK with connection in Value or S_ERROR
-    the calling method is responsible for closing this connection once it is no
-    longer needed.
+Gets a connection from the Queue (or open a new one if none is available)
+Returns S_OK with connection in Value or S_ERROR
+the calling method is responsible for closing this connection once it is no
+longer needed.
 
 
 
 
-    Some high level methods have been added to avoid the need to write SQL
-    statement in most common cases. They should be used instead of low level
-    _insert, _update methods when ever possible.
+Some high level methods have been added to avoid the need to write SQL
+statement in most common cases. They should be used instead of low level
+_insert, _update methods when ever possible.
 
-    buildCondition( self, condDict = None, older = None, newer = None,
-                      timeStamp = None, orderAttribute = None, limit = False,
-                      greater = None, smaller = None ):
+buildCondition( self, condDict = None, older = None, newer = None,
+                  timeStamp = None, orderAttribute = None, limit = False,
+                  greater = None, smaller = None ):
 
-      Build SQL condition statement from provided condDict and other extra check on
-      a specified time stamp.
-      The conditions dictionary specifies for each attribute one or a List of possible
-      values
-      greater and smaller are dictionaries in which the keys are the names of the fields,
-      that are requested to be >= or < than the corresponding value.
-      For compatibility with current usage it uses Exceptions to exit in case of
-      invalid arguments
+  Build SQL condition statement from provided condDict and other extra check on
+  a specified time stamp.
+  The conditions dictionary specifies for each attribute one or a List of possible
+  values
+  greater and smaller are dictionaries in which the keys are the names of the fields,
+  that are requested to be >= or < than the corresponding value.
+  For compatibility with current usage it uses Exceptions to exit in case of
+  invalid arguments
 
 
-    insertFields( self, tableName, inFields = None, inValues = None, conn = None, inDict = None ):
+insertFields( self, tableName, inFields = None, inValues = None, conn = None, inDict = None ):
 
-      Insert a new row in "tableName" assigning the values "inValues" to the
-      fields "inFields".
-      Alternatively inDict can be used
-      String type values will be appropriately escaped.
+  Insert a new row in "tableName" assigning the values "inValues" to the
+  fields "inFields".
+  Alternatively inDict can be used
+  String type values will be appropriately escaped.
 
 
-    updateFields( self, tableName, updateFields = None, updateValues = None,
-                  condDict = None,
-                  limit = False, conn = None,
-                  updateDict = None,
-                  older = None, newer = None,
-                  timeStamp = None, orderAttribute = None ):
+updateFields( self, tableName, updateFields = None, updateValues = None,
+              condDict = None,
+              limit = False, conn = None,
+              updateDict = None,
+              older = None, newer = None,
+              timeStamp = None, orderAttribute = None ):
 
-      Update "updateFields" from "tableName" with "updateValues".
-      updateDict alternative way to provide the updateFields and updateValues
-      N records can match the condition
-      return S_OK( number of updated rows )
-      if limit is not False, the given limit is set
-      String type values will be appropriately escaped.
+  Update "updateFields" from "tableName" with "updateValues".
+  updateDict alternative way to provide the updateFields and updateValues
+  N records can match the condition
+  return S_OK( number of updated rows )
+  if limit is not False, the given limit is set
+  String type values will be appropriately escaped.
 
 
-    deleteEntries( self, tableName,
-                   condDict = None,
-                   limit = False, conn = None,
-                   older = None, newer = None,
-                   timeStamp = None, orderAttribute = None ):
-
-      Delete rows from "tableName" with
-      N records can match the condition
-      if limit is not False, the given limit is set
-      String type values will be appropriately escaped, they can be single values or lists of values.
-
-
-    getFields( self, tableName, outFields = None,
+deleteEntries( self, tableName,
                condDict = None,
                limit = False, conn = None,
                older = None, newer = None,
                timeStamp = None, orderAttribute = None ):
 
-      Select "outFields" from "tableName" with condDict
-      N records can match the condition
-      return S_OK( tuple(Field,Value) )
-      if limit is not False, the given limit is set
-      String type values will be appropriately escaped, they can be single values or lists of values.
+  Delete rows from "tableName" with
+  N records can match the condition
+  if limit is not False, the given limit is set
+  String type values will be appropriately escaped, they can be single values or lists of values.
+
+
+getFields( self, tableName, outFields = None,
+           condDict = None,
+           limit = False, conn = None,
+           older = None, newer = None,
+           timeStamp = None, orderAttribute = None ):
 
-      for compatibility with other methods condDict keyed argument is added
+  Select "outFields" from "tableName" with condDict
+  N records can match the condition
+  return S_OK( tuple(Field,Value) )
+  if limit is not False, the given limit is set
+  String type values will be appropriately escaped, they can be single values or lists of values.
 
+  for compatibility with other methods condDict keyed argument is added
 
-    getCounters( self, table, attrList, condDict = None, older = None,
-                 newer = None, timeStamp = None, connection = False ):
 
-      Count the number of records on each distinct combination of AttrList, selected
-      with condition defined by condDict and time stamps
+getCounters( self, table, attrList, condDict = None, older = None,
+             newer = None, timeStamp = None, connection = False ):
 
+  Count the number of records on each distinct combination of AttrList, selected
+  with condition defined by condDict and time stamps
 
-    getDistinctAttributeValues( self, table, attribute, condDict = None, older = None,
-                                newer = None, timeStamp = None, connection = False ):
 
-      Get distinct values of a table attribute under specified conditions
+getDistinctAttributeValues( self, table, attribute, condDict = None, older = None,
+                            newer = None, timeStamp = None, connection = False ):
+
+  Get distinct values of a table attribute under specified conditions
 
 
 """
+
 import collections
 import functools
 import json
@@ -760,6 +761,7 @@ class MySQL:
 
         :return: S_OK with number of updated registers upon success.
                  S_ERROR upon error.
+                 lastRowId: if set, added to the returned dictionary
         """
 
         self.log.debug(f"_update: {self._safeCmd(cmd)}")
@@ -774,9 +776,11 @@ class MySQL:
         try:
             cursor = connection.cursor()
             res = cursor.execute(cmd, args=args)
+
             retDict = S_OK(res)
             if cursor.lastrowid:
                 retDict["lastRowId"] = cursor.lastrowid
+
         except Exception as x:
             retDict = self._except("_update", x, "Execution failed.", cmd, debug)
 
@@ -929,7 +933,7 @@ class MySQL:
               index is the list of fields to be indexed. This indexes will declared
               unique.
             "Engine": use the given DB engine, InnoDB is the default if not present.
-            "Charset": use the given character set. Default is latin1
+            "Charset": use the given character set. Default is utf8mb4
           force:
             if True, requested tables are DROP if they exist.
             if False, returned with S_ERROR if table exist.
@@ -1046,7 +1050,7 @@ class MySQL:
                         )
 
                 engine = thisTable.get("Engine", "InnoDB")
-                charset = thisTable.get("Charset", "latin1")
+                charset = thisTable.get("Charset", "utf8mb4")
 
                 cmd = "CREATE TABLE `{}` (\n{}\n) ENGINE={} DEFAULT CHARSET={}".format(
                     table,

DIRAC/Core/Utilities/Os.py

@@ -3,10 +3,11 @@
    by default on Error they return None
 """
 import os
+import threading
 
 import DIRAC
-from DIRAC.Core.Utilities.Subprocess import shellCall, systemCall
 from DIRAC.Core.Utilities import List
+from DIRAC.Core.Utilities.Subprocess import shellCall, systemCall
 
 DEBUG = 0
 
@@ -128,3 +129,33 @@ def sourceEnv(timeout, cmdTuple, inputEnv=None):
     result["stderr"] = stderr
 
     return result
+
+
+def safe_listdir(directory, timeout=60):
+    """This is a "safe" list directory,
+    for lazily-loaded File Systems like CVMFS.
+    There's by default a 60 seconds timeout.
+
+    .. warning::
+        There is no distinction between an empty directory, and a non existent one.
+        It will return `[]` in both cases.
+
+    :param str directory: directory to list
+    :param int timeout: optional timeout, in seconds. Defaults to 60.
+    """
+
+    def listdir(directory):
+        try:
+            return os.listdir(directory)
+        except FileNotFoundError:
+            print(f"{directory} not found")
+            return []
+
+    contents = []
+    t = threading.Thread(target=lambda: contents.extend(listdir(directory)))
+    t.daemon = True  # don't delay program's exit
+    t.start()
+    t.join(timeout)
+    if t.is_alive():
+        return None  # timeout
+    return contents

DIRAC/Core/Utilities/Platform.py

@@ -2,119 +2,14 @@
 Compile the externals
 """
 import platform
-import sys
-import os
-import re
-
-# We need to patch python platform module. It does a string comparison for the libc versions.
-# it fails when going from 2.9 to 2.10,
-# the fix converts the version to a tuple and attempts a numeric comparison
-
-_libc_search = re.compile(b"(__libc_init)" b"|" b"(GLIBC_([0-9.]+))" b"|" b"(libc(_\\w+)?\\.so(?:\\.(\\d[0-9.]*))?)")
-
-
-def libc_ver(executable=sys.executable, lib="", version="", chunksize=2048):
-    """Tries to determine the libc version that the file executable
-    (which defaults to the Python interpreter) is linked against.
-
-    Returns a tuple of strings (lib,version) which default to the
-    given parameters in case the lookup fails.
-
-    Note that the function has intimate knowledge of how different
-    libc versions add symbols to the executable and thus is probably
-    only useable for executables compiled using gcc.
-
-    The file is read and scanned in chunks of chunksize bytes.
-
-    """
-    with open(executable, "rb") as f:
-        binary = f.read(chunksize)
-        pos = 0
-        version = [0, 0, 0]
-        while True:
-            m = _libc_search.search(binary, pos)
-            if not m:
-                binary = f.read(chunksize)
-                if not binary:
-                    break
-                pos = 0
-                continue
-            libcinit, glibc, glibcversion, so, threads, soversion = m.groups()
-            if libcinit and not lib:
-                lib = b"libc"
-            elif glibc:
-                glibcversion_parts = glibcversion.split(b".")
-                for i, part in enumerate(glibcversion_parts):
-                    try:
-                        glibcversion_parts[i] = int(part)
-                    except ValueError:
-                        glibcversion_parts[i] = 0
-                if libcinit and not lib:
-                    lib = b"libc"
-                elif glibc:
-                    if lib != b"glibc":
-                        lib = b"glibc"
-                        version = glibcversion_parts
-                    elif glibcversion_parts > version:
-                        version = glibcversion_parts
-            elif so:
-                if lib != b"glibc":
-                    lib = b"libc"
-                    version = max(version, [int(soversion)]).pop()
-                    if threads and version[-len(threads) :] != threads:
-                        version = version + threads
-            pos = m.end()
-    return lib.decode(), ".".join(map(str, version))
-
-
-# ## Command line interface
 
 
+# Command line interface
 def getPlatformString():
     # Modified to return our desired platform string, R. Graciani
     platformTuple = (platform.system(), platform.machine())
     if platformTuple[0] == "Linux":
-        try:
-            import subprocess
-
-            sp = subprocess.Popen(["/sbin/ldconfig", "--print-cache"], stdout=subprocess.PIPE, universal_newlines=True)
-            spStdout = sp.stdout
-        except Exception:
-            sp = None
-            spStdout = os.popen("/sbin/ldconfig --print-cache", "r")
-        ldre = re.compile(r".*=> (.*/libc\.so\..*$)")
-        libs = []
-        for line in spStdout.readlines():
-            reM = ldre.match(line)
-            if reM:
-                libs.append(reM.groups()[0])
-        if sp:
-            if "terminate" in dir(sp):
-                sp.terminate()
-                sp.wait()
-
-        if not libs:
-            # get version of higher libc installed
-            if platform.machine().find("64") != -1:
-                lib = "/lib64"
-            else:
-                lib = "/lib"
-            for libFile in os.listdir(lib):
-                if libFile.find("libc-") == 0 or libFile.find("libc.so") == 0:
-                    libs.append(os.path.join(lib, libFile))
-        newest_lib = [0, 0, 0]
-        for lib in libs:
-            lib_parts = libc_ver(lib)[1].split(".")
-            for i, part in enumerate(lib_parts):
-                try:
-                    lib_parts[i] = int(part)
-                except ValueError:
-                    lib_parts[i] = 0
-                    # print "non integer version numbers"
-            if lib_parts > newest_lib:
-                newest_lib = lib_parts
-
-        platformTuple += ("glibc-" + ".".join(map(str, newest_lib)),)
+        platformTuple += ("-".join(platform.libc_ver()),)
     elif platformTuple[0] == "Darwin":
         platformTuple += (".".join(platform.mac_ver()[0].split(".")[:2]),)
     else:

DIRAC/Core/Utilities/Proxy.py

@@ -160,10 +160,6 @@ def executeWithoutServerCertificate(fcn):
 
         try:
             return fcn(*args, **kwargs)
-        except Exception as lException:  # pylint: disable=broad-except
-            value = ",".join([str(arg) for arg in lException.args])
-            exceptType = lException.__class__.__name__
-            return S_ERROR(f"Exception - {exceptType}: {value}")
         finally:
             # Restore the default host certificate usage if necessary
             if useServerCertificate: