mas-cli 15.8.0__py3-none-any.whl → 15.9.0__py3-none-any.whl

mas/cli/__init__.py

@@ -8,4 +8,4 @@
 #
 # *****************************************************************************
 
-__version__ = "15.8.0"  # Python module compatible semver
+__version__ = "15.9.0"  # Python module compatible semver

mas/cli/aiservice/install/app.py

@@ -599,6 +599,8 @@ class AiServiceInstallApp(BaseApp, aiServiceInstallArgBuilderMixin, aiServiceIns
         self.promptForString("Watsonxai api key", "aiservice_watsonxai_apikey", isPassword=True)
         self.promptForString("Watsonxai machine learning url", "aiservice_watsonxai_url")
         self.promptForString("Watsonxai project id", "aiservice_watsonxai_project_id")
+        if self.yesOrNo("Does the Watsonxai AI use a self-signed certificate?"):
+            self.promptForString("Watsonxai CA certificate (PEM format)", "aiservice_watsonxai_ca_crt")
         self.promptForString("Watsonxai Deployment ID (optional)", "aiservice_watsonxai_deployment_id")
         self.promptForString("Watsonxai Space ID (optional)", "aiservice_watsonxai_space_id")
 

mas/cli/aiservice/install/argBuilder.py

@@ -135,6 +135,8 @@ class aiServiceInstallArgBuilderMixin():
             command += f"  --watsonxai-project-id \"{self.getParam('aiservice_watsonxai_project_id')}\"{newline}"
         if self.getParam('aiservice_watsonx_action') != "":
             command += f"  --watsonx-action \"{self.getParam('aiservice_watsonx_action')}\"{newline}"
+        if self.getParam('aiservice_watsonxai_ca_crt') != "":
+            command += f"  --watsonxai-ca-crt \"{self.getParam('aiservice_watsonxai_ca_crt')}\"{newline}"
         if self.getParam('aiservice_watsonxai_deployment_id'):
             command += f" --watsonxai-deployment-id {self.getParam('aiservice_watsonxai_deployment_id')}\"{newline}"
         if self.getParam('aiservice_watsonxai_space_id'):

mas/cli/aiservice/install/argParser.py

@@ -302,16 +302,22 @@ watsonxArgGroup.add_argument(
     help="Action to perform with WatsonX (install/remove)"
 )
 watsonxArgGroup.add_argument(
-    '--watsonxai-deployment-id',
+    "--watsonxai-ca-crt",
+    dest="aiservice_watsonxai_ca_crt",
+    required=False,
+    help="CA certificate for WatsonX AI (PEM format, optional, only if using self-signed certs)"
+)
+watsonxArgGroup.add_argument(
+    "--watsonxai-deployment-id",
     dest="aiservice_watsonxai_deployment_id",
     required=False,
-    help='WatsonX deployment ID'
+    help="WatsonX deployment ID"
 )
 watsonxArgGroup.add_argument(
-    '--watsonxai-space-id',
+    "--watsonxai-space-id",
     dest="aiservice_watsonxai_space_id",
     required=False,
-    help='WatsonX space ID'
+    help="WatsonX space ID"
 )
 
 

mas/cli/aiservice/install/params.py

@@ -74,6 +74,7 @@ optionalParams = [
     "aiservice_watsonxai_url",
     "aiservice_watsonxai_project_id",
     "aiservice_watsonx_action",
+    "aiservice_watsonxai_ca_crt",
     "aiservice_watsonxai_deployment_id",
     "aiservice_watsonxai_space_id",
 

mas/cli/cli.py

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

mas/cli/install/catalogs.py

@@ -9,10 +9,10 @@
 # *****************************************************************************
 supportedCatalogs = {
     "amd64": [
+        "v9-251010-amd64",
         "v9-250925-amd64",
         "v9-250902-amd64",
         "v9-250828-amd64",
-        "v9-250731-amd64",
     ],
     "s390x": [
         # No "v9-250925-s390x" catalog for the s390x
@@ -20,9 +20,9 @@ supportedCatalogs = {
         "v9-250828-s390x",
     ],
     "ppc64le": [
+        "v9-251010-ppc64le",
         "v9-250925-ppc64le",
         "v9-250902-ppc64le",
         "v9-250828-ppc64le",
-        "v9-250731-ppc64le",
     ],
 }