aioli-sdk 1.2.0.dev41__tar.gz → 1.2.0.dev42__tar.gz

{aioli_sdk-1.2.0.dev41 → aioli_sdk-1.2.0.dev42}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aioli-sdk
-Version: 1.2.0.dev41
+Version: 1.2.0.dev42
 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.2.0.dev41 → aioli_sdk-1.2.0.dev42}/aioli/__version__.py

@@ -1,2 +1,2 @@
 # © Copyright 2024 Hewlett Packard Enterprise Development LP
-__version__ = "1.2.0-dev41"
+__version__ = "1.2.0-dev42"

{aioli_sdk-1.2.0.dev41 → aioli_sdk-1.2.0.dev42}/aioli/cli/deployment.py

@@ -29,6 +29,7 @@ def dashboard(args: Namespace) -> None:
 
     deployment: Deployment = lookup_deployment(args.name, api_instance)
 
+    assert deployment.id is not None
     observability = api_instance.deployments_id_observability_get(deployment.id)
     launch_dashboard(args, observability.dashboard_url)
 
@@ -67,12 +68,16 @@ def list_deployments(args: Namespace) -> None:
     model_api = aiolirest.PackagedModelsApi(session)
 
     if args.json:
-        format_json(response, model_api)
+        render.print_json(format_json(response, model_api))
+    elif args.yaml:
+        print(render.format_object_as_yaml(format_json(response, model_api)))
     else:
         format_deployments(response, args, model_api)
 
 
-def format_json(response: List[Deployment], model_api: aiolirest.PackagedModelsApi) -> None:
+def format_json(
+    response: List[Deployment], model_api: aiolirest.PackagedModelsApi
+) -> List[Dict[str, str]]:
     deps = []
     for d in response:
         # Don't use the d.to_json() method as it adds backslash escapes for double quote
@@ -88,7 +93,8 @@ def format_json(response: List[Deployment], model_api: aiolirest.PackagedModelsA
         m_dict["model"] = model.name
         m_dict.pop("clusterName", None)
         deps.append(m_dict)
-    render.print_json(deps)
+
+    return deps
 
 
 def format_deployments(
@@ -314,7 +320,12 @@ def get_deployment_events(args: Namespace) -> None:
             "Event Type",
         ]
         values = [format_events(r) for r in events]
-        render.tabulate_or_csv(headers, values, args.csv)
+        if args.json:
+            render.print_json([e.to_dict() for e in events])
+        elif args.yaml:
+            print(render.format_object_as_yaml([e.to_dict() for e in events]))
+        else:
+            render.tabulate_or_csv(headers, values, args.csv)
 
 
 def str2bool(v: str) -> bool:
@@ -420,6 +431,7 @@ main_cmd = Cmd(
             [
                 Arg("--csv", action="store_true", help="print as CSV"),
                 Arg("--json", action="store_true", help="print as JSON"),
+                Arg("--yaml", action="store_true", help="print as YAML"),
             ],
             is_default=True,
         ),
@@ -511,7 +523,11 @@ main_cmd = Cmd(
             "get deployment events",
             [
                 Arg("name", help="The name of the deployment"),
-                Arg("--csv", action="store_true", help="print as CSV"),
+                Group(
+                    Arg("--csv", action="store_true", help="print as CSV"),
+                    Arg("--json", action="store_true", help="print as JSON"),
+                    Arg("--yaml", action="store_true", help="print as YAML"),
+                ),
             ],
         ),
     ],

{aioli_sdk-1.2.0.dev41 → aioli_sdk-1.2.0.dev42}/aioli/cli/model.py

@@ -1,7 +1,7 @@
 # © Copyright 2023-2024 Hewlett Packard Enterprise Development LP
 import re
 from argparse import Namespace
-from typing import Any, List, Optional
+from typing import Any, Dict, List, Optional
 
 from pydantic import StrictInt
 
@@ -43,12 +43,16 @@ def list_models(args: Namespace) -> None:
     registries_api = aiolirest.RegistriesApi(session)
 
     if args.json:
-        format_json(response, registries_api)
+        render.print_json(format_json(response, registries_api))
+    elif args.yaml:
+        print(render.format_object_as_yaml(format_json(response, registries_api)))
     else:
         format_models(response, args, registries_api)
 
 
