mlrun 1.10.0rc1__py3-none-any.whl → 1.10.0rc3__py3-none-any.whl

mlrun/__init__.py

@@ -120,7 +120,7 @@ def set_environment(
     :param mock_functions: set to True to create local/mock functions instead of real containers,
                            set to "auto" to auto determine based on the presence of k8s/Nuclio
     :returns:
-        default project name
+        active project name
         actual artifact path/url, can be used to create subpaths per task or group of artifacts
     """
     if env_file:
@@ -161,7 +161,7 @@ def set_environment(
             )
         mlconf.artifact_path = artifact_path
 
-    return mlconf.default_project, mlconf.artifact_path
+    return mlconf.active_project, mlconf.artifact_path
 
 
 def get_current_project(silent: bool = False) -> Optional[MlrunProject]:

mlrun/__main__.py

@@ -13,6 +13,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+import functools
+import importlib.metadata
 import json
 import pathlib
 import socket
@@ -25,12 +27,14 @@ from pprint import pprint
 import click
 import dotenv
 import pandas as pd
+import semver
 import yaml
 from tabulate import tabulate
 
 import mlrun
 import mlrun.common.constants as mlrun_constants
 import mlrun.common.schemas
+import mlrun.platforms
 import mlrun.utils.helpers
 from mlrun.common.helpers import parse_versioned_object_uri
 from mlrun.runtimes.mounts import auto_mount as auto_mount_modifier
@@ -63,12 +67,19 @@ from .utils.version import Version
 pd.set_option("mode.chained_assignment", None)
 
 
-def validate_base_argument(ctx, param, value):
+def validate_base_argument(ctx: click.Context, param: click.Parameter, value: str):
+    # click 8.2 expects the context to be passed to make_metavar
+    if semver.VersionInfo.parse(
+        importlib.metadata.version("click")
+    ) < semver.VersionInfo.parse("8.2.0"):
+        metavar_func = functools.partial(param.make_metavar)
+    else:
+        metavar_func = functools.partial(param.make_metavar, ctx)
     if value and value.startswith("-"):
         raise click.BadParameter(
             f"{param.human_readable_name} ({value}) cannot start with '-', ensure the command options are typed "
             f"correctly. Preferably use '--' to separate options and arguments "
-            f"e.g. 'mlrun run --option1 --option2 -- {param.make_metavar()} [--arg1|arg1] [--arg2|arg2]'",
+            f"e.g. 'mlrun run --option1 --option2 -- {metavar_func()} [--arg1|arg1] [--arg2|arg2]'",
             ctx=ctx,
             param=param,
         )
@@ -539,7 +550,7 @@ def build(
         exit(1)
 
     meta = func.metadata
-    meta.project = project or meta.project or mlconf.default_project
+    meta.project = project or meta.project or mlconf.active_project
     meta.name = name or meta.name
     meta.tag = tag or meta.tag
 
@@ -859,7 +870,7 @@ def version():
 @main.command()
 @click.argument("uid", type=str)
 @click.option(
-    "--project", "-p", help="project name (defaults to mlrun.mlconf.default_project)"
+    "--project", "-p", help="project name (defaults to mlrun.mlconf.active_project)"
 )
 @click.option("--offset", type=int, default=0, help="byte offset")
 @click.option("--db", help="api and db service path/url")

mlrun/artifacts/base.py

@@ -219,7 +219,7 @@ class Artifact(ModelObj):
         project=None,
         src_path: typing.Optional[str] = None,
         # All params up until here are legacy params for compatibility with legacy artifacts.
-        # TODO: remove them in 1.9.0.
+        # TODO: remove them in 1.10.0.
         metadata: ArtifactMetadata = None,
         spec: ArtifactSpec = None,
     ):
@@ -235,7 +235,7 @@ class Artifact(ModelObj):
             or src_path
         ):
             warnings.warn(
-                "Artifact constructor parameters are deprecated and will be removed in 1.9.0. "
+                "Artifact constructor parameters are deprecated in 1.7.0 and will be removed in 1.10.0. "
                 "Use the metadata and spec parameters instead.",
                 DeprecationWarning,
             )
@@ -247,7 +247,7 @@ class Artifact(ModelObj):
 
         self.metadata.key = key or self.metadata.key
         self.metadata.project = (
-            project or mlrun.mlconf.default_project or self.metadata.project
+            project or mlrun.mlconf.active_project or self.metadata.project
         )
         self.spec.size = size or self.spec.size
         self.spec.target_path = target_path or self.spec.target_path
@@ -758,13 +758,13 @@ class LinkArtifact(Artifact):
         link_tree=None,
         project=None,
         # All params up until here are legacy params for compatibility with legacy artifacts.
-        # TODO: remove them in 1.9.0.
+        # TODO: remove them in 1.10.0.
         metadata: ArtifactMetadata = None,
         spec: LinkArtifactSpec = None,
     ):
         if key or target_path or link_iteration or link_key or link_tree or project:
             warnings.warn(
-                "Artifact constructor parameters are deprecated and will be removed in 1.9.0. "
+                "Artifact constructor parameters are deprecated in 1.7.0 and will be removed in 1.10.0. "
                 "Use the metadata and spec parameters instead.",
                 DeprecationWarning,
             )
@@ -907,7 +907,7 @@ def convert_legacy_artifact_to_new_format(
         artifact_key = f"{artifact_key}:{artifact_tag}"
     # TODO: Remove once data migration v5 is obsolete
     warnings.warn(
-        f"Converting legacy artifact '{artifact_key}' to new format. This will not be supported in MLRun 1.9.0. "
+        f"Converting legacy artifact '{artifact_key}' to new format. This will not be supported in MLRun 1.10.0. "
         f"Make sure to save the artifact/project in the new format.",
         FutureWarning,
     )

mlrun/artifacts/dataset.py

@@ -163,7 +163,7 @@ class DatasetArtifact(Artifact):
     ):
         if key or format or target_path:
             warnings.warn(
-                "Artifact constructor parameters are deprecated and will be removed in 1.9.0. "
+                "Artifact constructor parameters are deprecated in 1.7.0 and will be removed in 1.10.0. "
                 "Use the metadata and spec parameters instead.",
                 DeprecationWarning,
             )

mlrun/artifacts/document.py

@@ -190,7 +190,7 @@ class MLRunLoader:
 
                 # Resolve the producer
                 if not self.producer:
-                    self.producer = mlrun.mlconf.default_project
+                    self.producer = mlrun.mlconf.active_project
                 if isinstance(self.producer, str):
                     self.producer = mlrun.get_or_create_project(self.producer)
 

mlrun/artifacts/model.py

@@ -152,7 +152,7 @@ class ModelArtifact(Artifact):
     ):
         if key or body or format or target_path:
             warnings.warn(
-                "Artifact constructor parameters are deprecated and will be removed in 1.9.0. "
+                "Artifact constructor parameters are deprecated in 1.7.0 and will be removed in 1.10.0. "
                 "Use the metadata and spec parameters instead.",
                 DeprecationWarning,
             )

mlrun/artifacts/plots.py

@@ -37,7 +37,7 @@ class PlotArtifact(Artifact):
     ):
         if key or body or is_inline or target_path:
             warnings.warn(
-                "Artifact constructor parameters are deprecated and will be removed in 1.9.0. "
+                "Artifact constructor parameters are deprecated in 1.7.0 and will be removed in 1.10.0. "
                 "Use the metadata and spec parameters instead.",
                 DeprecationWarning,
             )
@@ -96,7 +96,7 @@ class PlotlyArtifact(Artifact):
         """
         if key or target_path:
             warnings.warn(
-                "Artifact constructor parameters are deprecated and will be removed in 1.9.0. "
+                "Artifact constructor parameters are deprecated in 1.7.0 and will be removed in 1.10.0. "
                 "Use the metadata and spec parameters instead.",
                 DeprecationWarning,
             )

mlrun/common/constants.py

@@ -90,6 +90,13 @@ class MLRunInternalLabels:
             if not key.startswith("__") and isinstance(value, str)
         ]
 
