cmsdials 1.8.0__tar.gz → 2.0.0__tar.gz

cmsdials-2.0.0/.gitlab-ci.yml

@@ -0,0 +1,74 @@
+include:
+  - project: "cms-ppd/technical-support/ci-templates"
+    ref: release/v1
+    file:
+      - "templates/python/uv_build.yml"
+      - "templates/python/uv_publish.yml"
+      - "templates/gitlab/create_release.yml"
+
+stages:
+  - test
+  - build
+  - publish
+  - create_release
+
+###########
+# Run tests
+###########
+
+test_matrix:
+  stage: test
+  parallel:
+    matrix:
+      - PYTHON_VERSION: ["3.9", "3.10", "3.11", "3.12"]
+  image: registry.cern.ch/docker.io/library/python:$PYTHON_VERSION
+  before_script:
+    - python -m pip install --upgrade pip
+    - pip install uv
+    - uv sync --all-groups --extra pandas --extra tqdm
+  script:
+    - uv run ruff format --check cmsdials tests
+    - uv run ruff check cmsdials tests
+    - uv run mypy cmsdials tests
+    - uv run pytest tests
+  coverage: "/TOTAL.+ ([0-9]{1,3}%)/"
+  artifacts:
+    reports:
+      coverage_report:
+        coverage_format: cobertura
+        path: coverage.xml
+  variables:
+    SECRET_KEY: "$SECRET_KEY"
+
+###############
+# Build package
+###############
+
+build:
+  extends: .uv_build
+  variables:
+    UV_SYNC_FLAGS: "--all-groups --extra pandas --extra tqdm"
+  needs:
+    - test_matrix
+
+#################
+# Publish to PyPI
+#################
+
+publish:
+  extends: .uv_publish
+  rules:
+    - if: $CI_COMMIT_TAG
+  needs:
+    - build
+
+##########################
+# Create release in GitLab
+##########################
+
+create_release:
+  extends: .create_gitlab_release
+  rules:
+    - if: $CI_COMMIT_TAG
+  needs:
+    - publish

