Merge pull request #743 from MikroElektronika/mikrosdk-2.18.0-release

Fixed the http error

Author: IvanRuzavin

scripts/compare_assets.py

@@ -23,7 +23,7 @@ def fetch_specified_release_version(repo, token, tag):
             print(f'GitHub API attempt {attempt}/5 (timeout=10s)')
             response = requests.get(url, headers=api_headers, timeout=10)
             response.raise_for_status()
-            return support.get_specified_release(response.json(), tag)
+            return support.get_specified_release(repo, api_headers, tag)
 
         except requests.exceptions.RequestException as e:
             last_exception = e
@@ -34,7 +34,7 @@ def fetch_specified_release_version(repo, token, tag):
         print('Final attempt with extended timeout (600s)')
         response = requests.get(url, headers=api_headers, timeout=600)
         response.raise_for_status()
-        return support.get_specified_release(response.json(), tag)
+        return support.get_specified_release(repo, api_headers, tag)
 
     except requests.exceptions.RequestException as e:
         print('\033[91mFinal attempt failed too\033[0m')

scripts/index.py

@@ -42,73 +42,21 @@ def get_headers(api, token):
             'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/50.0.2661.102 Safari/537.36'
         }
 
-def fetch_all_releases(repo, token, api_headers):
-    api_headers = get_headers(True, token)
-    url = f"https://api.github.com/repos/{repo}/releases"
-
-    releases = []
-    params = {
-        "per_page": 100,
-        "page": 1,
-    }
-
-    while True:
-        response = requests.get(url, headers=api_headers, params=params)
-        response.raise_for_status()
-
-        page_releases = response.json()
-        if not page_releases:
-            break
-
-        releases.extend(page_releases)
-
-        if len(page_releases) < params["per_page"]:
-            break
-
-        params["page"] += 1
-
-    return releases
-
 # Function to fetch release details from GitHub
 def fetch_release_details(repo, token, version):
     api_headers = get_headers(True, token)
-    response_acquired = False
-
-    # First: 5 fast attempts (10s timeout)
-    for attempt in range(1, 6):
-        try:
-            print(f'GitHub API attempt {attempt}/5 (timeout=10s)')
-            # Get all releases with pagination
-            all_releases = fetch_all_releases(repo, token, api_headers)
-            response_acquired = True
-            break
-
-        except requests.exceptions.RequestException as e:
-            last_exception = e
-            print(f'\033[93mAttempt {attempt} failed:\033[0m {e}')
-
-    if not response_acquired:
-        # Final fallback attempt (600s timeout)
-        try:
-            print('Final attempt with extended timeout (600s)')
-            # Get all releases with pagination
-            all_releases = fetch_all_releases(repo, token, api_headers)
-
-        except requests.exceptions.RequestException as e:
-            print('\033[91mFinal attempt failed too\033[0m')
-            raise last_exception from e
 
     if "latest" == version:
-        return support.get_latest_release(all_releases), support.get_previous_release(all_releases, True)
+        return support.get_latest_release(repo, api_headers), None
     else:
         release_check = None
-        release_check = support.get_specified_release(all_releases, version)
+        release_check = support.get_specified_release(repo, api_headers, version)
         if release_check:
-            return release_check, support.get_latest_release(all_releases)
+            return release_check, support.get_latest_release(repo, api_headers)
         else:
             ## Always fallback to latest release
             print("WARNING: Falling back to LATEST release.")
-            return support.get_latest_release(all_releases), support.get_previous_release(all_releases, True)
+            return support.get_latest_release(repo, api_headers), None
 
 # Function to fetch content as JSON from the link
 def fetch_json_data(download_link, token):
