diracx-testing 0.0.1a20__py3-none-any.whl → 0.0.1a22__py3-none-any.whl

diracx/testing/__init__.py

@@ -6,10 +6,14 @@ import asyncio
 import contextlib
 import os
 import re
+import ssl
 import subprocess
+import tomllib
+from collections import defaultdict
 from datetime import datetime, timedelta, timezone
 from functools import partial
 from html.parser import HTMLParser
+from importlib.metadata import PackageNotFoundError, distribution, entry_points
 from pathlib import Path
 from typing import TYPE_CHECKING
 from urllib.parse import parse_qs, urljoin, urlparse
@@ -20,7 +24,7 @@ import requests
 
 if TYPE_CHECKING:
     from diracx.core.settings import DevelopmentSettings
-    from diracx.routers.job_manager.sandboxes import SandboxStoreSettings
+    from diracx.routers.jobs.sandboxes import SandboxStoreSettings
     from diracx.routers.utils.users import AuthorizedUserInfo, AuthSettings
 
 
@@ -123,7 +127,7 @@ def aio_moto(worker_id):
 
 @pytest.fixture(scope="session")
 def test_sandbox_settings(aio_moto) -> SandboxStoreSettings:
-    from diracx.routers.job_manager.sandboxes import SandboxStoreSettings
+    from diracx.routers.jobs.sandboxes import SandboxStoreSettings
 
     yield SandboxStoreSettings(
         bucket_name="sandboxes",
@@ -456,6 +460,50 @@ def with_config_repo(tmp_path_factory):
                 }
             },
             "Operations": {"Defaults": {}},
+            "Systems": {
+                "WorkloadManagement": {
+                    "Production": {
+                        "Databases": {
+                            "JobDB": {
+                                "DBName": "xyz",
+                                "Host": "xyz",
+                                "Port": 9999,
+                                "MaxRescheduling": 3,
+                            },
+                            "JobLoggingDB": {
+                                "DBName": "xyz",
+                                "Host": "xyz",
+                                "Port": 9999,
+                            },
+                            "PilotAgentsDB": {
+                                "DBName": "xyz",
+                                "Host": "xyz",
+                                "Port": 9999,
+                            },
+                            "SandboxMetadataDB": {
+                                "DBName": "xyz",
+                                "Host": "xyz",
+                                "Port": 9999,
+                            },
+                            "TaskQueueDB": {
+                                "DBName": "xyz",
+                                "Host": "xyz",
+                                "Port": 9999,
+                            },
+                            "ElasticJobParametersDB": {
+                                "DBName": "xyz",
+                                "Host": "xyz",
+                                "Port": 9999,
+                            },
+                            "VirtualMachineDB": {
+                                "DBName": "xyz",
+                                "Host": "xyz",
+                                "Port": 9999,
+                            },
+                        },
+                    },
+                },
+            },
         }
     )
     cs_file.write_text(example_cs.model_dump_json())
@@ -516,7 +564,11 @@ def cli_env(monkeypatch, tmp_path, demo_urls, demo_dir):
         raise RuntimeError(f"Could not find {ca_path}, is the demo running?")
 
     # Ensure the demo is working
-    r = httpx.get(f"{diracx_url}/api/openapi.json", verify=ca_path)
+
+    r = httpx.get(
+        f"{diracx_url}/api/openapi.json",
+        verify=ssl.create_default_context(cafile=ca_path),
+    )
     r.raise_for_status()
     assert r.json()["info"]["title"] == "Dirac"
 
@@ -637,3 +689,63 @@ def do_device_flow_with_dex(url: str, ca_path: str) -> None:
 
     # This should have redirected to the DiracX page that shows the login is complete
     assert "Please close the window" in r.text
