aioli-sdk 1.0.1.dev4__tar.gz → 1.0.1.dev22__tar.gz

{aioli_sdk-1.0.1.dev4 → aioli_sdk-1.0.1.dev22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aioli-sdk
-Version: 1.0.1.dev4
+Version: 1.0.1.dev22
 Summary: Aioli (AI OnLine Inference), a platform for deploying AI models at scale.
 Home-page: https://github.com/determined-ai/aioli
 Author: HPE AI Solutions

{aioli_sdk-1.0.1.dev4 → aioli_sdk-1.0.1.dev22}/aioli/__version__.py

@@ -1,2 +1,2 @@
 # © Copyright 2024 Hewlett Packard Enterprise Development LP
-__version__ = "1.0.1-dev4"
+__version__ = "1.0.1-dev22"

{aioli_sdk-1.0.1.dev4 → aioli_sdk-1.0.1.dev22}/aioli/cli/_util.py

@@ -8,7 +8,7 @@ from aioli.common.api import authentication
 
 
 def setup_session_no_auth(host: str) -> aiolirest.ApiClient:
-    host = prepend_protocol(host)
+    host = util.prepend_protocol(host)
 
     return aiolirest.ApiClient(authentication.get_rest_config(host))
 
@@ -23,7 +23,7 @@ def setup_session(
     else:
         host = args.controller
 
-    host = prepend_protocol(host)
+    host = util.prepend_protocol(host)
 
     configuration = authentication.get_rest_config(host)
 
@@ -40,10 +40,3 @@ def setup_session(
     configuration.api_key["ApiKeyAuth"] = "Bearer " + token
 
     return aiolirest.ApiClient(configuration)
-
-
-def prepend_protocol(host: str) -> str:
-    # If neither http nor https is specified, supply the default of http.
-    if not (host.startswith("http://") or host.startswith("https://")):
-        host = f"http://{host}"
-    return f"{host}/api/v1"

{aioli_sdk-1.0.1.dev4 → aioli_sdk-1.0.1.dev22}/aioli/cli/cli.py

@@ -21,6 +21,7 @@ from aioli.cli.model import args_description as model_args_description
 from aioli.cli.registry import args_description as registry_args_description
 from aioli.cli.role import args_description as role_args_description
 from aioli.cli.sso import args_description as sso_args_description
+from aioli.cli.token import args_description as deployment_token_args_description
 from aioli.cli.user import args_description as user_args_description
 from aioli.cli.version import args_description as version_args_description
 from aioli.cli.version import check_version
@@ -59,6 +60,7 @@ all_args_description: ArgsDescription = (
     + user_args_description
     + role_args_description
     + sso_args_description
+    + deployment_token_args_description
 )
 
 

aioli_sdk-1.0.1.dev22/aioli/cli/token.py

@@ -0,0 +1,221 @@
+# © Copyright 2024 Hewlett Packard Enterprise Development LP
+
+import argparse
+import datetime
+from typing import Any, List
+
+import aioli
+import aioli.cli
+import aioli.cli.errors
+import aioli.cli.render
+import aioli.common.api.authentication
+import aioli.common.declarative_argparse
+import aiolirest
+
+
+def format_token(t: aiolirest.DeploymentToken) -> List[Any]:
+    result = [t.id, t.description, t.username, t.deployment, t.expiration, t.revoked]
+    return result
+
+
+@aioli.common.api.authentication.required
+def create_token(parsed_args: argparse.Namespace) -> None:
+    """Create a deployment token with the provided arguments.
+
+    Invoke the Aioli Tokens API to create the deployment token. Print the ID of the deployment
+    token created on the console.
+
+    Args:
+        parsed_args: command line arguments provided by the user. Includes username, deployment
+        name, description, and expiration.
+    """
+    with aioli.cli.setup_session(parsed_args) as session:
+        tokens_api = aiolirest.TokensApi(session)
+
+    # The Aioli REST API endpoint /tokens has a mandatory field expiration and it
+    # accepts timestamp in only one format, i.e., 2024-06-28T18:41:52-05:00.
+    # If the user provided timestamp doesn't match the expected format. The REST API returns an
+    # error but does not include the expected format. This makes it difficult for the users to
+    # invoke the command successfully.
+    # The validation below is and the error message help the users to quickly change the format
+    # of the timestamp, if needed. This validation can be removed once the REST API is updated
+    # to handle expiration timestamp in a user-friendly way.
+    try:
+        datetime.datetime.strptime(parsed_args.expiration, "%Y-%m-%dT%H:%M:%S%z")
+    except ValueError as e:
+        raise aioli.cli.errors.CliError(
+            f"Failed to parse expiration: {parsed_args.expiration}. "
+            "Expected format: 2024-06-28T18:41:52-05:00"
+        ) from e
+
+    token_request = aiolirest.DeploymentTokenRequest(
+        user=parsed_args.username,
+        deployment=parsed_args.deployment,
+        description=parsed_args.description,
+        expiration=parsed_args.expiration,
+    )
+    token = tokens_api.tokens_post(request=token_request)
+    print(token.id)
+
+
+@aioli.common.api.authentication.required
+def list_tokens(parsed_args: argparse.Namespace) -> None:
+    """List the deployment tokens.
+
+    Invoke the Aioli Tokens API and fetch the deployment tokens. Format and display the deployment
+    tokens on the console as a table.
+    """
+    with aioli.cli.setup_session(parsed_args) as session:
+        tokens_api = aiolirest.TokensApi(session)
+        response = tokens_api.tokens_get()
+
+    if parsed_args.json:
+        tokens = [token.to_dict() for token in response]
+        aioli.cli.render.print_json(tokens)
+    else:
+        headers = ["ID", "Description", "Username", "Deployment", "Expiration", "Revoked"]
+        values = [format_token(t) for t in response]
+        aioli.cli.render.tabulate_or_csv(headers, values, parsed_args.csv)
+
+
+@aioli.common.api.authentication.required
+def get_token(parsed_args: argparse.Namespace) -> None:
+    """Get the deployment token with the provided ID.
+
+    Invoke the Aioli Tokens API to get the deployment token with the provided ID. Display the
+    deployment token details in JSON format on the console.
+
+    Args:
+        parsed_args: command line arguments provided by the user. Includes ID for the deployment
+        token.
+    """
+    with aioli.cli.setup_session(parsed_args) as session:
+        tokens_api = aiolirest.TokensApi(session)
+        token = tokens_api.tokens_id_get(parsed_args.id)
+        if parsed_args.json:
+            aioli.cli.render.print_json(token.to_json())
+        else:
+            token_yaml = aioli.cli.render.format_object_as_yaml(token.to_dict())
+            print(token_yaml)
+
+
+@aioli.common.api.authentication.required
+def delete_token(parsed_args: argparse.Namespace) -> None:
+    """Delete the deployment token with the provided ID.
+
+    Invoke the Aioli Tokens API to delete the deployment token with the provided ID.
+
+    Args:
+        parsed_args: command line arguments provided by the user. Includes ID for the deployment
+        token.
+    """
+    with aioli.cli.setup_session(parsed_args) as session:
+        tokens_api = aiolirest.TokensApi(session)
+        tokens_api.tokens_id_delete(parsed_args.id)
+
+
+@aioli.common.api.authentication.required
+def update_token(parsed_args: argparse.Namespace) -> None:
+    """Update the description for the deployment token with the provided ID.
+
+    Invoke the Aioli Tokens API to update the description for the deployment token with the
+    provided ID.
+
+    Args:
+        parsed_args: command line arguments provided by the user. Includes ID for the deployment
+        token and the updated description.
+    """
+    with aioli.cli.setup_session(parsed_args) as session:
+        tokens_api = aiolirest.TokensApi(session)
+        token_patch_request = aiolirest.DeploymentTokenPatchRequest(
+            description=parsed_args.description,
+        )
+        tokens_api.tokens_id_patch(parsed_args.id, token_patch_request)
+
+
+@aioli.common.api.authentication.required
+def revoke_token(parsed_args: argparse.Namespace) -> None:
+    """Revoke the deployment token with the provided ID.
+
+    Invoke the Aioli Tokens API to revoke the deployment token with the provided ID.
+
+    Args:
+        parsed_args: command line arguments provided by the user. Includes ID for the deployment
+        token to be revoked.
+    """
+    with aioli.cli.setup_session(parsed_args) as session:
+        tokens_api = aiolirest.TokensApi(session)
+        token_patch_request = aiolirest.DeploymentTokenPatchRequest(
+            revoked=True,
+        )
+        tokens_api.tokens_id_patch(parsed_args.id, token_patch_request)
+
+
+# fmt: off
+
+args_description = [
+    aioli.common.declarative_argparse.Cmd("t|oken", None, "manage deployment tokens", [
+        aioli.common.declarative_argparse.Cmd("create", create_token, "create deployment token", [
+            aioli.common.declarative_argparse.Arg(
+                "deployment", help="The deployment for which the token will be created.",
+            ),
+            aioli.common.declarative_argparse.Arg(
+                "--username",
+                help="The username for whom the token will be created. "
+                "If no username is provided, the current user's username will be used."
+            ),
+            aioli.common.declarative_argparse.Arg(
+                "--description", help="Description for the deployment token."
+            ),
+            aioli.common.declarative_argparse.Arg(
+                "--expiration",
+                help="Expiration date for the token. For example, 2024-06-28T18:41:52-05:00",
+            ),
+        ]),
+        aioli.common.declarative_argparse.Cmd(
+            "list ls",
+            list_tokens,
+            "list the deployment tokens",
+            [
+                aioli.common.declarative_argparse.Arg(
+                    "--json", action="store_true",
+                    help="Print the tokens in JSON format.",
+                ),
+                aioli.common.declarative_argparse.Arg(
+                    "--csv", action="store_true",
+                    help="Print the tokens in CSV format.",
+                ),
+            ],
+            is_default=True,
+        ),
+        aioli.common.declarative_argparse.Cmd(
+            "show", get_token, "show the details of the deployment token with given ID", [
+                aioli.common.declarative_argparse.Arg("id", help="ID of the token"),
+                aioli.common.declarative_argparse.Arg(
+                    "--json", action="store_true",
+                    help="Print the token in JSON format.",
+                ),
+            ]
+        ),
+        aioli.common.declarative_argparse.Cmd(
+            "update", update_token, "update the description for deployment token with given ID", [
+                aioli.common.declarative_argparse.Arg("id", help="ID of the token"),
+                aioli.common.declarative_argparse.Arg(
+                    "description", help="New description for the deployment token."
+                ),
+            ]
+        ),
+        aioli.common.declarative_argparse.Cmd(
+            "revoke", revoke_token, "revoke the deployment token with given ID", [
+                aioli.common.declarative_argparse.Arg("id", help="ID of the token"),
+            ]
+        ),
+        aioli.common.declarative_argparse.Cmd(
+            "delete", delete_token, "delete the deployment token with given ID", [
+                aioli.common.declarative_argparse.Arg("id", help="ID of the token"),
+            ]
+        ),
+    ])
+]  # type: List[Any]
+
+# fmt: on

{aioli_sdk-1.0.1.dev4 → aioli_sdk-1.0.1.dev22}/aioli/cli/user.py

@@ -72,7 +72,22 @@ def log_in_user(parsed_args: Namespace) -> None:
     password = getpass.getpass(message)
 
     token_store = authentication.TokenStore(parsed_args.controller)
-    token = authentication.do_login(parsed_args.controller, username, password, certs.cli_cert)
+
+    try:
+        token = authentication.do_login(
+            parsed_args.controller,
+            username,
+            authentication.salt_and_hash(password),
+            True,
+            certs.cli_cert,
+        )
+    except aiolirest.exceptions.ForbiddenException:
+        # log in request was possibly for user that was created before INF-851,
+        # retry log in using the password without apply salt_and_hash
+        token = authentication.do_login(
+            parsed_args.controller, username, password, False, certs.cli_cert
+        )
+
     token_store.set_token(username, token)
     token_store.set_active(username)
 
@@ -104,7 +119,8 @@ def change_password(parsed_args: Namespace) -> None:
     if password != check_password:
         raise errors.CliError("Passwords do not match")
 
-    patch_data = UserPatchRequest(password=password)
+    password = authentication.salt_and_hash(password)
+    patch_data = UserPatchRequest(password=password, isHashed=True)
 
     patch_user(parsed_args, username, patch_data)
 
@@ -112,7 +128,9 @@ def change_password(parsed_args: Namespace) -> None:
     # password change so that the user doesn't have to do so manually.
     if parsed_args.target_user is None:
         token_store = authentication.TokenStore(parsed_args.controller)
-        token = authentication.do_login(parsed_args.controller, username, password, certs.cli_cert)
+        token = authentication.do_login(
+            parsed_args.controller, username, password, True, certs.cli_cert
+        )
         token_store.set_token(username, token)
         token_store.set_active(username)
 
@@ -145,7 +163,8 @@ def create_user(parsed_args: Namespace) -> None:
         displayName=display_name,
         remote=remote,
         roleName=role_name,
-        password=password,
+        password=authentication.salt_and_hash(password),
+        isHashed=True,
     )
     api_instance.users_post(user=new_user)
 

{aioli_sdk-1.0.1.dev4 → aioli_sdk-1.0.1.dev22}/aioli/common/api/authentication.py

@@ -160,7 +160,7 @@ class Authentication:
             password = getpass.getpass("Password for user '{}': ".format(session_user))
 
         try:
-            token = do_login(self.master_address, session_user, password, cert)
+            token = do_login(self.master_address, session_user, salt_and_hash(password), True, cert)
         except api.errors.ForbiddenException:
             if fallback_to_default:
                 raise api.errors.UnauthenticatedException(username=session_user)
@@ -197,13 +197,14 @@ def do_login(
     controller_address: str,
     username: str,
     password: str,
+    isHashed: bool,
     cert: Optional[certs.Cert] = None,
 ) -> str:
     host: str = controller_address
     host = util.prepend_protocol(host)
 
     client = aiolirest.ApiClient(get_rest_config(host))
-    request = aiolirest.LoginRequest(username=username, password=password)
+    request = aiolirest.LoginRequest(username=username, password=password, isHashed=isHashed)
     response = aiolirest.AuthenticationApi(client).login_post(request=request)
 
     token = response.token
@@ -531,8 +532,7 @@ def required(func: Callable[[argparse.Namespace], Any]) -> Callable[..., Any]:
 
     @functools.wraps(func)
     def f(namespace: argparse.Namespace) -> Any:
-        global cli_auth
-        cli_auth = Authentication(namespace.controller, namespace.user)
+        update_cli_auth(namespace)
         return func(namespace)
 
     return f
@@ -542,3 +542,8 @@ def must_cli_auth() -> Authentication:
     if not cli_auth:
         raise api.errors.UnauthenticatedException(username="")
     return cli_auth
+
+
+def update_cli_auth(namespace: argparse.Namespace) -> None:
+    global cli_auth
+    cli_auth = Authentication(namespace.controller, namespace.user)

{aioli_sdk-1.0.1.dev4 → aioli_sdk-1.0.1.dev22}/aioli_sdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aioli-sdk
-Version: 1.0.1.dev4
+Version: 1.0.1.dev22
 Summary: Aioli (AI OnLine Inference), a platform for deploying AI models at scale.
 Home-page: https://github.com/determined-ai/aioli
 Author: HPE AI Solutions

{aioli_sdk-1.0.1.dev4 → aioli_sdk-1.0.1.dev22}/aioli_sdk.egg-info/SOURCES.txt

@@ -15,6 +15,7 @@ aioli/cli/registry.py
 aioli/cli/render.py
 aioli/cli/role.py
 aioli/cli/sso.py
+aioli/cli/token.py
 aioli/cli/user.py
 aioli/cli/version.py
 aioli/cli/test/conftest.py
@@ -53,6 +54,7 @@ aiolirest/api/packaged_models_api.py
 aiolirest/api/registries_api.py
 aiolirest/api/roles_api.py
 aiolirest/api/templates_api.py
+aiolirest/api/tokens_api.py
 aiolirest/api/users_api.py
 aiolirest/models/__init__.py
 aiolirest/models/auto_scaling_template.py
@@ -62,6 +64,9 @@ aiolirest/models/deployment.py
 aiolirest/models/deployment_model_version.py
 aiolirest/models/deployment_request.py
 aiolirest/models/deployment_state.py
+aiolirest/models/deployment_token.py
+aiolirest/models/deployment_token_patch_request.py
+aiolirest/models/deployment_token_request.py
 aiolirest/models/error_response.py
 aiolirest/models/event_info.py
 aiolirest/models/failure_info.py

{aioli_sdk-1.0.1.dev4 → aioli_sdk-1.0.1.dev22}/aiolirest/__init__.py

@@ -7,7 +7,7 @@
 
     HPE MLIS is *Aioli* -- The AI On-line Inference Platform that enables easy deployment, tracking, and serving of your packaged models regardless of your preferred AI framework.
 
-    The version of the OpenAPI document: 1.0.1-dev4
+    The version of the OpenAPI document: 1.0.1-dev22
     Contact: community@determined-ai
     Generated by OpenAPI Generator (https://openapi-generator.tech)
 
@@ -25,6 +25,7 @@ from aiolirest.api.packaged_models_api import PackagedModelsApi
 from aiolirest.api.registries_api import RegistriesApi
 from aiolirest.api.roles_api import RolesApi
 from aiolirest.api.templates_api import TemplatesApi
+from aiolirest.api.tokens_api import TokensApi
 from aiolirest.api.users_api import UsersApi
 
 # import ApiClient
@@ -46,6 +47,9 @@ from aiolirest.models.deployment import Deployment
 from aiolirest.models.deployment_model_version import DeploymentModelVersion
 from aiolirest.models.deployment_request import DeploymentRequest
 from aiolirest.models.deployment_state import DeploymentState
+from aiolirest.models.deployment_token import DeploymentToken
+from aiolirest.models.deployment_token_patch_request import DeploymentTokenPatchRequest
+from aiolirest.models.deployment_token_request import DeploymentTokenRequest
 from aiolirest.models.error_response import ErrorResponse
 from aiolirest.models.event_info import EventInfo
 from aiolirest.models.failure_info import FailureInfo

{aioli_sdk-1.0.1.dev4 → aioli_sdk-1.0.1.dev22}/aiolirest/api/__init__.py

@@ -8,5 +8,6 @@ from aiolirest.api.packaged_models_api import PackagedModelsApi
 from aiolirest.api.registries_api import RegistriesApi
 from aiolirest.api.roles_api import RolesApi
 from aiolirest.api.templates_api import TemplatesApi
+from aiolirest.api.tokens_api import TokensApi
 from aiolirest.api.users_api import UsersApi
 

{aioli_sdk-1.0.1.dev4 → aioli_sdk-1.0.1.dev22}/aiolirest/api/authentication_api.py

@@ -5,7 +5,7 @@
 
     HPE MLIS is *Aioli* -- The AI On-line Inference Platform that enables easy deployment, tracking, and serving of your packaged models regardless of your preferred AI framework.
 
-    The version of the OpenAPI document: 1.0.1-dev4
+    The version of the OpenAPI document: 1.0.1-dev22
     Contact: community@determined-ai
     Generated by OpenAPI Generator (https://openapi-generator.tech)
 

{aioli_sdk-1.0.1.dev4 → aioli_sdk-1.0.1.dev22}/aiolirest/api/deployments_api.py

@@ -5,7 +5,7 @@
 
     HPE MLIS is *Aioli* -- The AI On-line Inference Platform that enables easy deployment, tracking, and serving of your packaged models regardless of your preferred AI framework.
 
-    The version of the OpenAPI document: 1.0.1-dev4
+    The version of the OpenAPI document: 1.0.1-dev22
     Contact: community@determined-ai
     Generated by OpenAPI Generator (https://openapi-generator.tech)
 

{aioli_sdk-1.0.1.dev4 → aioli_sdk-1.0.1.dev22}/aiolirest/api/information_api.py

@@ -5,7 +5,7 @@
 
     HPE MLIS is *Aioli* -- The AI On-line Inference Platform that enables easy deployment, tracking, and serving of your packaged models regardless of your preferred AI framework.
 
-    The version of the OpenAPI document: 1.0.1-dev4
+    The version of the OpenAPI document: 1.0.1-dev22
     Contact: community@determined-ai
     Generated by OpenAPI Generator (https://openapi-generator.tech)
 

{aioli_sdk-1.0.1.dev4 → aioli_sdk-1.0.1.dev22}/aiolirest/api/packaged_models_api.py

@@ -5,7 +5,7 @@
 
     HPE MLIS is *Aioli* -- The AI On-line Inference Platform that enables easy deployment, tracking, and serving of your packaged models regardless of your preferred AI framework.
 
-    The version of the OpenAPI document: 1.0.1-dev4
+    The version of the OpenAPI document: 1.0.1-dev22
     Contact: community@determined-ai
     Generated by OpenAPI Generator (https://openapi-generator.tech)
 

{aioli_sdk-1.0.1.dev4 → aioli_sdk-1.0.1.dev22}/aiolirest/api/registries_api.py

@@ -5,7 +5,7 @@
 
     HPE MLIS is *Aioli* -- The AI On-line Inference Platform that enables easy deployment, tracking, and serving of your packaged models regardless of your preferred AI framework.
 
-    The version of the OpenAPI document: 1.0.1-dev4
+    The version of the OpenAPI document: 1.0.1-dev22
     Contact: community@determined-ai
     Generated by OpenAPI Generator (https://openapi-generator.tech)
 

{aioli_sdk-1.0.1.dev4 → aioli_sdk-1.0.1.dev22}/aiolirest/api/roles_api.py

@@ -5,7 +5,7 @@
 
     HPE MLIS is *Aioli* -- The AI On-line Inference Platform that enables easy deployment, tracking, and serving of your packaged models regardless of your preferred AI framework.
 
-    The version of the OpenAPI document: 1.0.1-dev4
+    The version of the OpenAPI document: 1.0.1-dev22
     Contact: community@determined-ai
     Generated by OpenAPI Generator (https://openapi-generator.tech)
 

{aioli_sdk-1.0.1.dev4 → aioli_sdk-1.0.1.dev22}/aiolirest/api/templates_api.py

@@ -5,7 +5,7 @@
 
     HPE MLIS is *Aioli* -- The AI On-line Inference Platform that enables easy deployment, tracking, and serving of your packaged models regardless of your preferred AI framework.
 
-    The version of the OpenAPI document: 1.0.1-dev4
+    The version of the OpenAPI document: 1.0.1-dev22
     Contact: community@determined-ai
     Generated by OpenAPI Generator (https://openapi-generator.tech)