rhdl 0.1.0.post1729010231__tar.gz → 0.1.0.post1729158829__tar.gz

{rhdl-0.1.0.post1729010231/rhdl.egg-info → rhdl-0.1.0.post1729158829}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rhdl
-Version: 0.1.0.post1729010231
+Version: 0.1.0.post1729158829
 Summary: RHDL CLI module
 Home-page: https://gitlab.cee.redhat.com/rhdl/rhdl
 Author: Distributed CI team

{rhdl-0.1.0.post1729010231 → rhdl-0.1.0.post1729158829/rhdl.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rhdl
-Version: 0.1.0.post1729010231
+Version: 0.1.0.post1729158829
 Summary: RHDL CLI module
 Home-page: https://gitlab.cee.redhat.com/rhdl/rhdl
 Author: Distributed CI team

{rhdl-0.1.0.post1729010231 → rhdl-0.1.0.post1729158829}/rhdlcli/api.py

@@ -2,12 +2,12 @@
 # -*- coding: utf-8 -*-
 import os
 import requests
+import sys
 import time
 
 from concurrent.futures import ThreadPoolExecutor
 from functools import wraps
-from threading import local
-
+from urllib.parse import urljoin
 from rhdlcli.fs import create_parent_dir
 from rhdllib.auth import HmacAuthBase
 
@@ -17,49 +17,19 @@ TEN_SECONDS = 10
 REQUESTS_TIMEOUT = (FIVE_SECONDS, TEN_SECONDS)
 
 
-def build_hmac_context(component_id, base_url, access_key, secret_key):
-    class HmacContext(object):
-        """
-        S3Context builds a request Session() object configured to download
-        files from S3 through a redirection from RHDL API.
-        """
-
-        def __init__(self, base_url, access_key, secret_key):
-            self.threadlocal = local()
-            self.session_auth = HmacAuthBase(
-                access_key, secret_key, service="api", region="us-east-1"
-            )
-            self.base_url = base_url
-
-        @property
-        def session(self):
-            """
-            Each thread must have its own `requests.Session()` instance.
-            `session` is a property looking for `session` object in a
-            thread-local context.
-            """
-            if not hasattr(self.threadlocal, "session"):
-                session = requests.Session()
-                session.auth = self.session_auth
-                session.stream = True
-                self.threadlocal.session = session
-            return self.threadlocal.session
-
-        def get(self, relpath):
-            return self.session.get(
-                "%s/%s" % (self.base_url, relpath.lstrip("/")), timeout=REQUESTS_TIMEOUT
-            )
-
-        def head(self, relpath):
-            # allow_redirects must be set to True to get the final HTTP status
-            return self.session.head(
-                "%s/%s" % (self.base_url, relpath.lstrip("/")),
-                allow_redirects=True,
-                timeout=REQUESTS_TIMEOUT,
-            )
-
-    base_url = "%s/api/v1/components/%s/files" % (base_url, component_id)
-    return HmacContext(base_url, access_key, secret_key)
+class HmacSession(requests.Session):
+    def __init__(self, base_url, access_key, secret_key):
+        self.base_url = base_url
+        self.access_key = access_key
+        self.secret_key = secret_key
+        super(HmacSession, self).__init__()
+
+    def request(self, method, url, *args, **kwargs):
+        url = urljoin(self.base_url, url)
+        auth = HmacAuthBase(
+            self.access_key, self.secret_key, service="api", region="us-east-1"
+        )
+        return super(HmacSession, self).request(method, url, auth=auth, *args, **kwargs)
 
 
 def retry(tries=3, delay=2, multiplier=2):
@@ -87,16 +57,34 @@ def retry(tries=3, delay=2, multiplier=2):
     return decorated_retry
 
 
+def get_component(options):
+    session = HmacSession(
+        base_url=options["base_url"],
+        access_key=options["access_key"],
+        secret_key=options["secret_key"],
+    )
+    compose = options["compose"]
+    r = session.get(
+        f"/api/v1/components?compose_id_startswith={compose}&state=active&sort=-released_at"
+    )
+    r.raise_for_status()
+    components = r.json()["components"]
+    if len(components) <= 0:
+        print(f"No component found with compose id starting with {compose}")
+        sys.exit(1)
+    return components[0]
+
+
 @retry()
-def get_files_list(context):
+def get_files_list(session):
     print("Download file list, it may take a few seconds")
-    r = context.get("rhdl_files_list.json")
+    r = session.get("rhdl_files_list.json")
     r.raise_for_status()
     return r.json()
 
 
 @retry()
-def download_file(context, download_folder, file, i, nb_files):
+def download_file(session, download_folder, file, i, nb_files):
     start_time = time.monotonic()
     relative_file_path = os.path.join(file["path"], file["name"])
     destination = os.path.join(download_folder, relative_file_path)
@@ -105,7 +93,7 @@ def download_file(context, download_folder, file, i, nb_files):
         return
     print(f"({i + 1}/{nb_files}): < Getting {destination}")
     create_parent_dir(destination)
-    r = context.get(relative_file_path)
+    r = session.get(relative_file_path)
     r.raise_for_status()
     with open(destination, "wb") as f:
         for chunk in r.iter_content(chunk_size=1024 * 1024):
@@ -115,14 +103,14 @@ def download_file(context, download_folder, file, i, nb_files):
     return file
 
 
-def download_files(context, download_folder, files):
+def download_files(session, download_folder, files):
     nb_files = len(files)
     with ThreadPoolExecutor(max_workers=10) as executor:
         for file in executor.map(
             download_file,
             *zip(
                 *[
-                    (context, download_folder, file, i, nb_files)
+                    (session, download_folder, file, i, nb_files)
                     for i, file in enumerate(files)
                 ]
             ),

{rhdl-0.1.0.post1729010231 → rhdl-0.1.0.post1729158829}/rhdlcli/cli.py

@@ -6,11 +6,14 @@ from rhdlcli.version import __version__
 
 EXAMPLES = """
 examples:
-  # download the latest RHEL-9.4 compose in the current folder
-  rhdl download RHEL-9.4
+  # Login to RHDL
+  rhdl login
 
-  # download in /tmp/repo folder
-  rhdl download RHEL-9.4 --destination /tmp/repo
+  # download lastest RHEL-10 compose in the current folder
+  rhdl download RHEL-10
+
+  # download latest RHEL-10 in /tmp/repo folder
+  rhdl download RHEL-10 --destination /tmp/repo
 """
 
 COPYRIGHT = """
@@ -50,7 +53,7 @@ class IncludeExcludeAction(argparse.Action):
 
 def parse_arguments(arguments):
     parser = argparse.ArgumentParser(
-        usage="rhdl COMMAND COMPOSE_ID [OPTIONS]",
+        usage="rhdl COMMAND [OPTIONS]",
         description="Download the latest RHEL compose easily.",
         epilog=EXAMPLES + COPYRIGHT,
         formatter_class=argparse.RawDescriptionHelpFormatter,
@@ -59,10 +62,10 @@ def parse_arguments(arguments):
         "command",
         metavar="COMMAND",
         nargs="?",
-        help="Available commands: download",
+        help="Available commands: download, login",
     )
     parser.add_argument(
-        "compose_id", metavar="COMPOSE_ID", nargs="?", help="Compose ID"
+        "compose", metavar="COMPOSE", nargs="?", help="Compose ID or NAME"
     )
     parser.add_argument(
         "-d",

{rhdl-0.1.0.post1729010231 → rhdl-0.1.0.post1729158829}/rhdlcli/downloader.py

@@ -1,11 +1,12 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 import os
-
+from urllib.parse import urljoin
 from rhdlcli.api import (
+    get_component,
     get_files_list,
     download_files,
-    build_hmac_context,
+    HmacSession,
 )
 from rhdlcli.stats import check_download_folder_has_enough_space
 from rhdlcli.files import get_files_to_remove, filter_files
@@ -30,21 +31,19 @@ def clean_download_folder(download_folder, files):
 
 
 def download_component(options):
-    context = build_hmac_context(
-        component_id=options["compose_id"],
-        base_url=options["base_url"],
+    component = get_component(options)
+    session = HmacSession(
+        base_url=urljoin(
+            options["base_url"], f"/api/v1/components/{component['compose_id']}/files/"
+        ),
         access_key=options["access_key"],
         secret_key=options["secret_key"],
     )
-    files_list = get_files_list(context)
-
+    files_list = get_files_list(session)
     files = files_list["files"]
     files = filter_files(files, options["include_and_exclude"])
-
     download_folder = options["destination"]
     clean_download_folder(download_folder, files)
     check_download_folder_has_enough_space(download_folder, files)
-
-    download_files(context, download_folder, files)
-
+    download_files(session, download_folder, files)
     recreate_symlinks(download_folder, files_list["symlinks"])

{rhdl-0.1.0.post1729010231 → rhdl-0.1.0.post1729158829}/rhdlcli/main.py

@@ -6,7 +6,7 @@ import sys
 
 from rhdlcli.cli import parse_arguments
 from rhdlcli.downloader import download_component
-from rhdlcli.options import build_options, configure
+from rhdlcli.options import build_options, login
 from rhdlcli.validator import (
     exit_if_arguments_invalid,
     exit_if_credentials_invalid,
@@ -35,8 +35,8 @@ def main():
     cwd = os.path.dirname(sys.argv[0])
     env_variables = dict(os.environ)
     options = build_options(cwd, arguments, env_variables)
-    if options["command"] == "configure":
-        configure(options)
+    if options["command"] == "login":
+        login(options)
         return
     exit_if_credentials_invalid(options)
     download_component(options)

{rhdl-0.1.0.post1729010231 → rhdl-0.1.0.post1729158829}/rhdlcli/options.py

@@ -39,14 +39,14 @@ def build_options(cwd, arguments, env_variables):
     return options
 
 
-def configure(options):
+def login(options):
     app_config_path = options["app_config_path"]
     if not os.path.exists(app_config_path):
         os.makedirs(app_config_path)
 
     access_key = input("RHDL Access Key [None]: ")
     secret_key = input("RHDL Secret Key [None]:")
-    default_base_url = "https://api.distributed-ci.io"
+    default_base_url = "https://api.rhdl.distributed-ci.io"
     base_url = input(f"RHDL server host [{default_base_url}]:") or default_base_url
     credentials = {
         "base_url": base_url,

{rhdl-0.1.0.post1729010231 → rhdl-0.1.0.post1729158829}/rhdlcli/validator.py

@@ -10,13 +10,13 @@ def credentials_are_defined(options):
 
 def exit_if_credentials_invalid(options):
     if not credentials_are_defined(options):
-        print("Credentials are invalid. Run `rhdl configure` or set env variables.")
+        print("Credentials are invalid. Run `rhdl login` or set env variables.")
         sys.exit(1)
 
 
 def arguments_are_valid(arguments):
     command = arguments["command"]
-    AVAILABLE_COMMANDS = ["download", "configure"]
+    AVAILABLE_COMMANDS = ["download", "login"]
     if arguments["command"] not in AVAILABLE_COMMANDS:
         print(
             f"Invalid command {command}. Available commands are: {','.join(AVAILABLE_COMMANDS)}"

{rhdl-0.1.0.post1729010231 → rhdl-0.1.0.post1729158829}/tests/test_cli.py

@@ -22,8 +22,8 @@ def test_parse_arguments_command_argument():
     assert parse_arguments(["download", "RHEL-9.4"])["command"] == "download"
 
 
-def test_parse_arguments_compose_id_argument():
-    assert parse_arguments(["download", "RHEL-9.4"])["compose_id"] == "RHEL-9.4"
+def test_parse_arguments_compose_argument():
+    assert parse_arguments(["download", "RHEL-9.4"])["compose"] == "RHEL-9.4"
 
 
 def test_parse_arguments_destination_argument():

{rhdl-0.1.0.post1729010231 → rhdl-0.1.0.post1729158829}/tests/test_options.py

@@ -14,7 +14,7 @@ def test_build_options():
     options = build_options(cwd, arguments, env_variables)
     assert options == {
         "command": "download",
-        "compose_id": "RHEL-9.4",
+        "compose": "RHEL-9.4",
         "destination": "/tmp/repo",
         "app_config_path": ANY,
         "base_url": "",
@@ -45,7 +45,7 @@ def test_build_options_transform_relative_folder_into_absolute_folder():
 
 
 def test_build_options_read_XDG_CONFIG_HOME_env_variable_for_app_config_path():
-    arguments = parse_arguments(["configure"])
+    arguments = parse_arguments(["login"])
     cwd = "/tmp"
     env_variables = {"RHDL_BASE_URL": "", "RHDL_ACCESS_KEY": "", "RHDL_SECRET_KEY": ""}
     assert build_options(cwd, arguments, env_variables)["app_config_path"].endswith(

{rhdl-0.1.0.post1729010231 → rhdl-0.1.0.post1729158829}/tests/test_validator.py

@@ -34,5 +34,5 @@ def test_credentials_are_defined():
     )
 
 
-def test_arguments_are_valid_with_configure_command():
-    assert arguments_are_valid(parse_arguments(["configure"]))
+def test_arguments_are_valid_with_login_command():
+    assert arguments_are_valid(parse_arguments(["login"]))