diracx-client 0.0.1a17__tar.gz → 0.0.1a19__tar.gz

{diracx_client-0.0.1a17 → diracx_client-0.0.1a19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: diracx-client
-Version: 0.0.1a17
+Version: 0.0.1a19
 Summary: TODO
 License: GPL-3.0-only
 Classifier: Intended Audience :: Science/Research
@@ -8,7 +8,7 @@ Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Scientific/Engineering
 Classifier: Topic :: System :: Distributed Computing
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 Requires-Dist: azure-core
 Requires-Dist: diracx-core

{diracx_client-0.0.1a17 → diracx_client-0.0.1a19}/pyproject.toml

@@ -2,9 +2,9 @@
 name = "diracx-client"
 description = "TODO"
 readme = "README.md"
-requires-python = ">=3.10"
+requires-python = ">=3.11"
 keywords = []
-license = {text = "GPL-3.0-only"}
+license = { text = "GPL-3.0-only" }
 classifiers = [
     "Intended Audience :: Science/Research",
     "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
@@ -12,21 +12,12 @@ classifiers = [
     "Topic :: Scientific/Engineering",
     "Topic :: System :: Distributed Computing",
 ]
-dependencies = [
-    "azure-core",
-    "diracx-core",
-    "isodate",
-    "requests",
-]
+dependencies = ["azure-core", "diracx-core", "isodate", "requests"]
 dynamic = ["version"]
 
 [project.optional-dependencies]
-testing = [
-    "diracx-testing",
-]
-types = [
-    "types-requests",
-]
+testing = ["diracx-testing"]
+types = ["types-requests"]
 
 [tool.setuptools.packages.find]
 where = ["src"]
@@ -35,6 +26,11 @@ where = ["src"]
 requires = ["setuptools>=61", "wheel", "setuptools_scm>=8"]
 build-backend = "setuptools.build_meta"
 
+[project.entry-points."diracx"]
+client_class = "diracx.client.generated._client:Dirac"
+aio_client_class = "diracx.client.generated.aio._client:Dirac"
+
+
 [tool.setuptools_scm]
 root = ".."
 
@@ -42,7 +38,8 @@ root = ".."
 testpaths = ["tests"]
 addopts = [
     "-v",
-    "--cov=diracx.client", "--cov-report=term-missing",
+    "--cov=diracx.client",
+    "--cov-report=term-missing",
     "-pdiracx.testing",
     "--import-mode=importlib",
 ]

diracx_client-0.0.1a19/src/diracx/client/__init__.py

@@ -0,0 +1,7 @@
+from .extensions import initialize_client
+
+initialize_client()
+
+
+from .generated import *  # pylint: disable=unused-wildcard-import
+from .patches import DiracClient

diracx_client-0.0.1a19/src/diracx/client/aio.py

@@ -0,0 +1 @@
+from .patches.aio import DiracClient

diracx_client-0.0.1a19/src/diracx/client/extensions.py

@@ -0,0 +1,90 @@
+import os
+import sys
+import importlib
+
+from importlib.abc import MetaPathFinder
+from importlib.machinery import SourceFileLoader, ModuleSpec
+
+
+class DiracxLoader(SourceFileLoader):
+
+    def create_module(self, spec):
+        if spec.name in sys.modules:
+            return sys.modules[spec.name]
+
+    def exec_module(self, module): ...
+
+
+class DiracxPathFinder(MetaPathFinder):
+    """
+    This MetaPathFinder modifies the import such that the patches
+    from vanila diracx are looked at first.
+    """
+
+    diracx_extensions = os.environ.get("DIRACX_EXTENSIONS", "diracx").split(",")
+
+    @classmethod
+    def find_spec(cls, fullname, path, target=None):
+        for i, extension in enumerate(cls.diracx_extensions, start=1):
+            # If we are trying to load the patch from an extension
+            # make sure it does not exist in the lower levels first
+            if any(
+                [
+                    fullname.startswith(prefix)
+                    for prefix in [
+                        f"{extension}.client.generated.operations._patch",
+                        f"{extension}.client.generated.models._patch",
+                        f"{extension}.client.generated.aio.operations._patch",
+                    ]
+                ]
+            ):
+                for lower_extension in cls.diracx_extensions[i:][::-1]:
+                    try:
+                        patched_name = fullname.replace(extension, lower_extension)
+                        overwritten = importlib.util.find_spec(patched_name)
+
+                        spec = ModuleSpec(
+                            patched_name, DiracxLoader(patched_name, path)
+                        )
+                        return spec
+                        if patched_name in sys.modules:
+                            return sys.modules[patched_name].__spec__
+
+                        overwritten = importlib.util.find_spec(patched_name)
+
+                        # overwritten = spec_from_loader(patched_name, DiracxLoader(filepath))
+                        return overwritten
+                    except Exception as e:
+                        pass
+
+        return None
+
+
+def initialize_client():
+
+    # insert a DiracxPathFinder instance at the start of the meta_path list
+    if not isinstance(sys.meta_path[0], DiracxPathFinder):
+
+        sys.meta_path.insert(0, DiracxPathFinder())
+
+        # Reload all the client module that could potentially have been
+        # already loaded
+        # This was needed when the generated code was at the top
+        # level of the module.
+        # In principle, this is not needed anymore so I comment it out,
+        # but in case it ends up being needed, I keep it there, as it is rather
+        # tricky
+        # importlib.invalidate_caches()
+        # diracx_extensions = os.environ.get("DIRACX_EXTENSIONS", "diracx").split(",")
+        # for top_module in diracx_extensions:
+        #     for module_name, module in sys.modules.copy().items():
+        #         if (
+        #             (f"{top_module}.client" in module_name)
+        #             and module_name
+        #             not in (
+        #                 f"{top_module}.client.generated",
+        #                 f"{top_module}.client.generated._patch",
+        #             )
+        #             and "_patch" in module_name
+        #         ):
+        #             importlib.reload(module)

{diracx_client-0.0.1a17/src/diracx/client → diracx_client-0.0.1a19/src/diracx/client/generated}/__init__.py

@@ -1,6 +1,6 @@
 # coding=utf-8
 # --------------------------------------------------------------------------
-# Code generated by Microsoft (R) AutoRest Code Generator (autorest: 3.10.2, generator: @autorest/python@6.13.19)
+# Code generated by Microsoft (R) AutoRest Code Generator (autorest: 3.10.0, generator: @autorest/python@6.23.0)
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
@@ -9,7 +9,7 @@ from ._client import Dirac
 try:
     from ._patch import __all__ as _patch_all
     from ._patch import *  # pylint: disable=unused-wildcard-import
-except ImportError:
+except ValueError:
     _patch_all = []
 from ._patch import patch_sdk as _patch_sdk
 

{diracx_client-0.0.1a17/src/diracx/client → diracx_client-0.0.1a19/src/diracx/client/generated}/_client.py

@@ -1,11 +1,12 @@
 # coding=utf-8
 # --------------------------------------------------------------------------
-# Code generated by Microsoft (R) AutoRest Code Generator (autorest: 3.10.2, generator: @autorest/python@6.13.19)
+# Code generated by Microsoft (R) AutoRest Code Generator (autorest: 3.10.0, generator: @autorest/python@6.23.0)
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
 from copy import deepcopy
 from typing import Any
+from typing_extensions import Self
 
 from azure.core import PipelineClient
 from azure.core.pipeline import policies
@@ -26,13 +27,13 @@ class Dirac:  # pylint: disable=client-accepts-api-version-keyword
     """Dirac.
 
     :ivar well_known: WellKnownOperations operations
-    :vartype well_known: client.operations.WellKnownOperations
+    :vartype well_known: generated.operations.WellKnownOperations
     :ivar auth: AuthOperations operations
-    :vartype auth: client.operations.AuthOperations
+    :vartype auth: generated.operations.AuthOperations
     :ivar config: ConfigOperations operations
-    :vartype config: client.operations.ConfigOperations
+    :vartype config: generated.operations.ConfigOperations
     :ivar jobs: JobsOperations operations
-    :vartype jobs: client.operations.JobsOperations
+    :vartype jobs: generated.operations.JobsOperations
     :keyword endpoint: Service URL. Required. Default value is "".
     :paramtype endpoint: str
     """
@@ -112,7 +113,7 @@ class Dirac:  # pylint: disable=client-accepts-api-version-keyword
     def close(self) -> None:
         self._client.close()
 
-    def __enter__(self) -> "Dirac":
+    def __enter__(self) -> Self:
         self._client.__enter__()
         return self
 

{diracx_client-0.0.1a17/src/diracx/client → diracx_client-0.0.1a19/src/diracx/client/generated}/_configuration.py

@@ -1,6 +1,6 @@
 # coding=utf-8
 # --------------------------------------------------------------------------
-# Code generated by Microsoft (R) AutoRest Code Generator (autorest: 3.10.2, generator: @autorest/python@6.13.19)
+# Code generated by Microsoft (R) AutoRest Code Generator (autorest: 3.10.0, generator: @autorest/python@6.23.0)
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 

diracx_client-0.0.1a19/src/diracx/client/generated/_patch.py

@@ -0,0 +1,47 @@
+# ------------------------------------
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+# ------------------------------------
+"""Customize generated code here.
+
+Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize
+"""
+from __future__ import annotations
+
+import os
+from datetime import datetime, timezone
+import importlib.util
+import json
+import jwt
+import requests
+
+from pathlib import Path
+from typing import Any, Dict, List, Optional, cast
+from urllib import parse
+from azure.core.credentials import AccessToken
+from azure.core.credentials import TokenCredential
+from azure.core.pipeline import PipelineRequest
+from azure.core.pipeline.policies import BearerTokenCredentialPolicy
+
+from diracx.core.preferences import DiracxPreferences, get_diracx_preferences
+
+
+import sys
+import importlib
+from importlib.abc import MetaPathFinder, Loader
+
+__all__: List[str] = [
+    "DiracClient",
+]  # Add all objects you want publicly available to users at this package level
+
+
+def patch_sdk():
+    """Do not remove from this file.
+
+    `patch_sdk` is a last resort escape hatch that allows you to do customizations
+    you can't accomplish using the techniques described in
+    https://aka.ms/azsdk/python/dpcodegen/python/customize
+    """
+
+
+from ..patches import DiracClient