Merge branch 'dev'

Author: nothingface0

.github/workflows/test_package.yaml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.9", "3.10", "3.11"]
 
     steps:
       - uses: actions/checkout@v4

.vscode/settings.json

@@ -1,5 +1,5 @@
 {
-    "python.pythonPath": "/Users/fabioespinosa/Desktop/runregistry/runregistry_api_client/venv/bin/python3.6",
-    "python.linting.enabled": false,
-    "python.formatting.provider": "yapf"
-}
+  "python.linting.enabled": true,
+  "python.formatting.provider": "ruff",
+  "python.analysis.typeCheckingMode": "basic"
+}

runregistry/runregistry.py

@@ -52,7 +52,7 @@ def setup(target):
         target_application = "cmsrunregistry-sso-proxy"
 
 
-def _get_headers(token: str = None):
+def _get_headers(token: str = ""):
     headers = {"Content-type": "application/json"}
     if not use_cookies:
         headers["email"] = email
@@ -199,7 +199,7 @@ def get_dataset(run_number, dataset_name="online", **kwargs):
     return dataset[0]
 
 
-def get_datasets(limit=40000, compress_attributes=True, **kwargs):
+def get_datasets(limit=40000, compress_attributes=True, **kwargs) -> list:
     """
     Gets all datasets that match the filter given
     :param compress_attributes: Gets the attributes inside rr_attributes:* and the ones in the DatasetTripletCache (The lumisections insdie the run/dataset) and spreads them over the run object
@@ -226,7 +226,7 @@ def get_datasets(limit=40000, compress_attributes=True, **kwargs):
         print(
             "ERROR: For queries that retrieve more than 20,000 datasets, you must pass a filter into get_datasets, an empty filter get_datasets(filter={}) works"
         )
-        return None
+        return []
     for page_number in range(1, page_count):
         additional_datasets = _get_page(
             page=page_number, url=url, data_type="datasets", **kwargs
@@ -251,6 +251,14 @@ def get_datasets(limit=40000, compress_attributes=True, **kwargs):
     return datasets
 
 
+def get_cycles():
+    url = "{}/cycles/global".format(api_url)
+    headers = _get_headers(token=_get_token())
+    if os.getenv("ENVIRONMENT") == "development":
+        print(url)
+    return requests.get(url, headers=headers).json()
+
+
 def _get_lumisection_helper(url, run_number, dataset_name="online", **kwargs):
     """
     Puts the headers for all other lumisection methods
@@ -307,7 +315,7 @@ def generate_json(json_logic, **kwargs):
     DO NOT USE, USE THE ONE BELOW (create_json)...
     It receives a json logic configuration and returns a json with lumisections which pass the filter
     """
-    if isinstance(json_logic, str) == False:
+    if not isinstance(json_logic, str):
         json_logic = json.dumps(json_logic)
     url = "{}/json_creation/generate".format(api_url)
     headers = _get_headers(token=_get_token())
@@ -321,7 +329,7 @@ def create_json(json_logic, dataset_name_filter, **kwargs):
     """
     It adds a json to the queue and polls until json is either finished or an error occured
     """
-    if isinstance(json_logic, str) == False:
+    if not isinstance(json_logic, str):
         json_logic = json.dumps(json_logic)
     url = "{}/json_portal/generate".format(api_url)
 

runregistry/utils.py

@@ -20,7 +20,7 @@ def __parse_runs_arg(runs):
         try:
             runs = int(runs)
             return [runs]
-        except:
+        except Exception:
             return []
     elif isinstance(runs, list):
         return runs
@@ -32,7 +32,7 @@ def transform_to_rr_run_filter(run_filter):
     :param run_filter: a filter that the user inputs into the api client
     :return: returns a filter that runregistry back end understands.
     """
-    if run_filter == None:
+    if not run_filter:
         return {}
     transformed_filter = {}
     for key, value in run_filter.items():
@@ -50,7 +50,7 @@ def transform_to_rr_run_filter(run_filter):
         elif key in run_rr_attributes:
             transformed_filter["rr_attributes." + key] = value
         elif key in run_triplet_attributes:
-            if "=" in value and type(value["="]) == str:
+            if "=" in value and isinstance(value["="], str):
                 # if it is a string, we know for sure its either GOOD, BAD, STANDBY, ETC...
                 value = value["="].upper()
                 if value not in (
@@ -91,7 +91,7 @@ def transform_to_rr_dataset_filter(dataset_filter):
     :param dataset_filter: a filter that the user inputs into the api client
     :return: returns a filter that runregistry back end understands.
     """
-    if dataset_filter == None:
+    if not dataset_filter:
         return {}
     transformed_filter = {}
     for key, value in dataset_filter.items():
@@ -112,7 +112,7 @@ def transform_to_rr_dataset_filter(dataset_filter):
         elif key in dataset_attributes:
             transformed_filter["dataset_attributes." + key] = value
         elif key in dataset_triplet_attributes:
-            if type(value["="]) == str:
+            if isinstance(value["="], str):
                 # if it is a string, we know for sure its either GOOD, BAD, STANDBY, ETC...
                 value = value["="].upper()
             if value not in ("GOOD", "BAD", "STANDBY", "EXCLUDED", "NOTSET", "EMPTY"):