cmsdials 1.7.2b1__tar.gz → 2.0.0__tar.gz

cmsdials-2.0.0/.coveragerc

@@ -0,0 +1,14 @@
+[run]
+source =
+    cmsdials
+omit =
+    cmsdials/_version.py
+
+[report]
+show_missing = true
+
+[html]
+directory = htmlcov
+
+[xml]
+output = coverage.xml

{cmsdials-1.7.2b1 → cmsdials-2.0.0}/.gitignore

@@ -160,6 +160,9 @@ cython_debug/
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 #.idea/
 
+# ruff
+.ruff_cache/
+
 # uv
 uv.lock
 

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.7.2b1 → cmsdials-2.0.0}/.pre-commit-config.yaml

@@ -18,8 +18,16 @@ repos:
       - id: trailing-whitespace
       - id: end-of-file-fixer
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.3.2
+    rev: v0.11.4
     hooks:
       - id: ruff
         args: [--fix]
       - id: ruff-format
+  - repo: https://github.com/pre-commit/mirrors-mypy
+    rev: v1.15.0
+    hooks:
+      - id: mypy
+        additional_dependencies:
+          - pandas-stubs>=2.2.2.240807
+          - types-requests>=2.31.0.6
+          - types-tqdm>=4.67.0.20250516

{cmsdials-1.7.2b1 → cmsdials-2.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cmsdials
-Version: 1.7.2b1
+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
@@ -21,8 +21,9 @@ Provides-Extra: tqdm
 Requires-Dist: tqdm>=4.66.1; extra == "tqdm"
 Dynamic: license-file
 
-![Build Status](https://gitlab.cern.ch/cms-dqmdc/libraries/dials-py/badges/dev/pipeline.svg)
-![Coverage](https://gitlab.cern.ch/cms-dqmdc/libraries/dials-py/badges/dev/coverage.svg)
+![Build Status](https://gitlab.cern.ch/cms-dqmdc/libraries/dials-py/badges/develop/pipeline.svg)
+![Coverage](https://gitlab.cern.ch/cms-dqmdc/libraries/dials-py/badges/develop/coverage.svg)
+![Latest Release](https://gitlab.cern.ch/cms-dqmdc/libraries/dials-py/-/badges/release.svg)
 [![PyPI version](https://badge.fury.io/py/cmsdials.png)](https://badge.fury.io/py/cmsdials)
 
 # dials-py
@@ -136,7 +137,8 @@ dials.ml_bad_lumisection.list()
 
 ### Retrieving all available pages of a list of objects using `list_all`
 
-Note: Keep in mind that running `list_all` without any filter can take too much time, since you will be retrieving all rows in the database.
+> [!NOTE]
+> Keep in mind that running `list_all` without any filter can take too much time, since you will be retrieving all rows in the database.
 
 ```python
 dials.dataset_index.list_all()
@@ -316,12 +318,22 @@ dials = Dials(creds, base_url=DEV_URL)
 dials.h2d.list_all(LumisectionHistogram2DFilters(me__regex="EEOT digi occupancy EE +", entries__gte=100, run_number__gte=360392, run_number__lte=365000), max_pages=5)
 ```
 
-## Running tests
+## Development
+
+Install the dependencies and the package using `uv`:
+
+```shell
+uv sync --all-groups --extra pandas --extra tqdm
+uv run pre-commit install
+uv pip install -e .
+```
+
+### Running tests
 
 The repository has some tests written to make sure DIALS responses are compatible with pydantic metaclasses, you can use pytest to run all tests but you need to specify a secret key to authenticate non-interactively against DIALS api:
 
 ```bash
-SECRET_KEY=... pytest tests --cov=cmsdials --cov-report=xml --cov-report=term --cov-report=html
+SECRET_KEY=... uv run pytest tests
 ```
 
 The secret key is an api client enabled secret key and can be obtained from the applications portal, any api client secret key whitelisted in DIALS can be used. The interactive authentication flow should be tested manually, an example for this can be found in [this line](/tests/integration/test_auth_client.py#L33).
@@ -329,15 +341,15 @@ The secret key is an api client enabled secret key and can be obtained from the
 If testing against a local version of DIALS you need to specify the BASE_URL:
 
 ```bash
-SECRET_KEY=... BASE_URL=http://localhost:8000 pytest tests --cov=cmsdials --cov-report=xml --cov-report=term --cov-report=html
+SECRET_KEY=... BASE_URL=http://localhost:8000 uv run pytest tests
 ```
 
-### Tox
+#### Tox
 
-Tox is pre-configured in `pyproject.toml`, so you can run the following to test against multiple python versions locally:
+Tox is pre-configured in `tox.ini`, so you can run the following to test against multiple python versions locally:
 
 ```bash
-SECRET_KEY=... poetry run tox
+SECRET_KEY=... uv run tox
 ```
 
 **[asdf](https://asdf-vm.com/) users**
@@ -350,34 +362,36 @@ asdf set python 3.12.9 3.11.10 3.10.13 3.9.19
 
 This will use `3.12.9` by default (if you just run `python`), but it will also put `python3.11`, `python3.10` and `python3.9` symlinks in your path so you can run those too (which is exactly what tox is looking for).
 
-## Releasing the package on PyPI
+### Releasing the package on PyPI
 
-### Build
+The package is available in PyPI at [cmsdials](https://pypi.org/project/cmsdials/), under the [cmsdqm](https://pypi.org/org/cms-dqm/) organization. You'll need at leat Mantainer rights to be able to push new versions.
 
-You can use poetry to build the package using:
+#### CI
 
-```bash
-poetry build
-```
+Do not worry. The GitLab CI is configured to automatically publish the package on PyPI and the release notes in GitLab whever a tag is pushed to the repo.
 
-The build system requires `poetry-dynamic-versioning` plugin installed to update the package version during build time. To install this plugin simply:
+> [!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
 
-```
-poetry self add "poetry-dynamic-versioning[plugin]"
-```
+#### Manual
 
-The build system will automatically update the package version based on the git tag of the current commit.
+If you want to follow the manual approach, you need to first build and then publish.
 
-### Publish
+##### Build
 
-To publish the package will need maintainer rights to the `cmsdials` page in PyPI and configure your poetry installation to publish with a PyPI api token. Provided you have already generate a PyPI api token in your account you can configure your poetry installation using:
+You can use uv to build the package using:
 
+```bash
+uv build
 ```
-poetry config pypi-token.pypi <your-api-token>
-```
 
-Then, to build and publish in one go you can do:
+The build system will automatically update the package version based on the git tag of the current commit.
+
+##### Publish
+
+Provided you have already generate a PyPI api token in your account or in CMDQM org, you can publish using:
 
 ```bash
-poetry publish --build
+UV_PUBLISH_TOKEN=... uv publish
 ```

{cmsdials-1.7.2b1 → cmsdials-2.0.0}/README.md

@@ -1,5 +1,6 @@
-![Build Status](https://gitlab.cern.ch/cms-dqmdc/libraries/dials-py/badges/dev/pipeline.svg)
-![Coverage](https://gitlab.cern.ch/cms-dqmdc/libraries/dials-py/badges/dev/coverage.svg)
+![Build Status](https://gitlab.cern.ch/cms-dqmdc/libraries/dials-py/badges/develop/pipeline.svg)
+![Coverage](https://gitlab.cern.ch/cms-dqmdc/libraries/dials-py/badges/develop/coverage.svg)
+![Latest Release](https://gitlab.cern.ch/cms-dqmdc/libraries/dials-py/-/badges/release.svg)
 [![PyPI version](https://badge.fury.io/py/cmsdials.png)](https://badge.fury.io/py/cmsdials)
 
 # dials-py
@@ -113,7 +114,8 @@ dials.ml_bad_lumisection.list()
 
 ### Retrieving all available pages of a list of objects using `list_all`
 
-Note: Keep in mind that running `list_all` without any filter can take too much time, since you will be retrieving all rows in the database.
+> [!NOTE]
+> Keep in mind that running `list_all` without any filter can take too much time, since you will be retrieving all rows in the database.
 
 ```python
 dials.dataset_index.list_all()
@@ -293,12 +295,22 @@ dials = Dials(creds, base_url=DEV_URL)
 dials.h2d.list_all(LumisectionHistogram2DFilters(me__regex="EEOT digi occupancy EE +", entries__gte=100, run_number__gte=360392, run_number__lte=365000), max_pages=5)
 ```
 
-## Running tests
+## Development
+
+Install the dependencies and the package using `uv`:
+
+```shell
+uv sync --all-groups --extra pandas --extra tqdm
+uv run pre-commit install
+uv pip install -e .
+```
+
+### Running tests
 
 The repository has some tests written to make sure DIALS responses are compatible with pydantic metaclasses, you can use pytest to run all tests but you need to specify a secret key to authenticate non-interactively against DIALS api:
 
 ```bash
-SECRET_KEY=... pytest tests --cov=cmsdials --cov-report=xml --cov-report=term --cov-report=html
+SECRET_KEY=... uv run pytest tests
 ```
 
 The secret key is an api client enabled secret key and can be obtained from the applications portal, any api client secret key whitelisted in DIALS can be used. The interactive authentication flow should be tested manually, an example for this can be found in [this line](/tests/integration/test_auth_client.py#L33).
@@ -306,15 +318,15 @@ The secret key is an api client enabled secret key and can be obtained from the
 If testing against a local version of DIALS you need to specify the BASE_URL:
 
 ```bash
-SECRET_KEY=... BASE_URL=http://localhost:8000 pytest tests --cov=cmsdials --cov-report=xml --cov-report=term --cov-report=html
+SECRET_KEY=... BASE_URL=http://localhost:8000 uv run pytest tests
 ```
 
-### Tox
+#### Tox
 
-Tox is pre-configured in `pyproject.toml`, so you can run the following to test against multiple python versions locally:
+Tox is pre-configured in `tox.ini`, so you can run the following to test against multiple python versions locally:
 
 ```bash
-SECRET_KEY=... poetry run tox
+SECRET_KEY=... uv run tox
 ```
 
 **[asdf](https://asdf-vm.com/) users**
@@ -327,34 +339,36 @@ asdf set python 3.12.9 3.11.10 3.10.13 3.9.19
 
 This will use `3.12.9` by default (if you just run `python`), but it will also put `python3.11`, `python3.10` and `python3.9` symlinks in your path so you can run those too (which is exactly what tox is looking for).
 
-## Releasing the package on PyPI
+### Releasing the package on PyPI
 
-### Build
+The package is available in PyPI at [cmsdials](https://pypi.org/project/cmsdials/), under the [cmsdqm](https://pypi.org/org/cms-dqm/) organization. You'll need at leat Mantainer rights to be able to push new versions.
 
-You can use poetry to build the package using:
+#### CI
 
-```bash
-poetry build
-```
+Do not worry. The GitLab CI is configured to automatically publish the package on PyPI and the release notes in GitLab whever a tag is pushed to the repo.
 
-The build system requires `poetry-dynamic-versioning` plugin installed to update the package version during build time. To install this plugin simply:
+> [!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
 
-```
-poetry self add "poetry-dynamic-versioning[plugin]"
-```
+#### Manual
 
-The build system will automatically update the package version based on the git tag of the current commit.
+If you want to follow the manual approach, you need to first build and then publish.
 
-### Publish
+##### Build
 
-To publish the package will need maintainer rights to the `cmsdials` page in PyPI and configure your poetry installation to publish with a PyPI api token. Provided you have already generate a PyPI api token in your account you can configure your poetry installation using:
+You can use uv to build the package using:
 
+```bash
+uv build
 ```
-poetry config pypi-token.pypi <your-api-token>
-```
 
-Then, to build and publish in one go you can do:
+The build system will automatically update the package version based on the git tag of the current commit.
+
+##### Publish
+
+Provided you have already generate a PyPI api token in your account or in CMDQM org, you can publish using:
 
 ```bash
-poetry publish --build
+UV_PUBLISH_TOKEN=... uv publish
 ```

{cmsdials-1.7.2b1 → cmsdials-2.0.0}/cmsdials/__init__.py

@@ -2,4 +2,4 @@ from ._version import __version__
 from .cmsdials import Dials
 
 
-__all__ = ["__version__", "Dials"]
+__all__ = ["Dials", "__version__"]

{cmsdials-1.7.2b1 → 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.7.2b1'
-__version_tuple__ = version_tuple = (1, 7, 2, 'b1')
+__version__ = version = '2.0.0'
+__version_tuple__ = version_tuple = (2, 0, 0)
+
+__commit_id__ = commit_id = 'g68ff6a70a'

{cmsdials-1.7.2b1 → cmsdials-2.0.0}/cmsdials/auth/_base.py

@@ -1,6 +1,5 @@
 import threading
 from abc import ABC, abstractmethod
-from collections.abc import Mapping
 from datetime import datetime, timedelta
 from enum import Enum
 
@@ -87,7 +86,7 @@ class BaseCredentials(ABC):
         return TokenState.FRESH
 
     @abstractmethod
-    def apply(self, headers: Mapping[str, str]) -> None:
+    def apply(self, headers: dict[str, str]) -> None:
         """
         Apply the token to the authentication header.
         """
@@ -109,7 +108,7 @@ class BaseCredentials(ABC):
         self.refresh()
         self._stale_lock.release()
 
-    def before_request(self, headers: Mapping[str, str]):
+    def before_request(self, headers: dict[str, str]):
         """
         Performs credential-specific before request logic.
         """

{cmsdials-1.7.2b1 → cmsdials-2.0.0}/cmsdials/auth/bearer.py

@@ -1,7 +1,6 @@
 import json
 import os
 import os.path
-from collections.abc import Mapping
 from datetime import datetime
 from typing import Optional
 
@@ -55,8 +54,8 @@ class Credentials(BaseCredentials):
         # If loaded token is invalid, trigger authentication
         if self.token_state == TokenState.INVALID:
             logger.info("Access token and refresh token are expired, triggering device authentication flow...")
-            token: Token = self.client.device_auth_flow()
-            self._set_token(token)
+            _token = self.client.device_auth_flow()
+            self._set_token(_token)
 
         # Only cache if token is fresh
         if self.token_state == TokenState.FRESH:
@@ -112,7 +111,7 @@ class Credentials(BaseCredentials):
             token = Token(**fcontents)
         except FileNotFoundError:
             logger.info("Credentials file not found, triggering device authentication flow...")
-            token: Token = client.device_auth_flow()
+            token = client.device_auth_flow()
 
         return Credentials.from_authclient_token(token, cache_dir, client)
 
@@ -135,7 +134,7 @@ class Credentials(BaseCredentials):
         self._set_token(token)
         self.cache_credentials()
 
-    def apply(self, headers: Mapping[str, str]) -> None:
+    def apply(self, headers: dict[str, str]) -> None:
         """
         Apply the Client secret key token to the X-CLIENT-SECRET header.
         """

{cmsdials-1.7.2b1 → cmsdials-2.0.0}/cmsdials/auth/client.py

@@ -27,8 +27,8 @@ class AuthClient(BaseAPIClient):
             timeout=self.default_timeout,
         )
         response.raise_for_status()
-        response = response.json()
-        return Device(**response)
+        data = response.json()
+        return Device(**data)
 
     def device_token(self, device_code: str) -> Token:
         endpoint_url = self.api_url + "auth/device-token/"
@@ -47,11 +47,12 @@ class AuthClient(BaseAPIClient):
             raise PendingAuthorizationError
 
         response.raise_for_status()
-        response = response.json()
+        data = response.json()
         curr_datetime = datetime.now()
-        token = DeviceToken(**response)
+        token = DeviceToken(**data)
+        token_dict = token.model_dump()
         return Token(
-            **token.dict(),
+            **token_dict,
             expires_at=curr_datetime + timedelta(seconds=token.expires_in),
             refresh_expires_at=curr_datetime + timedelta(seconds=token.refresh_expires_in),
         )
@@ -70,11 +71,12 @@ class AuthClient(BaseAPIClient):
             timeout=self.default_timeout,
         )
         response.raise_for_status()
-        response = response.json()
+        data = response.json()
         curr_datetime = datetime.now()
-        token = RefreshToken(**response)
+        token = RefreshToken(**data)
+        token_dict = token.model_dump()
         return Token(
-            **token.dict(),
+            **token_dict,
             expires_at=curr_datetime + timedelta(seconds=token.expires_in),
             refresh_expires_at=curr_datetime + timedelta(seconds=token.refresh_expires_in),
         )

{cmsdials-1.7.2b1 → cmsdials-2.0.0}/cmsdials/auth/secret_key.py

@@ -1,4 +1,4 @@
-from collections.abc import Mapping
+from typing import Optional
 
 from ._base import BaseCredentials
 
@@ -9,7 +9,7 @@ class Credentials(BaseCredentials):
     These credential use Client secret key to provide authorization to applications.
     """
 
-    def __init__(self, token: str) -> None:
+    def __init__(self, token: Optional[str]) -> None:
         if not token:
             raise ValueError("token must be a non-empty Client secret key string")
         self.token = token
@@ -29,13 +29,13 @@ class Credentials(BaseCredentials):
     def refresh(self) -> None:
         return
 
-    def apply(self, headers: Mapping[str, str]) -> None:
+    def apply(self, headers: dict[str, str]) -> None:
         """
         Apply the Client secret key token to the X-CLIENT-SECRET header.
         """
         headers["X-CLIENT-SECRET"] = self.token
 
-    def before_request(self, headers: Mapping[str, str]):
+    def before_request(self, headers: dict[str, str]):
         """
         Performs credential-specific before request logic.
         """

{cmsdials-1.7.2b1 → cmsdials-2.0.0}/cmsdials/clients/dataset_index/client.py

@@ -1,8 +1,14 @@
-from ...utils.api_client import BaseAuthorizedAPIClient
+from ...utils.api_client import BaseAuthorizedPaginatedAPIClient
 from .models import DatasetIndex, DatasetIndexFilters, PaginatedDatasetIndexList
 
 
-class DatasetIndexClient(BaseAuthorizedAPIClient):
+class DatasetIndexClient(
+    BaseAuthorizedPaginatedAPIClient[
+        DatasetIndex,
+        PaginatedDatasetIndexList,
+        DatasetIndexFilters,
+    ]
+):
     data_model = DatasetIndex
     pagination_model = PaginatedDatasetIndexList
     filter_class = DatasetIndexFilters
@@ -10,4 +16,4 @@ class DatasetIndexClient(BaseAuthorizedAPIClient):
 
     def get(self, dataset_id: int, file_id: int, **kwargs):
         edp = f"{dataset_id}/{file_id}/"
-        return super().get(edp, **kwargs)
+        return super()._get(edp, **kwargs)

{cmsdials-1.7.2b1 → cmsdials-2.0.0}/cmsdials/clients/dataset_index/models.py

@@ -1,9 +1,9 @@
 from datetime import datetime
 from typing import Optional
 
-from pydantic import AnyUrl, BaseModel, Field
+from pydantic import BaseModel, Field
 
-from ...utils.base_model import OBaseModel, PaginatedBaseModel
+from ...utils.base_model import PaginatedBaseFilters, PaginatedBaseModel
 
 
 class DatasetIndex(BaseModel):
@@ -17,14 +17,10 @@ class DatasetIndex(BaseModel):
     last_modification_date: datetime
 
 
-class PaginatedDatasetIndexList(PaginatedBaseModel):
-    next: Optional[AnyUrl]
-    previous: Optional[AnyUrl]
-    results: list[DatasetIndex]
+class PaginatedDatasetIndexList(PaginatedBaseModel[DatasetIndex]):
+    pass
 
 
-class DatasetIndexFilters(OBaseModel):
-    next_token: Optional[str] = None
-    page_size: Optional[int] = None
+class DatasetIndexFilters(PaginatedBaseFilters):
     dataset: Optional[str] = None
     dataset__regex: Optional[str] = None

{cmsdials-1.7.2b1 → cmsdials-2.0.0}/cmsdials/clients/file_index/client.py

@@ -1,8 +1,14 @@
-from ...utils.api_client import BaseAuthorizedAPIClient
+from ...utils.api_client import BaseAuthorizedPaginatedAPIClient
 from .models import FileIndex, FileIndexFilters, PaginatedFileIndexList
 
 
-class FileIndexClient(BaseAuthorizedAPIClient):
+class FileIndexClient(
+    BaseAuthorizedPaginatedAPIClient[
+        FileIndex,
+        PaginatedFileIndexList,
+        FileIndexFilters,
+    ]
+):
     data_model = FileIndex
     pagination_model = PaginatedFileIndexList
     filter_class = FileIndexFilters
@@ -10,4 +16,4 @@ class FileIndexClient(BaseAuthorizedAPIClient):
 
     def get(self, dataset_id: int, file_id: int, **kwargs):
         edp = f"{dataset_id}/{file_id}/"
-        return super().get(edp, **kwargs)
+        return super()._get(edp, **kwargs)

{cmsdials-1.7.2b1 → cmsdials-2.0.0}/cmsdials/clients/file_index/models.py

@@ -1,9 +1,9 @@
 from datetime import datetime
 from typing import Optional
 
-from pydantic import AnyUrl, BaseModel, Field
+from pydantic import BaseModel, Field
 
-from ...utils.base_model import OBaseModel, PaginatedBaseModel
+from ...utils.base_model import PaginatedBaseFilters, PaginatedBaseModel
 
 
 class FileIndex(BaseModel):
@@ -18,15 +18,11 @@ class FileIndex(BaseModel):
     err_trace: Optional[str] = Field(..., max_length=5000)
 
 
-class PaginatedFileIndexList(PaginatedBaseModel):
-    next: Optional[AnyUrl]
-    previous: Optional[AnyUrl]
-    results: list[FileIndex]
+class PaginatedFileIndexList(PaginatedBaseModel[FileIndex]):
+    pass
 
 
-class FileIndexFilters(OBaseModel):
-    next_token: Optional[str] = None
-    page_size: Optional[int] = None
+class FileIndexFilters(PaginatedBaseFilters):
     dataset_id: Optional[int] = None
     logical_file_name: Optional[str] = None
     logical_file_name__regex: Optional[str] = None