-def format_json(response: List[PackagedModel], registries_api: aiolirest.RegistriesApi) -> None:
+def format_json(
+    response: List[PackagedModel], registries_api: aiolirest.RegistriesApi
+) -> List[Dict[str, str]]:
     models = []
     for m in response:
         # Don't use the m.to_json() method as it adds backslash escapes for double quote
@@ -59,7 +63,7 @@ def format_json(response: List[PackagedModel], registries_api: aiolirest.Registr
         d["registry"] = rname
         models.append(d)
 
-    render.print_json(models)
+    return models
 
 
 def format_models(
@@ -193,6 +197,7 @@ def dashboard(args: Namespace) -> None:
 
     model = lookup_model(args.name, api_instance)
 
+    assert model.id is not None
     observability = api_instance.models_id_observability_get(model.id)
     launch_dashboard(args, observability.dashboard_url)
 
@@ -359,8 +364,13 @@ def list_deployments(args: Namespace) -> None:
         "Traffic",
     ]
 
-    values = [format_deployments(r) for r in response]
-    render.tabulate_or_csv(headers, values, args.csv)
+    if args.json:
+        render.print_json([r.to_dict() for r in response])
+    elif args.yaml:
+        print(render.format_object_as_yaml([r.to_dict() for r in response]))
+    else:
+        values = [format_deployments(r) for r in response]
+        render.tabulate_or_csv(headers, values, args.csv)
 
 
 common_model_args: ArgsDescription = [
@@ -430,8 +440,11 @@ main_cmd = Cmd(
                     Arg("--all", action="store_true", help="show all models"),
                     Arg("--name", help="list all versions of model, if specified"),
                 ),
-                Arg("--csv", action="store_true", help="print as CSV"),
-                Arg("--json", action="store_true", help="print as JSON"),
+                Group(
+                    Arg("--csv", action="store_true", help="print as CSV"),
+                    Arg("--json", action="store_true", help="print as JSON"),
+                    Arg("--yaml", action="store_true", help="print as YAML"),
+                ),
             ],
             is_default=True,
         ),
@@ -524,11 +537,15 @@ main_cmd = Cmd(
             list_deployments,
             "list of deployment versions for a packaged model",
             [
-                Arg("--csv", action="store_true", help="print as CSV"),
                 Arg(
                     "name",
                     help=VERSIONED_MODEL_HELP_MSG,
                 ),
+                Group(
+                    Arg("--csv", action="store_true", help="print as CSV"),
+                    Arg("--json", action="store_true", help="print as JSON"),
+                    Arg("--yaml", action="store_true", help="print as YAML"),
+                ),
             ],
         ),
     ],

{aioli_sdk-1.2.0.dev41 → aioli_sdk-1.2.0.dev42}/aioli/cli/registry.py

@@ -2,7 +2,7 @@
 import os
 import textwrap
 from argparse import Namespace
-from typing import Any, List, Optional
+from typing import Any, Dict, List, Optional
 
 from pydantic import StrictInt
 
@@ -27,12 +27,14 @@ def list_registries(args: Namespace) -> None:
         response = api_instance.registries_get()
 
     if args.json:
-        format_json(response)
+        render.print_json(format_json(response))
+    elif args.yaml:
+        print(render.format_object_as_yaml(format_json(response)))
     else:
         format_deployment(response, args)
 
 
-def format_json(response: List[TrainedModelRegistry]) -> None:
+def format_json(response: List[TrainedModelRegistry]) -> List[Dict[str, str]]:
     regs = []
     for r in response:
         # Don't use the r.to_json() method as it adds backslash escapes for double quote
@@ -41,7 +43,7 @@ def format_json(response: List[TrainedModelRegistry]) -> None:
         d.pop("modifiedAt")
         regs.append(d)
 
-    render.print_json(regs)
+    return regs
 
 
 def format_deployment(response: List[TrainedModelRegistry], args: Namespace) -> None:
@@ -256,6 +258,7 @@ def list_models(args: Namespace) -> None:
 
     # The columns displayed depend on the registry type, so adjust the headers accordingly.
     headers = ["Name", "Image", "Size\nGiB", "Description"]
