Pilot 7101: Update the message of new version notification (#210)

* build on testing

* build on testing

* remove the testing code

* update new version notification

* remove the testing pipeline

Author: colorzzr

app/services/output_manager/message_handler.py

@@ -353,12 +353,16 @@ def container_registry_share_project_success(role, project, username):
 
     @staticmethod
     def newer_version_available(version, download_url, print_message=True):
-        clickable_text = f'\033]8;;{download_url}\033\\latest cli version\033]8;;\033\\'
-        message = (
-            f'\nNewer version available! Pilotcli v{version} is available. Please vist \n{clickable_text}. '
-            'This link will expire in 10 minutes. If the link doesn\'t show up, Please visit the \n'
-            'support page on portal to download the latest version.'
-        )
+        message = f"""
+🚀 **Newer Version Available!**
+**Pilotcli v{version}** is now available.
+
+🔗 **Download Here:**
+[Linux Version (v{version})]({download_url})
+
+⏳ **Note:** This link will expire in **10 minutes**.
+If the download link doesn’t work, please visit the **support page** on the portal to get the latest version.
+"""
         if print_message:
             logger.warning(message)
 

app/utils/aggregated.py

@@ -16,7 +16,6 @@
 
 import app.services.logger_services.log_functions as logger
 from app.configs.app_config import AppConfig
-from app.configs.user_config import UserConfig
 from app.models.item import ItemStatus
 from app.models.item import ItemType
 from app.services.clients.base_auth_client import BaseAuthClient
@@ -234,13 +233,17 @@ def remove_the_output_file(filepath: str) -> None:
 
 
 def get_latest_cli_version() -> Tuple[Version, str]:
+    '''
+    Summary:
+        Get the latest version of the CLI and download link
+        from backend.
+    Returns:
+        - latest_version(Version): the latest version of the CLI
+        - download_url(str): the download link of the CLI
+    '''
 
     try:
         httpx_client = BaseClient(AppConfig.Connections.url_fileops_greenroom)
-        user_config = UserConfig()
-        if not user_config.is_access_token_exists():
-            return Version('0.0.0')
-
         headers = {'Authorization': 'Bearer'}
         response = httpx_client._get('v1/download/cli/presigned', headers=headers)
         result = response.json().get('result', {})

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "app"
-version = "3.15.2"
+version = "3.16.0"
 description = "This service is designed to support pilot platform"
 authors = ["Indoc Systems"]
 

tests/app/commands/test_user.py

@@ -93,39 +93,32 @@ def test_login_command_with_newer_version_available_message(
     api_key = fake.pystr(20)
     monkeypatch.setenv('PILOT_API_KEY', api_key)
     login_using_api_key_mock = mocker.patch('app.commands.user.login_using_api_key', return_value=True)
-    access_token_exists = mocker.patch('app.utils.aggregated.UserConfig.is_access_token_exists', return_value=True)
 
     download_url = fake.url()
     httpx_mock.add_response(
         url=AppConfig.Connections.url_fileops_greenroom + '/v1/download/cli/presigned',
         status_code=200,
-        json={'result': {'linux': {'version': new_version, 'url': download_url}}},
+        json={'result': {'linux': {'version': new_version, 'download_url': download_url}}},
     )
     mocker.patch('pkg_resources.get_distribution', return_value=mocker.Mock(version=current_version))
 
     result = cli_runner.invoke(login)
 
     assert result.exit_code == 0
     assert login_using_api_key_mock.called_once_with(api_key)
-    assert access_token_exists.called_once()
     if Version(current_version) < Version(new_version):
-        clickable_text = f'\033]8;;{download_url}\033\\latest cli version\033]8;;\033\\'
-        expected_message = result.output.replace(
-            '\x1b]8;;\x1b\\latest cli version\x1b]8;;\x1b\\', clickable_text
-        ).strip()
-        actual_message = mhandler.SrvOutPutHandler.newer_version_available(
+        except_message = mhandler.SrvOutPutHandler.newer_version_available(
             new_version, download_url, print_message=False
         )
 
-        assert actual_message.strip() == expected_message.split('\n\n')[1].strip()
+        assert except_message in result.output
 
 
 # nothing should be printed out
 def test_login_command_when_url_link_fails(mocker, cli_runner, fake, monkeypatch, httpx_mock):
     api_key = fake.pystr(20)
     monkeypatch.setenv('PILOT_API_KEY', api_key)
     mocker.patch('app.commands.user.login_using_api_key', return_value=True)
-    access_token_exists = mocker.patch('app.utils.aggregated.UserConfig.is_access_token_exists', return_value=True)
 
     httpx_mock.add_response(
         url=AppConfig.Connections.url_fileops_greenroom + '/v1/download/cli/presigned',
@@ -136,17 +129,14 @@ def test_login_command_when_url_link_fails(mocker, cli_runner, fake, monkeypatch
 
     result = cli_runner.invoke(login)
     assert result.exit_code == 0
-    assert access_token_exists.called_once()
 
 
 # nothing should be printed out
 def test_help_command_without_login(mocker, cli_runner, fake, monkeypatch, httpx_mock):
     api_key = fake.pystr(20)
     monkeypatch.setenv('PILOT_API_KEY', api_key)
     mocker.patch('app.commands.user.login_using_api_key', return_value=True)
-    access_token_exists = mocker.patch('app.utils.aggregated.UserConfig.is_access_token_exists', return_value=True)
     mocker.patch('pkg_resources.get_distribution', return_value=mocker.Mock(version='1.0.0'))
 
     result = cli_runner.invoke(login)
     assert result.exit_code == 0
-    assert access_token_exists.called_once()