cmsdials 1.8.0__tar.gz → 2.0.0rc2__tar.gz

{cmsdials-1.8.0 → cmsdials-2.0.0rc2}/.gitlab-ci.yml

@@ -65,6 +65,7 @@ create_release:
   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
@@ -75,26 +76,39 @@ create_release:
       # Fetch all tags
       git fetch --tags
 
-      # Get the previous tag
-      PREV_TAG=$(git describe --tags --abbrev=0 ${CI_COMMIT_TAG}^)
-      echo "Generating release for ${CI_COMMIT_TAG} (MRs since ${PREV_TAG})"
+      # 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
-      echo "### Changes since ${PREV_TAG}:" > release_notes.md
-      echo "" >> release_notes.md
-      echo "[${PREV_TAG}...${CI_COMMIT_TAG}]($CI_PROJECT_URL/-/compare/${PREV_TAG}...${CI_COMMIT_TAG})" >> release_notes.md
-      echo "" >> release_notes.md
+      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 $PREV_TAG..$CI_COMMIT_TAG --merges --pretty=format:"%b" | grep -oE '!([0-9]+)' | tr -d '!' | sort -u)
+      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
-      # The default merge commit message has this at the end: See merge request gamoreir/test-release-ci!3
       if [ -z "$MR_NUMBERS" ]; then
-        COMMIT_LIST=$(git log --pretty=format:"- #%h from %an <%ae>: %s" ${PREV_TAG}..${CI_COMMIT_TAG})
+        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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cmsdials
-Version: 1.8.0
+Version: 2.0.0rc2
 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.0rc2}/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-2.0.0rc2/cmsdials/_version.py

@@ -0,0 +1,34 @@
+# file generated by setuptools-scm
+# don't change, don't track in version control
+
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
+
+TYPE_CHECKING = False
+if TYPE_CHECKING:
+    from typing import Tuple
+    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 = '2.0.0rc2'
+__version_tuple__ = version_tuple = (2, 0, 0, 'rc2')
+
+__commit_id__ = commit_id = 'g20833ad4f'

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

@@ -11,8 +11,7 @@ class MLBadLumisection(BaseModel):
     file_id: int
     run_number: int
     ls_number: int
-    me_id: int
-    mse: float
+    metric_value: float
 
 
 class PaginatedMLBadLumisectionList(PaginatedBaseModel[MLBadLumisection]):

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cmsdials
-Version: 1.8.0
+Version: 2.0.0rc2
 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/_version.py

@@ -1,21 +0,0 @@
-# file generated by setuptools-scm
-# don't change, don't track in version control
-
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
-
-TYPE_CHECKING = False
-if TYPE_CHECKING:
-    from typing import Tuple
-    from typing import Union
-
-    VERSION_TUPLE = Tuple[Union[int, str], ...]
-else:
-    VERSION_TUPLE = object
-
-version: str
-__version__: str
-__version_tuple__: VERSION_TUPLE
-version_tuple: VERSION_TUPLE
-
-__version__ = version = '1.8.0'
-__version_tuple__ = version_tuple = (1, 8, 0)

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

@@ -1,26 +0,0 @@
-from typing import Optional
-
-from pydantic import BaseModel
-
-from ...utils.base_model import PaginatedBaseFilters, PaginatedBaseModel
-
-
-class MLModelsIndex(BaseModel):
-    model_id: int
-    filename: str
-    target_me: str
-    active: bool
-
-
-class PaginatedMLModelsIndexList(PaginatedBaseModel[MLModelsIndex]):
-    pass
-
-
-class MLModelsIndexFilters(PaginatedBaseFilters):
-    model_id: Optional[int] = None
-    model_id__in: Optional[list[int]] = None
-    filename: Optional[str] = None
-    filename__regex: Optional[str] = None
-    target_me: Optional[str] = None
-    target_me__regex: Optional[str] = None
-    active: Optional[bool] = None