+    assert registry.id is not None
     if registry.type == "openllm":
         headers = ["URL", "Description"]
         for model_format in knownOpenllmModelFormats:
@@ -267,8 +270,13 @@ def list_models(args: Namespace) -> None:
     if registry.type == "pfs":
         headers = ["Name", "URL", "Size\nGiB", "Description"]
 
-    values = [format_model(registry, m) for m in models]
-    render.tabulate_or_csv(headers, values, False)
+    if args.json:
+        render.print_json([m.to_dict() for m in models])
+    elif args.yaml:
+        print(render.format_object_as_yaml([m.to_dict() for m in models]))
+    else:
+        values = [format_model(registry, m) for m in models]
+        render.tabulate_or_csv(headers, values, args.csv)
 
 
 main_cmd = Cmd(
@@ -285,7 +293,8 @@ main_cmd = Cmd(
                 Group(
                     Arg("--csv", action="store_true", help="print as CSV"),
                     Arg("--json", action="store_true", help="print as JSON"),
-                )
+                    Arg("--yaml", action="store_true", help="print as YAML"),
+                ),
             ],
             is_default=True,
         ),
@@ -366,6 +375,11 @@ main_cmd = Cmd(
             "lists the available models in a registry (for certain registry types)",
             [
                 Arg("name", help="The name of the model registry"),
+                Group(
+                    Arg("--csv", action="store_true", help="print as CSV"),
+                    Arg("--json", action="store_true", help="print as JSON"),
+                    Arg("--yaml", action="store_true", help="print as YAML"),
+                ),
             ],
         ),
     ],

{aioli_sdk-1.2.0.dev41 → aioli_sdk-1.2.0.dev42}/aioli/cli/render.py

