cmsdials 2.0.0rc2__tar.gz → 2.0.0rc4__tar.gz

cmsdials-2.0.0rc4/.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-2.0.0rc2 → cmsdials-2.0.0rc4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cmsdials
-Version: 2.0.0rc2
+Version: 2.0.0rc4
 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

{cmsdials-2.0.0rc2 → cmsdials-2.0.0rc4}/cmsdials/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '2.0.0rc2'
-__version_tuple__ = version_tuple = (2, 0, 0, 'rc2')
+__version__ = version = '2.0.0rc4'
+__version_tuple__ = version_tuple = (2, 0, 0, 'rc4')
 
-__commit_id__ = commit_id = 'g20833ad4f'
+__commit_id__ = commit_id = 'g68ff6a70a'

cmsdials-2.0.0rc4/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-2.0.0rc2 → cmsdials-2.0.0rc4}/cmsdials/clients/ml_bad_lumisection/models.py

@@ -8,7 +8,6 @@ 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
     metric_value: float

{cmsdials-2.0.0rc2 → cmsdials-2.0.0rc4}/cmsdials/clients/ml_models_index/models.py

@@ -18,7 +18,7 @@ class MLModelsIndex(BaseModel):
     description: str
     flagging_key: Optional[str]
     input_signature: list[dict]
-    metric_key: str
+    metric_key: Optional[str]
     output_signature: list[dict]
     tags: Optional[list[dict]]
     isvc_service_name: Optional[str]

{cmsdials-2.0.0rc2 → cmsdials-2.0.0rc4}/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.0rc4/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-2.0.0rc2 → cmsdials-2.0.0rc4}/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-2.0.0rc2 → cmsdials-2.0.0rc4}/cmsdials.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cmsdials
-Version: 2.0.0rc2
+Version: 2.0.0rc4
 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

{cmsdials-2.0.0rc2 → cmsdials-2.0.0rc4}/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-2.0.0rc2 → cmsdials-2.0.0rc4}/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.0rc4/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-2.0.0rc2 → cmsdials-2.0.0rc4}/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-2.0.0rc2 → cmsdials-2.0.0rc4}/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-2.0.0rc2 → cmsdials-2.0.0rc4}/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-2.0.0rc2 → cmsdials-2.0.0rc4}/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)

{cmsdials-2.0.0rc2 → cmsdials-2.0.0rc4}/tests/integration/test_lumisection_client.py

@@ -4,46 +4,50 @@ from urllib3.util import Retry
 from cmsdials.clients.lumisection.models import Lumisection, PaginatedLumisectionList
 from cmsdials.filters import LumisectionFilters
 
-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_lumisection() -> None:
-    dials = setup_dials_object(workspace=DEFAULT_TEST_WORKSPACE)
-    data = dials.lumi.get(dataset_id=14677060, run_number=367112, ls_number=10)
+    dials = setup_dials_object()
+    data = dials.lumi.get(dataset_id=TEST_DATASET_ID, run_number=TEST_RUN_NUMBER, ls_number=TEST_LS_NUMBER)
     assert isinstance(data, Lumisection)
 
 
 def test_list_lumisection() -> None:
-    dials = setup_dials_object(workspace=DEFAULT_TEST_WORKSPACE)
+    dials = setup_dials_object()
     data = dials.lumi.list()
     assert isinstance(data, PaginatedLumisectionList)
     assert isinstance(data.to_pandas(), pd.DataFrame)
 
 
 def test_list_all_lumisection() -> None:
-    dials = setup_dials_object(workspace=DEFAULT_TEST_WORKSPACE)
+    dials = setup_dials_object()
     data = dials.lumi.list_all(LumisectionFilters(), max_pages=5)
     assert isinstance(data, PaginatedLumisectionList)
     assert isinstance(data.to_pandas(), pd.DataFrame)
 
 
 def test_get_lumisection_with_retries() -> None:
-    dials = setup_dials_object(workspace=DEFAULT_TEST_WORKSPACE)
+    dials = setup_dials_object()
     data = dials.lumi.get(
-        dataset_id=14677060, run_number=367112, ls_number=10, retries=Retry(total=3, backoff_factor=0.1)
+        dataset_id=TEST_DATASET_ID,
+        run_number=TEST_RUN_NUMBER,
+        ls_number=TEST_LS_NUMBER,
+        retries=Retry(total=3, backoff_factor=0.1),
     )
     assert isinstance(data, Lumisection)
 
 
 def test_list_lumisection_with_retries() -> None:
