mas-cli 15.1.10__py3-none-any.whl → 15.1.12__py3-none-any.whl

mas/cli/__init__.py

@@ -8,4 +8,4 @@
 #
 # *****************************************************************************
 
-__version__ = "15.1.10"  # Python module compatible semver
+__version__ = "15.1.12"  # Python module compatible semver

mas/cli/aiservice/install/app.py

@@ -204,18 +204,19 @@ class AiServiceInstallApp(BaseApp, aiServiceInstallArgBuilderMixin, aiServiceIns
 
             elif key == "install_minio_aiservice":
                 incompatibleWithMinioInstall = [
-                    "aiservice_storage_provider",
-                    "aiservice_storage_accesskey",
-                    "aiservice_storage_secretkey",
-                    "aiservice_storage_host",
-                    "aiservice_storage_port",
-                    "aiservice_storage_ssl",
-                    "aiservice_s3_endpoint_url",
-                    "aiservice_storage_region",
-                    "aiservice_tenant_s3_access_key",
-                    "aiservice_tenant_s3_secret_key",
-                    "aiservice_tenant_s3_endpoint_url",
-                    "aiservice_tenant_s3_region"
+                    # "aiservice_s3_provider",
+                    "aiservice_s3_accesskey",
+                    "aiservice_s3_secretkey",
+                    "aiservice_s3_host",
+                    "aiservice_s3_port",
+                    "aiservice_s3_ssl",
+                    "aiservice_s3_bucket_prefix",
+                    # "aiservice_s3_endpoint_url",
+                    "aiservice_s3_region",
+                    # "aiservice_tenant_s3_access_key",
+                    # "aiservice_tenant_s3_secret_key",
+                    # "aiservice_tenant_s3_endpoint_url",
+                    # "aiservice_tenant_s3_region"
                 ]
                 if value is None:
                     for uKey in incompatibleWithMinioInstall:
@@ -230,23 +231,24 @@ class AiServiceInstallApp(BaseApp, aiServiceInstallArgBuilderMixin, aiServiceIns
                         if vars(self.args)[rKey] is None:
                             self.fatalError(f"Missing required parameter for --install-minio: {rKey}")
 
-                    self.setParam("aiservice_storage_provider", "minio")
+                    # self.setParam("aiservice_s3_provider", "minio")
 
-                    self.setParam("aiservice_storage_accesskey", self.args.minio_root_user)
-                    self.setParam("aiservice_storage_secretkey", self.args.minio_root_password)
+                    self.setParam("aiservice_s3_accesskey", self.args.minio_root_user)
+                    self.setParam("aiservice_s3_secretkey", self.args.minio_root_password)
 
                     # TODO: Duplication -- we already have the URL, why do we need all the individual parts,
                     # especially when we don't need them for the tenant?
-                    self.setParam("aiservice_storage_host", "minio-service.minio.svc.cluster.local")
-                    self.setParam("aiservice_storage_port", "9000")
-                    self.setParam("aiservice_storage_ssl", "false")
-                    self.setParam("aiservice_s3_endpoint_url", "http://minio-service.minio.svc.cluster.local:9000")
-                    self.setParam("aiservice_storage_region", "none")
-
-                    self.setParam("aiservice_tenant_s3_access_key", self.args.minio_root_user)
-                    self.setParam("aiservice_tenant_s3_secret_key", self.args.minio_root_password)
-                    self.setParam("aiservice_tenant_s3_endpoint_url", "http://minio-service.minio.svc.cluster.local:9000")
-                    self.setParam("aiservice_tenant_s3_region", "none")
+                    self.setParam("aiservice_s3_host", "minio-service.minio.svc.cluster.local")
+                    self.setParam("aiservice_s3_port", "9000")
+                    self.setParam("aiservice_s3_ssl", "false")
+                    # self.setParam("aiservice_s3_endpoint_url", "http://minio-service.minio.svc.cluster.local:9000")
+                    self.setParam("aiservice_s3_region", "none")
+                    self.setParam("aiservice_s3_bucket_prefix", "aiservice")
+
+                    # self.setParam("aiservice_tenant_s3_access_key", self.args.minio_root_user)
+                    # self.setParam("aiservice_tenant_s3_secret_key", self.args.minio_root_password)
+                    # self.setParam("aiservice_tenant_s3_endpoint_url", "http://minio-service.minio.svc.cluster.local:9000")
+                    # self.setParam("aiservice_tenant_s3_region", "none")
                 else:
                     self.fatalError(f"Unsupported value for --install-minio: {value}")
 
@@ -544,21 +546,21 @@ class AiServiceInstallApp(BaseApp, aiServiceInstallArgBuilderMixin, aiServiceIns
         else:
             # Ask for external storage configuration
             self.printDescription(["Configure your external object storage (S3-compatible) connection details:"])
-            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")
-            self.promptForString("Storage port", "aiservice_storage_port")
-            self.promptForString("Storage ssl", "aiservice_storage_ssl")
-            self.promptForString("Storage region", "aiservice_storage_region")
-            self.promptForString("Storage pipelines bucket", "aiservice_storage_pipelines_bucket")
-            self.promptForString("Storage tenants bucket", "aiservice_storage_tenants_bucket")
-            self.promptForString("Storage templates bucket", "aiservice_storage_templates_bucket")
+            # s3_completer = WordCompleter(["aws", "minio"])
+            # s3_provider = self.promptForString("Storage provider", completer=s3_completer)
+            # self.setParam("aiservice_s3_provider", s3_provider)
+            self.promptForString("Storage access key", "aiservice_s3_accesskey")
+            self.promptForString("Storage secret key", "aiservice_s3_secretkey", isPassword=True)
+            self.promptForString("Storage host", "aiservice_s3_host")
+            self.promptForString("Storage port", "aiservice_s3_port")
+            self.promptForString("Storage ssl", "aiservice_s3_ssl")
+            self.promptForString("Storage region", "aiservice_s3_region")
+            self.promptForString("Storage bucket prefix", "aiservice_s3_bucket_prefix")
+            self.promptForString("Storage tenants bucket", "aiservice_s3_tenants_bucket")
+            self.promptForString("Storage templates bucket", "aiservice_s3_templates_bucket")
 
         # S3 parameters are now auto-derived from storage configuration
-        self._deriveS3ParametersFromStorage()
+        # self._deriveS3ParametersFromStorage()
 
     def aiServiceTenantSettings(self) -> None:
         self.printH1("AI Service Tenant Settings")
@@ -566,65 +568,65 @@ class AiServiceInstallApp(BaseApp, aiServiceInstallArgBuilderMixin, aiServiceIns
         self.promptForString("Tenant start date", "tenant_entitlement_start_date")
         self.promptForString("Tenant end date", "tenant_entitlement_end_date")
 
-    def _deriveS3ParametersFromStorage(self) -> None:
-        """
-        Auto-derive S3 and tenant S3 parameters from the aiservice_storage_* parameters.
-        This reuses the values provided for kmodel object storage to avoid redundant prompts.
-        """
-        storage_provider = self.getParam("aiservice_storage_provider")
-        storage_host = self.getParam("aiservice_storage_host")
-        storage_port = self.getParam("aiservice_storage_port")
-        storage_ssl = self.getParam("aiservice_storage_ssl")
-        storage_region = self.getParam("aiservice_storage_region")
-        storage_accesskey = self.getParam("aiservice_storage_accesskey")
-        storage_secretkey = self.getParam("aiservice_storage_secretkey")
-
-        # Build endpoint URL from storage configuration
-        protocol = "https" if storage_ssl == "true" else "http"
-
-        if storage_provider == "minio":
-            endpoint_url = f"{protocol}://{storage_host}:{storage_port}"
-        elif storage_provider == "s3":
-            # For AWS S3, construct proper endpoint
-            if storage_region and storage_region != "none":
-                endpoint_url = f"{protocol}://s3.{storage_region}.amazonaws.com"
-            else:
-                endpoint_url = f"{protocol}://s3.amazonaws.com"
-        else:
-            # For other providers, construct basic endpoint
-            endpoint_url = f"{protocol}://{storage_host}:{storage_port}" if storage_port else f"{protocol}://{storage_host}"
-
-        # Set S3 parameters (reusing storage configuration)
-        self.setParam("aiservice_s3_bucket_prefix", "aiservice")  # Default prefix
-        if endpoint_url:
-            self.setParam("aiservice_s3_endpoint_url", endpoint_url)
-        self.setParam("aiservice_s3_region", storage_region if storage_region else "none")
-
-        # Set tenant S3 parameters (reusing same storage configuration)
-        self.setParam("aiservice_tenant_s3_bucket_prefix", "tenant")  # Default tenant prefix
-        self.setParam("aiservice_tenant_s3_access_key", storage_accesskey)
-        self.setParam("aiservice_tenant_s3_secret_key", storage_secretkey)
-        if endpoint_url:
-            self.setParam("aiservice_tenant_s3_endpoint_url", endpoint_url)
-        self.setParam("aiservice_tenant_s3_region", storage_region if storage_region else "none")
+    # def _deriveS3ParametersFromStorage(self) -> None:
+    #     """
+    #     Auto-derive S3 and tenant S3 parameters from the aiservice_s3_* parameters.
+    #     This reuses the values provided for kmodel object storage to avoid redundant prompts.
+    #     """
+    #     storage_provider = self.getParam("aiservice_s3_provider")
+    #     storage_host = self.getParam("aiservice_s3_host")
+    #     storage_port = self.getParam("aiservice_s3_port")
+    #     storage_ssl = self.getParam("aiservice_s3_ssl")
+    #     storage_region = self.getParam("aiservice_s3_region")
+    #     storage_bucket_prefix = self.getParam("aiservice_s3_bucket_prefix")
+    #     storage_accesskey = self.getParam("aiservice_s3_accesskey")
+    #     storage_secretkey = self.getParam("aiservice_s3_secretkey")
+
+    #     # Build endpoint URL from storage configuration
+    #     protocol = "https" if storage_ssl == "true" else "http"
+
+    #     if storage_provider == "minio":
+    #         endpoint_url = f"{protocol}://{storage_host}:{storage_port}"
+    #     elif storage_provider == "aws":
+    #         # For AWS S3, construct proper endpoint
+    #         if storage_region and storage_region != "none":
+    #             endpoint_url = f"{protocol}://s3.{storage_region}.amazonaws.com"
+    #         else:
+    #             endpoint_url = f"{protocol}://s3.amazonaws.com"
+    #     else:
+    #         # For other providers, construct basic endpoint
+    #         endpoint_url = f"{protocol}://{storage_host}:{storage_port}" if storage_port else f"{protocol}://{storage_host}"
+
+    #     # Set S3 parameters (reusing storage configuration)
+    #     if endpoint_url:
+    #         self.setParam("aiservice_s3_endpoint_url", endpoint_url)
+    #     self.setParam("aiservice_s3_region", storage_region if storage_region else "none")
+
+    #     # Set tenant S3 parameters (reusing same storage configuration)
+    #     self.setParam("aiservice_tenant_s3_bucket_prefix", "tenant")  # Default tenant prefix
+    #     self.setParam("aiservice_tenant_s3_access_key", storage_accesskey)
+    #     self.setParam("aiservice_tenant_s3_secret_key", storage_secretkey)
+    #     if endpoint_url:
+    #         self.setParam("aiservice_tenant_s3_endpoint_url", endpoint_url)
+    #     self.setParam("aiservice_tenant_s3_region", storage_region if storage_region else "none")
 
     def _setMinioStorageDefaults(self) -> None:
         """
         Set MinIO storage defaults when MinIO is being installed in-cluster.
         This mirrors the logic from non-interactive mode.
         """
-        self.setParam("aiservice_storage_provider", "minio")
-        self.setParam("aiservice_storage_accesskey", self.getParam("minio_root_user"))
-        self.setParam("aiservice_storage_secretkey", self.getParam("minio_root_password"))
-        self.setParam("aiservice_storage_host", "minio-service.minio.svc.cluster.local")
-        self.setParam("aiservice_storage_port", "9000")
-        self.setParam("aiservice_storage_ssl", "false")
-        self.setParam("aiservice_storage_region", "none")
+        # self.setParam("aiservice_s3_provider", "minio")
+        self.setParam("aiservice_s3_accesskey", self.getParam("minio_root_user"))
+        self.setParam("aiservice_s3_secretkey", self.getParam("minio_root_password"))
+        self.setParam("aiservice_s3_host", "minio-service.minio.svc.cluster.local")
+        self.setParam("aiservice_s3_port", "9000")
+        self.setParam("aiservice_s3_ssl", "false")
+        self.setParam("aiservice_s3_region", "none")
+        self.setParam("aiservice_s3_bucket_prefix", "aiservice")
 
         # Set default bucket names
-        self.setParam("aiservice_storage_pipelines_bucket", "km-pipelines")
-        self.setParam("aiservice_storage_tenants_bucket", "km-tenants")
-        self.setParam("aiservice_storage_templates_bucket", "km-templates")
+        self.setParam("aiservice_s3_tenants_bucket", "km-tenants")
+        self.setParam("aiservice_s3_templates_bucket", "km-templates")
 
     def aiServiceIntegrations(self) -> None:
         self.printH1("WatsonX Integration")

mas/cli/aiservice/install/argBuilder.py

@@ -103,28 +103,28 @@ class aiServiceInstallArgBuilderMixin():
         if self.getParam('service_account_name') != "":
             command += f"  --service-account {self.getParam('service_account_name')}{newline}"
 
-        # Aibroker Advanced Settings
+        # AI Service Advanced Settings
         # -----------------------------------------------------------------------------
-        if self.getParam('aiservice_storage_provider') != "":
-            command += f"  --s3-provider \"{self.getParam('aiservice_storage_provider')}\"{newline}"
-        if self.getParam('aiservice_storage_accesskey') != "":
-            command += f"  --s3-accesskey \"{self.getParam('aiservice_storage_accesskey')}\"{newline}"
-        if self.getParam('aiservice_storage_secretkey') != "":
-            command += f"  --s3-secretkey \"{self.getParam('aiservice_storage_secretkey')}\"{newline}"
-        if self.getParam('aiservice_storage_host') != "":
-            command += f"  --s3-host \"{self.getParam('aiservice_storage_host')}\"{newline}"
-        if self.getParam('aiservice_storage_port') != "":
-            command += f"  --s3-port \"{self.getParam('aiservice_storage_port')}\"{newline}"
-        if self.getParam('aiservice_storage_ssl') != "":
-            command += f"  --s3-ssl \"{self.getParam('aiservice_storage_ssl')}\"{newline}"
-        if self.getParam('aiservice_storage_region') != "":
-            command += f"  --s3-region \"{self.getParam('aiservice_storage_region')}\"{newline}"
-        if self.getParam('aiservice_storage_pipelines_bucket') != "":
-            command += f"  --s3-pipelines-bucket \"{self.getParam('aiservice_storage_pipelines_bucket')}\"{newline}"
-        if self.getParam('aiservice_storage_tenants_bucket') != "":
-            command += f"  --s3-tenants-bucket \"{self.getParam('aiservice_storage_tenants_bucket')}\"{newline}"
-        if self.getParam('aiservice_storage_templates_bucket') != "":
-            command += f"  --s3-templates-bucket \"{self.getParam('aiservice_storage_templates_bucket')}\"{newline}"
+        # if self.getParam('aiservice_s3_provider') != "":
+        #     command += f"  --s3-provider \"{self.getParam('aiservice_s3_provider')}\"{newline}"
+        if self.getParam('aiservice_s3_accesskey') != "":
+            command += f"  --s3-accesskey \"{self.getParam('aiservice_s3_accesskey')}\"{newline}"
+        if self.getParam('aiservice_s3_secretkey') != "":
+            command += f"  --s3-secretkey \"{self.getParam('aiservice_s3_secretkey')}\"{newline}"
+        if self.getParam('aiservice_s3_host') != "":
+            command += f"  --s3-host \"{self.getParam('aiservice_s3_host')}\"{newline}"
+        if self.getParam('aiservice_s3_port') != "":
+            command += f"  --s3-port \"{self.getParam('aiservice_s3_port')}\"{newline}"
+        if self.getParam('aiservice_s3_ssl') != "":
+            command += f"  --s3-ssl \"{self.getParam('aiservice_s3_ssl')}\"{newline}"
+        if self.getParam('aiservice_s3_region') != "":
+            command += f"  --s3-region \"{self.getParam('aiservice_s3_region')}\"{newline}"
+        if self.getParam('aiservice_s3_bucket_prefix') != "":
+            command += f"  --s3-bucket-prefix \"{self.getParam('aiservice_s3_bucket_prefix')}\"{newline}"
+        if self.getParam('aiservice_s3_tenants_bucket') != "":
+            command += f"  --s3-tenants-bucket \"{self.getParam('aiservice_s3_tenants_bucket')}\"{newline}"
+        if self.getParam('aiservice_s3_templates_bucket') != "":
+            command += f"  --s3-templates-bucket \"{self.getParam('aiservice_s3_templates_bucket')}\"{newline}"
 
         if self.getParam('aiservice_watsonxai_apikey') != "":
             command += f"  --watsonxai-apikey \"{self.getParam('aiservice_watsonxai_apikey')}\"{newline}"
@@ -147,24 +147,6 @@ class aiServiceInstallArgBuilderMixin():
         if self.getParam('tenant_entitlement_end_date') != "":
             command += f"  --tenant-entitlement-end-date \"{self.getParam('tenant_entitlement_end_date')}\"{newline}"
 
-        if self.getParam('aiservice_s3_bucket_prefix') != "":
-            command += f"  --s3-bucket-prefix \"{self.getParam('aiservice_s3_bucket_prefix')}\"{newline}"
-        if self.getParam('aiservice_s3_endpoint_url') != "":
-            command += f"  --s3-endpoint-url \"{self.getParam('aiservice_s3_endpoint_url')}\"{newline}"
-        if self.getParam('aiservice_s3_region') != "":
-            command += f"  --s3-region \"{self.getParam('aiservice_s3_region')}\"{newline}"
-
-        if self.getParam('aiservice_tenant_s3_bucket_prefix') != "":
-            command += f"  --s3-bucket-prefix-tenant \"{self.getParam('aiservice_tenant_s3_bucket_prefix')}\"{newline}"
-        if self.getParam('aiservice_tenant_s3_region') != "":
-            command += f"  --s3-tenant-region \"{self.getParam('aiservice_tenant_s3_region')}\"{newline}"
-        if self.getParam('aiservice_tenant_s3_endpoint_url') != "":
-            command += f"  --s3-tenant-endpoint-url \"{self.getParam('aiservice_tenant_s3_endpoint_url')}\"{newline}"
-        if self.getParam('aiservice_tenant_s3_access_key') != "":
-            command += f"  --s3-tenant-access-key \"{self.getParam('aiservice_tenant_s3_access_key')}\"{newline}"
-        if self.getParam('aiservice_tenant_s3_secret_key') != "":
-            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}"
         if self.getParam('rsl_org_id') != "":

mas/cli/aiservice/install/argParser.py

@@ -168,17 +168,26 @@ masAppsArgGroup = aiServiceinstallArgParser.add_argument_group("MAS Applications
 masAppsArgGroup.add_argument(
     "--aiservice-channel",
     required=False,
-    help="Subscription channel for Maximo Ai Broker"
+    help="Subscription channel for Maximo AI Service"
 )
 
-# AI Broker
+# AI Service
 # -----------------------------------------------------------------------------
-aibrokerArgGroup = aiServiceinstallArgParser.add_argument_group("Maximo AI Broker")
+aiServiceArgGroup = aiServiceinstallArgParser.add_argument_group("Maximo AI Service")
 
+# S3 - General
+# -----------------------------------------------------------------------------
+s3ArgGroup = aiServiceinstallArgParser.add_argument_group("S3 Storage")
+
+# s3ArgGroup.add_argument(
+#     "--s3-provider",
+#     dest="aiservice_s3_provider",
+#     required=False,
+#     help="S3 storage provider type (e.g., minio, aws)"
+# )
 
 # S3 - Minio
 # -----------------------------------------------------------------------------
-s3ArgGroup = aiServiceinstallArgParser.add_argument_group("S3 Storage")
 s3ArgGroup.add_argument(
     "--install-minio",
     dest="install_minio_aiservice",
@@ -201,126 +210,66 @@ s3ArgGroup.add_argument(
     help="Password for minio root user"
 )
 
-# S3 - General
-# -----------------------------------------------------------------------------
-s3ArgGroup.add_argument(
-    "--s3-provider",
-    dest="aiservice_storage_provider",
-    required=False,
-    help="S3 storage provider type (e.g., minio, aws)"
-)
-
-# S3 - Bucket Naming
-# -----------------------------------------------------------------------------
-s3ArgGroup.add_argument(
-    "--s3-pipelines-bucket",
-    dest="aiservice_storage_pipelines_bucket",
-    required=False,
-    default="km-pipelines",
-    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="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="Name of the S3 bucket for templates storage"
-)
-
-# S3 - Bucket Prefixes
-# -----------------------------------------------------------------------------
-s3ArgGroup.add_argument(
-    "--s3-bucket-prefix",
-    dest="aiservice_s3_bucket_prefix",
-    required=False,
-    default="s3",
-    help="s3 bucket prefix"
-)
-s3ArgGroup.add_argument(
-    "--s3-bucket-prefix-tenant",
-    dest="aiservice_tenant_s3_bucket_prefix",
-    required=False,
-    default="s3",
-    help="s3 bucket prefix ( tenant level )"
-)
-
 # S3 - External Connection
 # -----------------------------------------------------------------------------
 s3ArgGroup.add_argument(
     "--s3-host",
-    dest="aiservice_storage_host",
+    dest="aiservice_s3_host",
     required=False,
     help="Hostname or IP address of the S3 storage service"
 )
 s3ArgGroup.add_argument(
     "--s3-port",
-    dest="aiservice_storage_port",
+    dest="aiservice_s3_port",
     required=False,
     help="Port number for the S3 storage service"
 )
 s3ArgGroup.add_argument(
     "--s3-ssl",
-    dest="aiservice_storage_ssl",
+    dest="aiservice_s3_ssl",
     required=False,
     help="Enable or disable SSL for S3 connection (true/false)"
 )
 s3ArgGroup.add_argument(
     "--s3-accesskey",
-    dest="aiservice_storage_accesskey",
+    dest="aiservice_s3_accesskey",
     required=False,
     help="Access key for authenticating with the S3 storage service"
 )
 s3ArgGroup.add_argument(
     "--s3-secretkey",
-    dest="aiservice_storage_secretkey",
+    dest="aiservice_s3_secretkey",
     required=False,
     help="Secret key for authenticating with the S3 storage service"
 )
 s3ArgGroup.add_argument(
     "--s3-region",
-    dest="aiservice_storage_region",
+    dest="aiservice_s3_region",
     required=False,
     help="Region for the S3 storage service"
 )
 s3ArgGroup.add_argument(
-    "--s3-endpoint-url",
-    dest="aiservice_s3_endpoint_url",
+    "--s3-bucket-prefix",
+    dest="aiservice_s3_bucket_prefix",
     required=False,
-    help="endpoint url for s3"
+    help="Bucket prefix configured with S3 storage service"
 )
 
-# S3 - External Access Credentials (Tenant)
+# S3 - Bucket Naming
 # -----------------------------------------------------------------------------
 s3ArgGroup.add_argument(
-    "--s3-tenant-access-key",
-    dest="aiservice_tenant_s3_access_key",
-    required=False,
-    help="access key for s3 ( tenant level )"
-)
-s3ArgGroup.add_argument(
-    "--s3-tenant-secret-key",
-    dest="aiservice_tenant_s3_secret_key",
-    required=False,
-    help="secret key for s3 ( tenant level )"
-)
-s3ArgGroup.add_argument(
-    "--s3-tenant-region",
-    dest="aiservice_tenant_s3_region",
+    "--s3-tenants-bucket",
+    dest="aiservice_s3_tenants_bucket",
     required=False,
-    help="s3 region ( tenant level )"
+    default="km-tenants",
+    help="Name of the S3 bucket for tenants storage"
 )
 s3ArgGroup.add_argument(
-    "--s3-tenant-endpoint-url",
-    dest="aiservice_tenant_s3_endpoint_url",
+    "--s3-templates-bucket",
+    dest="aiservice_s3_templates_bucket",
     required=False,
-    help="endpoint url for s3 ( tenant level )"
+    default="km-templates",
+    help="Name of the S3 bucket for templates storage"
 )
 
 # Watsonx
@@ -355,49 +304,49 @@ watsonxArgGroup.add_argument(
 
 # AI Service
 # -----------------------------------------------------------------------------
-aibrokerArgGroup.add_argument(
+aiServiceArgGroup.add_argument(
     "--tenant-entitlement-type",
     dest="tenant_entitlement_type",
     required=False,
     help="Type of aibroker tenant"
 )
-aibrokerArgGroup.add_argument(
+aiServiceArgGroup.add_argument(
     "--tenant-entitlement-start-date",
     dest="tenant_entitlement_start_date",
     required=False,
     help="Start date for Aibroker tenant"
 )
-aibrokerArgGroup.add_argument(
+aiServiceArgGroup.add_argument(
     "--tenant-entitlement-end-date",
     dest="tenant_entitlement_end_date",
     required=False,
     help="End date for Aibroker tenant"
 )
-aibrokerArgGroup.add_argument(
+aiServiceArgGroup.add_argument(
     "--rsl-url",
     dest="rsl_url",
     required=False,
     help="rsl url"
 )
-aibrokerArgGroup.add_argument(
+aiServiceArgGroup.add_argument(
     "--rsl-org-id",
     dest="rsl_org_id",
     required=False,
     help="org id for rsl"
 )
-aibrokerArgGroup.add_argument(
+aiServiceArgGroup.add_argument(
     "--rsl-token",
     dest="rsl_token",
     required=False,
     help="token for rsl"
 )
-aibrokerArgGroup.add_argument(
+aiServiceArgGroup.add_argument(
     "--rsl-ca-crt",
     dest="rsl_ca_crt",
     required=False,
     help="CA certificate for RSL API (PEM format, optional, only if using self-signed certs)"
 )
-aibrokerArgGroup.add_argument(
+aiServiceArgGroup.add_argument(
     "--environment-type",
     dest="environment_type",
     required=False,

mas/cli/aiservice/install/params.py

@@ -57,17 +57,17 @@ optionalParams = [
     # Dev Mode
     "artifactory_username",
     "artifactory_token",
-    # Aibroker
-    "aiservice_storage_provider",
-    "aiservice_storage_accesskey",
-    "aiservice_storage_secretkey",
-    "aiservice_storage_host",
-    "aiservice_storage_port",
-    "aiservice_storage_ssl",
-    "aiservice_storage_region",
-    "aiservice_storage_pipelines_bucket",
-    "aiservice_storage_tenants_bucket",
-    "aiservice_storage_templates_bucket",
+    # AI Service
+    # "aiservice_s3_provider",
+    "aiservice_s3_accesskey",
+    "aiservice_s3_secretkey",
+    "aiservice_s3_host",
+    "aiservice_s3_port",
+    "aiservice_s3_ssl",
+    "aiservice_s3_region",
+    "aiservice_s3_bucket_prefix",
+    "aiservice_s3_tenants_bucket",
+    "aiservice_s3_templates_bucket",
 
     "aiservice_watsonxai_apikey",
     "aiservice_watsonxai_url",
@@ -83,15 +83,6 @@ optionalParams = [
     "tenant_entitlement_start_date",
     "tenant_entitlement_end_date",
 
-    "aiservice_s3_bucket_prefix",
-    "aiservice_s3_region",
-    "aiservice_s3_endpoint_url",
-    "aiservice_tenant_s3_bucket_prefix",
-    "aiservice_tenant_s3_region",
-    "aiservice_tenant_s3_endpoint_url",
-    "aiservice_tenant_s3_access_key",
-    "aiservice_tenant_s3_secret_key",
-
     "rsl_url",
     "rsl_org_id",
     "rsl_token",

mas/cli/aiservice/install/summarizer.py

@@ -48,24 +48,19 @@ class aiServiceInstallSummarizerMixin():
         self.printParamSummary("Environment type", "environment_type")
 
         self.printH2("S3 Configuration")
-        self.printParamSummary("Storage provider", "aiservice_storage_provider")
-        if self.getParam("aiservice_storage_provider") == "minio":
+        # self.printParamSummary("Storage provider", "aiservice_s3_provider")
+        if self.getParam("minio_root_user") is not None and self.getParam("minio_root_user") != "":
             self.printParamSummary("minio root username", "minio_root_user")
         print()
-        self.printParamSummary("Storage access key", "aiservice_storage_accesskey")
-        self.printParamSummary("Storage host", "aiservice_storage_host")
-        self.printParamSummary("Storage port", "aiservice_storage_port")
-        self.printParamSummary("Storage ssl", "aiservice_storage_ssl")
-        self.printParamSummary("Storage region", "aiservice_storage_region")
-        self.printParamSummary("Storage pipelines bucket", "aiservice_storage_pipelines_bucket")
-        self.printParamSummary("Storage tenants bucket", "aiservice_storage_tenants_bucket")
-        self.printParamSummary("Storage templates bucket", "aiservice_storage_templates_bucket")
-        print()
+        self.printParamSummary("Storage access key", "aiservice_s3_accesskey")
+        self.printParamSummary("Storage host", "aiservice_s3_host")
+        self.printParamSummary("Storage port", "aiservice_s3_port")
+        self.printParamSummary("Storage ssl", "aiservice_s3_ssl")
+        self.printParamSummary("Storage region", "aiservice_s3_region")
         self.printParamSummary("S3 bucket prefix", "aiservice_s3_bucket_prefix")
-        self.printParamSummary("S3 endpoint url", "aiservice_s3_endpoint_url")
-        self.printParamSummary("S3 bucket prefix (tenant level)", "aiservice_tenant_s3_bucket_prefix")
-        self.printParamSummary("S3 region (tenant level)", "aiservice_tenant_s3_region")
-        self.printParamSummary("S3 endpoint url (tenant level)", "aiservice_tenant_s3_endpoint_url")
+        self.printParamSummary("Storage tenants bucket", "aiservice_s3_tenants_bucket")
+        self.printParamSummary("Storage templates bucket", "aiservice_s3_templates_bucket")
+        print()
 
         self.printH2("IBM WatsonX")
         self.printParamSummary("Watsonxai machine learning url", "aiservice_watsonxai_url")

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.10"
+        self.version = "15.1.12"
         self.h1count = 0
         self.h2count = 0