{cmsdials-1.8.0 → cmsdials-2.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cmsdials
-Version: 1.8.0
+Version: 2.0.0
 Summary: The Python api client interface to DIALS service
 Author-email: Gabriel Moreira <gabriel.moreira@cern.ch>
 Project-URL: Repository, https://gitlab.cern.ch/cms-dqmdc/libraries/dials-py
@@ -372,6 +372,7 @@ Do not worry. The GitLab CI is configured to automatically publish the package o
 
 > [!NOTE]
 > For this to work the CI/CD variables named `UV_PUBLISH_TOKEN`, `GITLAB_TOKEN` should be registered in gitlab. The `UV_PUBLISH_TOKEN` is a api token access of CMSDQM organization and the `GITLAB_TOKEN` is a Project Access Token with api read/write rights, which is needed to read merge requests using the `glab-cli`.
+> https://gitlab.cern.ch/cms-dqmdc/libraries/dials-py/-/settings/access_tokens
 
 #### Manual
 

{cmsdials-1.8.0 → cmsdials-2.0.0}/README.md

@@ -349,6 +349,7 @@ Do not worry. The GitLab CI is configured to automatically publish the package o
 
 > [!NOTE]
 > For this to work the CI/CD variables named `UV_PUBLISH_TOKEN`, `GITLAB_TOKEN` should be registered in gitlab. The `UV_PUBLISH_TOKEN` is a api token access of CMSDQM organization and the `GITLAB_TOKEN` is a Project Access Token with api read/write rights, which is needed to read merge requests using the `glab-cli`.
+> https://gitlab.cern.ch/cms-dqmdc/libraries/dials-py/-/settings/access_tokens
 
 #### Manual
 

{cmsdials-1.8.0 → cmsdials-2.0.0}/cmsdials/_version.py

@@ -1,7 +1,14 @@
 # file generated by setuptools-scm
 # don't change, don't track in version control
 
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
@@ -9,13 +16,19 @@ if TYPE_CHECKING:
     from typing import Union
 
     VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
 else:
     VERSION_TUPLE = object
+    COMMIT_ID = object
 
 version: str
 __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
 
-__version__ = version = '1.8.0'
-__version_tuple__ = version_tuple = (1, 8, 0)
+__version__ = version = '2.0.0'
+__version_tuple__ = version_tuple = (2, 0, 0)
+
+__commit_id__ = commit_id = 'g68ff6a70a'

cmsdials-2.0.0/cmsdials/clients/mes/client.py

@@ -0,0 +1,17 @@
+from ...utils.api_client import BaseAuthorizedNonPaginatedAPIClient
+from .models import MEFilters, MonitoringElement
+
+
+class MonitoringElementClient(
+    BaseAuthorizedNonPaginatedAPIClient[
+        MonitoringElement,
+        MEFilters,
+    ]
+):
+    data_model = MonitoringElement
+    filter_class = MEFilters
+    lookup_url = "mes/"
+
+    def get(self, id: int, **kwargs):  # noqa: A002
+        edp = f"{id}/"
+        return super()._get(edp, **kwargs)

{cmsdials-1.8.0 → cmsdials-2.0.0}/cmsdials/clients/ml_bad_lumisection/client.py

@@ -18,18 +18,24 @@ class MLBadLumisectionClient(
         edp = f"{model_id}/{dataset_id}/{run_number}/{ls_number}/{me_id}/"
         return super()._get(edp, **kwargs)
 
-    def cert_json(self, model_id__in: list[int], dataset_id__in: list[int], run_number__in: list[int], **kwargs):
-        edp = "cert-json/"
+    def __json_params_builder(
+        self, model_id__in: list[int], dataset_id__in: list[int], run_number__in: list[int], **kwargs
+    ):
         midin = ",".join(str(v) for v in model_id__in)
         didin = ",".join(str(v) for v in dataset_id__in)
         ridin = ",".join(str(v) for v in run_number__in)
-        params = {"model_id__in": midin, "dataset_id__in": didin, "run_number__in": ridin}
+        return {"model_id__in": midin, "dataset_id__in": didin, "run_number__in": ridin}
+
+    def cert_json(self, model_id__in: list[int], dataset_id__in: list[int], run_number__in: list[int], **kwargs):
+        edp = "cert-json/"
+        params = self.__json_params_builder(
+            model_id__in=model_id__in, dataset_id__in=dataset_id__in, run_number__in=run_number__in
+        )
         return super()._get(edp, params=params, return_raw_json=True, **kwargs)
 
     def golden_json(self, model_id__in: list[int], dataset_id__in: list[int], run_number__in: list[int], **kwargs):
         edp = "golden-json/"
-        midin = ",".join(str(v) for v in model_id__in)
-        didin = ",".join(str(v) for v in dataset_id__in)
-        ridin = ",".join(str(v) for v in run_number__in)
-        params = {"model_id__in": midin, "dataset_id__in": didin, "run_number__in": ridin}
+        params = self.__json_params_builder(
+            model_id__in=model_id__in, dataset_id__in=dataset_id__in, run_number__in=run_number__in
+        )
         return super()._get(edp, params=params, return_raw_json=True, **kwargs)

{cmsdials-1.8.0 → cmsdials-2.0.0}/cmsdials/clients/ml_bad_lumisection/models.py

@@ -8,11 +8,9 @@ from ...utils.base_model import PaginatedBaseFilters, PaginatedBaseModel
 class MLBadLumisection(BaseModel):
     model_id: int
     dataset_id: int
-    file_id: int
     run_number: int
     ls_number: int
-    me_id: int
-    mse: float
+    metric_value: float
 
 
 class PaginatedMLBadLumisectionList(PaginatedBaseModel[MLBadLumisection]):

cmsdials-2.0.0/cmsdials/clients/ml_models_index/models.py

@@ -0,0 +1,47 @@
+from datetime import datetime
+from typing import Optional
+
+from pydantic import BaseModel
+
+from ...utils.base_model import PaginatedBaseFilters, PaginatedBaseModel
+
+
+class MLModelsIndex(BaseModel):
+    id: int
+    name: str
+    revision: int
+    ready: bool
+    active: bool
+    type: str
+    anomaly_threshold: Optional[float]
+    builtin_threshold: bool
+    description: str
+    flagging_key: Optional[str]
+    input_signature: list[dict]
+    metric_key: Optional[str]
+    output_signature: list[dict]
+    tags: Optional[list[dict]]
+    isvc_service_name: Optional[str]
+    isvc_yaml: Optional[str]
+    created_by: str
+    modified_by: str
+    created_at: datetime
+    modified_at: datetime
+
+
+class PaginatedMLModelsIndexList(PaginatedBaseModel[MLModelsIndex]):
+    pass
+
+
+class MLModelsIndexFilters(PaginatedBaseFilters):
+    id: Optional[int] = None
+    id__in: Optional[list[int]] = None
+    name: Optional[str] = None
+    name__regex: Optional[str] = None
+    active: Optional[bool] = None
+    ready: Optional[bool] = None
+    type: Optional[str] = None
+    input_signature_contains_me: Optional[str] = None
+    input_signature_contains_me__regex: Optional[str] = None
+    tag_name: Optional[str] = None
+    tag_value: Optional[str] = None

{cmsdials-1.8.0 → cmsdials-2.0.0}/cmsdials/clients/run/models.py

@@ -10,6 +10,7 @@ class Run(BaseModel):
     dataset: str = Field(..., max_length=255)
     run_number: int
     ls_count: int
+    ls_completeness: Optional[float]
 
 
 class PaginatedRunList(PaginatedBaseModel[Run]):

cmsdials-2.0.0/cmsdials/clients/workspace/client.py

@@ -0,0 +1,49 @@
+from requests.adapters import DEFAULT_RETRIES
+from requests.exceptions import HTTPError
+
+from ...auth._base import BaseCredentials
+from ...utils.api_client import BaseAPIClient
+from ...utils.logger import logger
+
+
+class WorkspaceClient(BaseAPIClient):
+    default_timeout = 30
+    lookup_url = "auth/"
+
+    def __init__(
+        self,
+        creds: BaseCredentials,
+        *args: str,
+        **kwargs: str,
+    ) -> None:
+        super().__init__(*args, **kwargs)
+        self.creds = creds
+
+    def _build_headers(self) -> dict:
+        base = {"Accept": "application/json", "User-Agent": self._build_user_agent()}
+        self.creds.before_request(base)
+        return base
+
+    def __get(self, endpoint: str, retries=DEFAULT_RETRIES):
+        headers = self._build_headers()
+        endpoint_url = self.api_url + self.lookup_url + endpoint
+
+        response = self._requests_get_retriable(
+            endpoint_url,
+            headers=headers,
+            timeout=self.default_timeout,
+            retries=retries,
+        )
+        try:
+            response.raise_for_status()
+        except HTTPError as err:
+            logger.info(f"Api raw response: {response.text}")
+            raise err
+
+        return response.json()
+
+    def list(self, retries=DEFAULT_RETRIES):
+        return self.__get("workspaces", retries=retries)
+
+    def my_workspace(self, retries=DEFAULT_RETRIES):
+        return self.__get("user-default-workspace", retries=retries)

{cmsdials-1.8.0 → cmsdials-2.0.0}/cmsdials/cmsdials.py

@@ -11,6 +11,7 @@ from .clients.ml_bad_lumisection.client import MLBadLumisectionClient
 from .clients.ml_models_index.client import MLModelsIndexClient
 from .clients.oms_proxy.client import OMSProxyClient
 from .clients.run.client import RunClient
+from .clients.workspace.client import WorkspaceClient
 
 
 class Dials:
@@ -25,3 +26,4 @@ class Dials:
         self.oms = OMSProxyClient(creds, *args, **kwargs)
         self.ml_bad_lumis = MLBadLumisectionClient(creds, workspace, *args, **kwargs)
         self.ml_models_index = MLModelsIndexClient(creds, workspace, *args, **kwargs)
+        self.workspace = WorkspaceClient(creds, *args, **kwargs)

{cmsdials-1.8.0 → cmsdials-2.0.0}/cmsdials.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cmsdials
-Version: 1.8.0
+Version: 2.0.0
 Summary: The Python api client interface to DIALS service
 Author-email: Gabriel Moreira <gabriel.moreira@cern.ch>
 Project-URL: Repository, https://gitlab.cern.ch/cms-dqmdc/libraries/dials-py
@@ -372,6 +372,7 @@ Do not worry. The GitLab CI is configured to automatically publish the package o
 
 > [!NOTE]
 > For this to work the CI/CD variables named `UV_PUBLISH_TOKEN`, `GITLAB_TOKEN` should be registered in gitlab. The `UV_PUBLISH_TOKEN` is a api token access of CMSDQM organization and the `GITLAB_TOKEN` is a Project Access Token with api read/write rights, which is needed to read merge requests using the `glab-cli`.
+> https://gitlab.cern.ch/cms-dqmdc/libraries/dials-py/-/settings/access_tokens
 
 #### Manual
 

{cmsdials-1.8.0 → cmsdials-2.0.0}/cmsdials.egg-info/SOURCES.txt

@@ -59,12 +59,15 @@ cmsdials/clients/oms_proxy/models.py
 cmsdials/clients/run/__init__.py
 cmsdials/clients/run/client.py
 cmsdials/clients/run/models.py
+cmsdials/clients/workspace/__init__.py
+cmsdials/clients/workspace/client.py
 cmsdials/utils/__init__.py
 cmsdials/utils/_json.py
 cmsdials/utils/api_client.py
 cmsdials/utils/base_model.py
 cmsdials/utils/logger.py
 tests/integration/__init__.py
+tests/integration/env.py
 tests/integration/test_auth_client.py
 tests/integration/test_file_index_client.py
 tests/integration/test_h1d_client.py

{cmsdials-1.8.0 → cmsdials-2.0.0}/pyproject.toml

@@ -38,10 +38,10 @@ Repository = "https://gitlab.cern.ch/cms-dqmdc/libraries/dials-py"
 
 [dependency-groups]
 lint = [
-    "mypy>=1.15.0",
+    "mypy==1.15.0",
     "pandas-stubs>=2.2.2.240807",
     "pre-commit>=4.2.0",
-    "ruff>=0.11.4",
+    "ruff==0.11.4",
     "types-requests>=2.31.0.6",
     "types-tqdm>=4.67.0.20250516",
 ]

cmsdials-2.0.0/tests/integration/env.py

@@ -0,0 +1,15 @@
+import os
+
+
+SECRET_KEY = os.getenv("SECRET_KEY")
+if not SECRET_KEY:
+    raise OSError("SECRET_KEY environment variable is not set.")
+
+BASE_URL = os.getenv("BASE_URL", "https://dev-cmsdials-api.web.cern.ch/")
+TEST_WORKSPACE = os.getenv("TEST_WORKSPACE", "global")
+TEST_DATASET_ID = int(os.getenv("TEST_DATASET_ID", 15310647))  # /ZeroBias/Run2025B-PromptReco-v1/DQMIO
+TEST_FILE_ID = int(
+    os.getenv("TEST_FILE_ID", 22961052797)
+)  # /store/data/Run2025B/ZeroBias/DQMIO/PromptReco-v1/000/392/158/00000/DC769215-780F-4D7D-B0B7-E66F731E3FC0.root
+TEST_RUN_NUMBER = int(os.getenv("TEST_RUN_NUMBER", 392158))
+TEST_LS_NUMBER = int(os.getenv("TEST_LS_NUMBER", 10))

{cmsdials-1.8.0 → cmsdials-2.0.0}/tests/integration/test_auth_client.py

@@ -1,4 +1,3 @@
-import os
 from datetime import datetime, timedelta
 from typing import Union
 
@@ -10,21 +9,19 @@ from cmsdials.auth.bearer import Credentials as BearerCredentials
 from cmsdials.auth.client import AuthClient
 from cmsdials.auth.models import Token
 from cmsdials.auth.secret_key import Credentials as SecretKeyCredentials
-from cmsdials.clients.h1d.models import LumisectionHistogram1D
 
-
-BASE_URL = os.getenv("BASE_URL")
+from .env import BASE_URL, SECRET_KEY, TEST_WORKSPACE
 
 
 def __setup_dials_from_creds_and_test(creds: Union[SecretKeyCredentials, BearerCredentials]) -> None:
-    dials = Dials(creds, base_url=BASE_URL)
-    data = dials.h1d.get(dataset_id=14677060, run_number=367112, ls_number=10, me_id=1)
-    assert isinstance(data, LumisectionHistogram1D)
+    dials = Dials(creds, workspace=TEST_WORKSPACE, base_url=BASE_URL)
+    # just test if we can access the workspace endpoints
+    dials.workspace.my_workspace()
+    dials.workspace.list()
 
 
 def test_secret_key_success() -> None:
-    secret_key = os.getenv("SECRET_KEY")
-    creds = SecretKeyCredentials(token=secret_key)
+    creds = SecretKeyCredentials(token=SECRET_KEY)
     __setup_dials_from_creds_and_test(creds)
 
 

{cmsdials-1.8.0 → cmsdials-2.0.0}/tests/integration/test_file_index_client.py

@@ -4,44 +4,47 @@ from urllib3.util import Retry
 from cmsdials.clients.file_index.models import FileIndex, PaginatedFileIndexList
 from cmsdials.filters import FileIndexFilters
 
-from .utils import DEFAULT_TEST_WORKSPACE, setup_dials_object
+from .env import TEST_DATASET_ID, TEST_FILE_ID
+from .utils import setup_dials_object
 
 
 def test_get_file_index() -> None:
-    dials = setup_dials_object(workspace=DEFAULT_TEST_WORKSPACE)
-    data = dials.file_index.get(dataset_id=14677060, file_id=3393809397)
+    dials = setup_dials_object()
+    data = dials.file_index.get(dataset_id=TEST_DATASET_ID, file_id=TEST_FILE_ID)
     assert isinstance(data, FileIndex)
 
 
 def test_list_file_index() -> None:
-    dials = setup_dials_object(workspace=DEFAULT_TEST_WORKSPACE)
+    dials = setup_dials_object()
     data = dials.file_index.list()
     assert isinstance(data, PaginatedFileIndexList)
     assert isinstance(data.to_pandas(), pd.DataFrame)
 
 
 def test_list_all_file_index() -> None:
-    dials = setup_dials_object(workspace=DEFAULT_TEST_WORKSPACE)
+    dials = setup_dials_object()
     data = dials.file_index.list_all(FileIndexFilters(), max_pages=5)
     assert isinstance(data, PaginatedFileIndexList)
     assert isinstance(data.to_pandas(), pd.DataFrame)
 
 
 def test_get_file_index_with_retries() -> None:
-    dials = setup_dials_object(workspace=DEFAULT_TEST_WORKSPACE)
-    data = dials.file_index.get(dataset_id=14677060, file_id=3393809397, retries=Retry(total=3, backoff_factor=0.1))
+    dials = setup_dials_object()
+    data = dials.file_index.get(
+        dataset_id=TEST_DATASET_ID, file_id=TEST_FILE_ID, retries=Retry(total=3, backoff_factor=0.1)
+    )
     assert isinstance(data, FileIndex)
 
 
 def test_list_file_index_with_retries() -> None:
-    dials = setup_dials_object(workspace=DEFAULT_TEST_WORKSPACE)
+    dials = setup_dials_object()
     data = dials.file_index.list(retries=Retry(total=3, backoff_factor=0.1))
     assert isinstance(data, PaginatedFileIndexList)
     assert isinstance(data.to_pandas(), pd.DataFrame)
 
 
 def test_list_all_file_index_with_retries() -> None:
-    dials = setup_dials_object(workspace=DEFAULT_TEST_WORKSPACE)
+    dials = setup_dials_object()
     data = dials.file_index.list_all(FileIndexFilters(), max_pages=5, retries=Retry(total=3, backoff_factor=0.1))
     assert isinstance(data, PaginatedFileIndexList)
     assert isinstance(data.to_pandas(), pd.DataFrame)

{cmsdials-1.8.0 → cmsdials-2.0.0}/tests/integration/test_h1d_client.py

@@ -4,46 +4,71 @@ from urllib3.util import Retry
 from cmsdials.clients.h1d.models import LumisectionHistogram1D, PaginatedLumisectionHistogram1DList
 from cmsdials.filters import LumisectionHistogram1DFilters
 
-from .utils import DEFAULT_TEST_WORKSPACE, setup_dials_object
+from .env import TEST_DATASET_ID, TEST_LS_NUMBER, TEST_RUN_NUMBER
+from .utils import setup_dials_object
 
 
 def test_get_h1d() -> None:
-    dials = setup_dials_object(workspace=DEFAULT_TEST_WORKSPACE)
-    data = dials.h1d.get(dataset_id=14677060, run_number=367112, ls_number=10, me_id=1)
+    dials = setup_dials_object()
+
+    # Fetch any valid monitoring element ID with dimension 1 from the MEs endpoint
+    data = dials.mes.list()
+    me_id = None
+    for me in data:
+        if me.dim == 1:
+            me_id = me.me_id
+            break
+    assert me_id is not None, "No 1D Monitoring Element found in MEs endpoint"
+
+    data = dials.h1d.get(dataset_id=TEST_DATASET_ID, run_number=TEST_RUN_NUMBER, ls_number=TEST_LS_NUMBER, me_id=me_id)
     assert isinstance(data, LumisectionHistogram1D)
 
 
 def test_list_h1d() -> None:
-    dials = setup_dials_object(workspace=DEFAULT_TEST_WORKSPACE)
+    dials = setup_dials_object()
     data = dials.h1d.list()
     assert isinstance(data, PaginatedLumisectionHistogram1DList)
     assert isinstance(data.to_pandas(), pd.DataFrame)
 
 
 def test_list_all_h1d() -> None:
-    dials = setup_dials_object(workspace=DEFAULT_TEST_WORKSPACE)
+    dials = setup_dials_object()
     data = dials.h1d.list_all(LumisectionHistogram1DFilters(), max_pages=5)
     assert isinstance(data, PaginatedLumisectionHistogram1DList)
     assert isinstance(data.to_pandas(), pd.DataFrame)
 
 
 def test_get_h1d_with_retries() -> None:
-    dials = setup_dials_object(workspace=DEFAULT_TEST_WORKSPACE)
+    dials = setup_dials_object()
+
+    # Fetch any valid monitoring element ID with dimension 1 from the MEs endpoint
+    data = dials.mes.list()
+    me_id = None
+    for me in data:
+        if me.dim == 1:
+            me_id = me.me_id
+            break
+    assert me_id is not None, "No 1D Monitoring Element found in MEs endpoint"
+
     data = dials.h1d.get(
-        dataset_id=14677060, run_number=367112, ls_number=10, me_id=1, retries=Retry(total=3, backoff_factor=0.1)
+        dataset_id=TEST_DATASET_ID,
+        run_number=TEST_RUN_NUMBER,
+        ls_number=TEST_LS_NUMBER,
+        me_id=me_id,
+        retries=Retry(total=3, backoff_factor=0.1),
     )
     assert isinstance(data, LumisectionHistogram1D)
 
 
 def test_list_h1d_with_retries() -> None:
-    dials = setup_dials_object(workspace=DEFAULT_TEST_WORKSPACE)
+    dials = setup_dials_object()
     data = dials.h1d.list(retries=Retry(total=3, backoff_factor=0.1))
     assert isinstance(data, PaginatedLumisectionHistogram1DList)
     assert isinstance(data.to_pandas(), pd.DataFrame)
 
 
 def test_list_all_h1d_with_retries() -> None:
-    dials = setup_dials_object(workspace=DEFAULT_TEST_WORKSPACE)
+    dials = setup_dials_object()
     data = dials.h1d.list_all(LumisectionHistogram1DFilters(), max_pages=5, retries=Retry(total=5, backoff_factor=0.1))
     assert isinstance(data, PaginatedLumisectionHistogram1DList)
     assert isinstance(data.to_pandas(), pd.DataFrame)

{cmsdials-1.8.0 → cmsdials-2.0.0}/tests/integration/test_h2d_client.py

@@ -4,46 +4,71 @@ from urllib3.util import Retry
 from cmsdials.clients.h2d.models import LumisectionHistogram2D, PaginatedLumisectionHistogram2DList
 from cmsdials.filters import LumisectionHistogram2DFilters
 
-from .utils import DEFAULT_TEST_WORKSPACE, setup_dials_object
+from .env import TEST_DATASET_ID, TEST_LS_NUMBER, TEST_RUN_NUMBER
+from .utils import setup_dials_object
 
 
 def test_get_h2d() -> None:
-    dials = setup_dials_object(workspace=DEFAULT_TEST_WORKSPACE)
-    data = dials.h2d.get(dataset_id=14677060, run_number=367112, ls_number=10, me_id=100)
+    dials = setup_dials_object()
+
+    # Fetch any valid monitoring element ID with dimension 2 from the MEs endpoint
+    data = dials.mes.list()
+    me_id = None
+    for me in data:
+        if me.dim == 2:
+            me_id = me.me_id
+            break
+    assert me_id is not None, "No 2D Monitoring Element found in MEs endpoint"
+
+    data = dials.h2d.get(dataset_id=TEST_DATASET_ID, run_number=TEST_RUN_NUMBER, ls_number=TEST_LS_NUMBER, me_id=me_id)
     assert isinstance(data, LumisectionHistogram2D)
 
 
 def test_list_h2d() -> None:
-    dials = setup_dials_object(workspace=DEFAULT_TEST_WORKSPACE)
+    dials = setup_dials_object()
     data = dials.h2d.list()
     assert isinstance(data, PaginatedLumisectionHistogram2DList)
     assert isinstance(data.to_pandas(), pd.DataFrame)
 
 
 def test_list_all_h2d() -> None:
-    dials = setup_dials_object(workspace=DEFAULT_TEST_WORKSPACE)
+    dials = setup_dials_object()
     data = dials.h2d.list_all(LumisectionHistogram2DFilters(), max_pages=5)
     assert isinstance(data, PaginatedLumisectionHistogram2DList)
     assert isinstance(data.to_pandas(), pd.DataFrame)
 
 
 def test_get_h2d_with_retries() -> None:
-    dials = setup_dials_object(workspace=DEFAULT_TEST_WORKSPACE)
+    dials = setup_dials_object()
+
+    # Fetch any valid monitoring element ID with dimension 2 from the MEs endpoint
+    data = dials.mes.list()
+    me_id = None
+    for me in data:
+        if me.dim == 2:
+            me_id = me.me_id
+            break
+    assert me_id is not None, "No 2D Monitoring Element found in MEs endpoint"
+
     data = dials.h2d.get(
-        dataset_id=14677060, run_number=367112, ls_number=10, me_id=100, retries=Retry(total=3, backoff_factor=0.1)
+        dataset_id=TEST_DATASET_ID,
+        run_number=TEST_RUN_NUMBER,
+        ls_number=TEST_LS_NUMBER,
+        me_id=me_id,
+        retries=Retry(total=3, backoff_factor=0.1),
     )
     assert isinstance(data, LumisectionHistogram2D)
 
 
 def test_list_h2d_with_retries() -> None:
-    dials = setup_dials_object(workspace=DEFAULT_TEST_WORKSPACE)
+    dials = setup_dials_object()
     data = dials.h2d.list(retries=Retry(total=3, backoff_factor=0.1))
     assert isinstance(data, PaginatedLumisectionHistogram2DList)
     assert isinstance(data.to_pandas(), pd.DataFrame)
 
 
 def test_list_all_h2d_with_retries() -> None:
-    dials = setup_dials_object(workspace=DEFAULT_TEST_WORKSPACE)
+    dials = setup_dials_object()
     data = dials.h2d.list_all(LumisectionHistogram2DFilters(), max_pages=5, retries=Retry(total=5, backoff_factor=0.1))
     assert isinstance(data, PaginatedLumisectionHistogram2DList)
     assert isinstance(data.to_pandas(), pd.DataFrame)