-    dials = setup_dials_object(workspace=DEFAULT_TEST_WORKSPACE)
+    dials = setup_dials_object()
     data = dials.lumi.list(retries=Retry(total=3, backoff_factor=0.1))
     assert isinstance(data, PaginatedLumisectionList)
     assert isinstance(data.to_pandas(), pd.DataFrame)
 
 
 def test_list_all_lumisection_with_retries() -> None:
-    dials = setup_dials_object(workspace=DEFAULT_TEST_WORKSPACE)
+    dials = setup_dials_object()
     data = dials.lumi.list_all(LumisectionFilters(), max_pages=5, retries=Retry(total=3, backoff_factor=0.1))
     assert isinstance(data, PaginatedLumisectionList)
     assert isinstance(data.to_pandas(), pd.DataFrame)

cmsdials-2.0.0rc4/tests/integration/test_mes_client.py

@@ -0,0 +1,31 @@
+from urllib3.util import Retry
+
+from cmsdials.clients.mes.models import MonitoringElement
+
+from .utils import setup_dials_object
+
+
+def test_get_mes() -> None:
+    dials = setup_dials_object()
+    data = dials.mes.get(id=1)
+    assert isinstance(data, MonitoringElement)
+
+
+def test_list_mes() -> None:
+    dials = setup_dials_object()
+    data = dials.mes.list()
+    for me in data:
+        assert isinstance(me, MonitoringElement)
+
+
+def test_get_mes_with_retries() -> None:
+    dials = setup_dials_object()
+    data = dials.mes.get(id=1, retries=Retry(total=3, backoff_factor=0.1))
+    assert isinstance(data, MonitoringElement)
+
+
+def test_list_mes_with_retries() -> None:
+    dials = setup_dials_object()
+    data = dials.mes.list(retries=Retry(total=3, backoff_factor=0.1))
+    for me in data:
+        assert isinstance(me, MonitoringElement)

{cmsdials-2.0.0rc2 → cmsdials-2.0.0rc4}/tests/integration/test_oms_proxy_client.py

@@ -1,22 +1,23 @@
 from cmsdials.filters import OMSFilter, OMSPage
 
-from .utils import DEFAULT_TEST_WORKSPACE, setup_dials_object
+from .env import TEST_RUN_NUMBER
+from .utils import setup_dials_object
 
 
 def test_query_runs() -> None:
-    dials = setup_dials_object(workspace=DEFAULT_TEST_WORKSPACE)
+    dials = setup_dials_object()
     data = dials.oms.query(
-        endpoint="runs", filters=[OMSFilter(attribute_name="run_number", value=382921, operator="EQ")]
+        endpoint="runs", filters=[OMSFilter(attribute_name="run_number", value=TEST_RUN_NUMBER, operator="EQ")]
     )
     assert isinstance(data, dict)
     assert data["meta"]["totalResourceCount"] == 1
 
 
 def test_query_lumisections() -> None:
-    dials = setup_dials_object(workspace=DEFAULT_TEST_WORKSPACE)
+    dials = setup_dials_object()
     data = dials.oms.query(
         endpoint="lumisections",
-        filters=[OMSFilter(attribute_name="run_number", value=382921, operator="EQ")],
+        filters=[OMSFilter(attribute_name="run_number", value=TEST_RUN_NUMBER, operator="EQ")],
         pages=[OMSPage(attribute_name="limit", value=5000)],
     )
     assert isinstance(data, dict)
@@ -24,14 +25,14 @@ def test_query_lumisections() -> None:
 
 
 def test_query_datasetrates() -> None:
-    dials = setup_dials_object(workspace=DEFAULT_TEST_WORKSPACE)
+    dials = setup_dials_object()
     data = dials.oms.query(
         endpoint="datasetrates",
         filters=[
-            OMSFilter(attribute_name="run_number", value=382921, operator="EQ"),
+            OMSFilter(attribute_name="run_number", value=TEST_RUN_NUMBER, operator="EQ"),
             OMSFilter(attribute_name="dataset_name", value="ZeroBias", operator="EQ"),
         ],
         pages=[OMSPage(attribute_name="limit", value=5000)],
     )
     assert isinstance(data, dict)
-    assert data["meta"]["totalResourceCount"] > 100
+    assert data["meta"]["totalResourceCount"] == 98

{cmsdials-2.0.0rc2 → cmsdials-2.0.0rc4}/tests/integration/test_resume.py

@@ -2,19 +2,20 @@ from urllib3.util import Retry
 
 from cmsdials.filters import LumisectionHistogram2DFilters
 