+    @staticmethod
+    def default_run_labels_to_enrich():
+        return [
+            MLRunInternalLabels.owner,
+            MLRunInternalLabels.v3io_user,
+        ]
+
 
 class DeployStatusTextKind(mlrun.common.types.StrEnum):
     logs = "logs"

mlrun/common/runtimes/constants.py

@@ -237,7 +237,7 @@ class RunStates:
         }[pipeline_run_status]
 
 
-# TODO: remove this class in 1.9.0 - use only MlrunInternalLabels
+# TODO: remove this class in 1.10.0 - use only MlrunInternalLabels
 class RunLabels(enum.Enum):
     owner = mlrun_constants.MLRunInternalLabels.owner
     v3io_user = mlrun_constants.MLRunInternalLabels.v3io_user

mlrun/common/schemas/__init__.py

@@ -214,6 +214,7 @@ from .secret import (
     SecretsData,
     UserSecretCreationRequest,
 )
+from .serving import ModelRunnerStepData, MonitoringData
 from .tag import Tag, TagObjects
 from .workflow import (
     GetWorkflowResponse,

mlrun/common/schemas/artifact.py

@@ -80,7 +80,7 @@ class ArtifactIdentifier(pydantic.v1.BaseModel):
 
 @deprecated(
     version="1.7.0",
-    reason="mlrun.common.schemas.ArtifactsFormat is deprecated and will be removed in 1.9.0. "
+    reason="mlrun.common.schemas.ArtifactsFormat is deprecated and will be removed in 1.10.0. "
     "Use mlrun.common.formatters.ArtifactFormat instead.",
     category=FutureWarning,
 )

mlrun/common/schemas/pipeline.py

@@ -22,7 +22,7 @@ import mlrun.common.types
 
 @deprecated(
     version="1.7.0",
-    reason="mlrun.common.schemas.PipelinesFormat is deprecated and will be removed in 1.9.0. "
+    reason="mlrun.common.schemas.PipelinesFormat is deprecated and will be removed in 1.10.0. "
     "Use mlrun.common.formatters.PipelineFormat instead.",
     category=FutureWarning,
 )

mlrun/common/schemas/project.py

@@ -26,7 +26,7 @@ from .object import ObjectKind, ObjectStatus
 
 @deprecated(
     version="1.7.0",
-    reason="mlrun.common.schemas.ProjectsFormat is deprecated and will be removed in 1.9.0. "
+    reason="mlrun.common.schemas.ProjectsFormat is deprecated and will be removed in 1.10.0. "
     "Use mlrun.common.formatters.ProjectFormat instead.",
     category=FutureWarning,
 )

mlrun/common/schemas/runs.py

@@ -28,7 +28,7 @@ class RunIdentifier(pydantic.v1.BaseModel):
 
 @deprecated(
     version="1.7.0",
-    reason="mlrun.common.schemas.RunsFormat is deprecated and will be removed in 1.9.0. "
+    reason="mlrun.common.schemas.RunsFormat is deprecated and will be removed in 1.10.0. "
     "Use mlrun.common.formatters.RunFormat instead.",
     category=FutureWarning,
 )

mlrun/common/schemas/serving.py

@@ -14,9 +14,26 @@
 
 from pydantic.v1 import BaseModel
 
+from mlrun.common.types import StrEnum
+
 from .background_task import BackgroundTaskList
 
 
 class DeployResponse(BaseModel):
     data: dict
     background_tasks: BackgroundTaskList
+
+
+class ModelRunnerStepData(StrEnum):
+    MODELS = "models"
+    MONITORING_DATA = "monitoring_data"
+
+
+class MonitoringData(StrEnum):
+    INPUTS = "inputs"
+    OUTPUTS = "outputs"
+    INPUT_PATH = "input_path"
+    CREATION_STRATEGY = "creation_strategy"
+    LABELS = "labels"
+    MODEL_PATH = "model_path"
+    MODEL_ENDPOINT_UID = "model_endpoint_uid"

mlrun/config.py

@@ -79,7 +79,7 @@ default_config = {
     # comma separated list of images that are in the specified images_registry, and therefore will be enriched with this
     # registry when used. default to mlrun/* which means any image which is of the mlrun repository (mlrun/mlrun,
     # mlrun/ml-base, etc...)
-    "images_to_enrich_registry": "^mlrun/*,python:3.9",
+    "images_to_enrich_registry": "^mlrun/*,^python:3.(9|11)$",
     "kfp_url": "",
     "kfp_ttl": "14400",  # KFP ttl in sec, after that completed PODs will be deleted
     "kfp_image": "mlrun/mlrun-kfp",  # image to use for KFP runner
@@ -94,7 +94,7 @@ default_config = {
     "default_base_image": "mlrun/mlrun",  # default base image when doing .deploy()
     # template for project default image name. Parameter {name} will be replaced with project name
     "default_project_image_name": ".mlrun-project-image-{name}",
-    "default_project": "default",  # default project name
+    "active_project": "",  # active project name
     "default_archive": "",  # default remote archive URL (for build tar.gz)
     "mpijob_crd_version": "",  # mpijob crd version (e.g: "v1alpha1". must be in: mlrun.runtime.MPIJobCRDVersions)
     "ipython_widget": True,
@@ -286,7 +286,7 @@ default_config = {
             "remote": "mlrun/mlrun",
             "dask": "mlrun/ml-base",
             "mpijob": "mlrun/mlrun",
-            "application": "python:3.9",
+            "application": "python",
         },
         # see enrich_function_preemption_spec for more info,
         # and mlrun.common.schemas.function.PreemptionModes for available options
@@ -482,7 +482,7 @@ default_config = {
             "project_owners_cache_ttl": "30 seconds",
             # access key to be used when the leader is iguazio and polling is done from it
             "iguazio_access_key": "",
-            "iguazio_list_projects_default_page_size": 200,
+            "iguazio_list_projects_default_page_size": 500,
             "iguazio_client_job_cache_ttl": "20 minutes",
             "nuclio_project_deletion_verification_timeout": "300 seconds",
             "nuclio_project_deletion_verification_interval": "5 seconds",

mlrun/datastore/datastore_profile.py

@@ -16,7 +16,6 @@ import ast
 import base64
 import json
 import typing
-import warnings
 from urllib.parse import ParseResult, urlparse
 
 import pydantic.v1
@@ -142,7 +141,6 @@ class ConfigProfile(DatastoreProfile):
 class DatastoreProfileKafkaTarget(DatastoreProfile):
     type: str = pydantic.v1.Field("kafka_target")
     _private_attributes = "kwargs_private"
-    bootstrap_servers: typing.Optional[str] = None
     brokers: typing.Optional[str] = None
     topic: str
     kwargs_public: typing.Optional[dict]
@@ -151,31 +149,16 @@ class DatastoreProfileKafkaTarget(DatastoreProfile):
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
 
-        if not self.brokers and not self.bootstrap_servers:
+        if not self.brokers:
             raise mlrun.errors.MLRunInvalidArgumentError(
                 "DatastoreProfileKafkaTarget requires the 'brokers' field to be set"
             )
 
-        if self.bootstrap_servers:
-            if self.brokers:
-                raise mlrun.errors.MLRunInvalidArgumentError(
-                    "DatastoreProfileKafkaTarget cannot be created with both 'brokers' and 'bootstrap_servers'"
-                )
-            else:
-                self.brokers = self.bootstrap_servers
-                self.bootstrap_servers = None
-            warnings.warn(
-                "'bootstrap_servers' parameter is deprecated in 1.7.0 and will be removed in 1.9.0, "
-                "use 'brokers' instead.",
-                # TODO: Remove this in 1.9.0
-                FutureWarning,
-            )
-
     def get_topic(self) -> typing.Optional[str]:
         return self.topic
 
     def attributes(self):
-        attributes = {"brokers": self.brokers or self.bootstrap_servers}
+        attributes = {"brokers": self.brokers}
         if self.kwargs_public:
             attributes = merge(attributes, self.kwargs_public)
         if self.kwargs_private:
@@ -248,18 +231,7 @@ class DatastoreProfileS3(DatastoreProfile):
     assume_role_arn: typing.Optional[str] = None
     access_key_id: typing.Optional[str] = None
     secret_key: typing.Optional[str] = None
-    bucket: typing.Optional[str] = None
-
-    @pydantic.v1.validator("bucket")
-    @classmethod
-    def check_bucket(cls, v):
-        if not v:
-            warnings.warn(
-                "The 'bucket' attribute will be mandatory starting from version 1.9",
-                FutureWarning,
-                stacklevel=2,
-            )
-        return v
+    bucket: str
 
     def secrets(self) -> dict:
         res = {}
@@ -353,18 +325,7 @@ class DatastoreProfileGCS(DatastoreProfile):
     _private_attributes = ("gcp_credentials",)
     credentials_path: typing.Optional[str] = None  # path to file.
     gcp_credentials: typing.Optional[typing.Union[str, dict]] = None
-    bucket: typing.Optional[str] = None
-
-    @pydantic.v1.validator("bucket")
-    @classmethod
-    def check_bucket(cls, v):
-        if not v:
-            warnings.warn(
-                "The 'bucket' attribute will be mandatory starting from version 1.9",
-                FutureWarning,
-                stacklevel=2,
-            )
-        return v
+    bucket: str
 
     @pydantic.v1.validator("gcp_credentials", pre=True, always=True)
     @classmethod
@@ -410,18 +371,7 @@ class DatastoreProfileAzureBlob(DatastoreProfile):
     client_secret: typing.Optional[str] = None
     sas_token: typing.Optional[str] = None
     credential: typing.Optional[str] = None
-    container: typing.Optional[str] = None
-
-    @pydantic.v1.validator("container")
-    @classmethod
-    def check_container(cls, v):
-        if not v:
-            warnings.warn(
-                "The 'container' attribute will be mandatory starting from version 1.9",
-                FutureWarning,
-                stacklevel=2,
-            )
-        return v
+    container: str
 
     def url(self, subpath) -> str:
         if subpath.startswith("/"):
@@ -605,7 +555,7 @@ def datastore_profile_read(url, project_name="", secrets: typing.Optional[dict]
         url (str): A URL with 'ds' scheme pointing to the datastore profile
             (e.g., 'ds://profile-name').
         project_name (str, optional): The project name where the profile is stored.
-            Defaults to MLRun's default project.
+            Defaults to MLRun's active project.
         secrets (dict, optional): Dictionary containing secrets needed for profile retrieval.
 
     Returns:
@@ -630,7 +580,7 @@ def datastore_profile_read(url, project_name="", secrets: typing.Optional[dict]
         )
 
     profile_name = parsed_url.hostname
-    project_name = project_name or mlrun.mlconf.default_project
+    project_name = project_name or mlrun.mlconf.active_project
     datastore = TemporaryClientDatastoreProfiles().get(profile_name)
     if datastore:
         return datastore

mlrun/datastore/sources.py

@@ -11,6 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 import json
 import operator
 import os
@@ -18,7 +19,7 @@ import warnings
 from base64 import b64encode
 from copy import copy
 from datetime import datetime
-from typing import Any, Optional, Union
+from typing import Any, Literal, Optional, Union
 
 import pandas as pd
 import semver
@@ -794,12 +795,12 @@ class SnowflakeSource(BaseSourceDriver):
         warehouse: Optional[str] = None,
         **kwargs,
     ):
-        # TODO: Remove in 1.9.0
+        # TODO: Remove in 1.10.0
         if schema:
             warnings.warn(
-                "schema is deprecated in 1.7.0, and will be removed in 1.9.0, please use db_schema"
+                "schema is deprecated in 1.7.0, and will be removed in 1.10.0, please use db_schema"
             )
-        db_schema = db_schema or schema  # TODO: Remove in 1.9.0
+        db_schema = db_schema or schema  # TODO: Remove in 1.10.0
 
         attributes = attributes or {}
         if url:
@@ -1063,16 +1064,17 @@ class KafkaSource(OnlineSource):
 
     def __init__(
         self,
-        brokers=None,
-        topics=None,
-        group="serving",
-        initial_offset="earliest",
-        partitions=None,
-        sasl_user=None,
-        sasl_pass=None,
-        attributes=None,
+        brokers: Optional[list[str]] = None,
+        topics: Optional[list[str]] = None,
+        group: str = "serving",
+        initial_offset: Literal["earliest", "latest"] = "earliest",
+        partitions: Optional[list[int]] = None,
+        sasl_user: Optional[str] = None,
+        sasl_pass: Optional[str] = None,
+        tls_enable: Optional[bool] = None,
+        attributes: Optional[dict] = None,
         **kwargs,
-    ):
+    ) -> None:
         """Sets kafka source for the flow
 
         :param brokers: list of broker IP addresses
@@ -1082,6 +1084,7 @@ class KafkaSource(OnlineSource):
         :param partitions: Optional, A list of partitions numbers for which the function receives events.
         :param sasl_user: Optional, user name to use for sasl authentications
         :param sasl_pass: Optional, password to use for sasl authentications
+        :param tls_enable: Optional, if set - whether to enable TLS or not.
         :param attributes: Optional, extra attributes to be passed to kafka trigger
         """
         if isinstance(topics, str):
@@ -1095,10 +1098,15 @@ class KafkaSource(OnlineSource):
         attributes["initial_offset"] = initial_offset
         if partitions is not None:
             attributes["partitions"] = partitions
-        if sasl := mlrun.datastore.utils.KafkaParameters(attributes).sasl(
-            usr=sasl_user, pwd=sasl_pass
-        ):
+
+        kafka_params = mlrun.datastore.utils.KafkaParameters(attributes)
+
+        if sasl := kafka_params.sasl(usr=sasl_user, pwd=sasl_pass):
             attributes["sasl"] = sasl
+
+        if tls := kafka_params.tls(tls_enable=tls_enable):
+            attributes["tls"] = tls
+
         super().__init__(attributes=attributes, **kwargs)
 
     def to_dataframe(

mlrun/datastore/store_resources.py

@@ -152,19 +152,19 @@ def get_store_resource(
         )
     elif kind == StorePrefix.FeatureSet:
         project, name, tag, uid = parse_versioned_object_uri(
-            uri, project or config.default_project
+            uri, project or config.active_project
         )
         return db.get_feature_set(name, project, tag, uid)
 
     elif kind == StorePrefix.FeatureVector:
         project, name, tag, uid = parse_versioned_object_uri(
-            uri, project or config.default_project
+            uri, project or config.active_project
         )
         return db.get_feature_vector(name, project, tag, uid)
 
     elif StorePrefix.is_artifact(kind):
         project, key, iteration, tag, tree, uid = parse_artifact_uri(
-            uri, project or config.default_project
+            uri, project or config.active_project
         )
         resource = db.read_artifact(
             key,

mlrun/datastore/targets.py

@@ -443,8 +443,8 @@ class BaseStoreTarget(DataTargetBase):
         self.credentials_prefix = credentials_prefix
         if credentials_prefix:
             warnings.warn(
-                "The 'credentials_prefix' parameter is deprecated and will be removed in "
-                "1.9.0. Please use datastore profiles instead.",
+                "The 'credentials_prefix' parameter is deprecated in 1.7.0 and will be removed in "
+                "1.10.0. Please use datastore profiles instead.",
                 FutureWarning,
             )
 
@@ -1671,7 +1671,7 @@ class KafkaTarget(BaseStoreTarget):
     ):
         attrs = {}
 
-        # TODO: Remove this in 1.9.0
+        # TODO: Remove this in 1.10.0
         if bootstrap_servers:
             if brokers:
                 raise mlrun.errors.MLRunInvalidArgumentError(
@@ -1679,7 +1679,7 @@ class KafkaTarget(BaseStoreTarget):
                     "'bootstrap_servers' parameter. Please use 'brokers' only."
                 )
             warnings.warn(
-                "'bootstrap_servers' parameter is deprecated in 1.7.0 and will be removed in 1.9.0, "
+                "'bootstrap_servers' parameter is deprecated in 1.7.0 and will be removed in 1.10.0, "
                 "use 'brokers' instead.",
                 FutureWarning,
             )
@@ -2239,7 +2239,7 @@ def _get_target_path(driver, resource, run_id_mode=False, netloc=None, scheme=""
         else "vectors"
     )
     name = resource.metadata.name
-    project = resource.metadata.project or mlrun.mlconf.default_project
+    project = resource.metadata.project or mlrun.mlconf.active_project
 
     default_kind_name = kind
     if scheme == "ds":

mlrun/datastore/utils.py

@@ -176,8 +176,8 @@ def get_kafka_brokers_from_dict(options: dict, pop=False) -> typing.Optional[str
     kafka_bootstrap_servers = get_or_pop("kafka_bootstrap_servers", None)
     if kafka_bootstrap_servers:
         warnings.warn(
-            "The 'kafka_bootstrap_servers' parameter is deprecated and will be removed in "
-            "1.9.0. Please pass the 'kafka_brokers' parameter instead.",
+            "The 'kafka_bootstrap_servers' parameter is deprecated in 1.7.0 and will be removed in "
+            "1.10.0. Please pass the 'kafka_brokers' parameter instead.",
             FutureWarning,
         )
     return kafka_bootstrap_servers
@@ -246,6 +246,9 @@ class KafkaParameters:
             "partitions": "",
             "sasl": "",
             "worker_allocation_mode": "",
+            "tls_enable": "",  # for Nuclio with Confluent Kafka (Sarama client)
+            "tls": "",
+            "new_topic": "",
         }
         self._reference_dicts = (
             self._custom_attributes,
@@ -270,7 +273,9 @@ class KafkaParameters:
         }
         if sasl := self._kwargs.get("sasl"):
             res |= {
-                "security_protocol": "SASL_PLAINTEXT",
+                "security_protocol": self._kwargs.get(
+                    "security_protocol", "SASL_PLAINTEXT"
+                ),
                 "sasl_mechanism": sasl["mechanism"],
                 "sasl_plain_username": sasl["user"],
                 "sasl_plain_password": sasl["password"],
@@ -288,15 +293,25 @@ class KafkaParameters:
 
     def sasl(
         self, *, usr: typing.Optional[str] = None, pwd: typing.Optional[str] = None
-    ) -> dict:
-        usr = usr or self._kwargs.get("sasl_plain_username", None)
-        pwd = pwd or self._kwargs.get("sasl_plain_password", None)
+    ) -> dict[str, typing.Union[str, bool]]:
         res = self._kwargs.get("sasl", {})
+        usr = usr or self._kwargs.get("sasl_plain_username")
+        pwd = pwd or self._kwargs.get("sasl_plain_password")
         if usr and pwd:
             res["enable"] = True
             res["user"] = usr
             res["password"] = pwd
             res["mechanism"] = self._kwargs.get("sasl_mechanism", "PLAIN")
+            res["handshake"] = self._kwargs.get("sasl_handshake", True)
+        return res
+
+    def tls(self, *, tls_enable: typing.Optional[bool] = None) -> dict[str, bool]:
+        res = self._kwargs.get("tls", {})
+        tls_enable = (
+            tls_enable if tls_enable is not None else self._kwargs.get("tls_enable")
+        )
+        if tls_enable:
+            res["enable"] = tls_enable
         return res
 
     def valid_entries_only(self, input_dict: dict) -> dict: