mlrun 1.10.0rc18__py3-none-any.whl → 1.11.0rc16__py3-none-any.whl

mlrun/__init__.py

@@ -24,6 +24,7 @@ __all__ = [
     "v3io_cred",
     "auto_mount",
     "VolumeMount",
+    "sync_secret_tokens",
 ]
 
 from os import environ, path
@@ -31,11 +32,13 @@ from typing import Optional
 
 import dotenv
 
+from .common.constants import MLRUN_ACTIVE_PROJECT
 from .config import config as mlconf
 from .datastore import DataItem, ModelProvider, store_manager
 from .db import get_run_db
 from .errors import MLRunInvalidArgumentError, MLRunNotFoundError
 from .execution import MLClientCtx
+from .hub import get_hub_item, get_hub_module, get_hub_step, import_module
 from .model import RunObject, RunTemplate, new_task
 from .package import ArtifactType, DefaultPackager, Packager, handler
 from .projects import (
@@ -66,7 +69,7 @@ from .run import (
     wait_for_pipeline_completion,
 )
 from .runtimes import mounts, new_model_server
-from .secrets import get_secret_or_env
+from .secrets import get_secret_or_env, sync_secret_tokens
 from .utils.version import Version
 
 __version__ = Version().get()["version"]
@@ -167,11 +170,29 @@ def set_environment(
 
 
 def get_current_project(silent: bool = False) -> Optional[MlrunProject]:
-    if not pipeline_context.project and not silent:
+    if pipeline_context.project:
+        return pipeline_context.project
+
+    project_name = environ.get(MLRUN_ACTIVE_PROJECT, None)
+    if not project_name:
+        if not silent:
+            raise MLRunInvalidArgumentError(
+                "No current project is initialized. Use new, get or load project functions first."
+            )
+        return None
+
+    project = load_project(
+        name=project_name,
+        url=project_name,
+        save=False,
+        sync_functions=False,
+    )
+
+    if not project and not silent:
         raise MLRunInvalidArgumentError(
             "No current project is initialized. Use new, get or load project functions first."
         )
-    return pipeline_context.project
+    return project
 
 
 def get_sample_path(subpath=""):

mlrun/__main__.py

@@ -203,7 +203,6 @@ def main():
 @click.option(
     "--allow-cross-project",
     is_flag=True,
-    default=True,  # TODO: remove this default in 1.11
     help="Override the loaded project name. This flag ensures awareness of loading an existing project yaml "
     "as a baseline for a new project with a different name",
 )
@@ -513,7 +512,6 @@ def run(
 @click.option(
     "--allow-cross-project",
     is_flag=True,
-    default=True,  # TODO: remove this default in 1.11
     help="Override the loaded project name. This flag ensures awareness of loading an existing project yaml "
     "as a baseline for a new project with a different name",
 )
@@ -672,7 +670,6 @@ def build(
 @click.option(
     "--allow-cross-project",
     is_flag=True,
-    default=True,  # TODO: remove this default in 1.11
     help="Override the loaded project name. This flag ensures awareness of loading an existing project yaml "
     "as a baseline for a new project with a different name",
 )
@@ -1008,7 +1005,6 @@ def logs(uid, project, offset, db):
 @click.option(
     "--allow-cross-project",
     is_flag=True,
-    default=True,  # TODO: remove this default in 1.11
     help="Override the loaded project name. This flag ensures awareness of loading an existing project yaml "
     "as a baseline for a new project with a different name",
 )

mlrun/artifacts/dataset.py

@@ -366,9 +366,9 @@ def get_df_stats(df):
     for col, values in df.describe(include="all").items():
         stats_dict = {}
         for stat, val in values.dropna().items():
-            if isinstance(val, (float, np.floating, np.float64)):
+            if isinstance(val, float | np.floating | np.float64):
                 stats_dict[stat] = float(val)
-            elif isinstance(val, (int, np.integer, np.int64)):
+            elif isinstance(val, int | np.integer | np.int64):
                 stats_dict[stat] = int(val)
             else:
                 stats_dict[stat] = str(val)

mlrun/artifacts/document.py

@@ -359,7 +359,12 @@ class DocumentArtifact(Artifact):
         self,
         splitter: Optional["TextSplitter"] = None,  # noqa: F821
     ) -> list["Document"]:  # noqa: F821
-        from langchain.schema import Document
+        # Try new langchain 1.0+ import path first
+        try:
+            from langchain_core.documents import Document
+        except ImportError:
+            # Fall back to old langchain <1.0 import path
+            from langchain.schema import Document
 
         """
         Create LC documents from the artifact

mlrun/artifacts/llm_prompt.py

@@ -29,7 +29,7 @@ class LLMPromptArtifactSpec(ArtifactSpec):
     _dict_fields = ArtifactSpec._dict_fields + [
         "prompt_template",
         "prompt_legend",
-        "model_configuration",
+        "invocation_config",
         "description",
     ]
     PROMPT_TEMPLATE_KEYS = ("content", "role")
@@ -41,7 +41,7 @@ class LLMPromptArtifactSpec(ArtifactSpec):
         prompt_template: Optional[list[dict]] = None,
         prompt_path: Optional[str] = None,
         prompt_legend: Optional[dict] = None,
-        model_configuration: Optional[dict] = None,
+        invocation_config: Optional[dict] = None,
         description: Optional[str] = None,
         target_path: Optional[str] = None,
         **kwargs,
@@ -62,12 +62,17 @@ class LLMPromptArtifactSpec(ArtifactSpec):
             parent_uri=model_artifact.uri
             if isinstance(model_artifact, model_art.ModelArtifact)
             else model_artifact,
+            format=kwargs.pop("format", "") or "json",
             **kwargs,
         )
 
         self.prompt_template = prompt_template
         self.prompt_legend = prompt_legend
-        self.model_configuration = model_configuration
+        if invocation_config is not None and not isinstance(invocation_config, dict):
+            raise mlrun.errors.MLRunInvalidArgumentError(
+                "LLMPromptArtifact invocation_config must be a dictionary or None"
+            )
+        self.invocation_config = invocation_config or {}
         self.description = description
         self._model_artifact = (
             model_artifact
@@ -83,19 +88,20 @@ class LLMPromptArtifactSpec(ArtifactSpec):
             raise mlrun.errors.MLRunInvalidArgumentError(
                 "Expected prompt_template to be a list of dicts"
             )
-        keys_to_pop = []
         for message in prompt_template:
+            if set(key.lower() for key in message.keys()) != set(
+                self.PROMPT_TEMPLATE_KEYS
+            ):
+                raise mlrun.errors.MLRunInvalidArgumentError(
+                    f"Expected prompt_template to contain dicts with keys "
+                    f"{self.PROMPT_TEMPLATE_KEYS}, got {message.keys()}"
+                )
+            keys_to_pop = []
             for key in message.keys():
                 if isinstance(key, str):
-                    if key.lower() not in self.PROMPT_TEMPLATE_KEYS:
-                        raise mlrun.errors.MLRunInvalidArgumentError(
-                            f"Expected prompt_template to contain dict that "
-                            f"only has keys from {self.PROMPT_TEMPLATE_KEYS}"
-                        )
-                    else:
-                        if not key.islower():
-                            message[key.lower()] = message[key]
-                            keys_to_pop.append(key)
+                    if not key.islower():
+                        message[key.lower()] = message[key]
+                        keys_to_pop.append(key)
                 else:
                     raise mlrun.errors.MLRunInvalidArgumentError(
                         f"Expected prompt_template to contain dict that only"
@@ -169,7 +175,7 @@ class LLMPromptArtifact(Artifact):
         prompt_template: Optional[list[dict]] = None,
         prompt_path: Optional[str] = None,
         prompt_legend: Optional[dict] = None,
-        model_configuration: Optional[dict] = None,
+        invocation_config: Optional[dict] = None,
         description: Optional[str] = None,
         target_path=None,
         **kwargs,
@@ -179,7 +185,7 @@ class LLMPromptArtifact(Artifact):
             prompt_path=prompt_path,
             prompt_legend=prompt_legend,
             model_artifact=model_artifact,
-            model_configuration=model_configuration,
+            invocation_config=invocation_config,
             target_path=target_path,
             description=description,
         )

mlrun/artifacts/model.py

@@ -190,10 +190,10 @@ class ModelArtifact(Artifact):
         """
         super().__init__(key, body, format=format, target_path=target_path, **kwargs)
         model_file = str(model_file or "")
-        if model_file and model_url:
+        if (model_file or model_dir or body) and model_url:
             raise mlrun.errors.MLRunInvalidArgumentError(
-                "Arguments 'model_file' and 'model_dir' cannot be"
-                " used together with 'model_url'."
+                "Arguments 'model_file' and 'model_url' cannot be"
+                " used together with 'model_file', 'model_dir' or 'body'."
             )
         if model_file and "/" in model_file:
             if model_dir:

mlrun/artifacts/plots.py

@@ -42,7 +42,7 @@ class PlotArtifact(Artifact):
         import matplotlib
 
         if not self.spec.get_body() or not isinstance(
-            self.spec.get_body(), (bytes, matplotlib.figure.Figure)
+            self.spec.get_body(), bytes | matplotlib.figure.Figure
         ):
             raise ValueError(
                 "matplotlib fig or png bytes must be provided as artifact body"

mlrun/{model_monitoring/db/tsdb/tdengine → auth}/__init__.py

@@ -1,4 +1,4 @@
-# Copyright 2024 Iguazio
+# Copyright 2025 Iguazio
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,5 +11,4 @@
 # 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.
-
-from .tdengine_connector import TDEngineConnector
+from .providers import IGTokenProvider, OAuthClientIDTokenProvider, StaticTokenProvider

mlrun/auth/nuclio.py

@@ -0,0 +1,89 @@
+# Copyright 2023 Iguazio
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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 base64
+
+import requests.auth
+from nuclio.auth import AuthInfo as _NuclioAuthInfo
+from nuclio.auth import AuthKinds as NuclioAuthKinds
+
+import mlrun.auth.providers
+import mlrun.common.schemas.auth
+
+
+class NuclioAuthInfo(_NuclioAuthInfo):
+    def __init__(self, token=None, **kwargs):
+        super().__init__(**kwargs)
+        self._token = token
+
+    @classmethod
+    def from_auth_info(cls, auth_info: "mlrun.common.schemas.auth.AuthInfo"):
+        if not auth_info:
+            return None
+        if mlrun.mlconf.is_iguazio_v4_mode():
+            return cls.from_request_headers(auth_info.request_headers)
+        if auth_info.session != "":
+            return NuclioAuthInfo(
+                password=auth_info.session, mode=NuclioAuthKinds.iguazio
+            )
+        return None
+
+    @classmethod
+    def from_request_headers(cls, headers: dict[str, str]):
+        if not headers:
+            return cls()
+        for key, value in headers.items():
+            if key.lower() == "authorization":
+                if value.lower().startswith("bearer "):
+                    return cls(
+                        token=value[len("bearer ") :],
+                        mode=NuclioAuthKinds.iguazio,
+                    )
+                if value.lower().startswith("basic "):
+                    token = value[len("basic ") :]
+                    decoded_token = base64.b64decode(token).decode("utf-8")
+                    username, password = decoded_token.split(":", 1)
+                    return cls(
+                        username=username,
+                        password=password,
+                        mode=NuclioAuthKinds.iguazio,
+                    )
+        return cls()
+
+    @classmethod
+    def from_envvar(cls):
+        if mlrun.mlconf.is_iguazio_v4_mode():
+            token_provider = mlrun.auth.providers.IGTokenProvider(
+                token_endpoint=mlrun.mlconf.auth_token_endpoint,
+            )
+            return cls(
+                token=token_provider.get_token(),
+                mode=NuclioAuthKinds.iguazio,
+            )
+        return super().from_envvar()
+
+    def to_requests_auth(self) -> "requests.auth":
+        if self._token:
+            # in iguazio v4 mode we use bearer token auth
+            return _RequestAuthBearerToken(self._token)
+        return super().to_requests_auth()
+
+
+class _RequestAuthBearerToken(requests.auth.AuthBase):
+    def __init__(self, token: str):
+        self._token = token
+
+    def __call__(self, r):
+        r.headers["Authorization"] = f"Bearer {self._token}"
+        return r