-from .utils import DEFAULT_TEST_WORKSPACE, setup_dials_object
+from .env import TEST_LS_NUMBER
+from .utils import setup_dials_object
 
 
 def test_resume() -> None:
-    dials = setup_dials_object(workspace=DEFAULT_TEST_WORKSPACE)
+    dials = setup_dials_object()
     data = dials.h2d.list_all(
-        LumisectionHistogram2DFilters(me__regex="PXBarrel", ls_number=78, entries__gte=100),
+        LumisectionHistogram2DFilters(me__regex="PXBarrel", ls_number=TEST_LS_NUMBER, entries__gte=100),
         max_pages=10,
         keep_failed=True,
     )
     assert len(data.results) == 100
     data = dials.h2d.list_all(
-        LumisectionHistogram2DFilters(me__regex="PXBarrel", ls_number=78, entries__gte=100),
+        LumisectionHistogram2DFilters(me__regex="PXBarrel", ls_number=TEST_LS_NUMBER, entries__gte=100),
         max_pages=10,
         keep_failed=True,
         resume_from=data,
@@ -25,16 +26,16 @@ def test_resume() -> None:
 
 
 def test_resume_with_retries() -> None:
-    dials = setup_dials_object(workspace=DEFAULT_TEST_WORKSPACE)
+    dials = setup_dials_object()
     data = dials.h2d.list_all(
-        LumisectionHistogram2DFilters(me__regex="PXBarrel", ls_number=78, entries__gte=100),
+        LumisectionHistogram2DFilters(me__regex="PXBarrel", ls_number=TEST_LS_NUMBER, entries__gte=100),
         max_pages=10,
         keep_failed=True,
         retries=Retry(total=3, backoff_factor=0.1),
     )
     assert len(data.results) == 100
     data = dials.h2d.list_all(
-        LumisectionHistogram2DFilters(me__regex="PXBarrel", ls_number=78, entries__gte=100),
+        LumisectionHistogram2DFilters(me__regex="PXBarrel", ls_number=TEST_LS_NUMBER, entries__gte=100),
         max_pages=10,
         keep_failed=True,
         resume_from=data,

{cmsdials-2.0.0rc2 → cmsdials-2.0.0rc4}/tests/integration/test_run_client.py

@@ -4,44 +4,47 @@ from urllib3.util import Retry
 from cmsdials.clients.run.models import PaginatedRunList, Run
 from cmsdials.filters import RunFilters
 
-from .utils import DEFAULT_TEST_WORKSPACE, setup_dials_object
+from .env import TEST_DATASET_ID, TEST_RUN_NUMBER
+from .utils import setup_dials_object
 
 
 def test_get_run() -> None:
-    dials = setup_dials_object(workspace=DEFAULT_TEST_WORKSPACE)
-    data = dials.run.get(dataset_id=14677060, run_number=367112)
+    dials = setup_dials_object()
+    data = dials.run.get(dataset_id=TEST_DATASET_ID, run_number=TEST_RUN_NUMBER)
     assert isinstance(data, Run)
 
 
 def test_list_run() -> None:
-    dials = setup_dials_object(workspace=DEFAULT_TEST_WORKSPACE)
+    dials = setup_dials_object()
     data = dials.run.list()
     assert isinstance(data, PaginatedRunList)
     assert isinstance(data.to_pandas(), pd.DataFrame)
 
 
 def test_list_all_run() -> None:
-    dials = setup_dials_object(workspace=DEFAULT_TEST_WORKSPACE)
+    dials = setup_dials_object()
     data = dials.run.list_all(RunFilters(), max_pages=5)
     assert isinstance(data, PaginatedRunList)
     assert isinstance(data.to_pandas(), pd.DataFrame)
 
 
 def test_get_run_with_retries() -> None:
-    dials = setup_dials_object(workspace=DEFAULT_TEST_WORKSPACE)
-    data = dials.run.get(dataset_id=14677060, run_number=367112, retries=Retry(total=3, backoff_factor=0.1))
+    dials = setup_dials_object()
+    data = dials.run.get(
+        dataset_id=TEST_DATASET_ID, run_number=TEST_RUN_NUMBER, retries=Retry(total=3, backoff_factor=0.1)
+    )
     assert isinstance(data, Run)
 
 
 def test_list_run_with_retries() -> None:
-    dials = setup_dials_object(workspace=DEFAULT_TEST_WORKSPACE)
+    dials = setup_dials_object()
     data = dials.run.list(retries=Retry(total=3, backoff_factor=0.1))
     assert isinstance(data, PaginatedRunList)
     assert isinstance(data.to_pandas(), pd.DataFrame)
 
 
 def test_list_all_run_with_retries() -> None:
-    dials = setup_dials_object(workspace=DEFAULT_TEST_WORKSPACE)
+    dials = setup_dials_object()
     data = dials.run.list_all(RunFilters(), max_pages=5, retries=Retry(total=3, backoff_factor=0.1))
     assert isinstance(data, PaginatedRunList)
     assert isinstance(data.to_pandas(), pd.DataFrame)

cmsdials-2.0.0rc4/tests/integration/utils.py

@@ -0,0 +1,9 @@
+from cmsdials import Dials
+from cmsdials.auth.secret_key import Credentials
+
+from .env import BASE_URL, SECRET_KEY, TEST_WORKSPACE
+
+
+def setup_dials_object() -> Dials:
+    creds = Credentials(token=SECRET_KEY)
+    return Dials(creds, base_url=BASE_URL, workspace=TEST_WORKSPACE)

cmsdials-2.0.0rc2/.gitlab-ci.yml

@@ -1,129 +0,0 @@
-stages:
-  - test
-  - build
-  - publish
-  - create_release
-
-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 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:
-  stage: build
-  image: registry.cern.ch/docker.io/library/python:3.12
-  before_script:
-    - python -m pip install --upgrade pip
-    - pip install uv
-    - uv sync --all-groups --extra pandas --extra tqdm
-  script:
-    - rm -rf dist/
-    - uv build
-  artifacts:
-    paths:
-      - dist/
-    expire_in: 1 hour
-  needs:
-    - test_matrix
-
-publish:
-  stage: publish
-  image: registry.cern.ch/docker.io/library/python:3.12
-  rules:
-    - if: '$CI_COMMIT_TAG'
-      when: always
-    - when: never
-  before_script:
-    - python -m pip install --upgrade pip
-    - pip install uv
-  script:
-    - uv publish  # UV_PUBLISH_TOKEN has to be set in CI/CD variables
-  needs:
-    - build
-
-create_release:
-  stage: create_release
-  image: registry.cern.ch/registry.gitlab.com/gitlab-org/cli:latest
-  rules:
-    - if: $CI_COMMIT_TAG
-  variables:
-    # GITLAB_TOKEN has to be set in CI/CD variables - Project Access Token with api access permission
-    GITLAB_HOST: $CI_SERVER_FQDN
-  before_script:
-    - apk add jq --no-cache
-  script:
-    - |
-      set -x
-
-      # Fetch all tags
-      git fetch --tags
-
-      # Try to get the previous tag
-      PREV_TAG=$(git describe --tags --abbrev=0 "${CI_COMMIT_TAG}^" 2>/dev/null || true)
-
-      if [ -z "$PREV_TAG" ]; then
-        echo "Generating release for ${CI_COMMIT_TAG} - No previous tag found, assuming this is the first release."
-        COMMIT_RANGE_LINEAR_COMP=""
-        COMMIT_RANGE_SYMMETRIC_DIFF=""
-      else
-        echo "Generating release for ${CI_COMMIT_TAG} (MRs since ${PREV_TAG})"
-        COMMIT_RANGE_LINEAR_COMP="${PREV_TAG}..${CI_COMMIT_TAG}"
-        COMMIT_RANGE_SYMMETRIC_DIFF="${PREV_TAG}...${CI_COMMIT_TAG}"
-      fi
-
-      # Setup auth
-      glab auth login --token "$GITLAB_TOKEN"
-
-      # Generate release notes
-      if [ -z "$COMMIT_RANGE_LINEAR_COMP" ]; then
-        echo "### First release: ${CI_COMMIT_TAG}:" > release_notes.md
-        echo "" >> release_notes.md
-      else
-        echo "### Changes since ${PREV_TAG}:" > release_notes.md
-        echo "" >> release_notes.md
-        echo "[${COMMIT_RANGE_SYMMETRIC_DIFF}]($CI_PROJECT_URL/-/compare/${COMMIT_RANGE_SYMMETRIC_DIFF})" >> release_notes.md
-        echo "" >> release_notes.md
-      fi
-
-      # Get MR numbers between the two tags by parsing commit messages
-      MR_NUMBERS=$(git log ${COMMIT_RANGE_LINEAR_COMP} --merges --pretty=format:"%b" | grep -oE '!([0-9]+)' | tr -d '!' | sort -u)
-
-      # Update release notes, fallback to commit list if merge request list is empty
-      if [ -z "$MR_NUMBERS" ]; then
-        COMMIT_LIST=$(git log --pretty=format:"- #%h from %an <%ae>: %s" ${COMMIT_RANGE_LINEAR_COMP})
-        echo "${COMMIT_LIST}" >> release_notes.md
-      else
-        for mr in $MR_NUMBERS; do
-          echo "Fetching MR $mr metadata"
-          mr_metadata=$(glab mr view "$mr" -R "$CI_PROJECT_PATH" -F json)
-          mr_web_url=$(echo "$mr_metadata" | jq -r '.web_url')
-          title=$(echo "$mr_metadata" | jq -r '.title')
-          author_username=$(echo "$mr_metadata" | jq -r '.author.username')
-          author_username_web_url=$(echo "$mr_metadata" | jq -r '.author.web_url')
-          echo "- [!${mr}](${mr_web_url}) from [@${author_username}](${author_username_web_url}): ${title}" >> release_notes.md
-        done
-      fi
-
-      # Create the release
-      echo "Creating release for tag $CI_COMMIT_TAG"
-      glab release create "${CI_COMMIT_TAG}" -R "$CI_PROJECT_PATH" -F release_notes.md
-  needs:
-    - publish

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

@@ -1,36 +0,0 @@
-import warnings
-from typing import Union
-
-from requests.adapters import DEFAULT_RETRIES
-from urllib3.util import Retry
-
-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)
-
-    def list_all(self, filters: MEFilters, retries: Union[int, Retry] = DEFAULT_RETRIES, **kwargs):
-        """
-        This method is here just for the sake of compatibility.
-        In the past, this class and other paginated classes used to inherit from the same class.
-        """
-        warnings.warn(
-            "The `list_all` method is deprecated and will be removed in the future for non-paginated classes. "
-            "Please use the `list` method instead.",
-            DeprecationWarning,
-            stacklevel=2,  # Important: ensures the warning points to the caller
-        )
-        return super().list(filters, retries=retries, **kwargs)

cmsdials-2.0.0rc2/tests/integration/test_mes_client.py

@@ -1,49 +0,0 @@
-import pytest
-from urllib3.util import Retry
-
-from cmsdials.clients.mes.models import MonitoringElement
-from cmsdials.filters import MEFilters
-
-from .utils import DEFAULT_TEST_WORKSPACE, setup_dials_object
-
-
-def test_get_mes() -> None:
-    dials = setup_dials_object(workspace=DEFAULT_TEST_WORKSPACE)
-    data = dials.mes.get(id=1)
-    assert isinstance(data, MonitoringElement)
-
-
-def test_list_mes() -> None:
-    dials = setup_dials_object(workspace=DEFAULT_TEST_WORKSPACE)
-    data = dials.mes.list()
-    for me in data:
-        assert isinstance(me, MonitoringElement)
-
-
-def test_list_all_mes() -> None:
-    dials = setup_dials_object(workspace=DEFAULT_TEST_WORKSPACE)
-    with pytest.warns(DeprecationWarning, match="list_all"):
-        data = dials.mes.list_all(MEFilters())
-    for me in data:
-        assert isinstance(me, MonitoringElement)
-
-
-def test_get_mes_with_retries() -> None:
-    dials = setup_dials_object(workspace=DEFAULT_TEST_WORKSPACE)
-    data = dials.mes.get(id=1, retries=Retry(total=3, backoff_factor=0.1))
-    assert isinstance(data, MonitoringElement)
-
-
-def test_list_mes_with_retries() -> None:
-    dials = setup_dials_object(workspace=DEFAULT_TEST_WORKSPACE)
-    data = dials.mes.list(retries=Retry(total=3, backoff_factor=0.1))
-    for me in data:
-        assert isinstance(me, MonitoringElement)
-
-
-def test_list_all_mes_with_retries() -> None:
-    dials = setup_dials_object(workspace=DEFAULT_TEST_WORKSPACE)
-    with pytest.warns(DeprecationWarning, match="list_all"):
-        data = dials.mes.list_all(MEFilters(), retries=Retry(total=3, backoff_factor=0.1))
-    for me in data:
-        assert isinstance(me, MonitoringElement)

cmsdials-2.0.0rc2/tests/integration/utils.py

@@ -1,15 +0,0 @@
-import os
-from typing import Optional
-
-from cmsdials import Dials
-from cmsdials.auth.secret_key import Credentials
-
-
-DEFAULT_TEST_WORKSPACE = "tracker"
-
-
-def setup_dials_object(workspace: Optional[str] = None) -> Dials:
-    secret_key = os.getenv("SECRET_KEY")
-    base_url = os.getenv("BASE_URL")
-    creds = Credentials(token=secret_key)
-    return Dials(creds, base_url=base_url, workspace=workspace)