@@ -128,7 +128,7 @@ def render_objects(
 #     return s
 
 
-def format_object_as_yaml(source: Dict[str, Any]) -> str:
+def format_object_as_yaml(source: Union[Dict[str, Any], List[Dict[str, Any]]]) -> str:
     yaml = YAML(typ="safe", pure=True)
     yaml.default_flow_style = False
     stream = StringIO()

{aioli_sdk-1.2.0.dev41 → aioli_sdk-1.2.0.dev42}/aioli/cli/role.py

@@ -6,8 +6,7 @@ import aiolirest
 from aioli import cli
 from aioli.cli import render
 from aioli.common.api import authentication
-from aioli.common.declarative_argparse import Arg, Cmd
-from aiolirest.models.role import Role
+from aioli.common.declarative_argparse import Arg, Cmd, Group
 from aiolirest.models.role_assignment import RoleAssignment
 from aiolirest.models.role_assignments import RoleAssignments
 
@@ -18,20 +17,18 @@ def list_roles(args: Namespace) -> None:
         api_instance = aiolirest.RolesApi(session)
         response = api_instance.roles_get()
 
-    def format_roles(r: Role) -> List[Any]:
-        result = [
-            r.id,
-            r.role_name,
-        ]
-        return result
-
     headers = [
         "ID",
         "Role Name",
     ]
 
-    values = [format_roles(r) for r in response]
-    render.tabulate_or_csv(headers, values, args.csv)
+    if args.json:
+        render.print_json([r.to_dict() for r in response])
+    elif args.yaml:
+        print(render.format_object_as_yaml([r.to_dict() for r in response]))
+    else:
+        values = [[r.id, r.role_name] for r in response]
+        render.tabulate_or_csv(headers, values, args.csv)
 
 
 @authentication.required
@@ -40,20 +37,18 @@ def list_user_roles(args: Namespace) -> None:
         api_instance = aiolirest.RolesApi(session)
         response = api_instance.roles_assignments_get(args.username)
 
-    def format_assignments(r: RoleAssignment) -> List[Any]:
-        result = [
-            r.user_name,
-            r.role_name,
-        ]
-        return result
-
     headers = [
         "User Name",
         "Role Name",
     ]
 
-    values = [format_assignments(r) for r in response]
-    render.tabulate_or_csv(headers, values, args.csv)
+    if args.json:
+        render.print_json([r.to_dict() for r in response])
+    elif args.yaml:
+        print(render.format_object_as_yaml([r.to_dict() for r in response]))
+    else:
+        values = [[r.user_name, r.role_name] for r in response]
+        render.tabulate_or_csv(headers, values, args.csv)
 
 
 @authentication.required
@@ -88,7 +83,11 @@ main_cmd = Cmd(
             list_roles,
             "list roles",
             [
-                Arg("--csv", action="store_true", help="print as CSV"),
+                Group(
+                    Arg("--csv", action="store_true", help="print as CSV"),
+                    Arg("--json", action="store_true", help="print as JSON"),
+                    Arg("--yaml", action="store_true", help="print as YAML"),
+                ),
             ],
             is_default=True,
         ),
@@ -98,7 +97,11 @@ main_cmd = Cmd(
             "list roles for a user",
             [
                 Arg("username", help="The name of the user"),
-                Arg("--csv", action="store_true", help="print as CSV"),
+                Group(
+                    Arg("--csv", action="store_true", help="print as CSV"),
+                    Arg("--json", action="store_true", help="print as JSON"),
+                    Arg("--yaml", action="store_true", help="print as YAML"),
+                ),
             ],
         ),
         Cmd(

{aioli_sdk-1.2.0.dev41 → aioli_sdk-1.2.0.dev42}/aioli/cli/template.py

@@ -24,6 +24,17 @@ def list_resource_templates(args: Namespace) -> None:
         response = api_instance.templates_resources_get()
 
     def format_resource_template(rt: ResourcesTemplate) -> List[Any]:
+        assert rt is not None
+        assert rt.resources is not None
+        assert rt.resources.requests is not None
+        assert rt.resources.requests.cpu is not None
+        assert rt.resources.requests.gpu is not None
+        assert rt.resources.requests.memory is not None
+        assert rt.resources.limits is not None
+        assert rt.resources.limits.cpu is not None
+        assert rt.resources.limits.gpu is not None
+        assert rt.resources.limits.memory is not None
+
         result = [
             rt.name,
             rt.description,
@@ -34,9 +45,14 @@ def list_resource_templates(args: Namespace) -> None:
         ]
         return result
 
-    headers = ["Name", "Description", "CPU", "Memory", "GPU", "GPU Type"]
-    values = [format_resource_template(rt) for rt in response]
-    render.tabulate_or_csv(headers, values, False)
+    if args.json:
+        render.print_json([r.to_dict() for r in response])
+    elif args.yaml:
+        print(render.format_object_as_yaml([r.to_dict() for r in response]))
+    else:
+        headers = ["Name", "Description", "CPU", "Memory", "GPU", "GPU Type"]
+        values = [format_resource_template(rt) for rt in response]
+        render.tabulate_or_csv(headers, values, args.csv)
 
 
 def lookup_resource_template(name: str, api: aiolirest.TemplatesApi) -> ResourcesTemplate:
@@ -69,7 +85,7 @@ def create_resource_template(args: Namespace) -> None:
             description=args.description,
             name=args.name,
             resources=ConfigurationResources(
-                gpu_type=args.gpu_type,
+                gpuType=args.gpu_type,
                 limits=ResourceProfile(
                     cpu=args.limits_cpu, gpu=args.limits_gpu, memory=args.limits_memory
                 ),
@@ -87,11 +103,16 @@ def update_resource_template(args: Namespace) -> None:
         api_instance = aiolirest.TemplatesApi(session)
         found = lookup_resource_template(args.templatename, api_instance)
 
+        assert found is not None
+        assert found.resources is not None
+        assert found.resources.limits is not None
+        assert found.resources.requests is not None
+
         request = ResourcesTemplateRequest(
             name=found.name,
             description=found.description,
             resources=ConfigurationResources(
-                gpu_type=found.resources.gpu_type,
+                gpuType=found.resources.gpu_type,
                 limits=ResourceProfile(
                     cpu=found.resources.limits.cpu,
                     gpu=found.resources.limits.gpu,
@@ -105,6 +126,11 @@ def update_resource_template(args: Namespace) -> None:
             ),
         )
 
+        assert request is not None
+        assert request.resources is not None
+        assert request.resources.limits is not None
+        assert request.resources.requests is not None
+
         orig_name = found.name
 
         if args.name is not None:
@@ -155,6 +181,10 @@ def list_autoscaling_templates(args: Namespace) -> None:
         response = api_instance.templates_autoscaling_get()
 
     def format_autoscaling_template(at: AutoScalingTemplate) -> List[Any]:
+        assert at is not None
+        assert at.description is not None
+        assert at.auto_scaling is not None
+
         result = [
             at.name,
             at.description,
@@ -165,9 +195,14 @@ def list_autoscaling_templates(args: Namespace) -> None:
         ]
         return result
 
-    headers = ["Name", "Description", "MinReplicas", "MaxReplicas", "Metric", "Target"]
-    values = [format_autoscaling_template(at) for at in response]
-    render.tabulate_or_csv(headers, values, False)
+    if args.json:
+        render.print_json([r.to_dict() for r in response])
+    elif args.yaml:
+        print(render.format_object_as_yaml([r.to_dict() for r in response]))
+    else:
+        headers = ["Name", "Description", "MinReplicas", "MaxReplicas", "Metric", "Target"]
+        values = [format_autoscaling_template(at) for at in response]
+        render.tabulate_or_csv(headers, values, args.csv)
 
 
 def lookup_autoscaling_template(name: str, api: aiolirest.TemplatesApi) -> AutoScalingTemplate:
@@ -197,10 +232,10 @@ def create_autoscaling_template(args: Namespace) -> None:
         api_instance = aiolirest.TemplatesApi(session)
 
         at = AutoScalingTemplateRequest(
-            auto_scaling=Autoscaling(
-                max_replicas=args.autoscaling_max_replicas,
+            autoScaling=Autoscaling(
+                maxReplicas=args.autoscaling_max_replicas,
                 metric=args.autoscaling_metric,
-                min_replicas=args.autoscaling_min_replicas,
+                minReplicas=args.autoscaling_min_replicas,
                 target=args.autoscaling_target,
             ),
             description=args.description,
@@ -215,11 +250,14 @@ def update_autoscaling_template(args: Namespace) -> None:
         api_instance = aiolirest.TemplatesApi(session)
         found = lookup_autoscaling_template(args.templatename, api_instance)
 
+        assert found is not None
+        assert found.auto_scaling is not None
+
         request = AutoScalingTemplateRequest(
-            auto_scaling=Autoscaling(
-                max_replicas=found.auto_scaling.max_replicas,
+            autoScaling=Autoscaling(
+                maxReplicas=found.auto_scaling.max_replicas,
                 metric=found.auto_scaling.metric,
-                min_replicas=found.auto_scaling.min_replicas,
+                minReplicas=found.auto_scaling.min_replicas,
                 target=found.auto_scaling.target,
             ),
             description=found.description,
@@ -228,6 +266,9 @@ def update_autoscaling_template(args: Namespace) -> None:
 
         orig_name = found.name
 
+        assert request is not None
+        assert request.auto_scaling is not None
+
         if args.name is not None:
             request.name = args.name
 
@@ -281,7 +322,18 @@ main_cmd = Cmd(
             None,
             "manage resource templates",
             [
-                Cmd("list ls", list_resource_templates, "list resource templates", []),
+                Cmd(
+                    "list ls",
+                    list_resource_templates,
+                    "list resource templates",
+                    [
+                        Group(
+                            Arg("--csv", action="store_true", help="print as CSV"),
+                            Arg("--json", action="store_true", help="print as JSON"),
+                            Arg("--yaml", action="store_true", help="print as YAML"),
+                        ),
+                    ],
+                ),
                 Cmd(
                     "show",
                     show_resource_template,
@@ -335,7 +387,18 @@ main_cmd = Cmd(
             None,
             "manage autoscaling templates",
             [
-                Cmd("list ls", list_autoscaling_templates, "list autoscaling templates", []),
+                Cmd(
+                    "list ls",
+                    list_autoscaling_templates,
+                    "list autoscaling templates",
+                    [
+                        Group(
+                            Arg("--csv", action="store_true", help="print as CSV"),
+                            Arg("--json", action="store_true", help="print as JSON"),
+                            Arg("--yaml", action="store_true", help="print as YAML"),
+                        ),
+                    ],
+                ),
                 Cmd(
                     "show",
                     show_autoscaling_template,