Merge pull request DIRACGrid#8117 from chrisburr/diracx-client-fixes

[9.0] Follow DiracX client changes

Author: chaen

src/DIRAC/Core/Security/DiracX.py

@@ -14,12 +14,17 @@
 import json
 import re
 import textwrap
+from collections.abc import Iterator
 from contextlib import contextmanager
 from pathlib import Path
 from tempfile import NamedTemporaryFile
 from typing import Any
 
-from diracx.client import DiracClient as _DiracClient
+try:
+    from diracx.client.sync import SyncDiracClient
+except ImportError:
+    # TODO: Remove this once diracx is tagged
+    from diracx.client import DiracClient as SyncDiracClient
 from diracx.core.models import TokenResponse
 from diracx.core.preferences import DiracxPreferences
 from diracx.core.utils import serialize_credentials
@@ -82,7 +87,7 @@ class FutureClient:
 
 
 @contextmanager
-def DiracXClient() -> _DiracClient:
+def DiracXClient() -> Iterator[SyncDiracClient]:
     """Get a DiracX client instance with the current user's credentials"""
     diracxUrl = gConfig.getValue("/DiracX/URL")
     if not diracxUrl:
@@ -99,7 +104,7 @@ def DiracXClient() -> _DiracClient:
         token_file.seek(0)
 
         pref = DiracxPreferences(url=diracxUrl, credentials_path=token_file.name)
-        with _DiracClient(diracx_preferences=pref) as api:
+        with SyncDiracClient(diracx_preferences=pref) as api:
             yield api
 
 

src/DIRAC/Core/Utilities/ReturnValues.py

@@ -239,7 +239,7 @@ def wrapped(*args: P.args, **kwargs: P.kwargs) -> DReturnType[T]:
         except SErrorException as e:
             return e.result
         except Exception as e:
-            retval = S_ERROR(repr(e))
+            retval = S_ERROR(f"{repr(e)}: {e}")
             # Replace CallStack with the one from the exception
             # Use cast as mypy doesn't understand that sys.exc_info can't return None in an exception block
             retval["ExecInfo"] = cast(tuple[type[BaseException], BaseException, TracebackType], sys.exc_info())

src/DIRAC/FrameworkSystem/Utilities/diracx.py

@@ -14,7 +14,12 @@
 from diracx.core.utils import write_credentials
 
 from diracx.core.models import TokenResponse
-from diracx.client import DiracClient
+
+try:
+    from diracx.client.sync import SyncDiracClient
+except ImportError:
+    # TODO: Remove this once diracx is tagged
+    from diracx.client import DiracClient as SyncDiracClient
 
 # How long tokens are kept
 DEFAULT_TOKEN_CACHE_TTL = 5 * 60
@@ -61,11 +66,11 @@ def _get_token_file(username: str, group: str, dirac_properties: set[str]) -> Pa
     return token_location
 
 
-def TheImpersonator(credDict: dict[str, Any]) -> DiracClient:
+def TheImpersonator(credDict: dict[str, Any]) -> SyncDiracClient:
     """
     Client to be used by DIRAC server needing to impersonate
     a user for diracx.
-    It queries a token, places it in a file, and returns the `DiracClient`
+    It queries a token, places it in a file, and returns the `SyncDiracClient`
     class
 
     Use as a context manager
@@ -81,4 +86,4 @@ def TheImpersonator(credDict: dict[str, Any]) -> DiracClient:
     )
     pref = DiracxPreferences(url=diracxUrl, credentials_path=token_location)
 
-    return DiracClient(diracx_preferences=pref)
+    return SyncDiracClient(diracx_preferences=pref)