mas-cli 15.6.3__py3-none-any.whl → 15.7.0__py3-none-any.whl

mas/cli/__init__.py

@@ -8,4 +8,4 @@
 #
 # *****************************************************************************
 
-__version__ = "15.6.3"  # Python module compatible semver
+__version__ = "15.7.0"  # Python module compatible semver

mas/cli/aiservice/install/app.py

@@ -588,10 +588,19 @@ class AiServiceInstallApp(BaseApp, aiServiceInstallArgBuilderMixin, aiServiceIns
             "",
             "The project ID refers to your specific watsonx.ai project where your ML models and assets are stored.",
             "",
+            "Optional identifiers:",
+            " - DeploymentId: ID of the model deployment in a **dedicated watsonx runtime**",
+            "   (e.g., granite-3-2-8b-instruct deployed in your dedicated runtime).",
+            " - SpaceId: ID of the **watsonx deployment space** where deployments are managed.",
+            "Provide these only if you already have them; otherwise AI Service can proceed with defaults/workflows",
+            "that do not require pre-existing deployment/space identifiers.",
+            "",
         ])
         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")
+        self.promptForString("Watsonxai Deployment ID (optional)", "aiservice_watsonxai_deployment_id")
+        self.promptForString("Watsonxai Space ID (optional)", "aiservice_watsonxai_space_id")
 
         self.printH1("RSL Integration")
         self.printDescription([

mas/cli/aiservice/install/argBuilder.py

@@ -135,6 +135,10 @@ 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_deployment_id'):
+            command += f" --watsonxai-deployment-id {self.getParam('aiservice_watsonxai_deployment_id')}\"{newline}"
+        if self.getParam('aiservice_watsonxai_space_id'):
+            command += f" --watsonxai-space-id {self.getParam('aiservice_watsonxai_space_id')}\"{newline}"
 
         if self.getParam('minio_root_user') != "":
             command += f"  --minio-root-user \"{self.getParam('minio_root_user')}\"{newline}"

mas/cli/aiservice/install/argParser.py

@@ -301,6 +301,18 @@ watsonxArgGroup.add_argument(
     required=False,
     help="Action to perform with WatsonX (install/remove)"
 )
+watsonxArgGroup.add_argument(
+    '--watsonxai-deployment-id',
+    dest="aiservice_watsonxai_deployment_id",
+    required=False,
+    help='WatsonX deployment ID'
+)
+watsonxArgGroup.add_argument(
+    '--watsonxai-space-id',
+    dest="aiservice_watsonxai_space_id",
+    required=False,
+    help='WatsonX space ID'
+)
 
 
 # AI Service

mas/cli/aiservice/install/params.py

@@ -74,6 +74,8 @@ optionalParams = [
     "aiservice_watsonxai_url",
     "aiservice_watsonxai_project_id",
     "aiservice_watsonx_action",
+    "aiservice_watsonxai_deployment_id",
+    "aiservice_watsonxai_space_id",
 
     "aiservice_instance_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.6.3"
+        self.version = "15.7.0"
         self.h1count = 0
         self.h2count = 0
 
@@ -146,6 +146,10 @@ class BaseApp(PrintMixin, PromptMixin):
         self.architecture = None
 
         self.compatibilityMatrix = {
+            "9.2.x-feature": {
+                "manage": ["9.2.x-feature", "9.1.x"],
+                "optimizer": ["9.2.x-feature", "9.1.x"],
+            },
             "9.1.x": {
                 "facilities": ["9.1.x"],
                 "assist": ["9.1.x", "9.0.x"],
@@ -207,10 +211,11 @@ class BaseApp(PrintMixin, PromptMixin):
             "9.1.x-feature": " - <u>https://ibm.biz/MAS90-License</u>\n - <u>https://ibm.biz/MaximoIT90-License</u>\n - <u>https://ibm.biz/MAXArcGIS90-License</u>\n\nBe aware, this channel subscription is supported for non-production use only.   \nIt allows early access to new features for evaluation in non-production environments.   \nThis subscription is offered alongside and in parallel with our normal maintained streams.   \nWhen using this subscription, IBM Support will only accept cases for the latest available bundle deployed in a non-production environment.   \nSeverity must be either 3 or 4 and cases cannot be escalated.   \nPlease refer to IBM documentation for more details.\n",
             "9.1.x": " - <u>https://ibm.biz/MAS91-License</u>\n - <u>https://ibm.biz/MAXIT91-License</u>\n - <u>https://ibm.biz/MAXESRI91-License</u>",
             "aibroker-9.1.x": " - <u>https://ibm.biz/MAS91-License</u>",
+            "9.2.x-feature": " - <u>https://ibm.biz/MAS91-License</u>\n - <u>https://ibm.biz/MAXIT91-License</u>\n - <u>https://ibm.biz/MAXESRI91-License</u>\n\nBe aware, this channel subscription is supported for non-production use only.   \nIt allows early access to new features for evaluation in non-production environments.   \nThis subscription is offered alongside and in parallel with our normal maintained streams.   \nWhen using this subscription, IBM Support will only accept cases for the latest available bundle deployed in a non-production environment.   \nSeverity must be either 3 or 4 and cases cannot be escalated.   \nPlease refer to IBM documentation for more details.\n",
         }
 
         self.upgrade_path = {
-            "9.1.x": "9.1.x",
+            "9.1.x": "9.2.x-feature",
             "9.1.x-feature": "9.1.x",
             "9.0.x": "9.1.x",
             "8.11.x": "9.0.x",

mas/cli/install/catalogs.py

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