mas-cli 15.1.3__tar.gz → 15.1.5__tar.gz

{mas_cli-15.1.3 → mas_cli-15.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mas-cli
-Version: 15.1.3
+Version: 15.1.5
 Summary: Python Admin CLI for Maximo Application Suite
 Home-page: https://github.com/ibm-mas/cli
 Author: David Parker

{mas_cli-15.1.3 → mas_cli-15.1.5}/src/mas/cli/__init__.py

@@ -8,4 +8,4 @@
 #
 # *****************************************************************************
 
-__version__ = "15.1.3"  # Python module compatible semver
+__version__ = "15.1.5"  # Python module compatible semver

{mas_cli-15.1.3 → mas_cli-15.1.5}/src/mas/cli/aiservice/install/app.py

@@ -121,7 +121,7 @@ class AiServiceInstallApp(BaseApp, aiServiceInstallArgBuilderMixin, aiServiceIns
 
     @logMethodCall
     def configAibroker(self):
-        self.printH1("Configure Aibroker Instance")
+        self.printH1("Configure AI Service Instance")
         self.printDescription([
             "Instance ID restrictions:",
             " - Must be 3-12 characters long",
@@ -143,6 +143,7 @@ class AiServiceInstallApp(BaseApp, aiServiceInstallArgBuilderMixin, aiServiceIns
 
         self.storageClassProvider = "custom"
         self.slsLicenseFileLocal = None
+        self.showAdvancedOptions = True
 
         # Catalog
         self.configCatalog()
@@ -383,7 +384,7 @@ class AiServiceInstallApp(BaseApp, aiServiceInstallArgBuilderMixin, aiServiceIns
         if not self.devMode:
             self.printDescription([
                 "",
-                "<ForestGreen>Coming Soon!  We are busy putting the finishing touches on Maximo AI Service 9.1 ahead of a re-launch planned for the August 2025 catalog update</ForestGreen>",
+                "<ForestGreen>Coming Soon!  We are busy putting the finishing touches on Maximo AI Service 9.1 ahead of a re-launch planned for the 28 August 2025 catalog update</ForestGreen>",
                 ""
             ])
             exit(1)
@@ -543,7 +544,9 @@ class AiServiceInstallApp(BaseApp, aiServiceInstallArgBuilderMixin, aiServiceIns
         else:
             # Ask for external storage configuration
             self.printDescription(["Configure your external object storage (S3-compatible) connection details:"])
-            self.promptForString("Storage provider", "aiservice_storage_provider")
+            s3Completer = WordCompleter(["aws", "minio"])
+            s3Provider = self.promptForString("Storage provider", completer=s3Completer)
+            self.setParam("aiservice_storage_provider", s3Provider)
             self.promptForString("Storage access key", "aiservice_storage_accesskey")
             self.promptForString("Storage secret key", "aiservice_storage_secretkey", isPassword=True)
             self.promptForString("Storage host", "aiservice_storage_host")
@@ -874,7 +877,7 @@ class AiServiceInstallApp(BaseApp, aiServiceInstallArgBuilderMixin, aiServiceIns
 
     @logMethodCall
     def configAppChannel(self, appId):
-        self.params[f"mas_app_channel_{appId}"] = prompt(HTML('<Yellow>Custom channel for Aibroker</Yellow> '))
+        self.params["aiservice_channel"] = prompt(HTML('<Yellow>Custom channel for AI Service</Yellow> '))
 
     @logMethodCall
     def configOperationMode(self):

{mas_cli-15.1.3 → mas_cli-15.1.5}/src/mas/cli/aiservice/install/argBuilder.py

@@ -80,10 +80,6 @@ class aiServiceInstallArgBuilderMixin():
         # -----------------------------------------------------------------------------
         command += f"  --aiservice-channel \"{self.getParam('aiservice_channel')}\"{newline}"
 
-        # IBM Db2 Universal Operator
-        # -----------------------------------------------------------------------------
-        command += f"  --db2-aiservice{newline}"
-
         # Development Mode
         # -----------------------------------------------------------------------------
         if self.getParam('artifactory_username') != "":
@@ -110,34 +106,34 @@ class aiServiceInstallArgBuilderMixin():
         # Aibroker Advanced Settings
         # -----------------------------------------------------------------------------
         if self.getParam('aiservice_storage_provider') != "":
-            command += f"  --aiservice-storage-provider \"{self.getParam('aiservice_storage_provider')}\"{newline}"
+            command += f"  --s3-provider \"{self.getParam('aiservice_storage_provider')}\"{newline}"
         if self.getParam('aiservice_storage_accesskey') != "":
-            command += f"  --aiservice-storage-accesskey \"{self.getParam('aiservice_storage_accesskey')}\"{newline}"
+            command += f"  --s3-accesskey \"{self.getParam('aiservice_storage_accesskey')}\"{newline}"
         if self.getParam('aiservice_storage_secretkey') != "":
-            command += f"  --aiservice-storage-secretkey \"{self.getParam('aiservice_storage_secretkey')}\"{newline}"
+            command += f"  --s3-secretkey \"{self.getParam('aiservice_storage_secretkey')}\"{newline}"
         if self.getParam('aiservice_storage_host') != "":
-            command += f"  --aiservice-storage-host \"{self.getParam('aiservice_storage_host')}\"{newline}"
+            command += f"  --s3-host \"{self.getParam('aiservice_storage_host')}\"{newline}"
         if self.getParam('aiservice_storage_port') != "":
-            command += f"  --aiservice-storage-port \"{self.getParam('aiservice_storage_port')}\"{newline}"
+            command += f"  --s3-port \"{self.getParam('aiservice_storage_port')}\"{newline}"
         if self.getParam('aiservice_storage_ssl') != "":
-            command += f"  --aiservice-storage-ssl \"{self.getParam('aiservice_storage_ssl')}\"{newline}"
+            command += f"  --s3-ssl \"{self.getParam('aiservice_storage_ssl')}\"{newline}"
         if self.getParam('aiservice_storage_region') != "":
-            command += f"  --aiservice-storage-region \"{self.getParam('aiservice_storage_region')}\"{newline}"
+            command += f"  --s3-region \"{self.getParam('aiservice_storage_region')}\"{newline}"
         if self.getParam('aiservice_storage_pipelines_bucket') != "":
-            command += f"  --aiservice-storage-pipelines-bucket \"{self.getParam('aiservice_storage_pipelines_bucket')}\"{newline}"
+            command += f"  --s3-pipelines-bucket \"{self.getParam('aiservice_storage_pipelines_bucket')}\"{newline}"
         if self.getParam('aiservice_storage_tenants_bucket') != "":
-            command += f"  --aiservice-storage-tenants-bucket \"{self.getParam('aiservice_storage_tenants_bucket')}\"{newline}"
+            command += f"  --s3-tenants-bucket \"{self.getParam('aiservice_storage_tenants_bucket')}\"{newline}"
         if self.getParam('aiservice_storage_templates_bucket') != "":
-            command += f"  --aiservice-storage-templates-bucket \"{self.getParam('aiservice_storage_templates_bucket')}\"{newline}"
+            command += f"  --s3-templates-bucket \"{self.getParam('aiservice_storage_templates_bucket')}\"{newline}"
 
         if self.getParam('aiservice_watsonxai_apikey') != "":
-            command += f"  --aiservice-watsonxai-apikey \"{self.getParam('aiservice_watsonxai_apikey')}\"{newline}"
+            command += f"  --watsonxai-apikey \"{self.getParam('aiservice_watsonxai_apikey')}\"{newline}"
         if self.getParam('aiservice_watsonxai_url') != "":
-            command += f"  --aiservice-watsonxai-url \"{self.getParam('aiservice_watsonxai_url')}\"{newline}"
+            command += f"  --watsonxai-url \"{self.getParam('aiservice_watsonxai_url')}\"{newline}"
         if self.getParam('aiservice_watsonxai_project_id') != "":
-            command += f"  --aiservice-watsonxai-project-id \"{self.getParam('aiservice_watsonxai_project_id')}\"{newline}"
+            command += f"  --watsonxai-project-id \"{self.getParam('aiservice_watsonxai_project_id')}\"{newline}"
         if self.getParam('aiservice_watsonx_action') != "":
-            command += f"  --aiservice-watsonx-action \"{self.getParam('aiservice_watsonx_action')}\"{newline}"
+            command += f"  --watsonx-action \"{self.getParam('aiservice_watsonx_action')}\"{newline}"
 
         if self.getParam('minio_root_user') != "":
             command += f"  --minio-root-user \"{self.getParam('minio_root_user')}\"{newline}"
@@ -152,22 +148,22 @@ class aiServiceInstallArgBuilderMixin():
             command += f"  --tenant-entitlement-end-date \"{self.getParam('tenant_entitlement_end_date')}\"{newline}"
 
         if self.getParam('aiservice_s3_bucket_prefix') != "":
-            command += f"  --aiservice-s3-bucket-prefix \"{self.getParam('aiservice_s3_bucket_prefix')}\"{newline}"
+            command += f"  --s3-bucket-prefix \"{self.getParam('aiservice_s3_bucket_prefix')}\"{newline}"
         if self.getParam('aiservice_s3_endpoint_url') != "":
-            command += f"  --aiservice-s3-endpoint-url \"{self.getParam('aiservice_s3_endpoint_url')}\"{newline}"
+            command += f"  --s3-endpoint-url \"{self.getParam('aiservice_s3_endpoint_url')}\"{newline}"
         if self.getParam('aiservice_s3_region') != "":
-            command += f"  --aiservice-s3-region \"{self.getParam('aiservice_s3_region')}\"{newline}"
+            command += f"  --s3-region \"{self.getParam('aiservice_s3_region')}\"{newline}"
 
         if self.getParam('aiservice_tenant_s3_bucket_prefix') != "":
-            command += f"  --aiservice-tenant-s3-bucket-prefix \"{self.getParam('aiservice_tenant_s3_bucket_prefix')}\"{newline}"
+            command += f"  --s3-bucket-prefix-tenant \"{self.getParam('aiservice_tenant_s3_bucket_prefix')}\"{newline}"
         if self.getParam('aiservice_tenant_s3_region') != "":
-            command += f"  --aiservice-tenant-s3-region \"{self.getParam('aiservice_tenant_s3_region')}\"{newline}"
+            command += f"  --s3-tenant-region \"{self.getParam('aiservice_tenant_s3_region')}\"{newline}"
         if self.getParam('aiservice_tenant_s3_endpoint_url') != "":
-            command += f"  --aiservice-tenant-s3-endpoint-url \"{self.getParam('aiservice_tenant_s3_endpoint_url')}\"{newline}"
+            command += f"  --s3-tenant-endpoint-url \"{self.getParam('aiservice_tenant_s3_endpoint_url')}\"{newline}"
         if self.getParam('aiservice_tenant_s3_access_key') != "":
-            command += f"  --aiservice-tenant-s3-access-key \"{self.getParam('aiservice_tenant_s3_access_key')}\"{newline}"
+            command += f"  --s3-tenant-access-key \"{self.getParam('aiservice_tenant_s3_access_key')}\"{newline}"
         if self.getParam('aiservice_tenant_s3_secret_key') != "":
-            command += f"  --aiservice-tenant-s3-secret-key \"{self.getParam('aiservice_tenant_s3_secret_key')}\"{newline}"
+            command += f"  --s3-tenant-secret-key \"{self.getParam('aiservice_tenant_s3_secret_key')}\"{newline}"
 
         if self.getParam('rsl_url') != "":
             command += f"  --rsl-url \"{self.getParam('rsl_url')}\"{newline}"

{mas_cli-15.1.3 → mas_cli-15.1.5}/src/mas/cli/aiservice/install/argParser.py

@@ -149,7 +149,7 @@ droArgGroup.add_argument(
 droArgGroup.add_argument(
     "--dro-namespace",
     required=False,
-    help=""
+    help="Namespace for the Data Reporting Operator"
 )
 
 # MongoDb Community Operator
@@ -158,7 +158,7 @@ mongoArgGroup = aiServiceinstallArgParser.add_argument_group("MongoDb Community
 mongoArgGroup.add_argument(
     "--mongodb-namespace",
     required=False,
-    help=""
+    help="Namespace for the MongoDB Community Operator"
 )
 
 # MAS Applications
@@ -207,7 +207,7 @@ s3ArgGroup.add_argument(
     "--s3-provider",
     dest="aiservice_storage_provider",
     required=False,
-    help="TODO: Write me"
+    help="S3 storage provider type (e.g., minio, aws)"
 )
 
 # S3 - Bucket Naming
@@ -217,21 +217,21 @@ s3ArgGroup.add_argument(
     dest="aiservice_storage_pipelines_bucket",
     required=False,
     default="km-pipelines",
-    help="TODO: Write me"
+    help="Name of the S3 bucket for pipelines storage"
 )
 s3ArgGroup.add_argument(
     "--s3-tenants-bucket",
     dest="aiservice_storage_tenants_bucket",
     required=False,
     default="km-tenants",
-    help="TODO: Write me"
+    help="Name of the S3 bucket for tenants storage"
 )
 s3ArgGroup.add_argument(
     "--s3-templates-bucket",
     dest="aiservice_storage_templates_bucket",
     required=False,
     default="km-templates",
-    help="TODO: Write me"
+    help="Name of the S3 bucket for templates storage"
 )
 
 # S3 - Bucket Prefixes
@@ -257,37 +257,37 @@ s3ArgGroup.add_argument(
     "--s3-host",
     dest="aiservice_storage_host",
     required=False,
-    help="TODO: Write me"
+    help="Hostname or IP address of the S3 storage service"
 )
 s3ArgGroup.add_argument(
     "--s3-port",
     dest="aiservice_storage_port",
     required=False,
-    help="TODO: Write me"
+    help="Port number for the S3 storage service"
 )
 s3ArgGroup.add_argument(
     "--s3-ssl",
     dest="aiservice_storage_ssl",
     required=False,
-    help="TODO: Write me"
+    help="Enable or disable SSL for S3 connection (true/false)"
 )
 s3ArgGroup.add_argument(
     "--s3-accesskey",
     dest="aiservice_storage_accesskey",
     required=False,
-    help="TODO: Write me"
+    help="Access key for authenticating with the S3 storage service"
 )
 s3ArgGroup.add_argument(
     "--s3-secretkey",
     dest="aiservice_storage_secretkey",
     required=False,
-    help="TODO: Write me"
+    help="Secret key for authenticating with the S3 storage service"
 )
 s3ArgGroup.add_argument(
     "--s3-region",
     dest="aiservice_storage_region",
     required=False,
-    help="TODO: Write me"
+    help="Region for the S3 storage service"
 )
 s3ArgGroup.add_argument(
     "--s3-endpoint-url",
@@ -331,25 +331,25 @@ watsonxArgGroup.add_argument(
     "--watsonxai-apikey",
     dest="aiservice_watsonxai_apikey",
     required=False,
-    help="TODO: Write me"
+    help="API key for WatsonX"
 )
 watsonxArgGroup.add_argument(
     "--watsonxai-url",
     dest="aiservice_watsonxai_url",
     required=False,
-    help="TODO: Write me"
+    help="URL endpoint for WatsonX"
 )
 watsonxArgGroup.add_argument(
     "--watsonxai-project-id",
     dest="aiservice_watsonxai_project_id",
     required=False,
-    help="TODO: Write me"
+    help="Project ID for WatsonX"
 )
 watsonxArgGroup.add_argument(
     "--watsonx-action",
     dest="aiservice_watsonx_action",
     required=False,
-    help="TODO: Write me"
+    help="Action to perform with WatsonX (install/remove)"
 )
 
 

{mas_cli-15.1.3 → mas_cli-15.1.5}/src/mas/cli/cli.py

@@ -117,7 +117,7 @@ class BaseApp(PrintMixin, PromptMixin):
         logging.getLogger('asyncio').setLevel(logging.INFO)
 
         # Supports extended semver, unlike mas.cli.__version__
-        self.version = "15.1.3"
+        self.version = "15.1.5"
         self.h1count = 0
         self.h2count = 0