+
+
+def get_installed_entry_points():
+    """Retrieve the installed entry points from the environment."""
+    entry_pts = entry_points()
+    diracx_eps = defaultdict(dict)
+    for group in entry_pts.groups:
+        if "diracx" in group:
+            for ep in entry_pts.select(group=group):
+                diracx_eps[group][ep.name] = ep.value
+    return dict(diracx_eps)
+
+
+def get_entry_points_from_toml(toml_file):
+    """Parse entry points from pyproject.toml."""
+    with open(toml_file, "rb") as f:
+        pyproject = tomllib.load(f)
+    package_name = pyproject["project"]["name"]
+    return package_name, pyproject.get("project", {}).get("entry-points", {})
+
+
+def get_current_entry_points(repo_base) -> bool:
+    """Create current entry points dict for comparison."""
+    current_eps = {}
+    for toml_file in repo_base.glob("diracx-*/pyproject.toml"):
+        package_name, entry_pts = get_entry_points_from_toml(f"{toml_file}")
+        # Ignore packages that are not installed
+        try:
+            distribution(package_name)
+        except PackageNotFoundError:
+            continue
+        # Merge the entry points
+        for key, value in entry_pts.items():
+            current_eps[key] = current_eps.get(key, {}) | value
+    return current_eps
+
+
+@pytest.fixture(scope="session", autouse=True)
+def verify_entry_points(request, pytestconfig):
+    try:
+        ini_toml_name = tomllib.loads(pytestconfig.inipath.read_text())["project"][
+            "name"
+        ]
+    except tomllib.TOMLDecodeError:
+        return
+    if ini_toml_name == "diracx":
+        repo_base = pytestconfig.inipath.parent
+    elif ini_toml_name.startswith("diracx-"):
+        repo_base = pytestconfig.inipath.parent.parent
+    else:
+        return
+
+    installed_eps = get_installed_entry_points()
+    current_eps = get_current_entry_points(repo_base)
+
+    if installed_eps != current_eps:
+        pytest.fail(
+            "Project and installed entry-points are not consistent. "
+            "You should run `pip install -r requirements-dev.txt`",
+        )

{diracx_testing-0.0.1a20.dist-info → diracx_testing-0.0.1a22.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: diracx-testing
-Version: 0.0.1a20
+Version: 0.0.1a22
 Summary: TODO
 License: GPL-3.0-only
 Classifier: Intended Audience :: Science/Research

{diracx_testing-0.0.1a20.dist-info → diracx_testing-0.0.1a22.dist-info}/RECORD

@@ -1,9 +1,9 @@
-diracx/testing/__init__.py,sha256=vuPYuD45HWaIJKJ2mp8GCHWMy7JH7q4YsEmJF_2BEgQ,21658
+diracx/testing/__init__.py,sha256=T1gt7D7PjgbzyxIYN5gXMKbxGnHhE5qm0ORvJ6sspCs,25717
 diracx/testing/dummy_osdb.py,sha256=bNk3LF8KgMuQx3RVFNYuw4hMmpG2A80sZ58rEZqHo7M,907
 diracx/testing/mock_osdb.py,sha256=1TFb3b0xDb2vIy4Q4V23VtrsWoT3RE5kOZmOs8n541g,5862
 diracx/testing/osdb.py,sha256=m6mUBLnGOoQLTCIBie9P2GhmLMybrgzIrlIYfhF1_Ss,3230
 diracx/testing/routers.py,sha256=UW-TnikMQgcNxF5sUZD5DWoucGiCpP6s8mYmuahDiSc,979
-diracx_testing-0.0.1a20.dist-info/METADATA,sha256=GMrpB-ANxo89dX7e3Bpmn5jLHYHh3nXRm71rWBRoFIg,613
-diracx_testing-0.0.1a20.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-diracx_testing-0.0.1a20.dist-info/top_level.txt,sha256=vJx10tdRlBX3rF2Psgk5jlwVGZNcL3m_7iQWwgPXt-U,7
-diracx_testing-0.0.1a20.dist-info/RECORD,,
+diracx_testing-0.0.1a22.dist-info/METADATA,sha256=v0Iwfl9bbkfwoonPQNsMIJhkn1Y-bHbt-DIlI1lo6b0,613
+diracx_testing-0.0.1a22.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+diracx_testing-0.0.1a22.dist-info/top_level.txt,sha256=vJx10tdRlBX3rF2Psgk5jlwVGZNcL3m_7iQWwgPXt-U,7
+diracx_testing-0.0.1a22.dist-info/RECORD,,