@@ -514,48 +462,23 @@ def index_release_to_elasticsearch(es : Elasticsearch, index_name, release_detai
 
 def is_release_latest(repo, token, release_version):
     api_headers = get_headers(True, token)
-    url = f'https://api.github.com/repos/{repo}/releases'
-    response_acquired = False
-
-    # First: 5 fast attempts (10s timeout)
-    for attempt in range(1, 6):
-        try:
-            print(f'GitHub API attempt {attempt}/5 (timeout=10s)')
-            # Get all releases with pagination
-            all_releases = fetch_all_releases(repo, token, api_headers)
-            response_acquired = True
-            break
-
-        except requests.exceptions.RequestException as e:
-            last_exception = e
-            print(f'\033[93mAttempt {attempt} failed:\033[0m {e}')
-
-    if not response_acquired:
-        # Final fallback attempt (600s timeout)
-        try:
-            print('Final attempt with extended timeout (600s)')
-            # Get all releases with pagination
-            all_releases = fetch_all_releases(repo, token, api_headers)
-
-        except requests.exceptions.RequestException as e:
-            print('\033[91mFinal attempt failed too\033[0m')
-            raise last_exception from e
 
-    latest_release = support.get_latest_release(all_releases)
+    latest_release = support.get_latest_release(repo, api_headers)
+    specified_release = support.get_specified_release(repo, api_headers, release_version)
     if 'latest' == release_version:
-        return None, True
+        return True
     else:
-        return all_releases, release_version == latest_release['tag_name']
+        return latest_release['tag_name'] == specified_release['tag_name']
 
-def promote_to_latest(releases, repo, token, release_version):
+def promote_to_latest(repo, token, release_version):
     # Headers for authentication
     headers = {
         "Authorization": f"token {token}",
         "Accept": "application/vnd.github+json"
     }
 
     # Step 1: Update the prerelease version and set it as not prerelease
-    selected_release = support.get_specified_release(releases, release_version=release_version)
+    selected_release = support.get_specified_release(repo, headers, release_version)
     if selected_release['prerelease']:
         data_selected_release = {
             "tag_name": selected_release['tag_name'],
@@ -575,7 +498,7 @@ def promote_to_latest(releases, repo, token, release_version):
         raise Exception(f"Failed to update release {selected_release['name']}: {response_1.status_code} - {response_1.text}")
 
     # Step 2: Set the current latest release to prerelease
-    latest_release = support.get_latest_release(releases)
+    latest_release = support.get_latest_release(repo, headers)
     data_latest_release = {
         "prerelease": True
     }
@@ -654,6 +577,6 @@ def str2bool(v):
     # And then promote to latest if requested
     if (args.promote_release_to_latest):
         # If current release isn't latest already
-        releases, is_latest = is_release_latest(args.repo, args.token, args.release_version)
+        is_latest = is_release_latest(args.repo, args.token, args.release_version)
         if (not is_latest):
-            promote_to_latest(releases, args.repo, args.token, args.release_version)
+            promote_to_latest(args.repo, args.token, args.release_version)

scripts/support.py

@@ -13,26 +13,21 @@ class Colors:
     BOLD = '\033[1m'
     UNDERLINE = '\033[4m'
 
-def get_previous_release(releases, prerelases=None):
-    ''' Fetch the previously released version '''
-    for counter, release in enumerate(releases):
-        if not release['draft']:
-            if prerelases:
-                if release['prerelease']:
-                    continue
-            if counter + 1 < len(releases):
-                return releases[counter + 1]
-            else:
-                return None
-    return None
-
-def get_latest_release(releases):
-    ''' Fetch the latest released version '''
-    return next((release for release in releases if not release['prerelease'] and not release['draft']), None)
+def get_latest_release(repo, api_headers):
+    ''' Fetch the version that is labeled as "latest" '''
+    url = f"https://api.github.com/repos/{repo}/releases/latest"
+    resp = requests.get(url, headers=api_headers, timeout=30)
+    resp.raise_for_status()
+    latest_release = resp.json()
+    return latest_release
 
-def get_specified_release(releases, release_version):
-    ''' Fetch the latest released version '''
-    return next((release for release in releases if release_version == release['tag_name']), None)
+def get_specified_release(repo, api_headers, release_version):
+    ''' Fetch the specified released version '''
+    url = f'https://api.github.com/repos/{repo}/releases/tags/{release_version}'
+    resp = requests.get(url, headers=api_headers, timeout=30)
+    resp.raise_for_status()
+    specified_release = resp.json()
+    return specified_release
 
 def determine_archive_type(byte_stream):
     '''

scripts/update_board_changelog.py

@@ -55,7 +55,7 @@ def fetch_latest_release_version(repo, token):
         except requests.exceptions.RequestException as e:
             print('\033[91mFinal attempt failed too\033[0m')
             raise last_exception from e
-    return support.get_latest_release(response.json())
+    return support.get_latest_release(repo, api_headers)
 
 def edit_changelog(version):
     found_file, file_dir = find_file(os.path.join(os.getcwd(), "changelog"), "new_hw.md")