mlrun 1.5.0rc23__py3-none-any.whl → 1.5.1rc2__py3-none-any.whl

mlrun/model.py

@@ -423,7 +423,7 @@ class ImageBuilder(ModelObj):
             self.base_image = base_image
         if commands:
             self.with_commands(commands, overwrite=overwrite)
-        if requirements:
+        if requirements or requirements_file:
             self.with_requirements(requirements, requirements_file, overwrite=overwrite)
         if extra:
             self.extra = extra
@@ -471,7 +471,7 @@ class ImageBuilder(ModelObj):
 
     def with_requirements(
         self,
-        requirements: Union[str, List[str]],
+        requirements: Optional[Union[str, List[str]]] = None,
         requirements_file: str = "",
         overwrite: bool = False,
     ):
@@ -483,6 +483,7 @@ class ImageBuilder(ModelObj):
                                     when False (default) will append to existing requirements
         :return: function object
         """
+        requirements = requirements or []
         if isinstance(requirements, str) and mlrun.utils.is_file_path(requirements):
             # TODO: remove in 1.6.0
             warnings.warn(
@@ -507,6 +508,7 @@ class ImageBuilder(ModelObj):
     def _resolve_requirements(
         requirements: typing.Union[str, list], requirements_file: str = ""
     ) -> list:
+        requirements = requirements or []
         requirements_to_resolve = []
 
         # handle the requirements_file argument

mlrun/projects/operations.py

@@ -280,8 +280,8 @@ def build_function(
     if engine == "kfp":
         if overwrite_build_params:
             function.spec.build.commands = None
-        if requirements:
-            function.with_requirements(requirements, requirements_file)
+        if requirements or requirements_file:
+            function.with_requirements(requirements, requirements_file, overwrite=True)
         if commands:
             function.with_commands(commands)
         return function.deploy_step(

mlrun/projects/project.py

@@ -2002,6 +2002,7 @@ class MlrunProject(ModelObj):
                 "with_repo": with_repo,
                 "tag": tag,
                 "requirements": requirements,
+                "requirements_file": requirements_file,
             }
             func = {k: v for k, v in function_dict.items() if v}
             resolved_function_name, function_object = _init_function_from_dict(
@@ -2022,9 +2023,9 @@ class MlrunProject(ModelObj):
             if with_repo:
                 # mark source to be enriched before run with project source (enrich_function_object)
                 function_object.spec.build.source = "./"
-            if requirements:
+            if requirements or requirements_file:
                 function_object.with_requirements(
-                    requirements, requirements_file=requirements_file
+                    requirements, requirements_file=requirements_file, overwrite=True
                 )
             if not resolved_function_name:
                 raise ValueError("Function name must be specified")
@@ -3321,6 +3322,7 @@ def _init_function_from_dict(
     handler = f.get("handler", None)
     with_repo = f.get("with_repo", False)
     requirements = f.get("requirements", None)
+    requirements_file = f.get("requirements_file", None)
     tag = f.get("tag", None)
 
     has_module = _has_module(handler, kind)
@@ -3383,8 +3385,12 @@ def _init_function_from_dict(
     if with_repo:
         # mark source to be enriched before run with project source (enrich_function_object)
         func.spec.build.source = "./"
-    if requirements:
-        func.with_requirements(requirements)
+    if requirements or requirements_file:
+        func.with_requirements(
+            requirements=requirements,
+            requirements_file=requirements_file,
+            overwrite=True,
+        )
 
     return _init_function_from_obj(func, project)
 

mlrun/run.py

@@ -667,7 +667,7 @@ def new_function(
         else:
             runner.spec.default_handler = handler
 
-    if requirements:
+    if requirements or requirements_file:
         runner.with_requirements(
             requirements,
             requirements_file=requirements_file,
@@ -821,7 +821,7 @@ def code_to_function(
         fn.spec.build.commands = get_in(spec, "spec.build.commands")
         fn.spec.build.secret = get_in(spec, "spec.build.secret")
 
-        if requirements:
+        if requirements or requirements_file:
             fn.with_requirements(requirements, requirements_file=requirements_file)
 
         if embed_code:

mlrun/runtimes/base.py

@@ -792,7 +792,7 @@ class BaseRuntime(ModelObj):
 
     def with_requirements(
         self,
-        requirements: Union[str, List[str]],
+        requirements: Optional[Union[str, List[str]]] = None,
         overwrite: bool = False,
         verify_base_image: bool = False,
         prepare_image_for_deploy: bool = True,

mlrun/utils/version/version.json

@@ -1,4 +1,4 @@
 {
-  "git_commit": "eda0f94564d928ba33eaba02436bb367110a75b3",
-  "version": "1.5.0-rc23"
+  "git_commit": "49dc443de0204565aa7823c76a55cfc29fe63189",
+  "version": "1.5.1-rc2"
 }

{mlrun-1.5.0rc23.dist-info → mlrun-1.5.1rc2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mlrun
-Version: 1.5.0rc23
+Version: 1.5.1rc2
 Summary: Tracking and config of machine learning runs
 Home-page: https://github.com/mlrun/mlrun
 Author: Yaron Haviv

{mlrun-1.5.0rc23.dist-info → mlrun-1.5.1rc2.dist-info}/RECORD

@@ -7,9 +7,9 @@ mlrun/features.py,sha256=UQQ2uh5Xh9XsMGiYBqh3bKgDhOHANjv1gQgWyId9qQE,15624
 mlrun/k8s_utils.py,sha256=UJTo0uHTphDi-o305l7R-oeyDfqVVfoYbk0EW6cm38Q,5382
 mlrun/kfpops.py,sha256=Aqp0r43jpBFf1IJ-h_ZV1UvL0udxw3z1_pWKyFY61ZI,29860
 mlrun/lists.py,sha256=XFv87TKpfdkah_KFoOVUHNxoouOT2sS306aZnGO4nKQ,8779
-mlrun/model.py,sha256=J8WV70QRExOhq_CxB5CcJE_3mqqc4IMyE2GR-0iFEgs,62820
+mlrun/model.py,sha256=A6thnspZpv31h7LEAOc0Ljg7dwZ1xQ1eTNloeTl2w20,62942
 mlrun/render.py,sha256=a_s-kzQ35bJg7e7cBxk3MCnoIK4qvDS2dGO8RzHgI1c,13016
-mlrun/run.py,sha256=X1oy0p-7eA-TLQtm4LhSHHc0GxSaABuRbPjVuY58cN4,47807
+mlrun/run.py,sha256=MyKt9nAizLr3xXCPZoQmeRu2ZJCgkmTPROu8XJ73IR4,47849
 mlrun/secrets.py,sha256=hr2Ia9kLkoMM3KoxijXqO6AIJOUrrLxvz4Q7Xk39d4Y,7783
 mlrun/api/__init__.py,sha256=xY3wHC4TEJgez7qtnn1pQvHosi8-5UJOCtyGBS7FcGE,571
 mlrun/api/alembic.ini,sha256=oeSJRHwBbF3c3-N_RJilcZD-diq3F-oPv21gDIkrZGs,2105
@@ -408,11 +408,11 @@ mlrun/platforms/__init__.py,sha256=ArWn_iZiEE6qz7hvY_1RqMkFnHGuKjP3k5xYKnfKA58,2
 mlrun/platforms/iguazio.py,sha256=LU1d33ll5EKIyp2zitCffZIbq-3fRwNSNO9MK2cIsHc,21729
 mlrun/platforms/other.py,sha256=z4pWqxXkVVuMLk-MbNb0Y_ZR5pmIsUm0R8vHnqpEnew,11852
 mlrun/projects/__init__.py,sha256=Lv5rfxyXJrw6WGOWJKhBz66M6t3_zsNMCfUD6waPwx4,1153
-mlrun/projects/operations.py,sha256=Fot74eIimCWb1DflMcp5gl8kG3li-A783Lp2xhziu80,18122
+mlrun/projects/operations.py,sha256=H-YYZezd4nP6sI8ffRCX6DNr2l4G9z6knkAfP5A6N2o,18159
 mlrun/projects/pipelines.py,sha256=8jCk6gyVNgUJK-J6R4bRPM3TZo-4sUil5cJMxocRNeA,36895
-mlrun/projects/project.py,sha256=P11VYOYntNZgUE6jxwULoT5N_VhJ3O-vcP8_BrcF0LY,138181
+mlrun/projects/project.py,sha256=JaEZhBDEA5sjhIXrS9bglcM_0k6PEk0AePZrLBpmLZA,138465
 mlrun/runtimes/__init__.py,sha256=OuwnzCoaoXnqAv_RhoYRF6mRPfZ2pkslenxASpXhHQM,6707
-mlrun/runtimes/base.py,sha256=Xv5qOlb070_eU1H5IGpc_TY5p1uBlh-ghz8kSVKu6z0,38097
+mlrun/runtimes/base.py,sha256=8frflsMi-gAs4t3ndUFVqCRVJLyW2vqsYYAhigGh7lo,38114
 mlrun/runtimes/constants.py,sha256=TnkD0nQ7pcFq1aJvbweoM4BgbkhaA6fHhg9rnAkxDBE,6689
 mlrun/runtimes/daskjob.py,sha256=LgA4Y1gcNUHvRz0YlFT-mfEfzn8-yPD5Y1MCF2HPgFk,16226
 mlrun/runtimes/funcdoc.py,sha256=UGMHyhu9NGdD3iKotdfbFj6J-KlR1hxkwjjpiZPMs4E,10268
@@ -470,11 +470,11 @@ mlrun/utils/notifications/notification/ipython.py,sha256=qrBmtECiRG6sZpCIVMg7RZc
 mlrun/utils/notifications/notification/slack.py,sha256=5JysqIpUYUZKXPSeeZtbl7qb2L9dj7p2NvnEBcEsZkA,3898
 mlrun/utils/notifications/notification/webhook.py,sha256=QHezCuN5uXkLcroAGxGrhGHaxAdUvkDLIsp27_Yrfd4,2390
 mlrun/utils/version/__init__.py,sha256=7kkrB7hEZ3cLXoWj1kPoDwo4MaswsI2JVOBpbKgPAgc,614
-mlrun/utils/version/version.json,sha256=Grz9O6E01_0aanPq_eoMyc4_Kk-x0vUdHZ88RIe9BkY,89
+mlrun/utils/version/version.json,sha256=TbEmWFNDKCtb0cQcNzva4DHtourhHTcAHOySJlWIzOA,88
 mlrun/utils/version/version.py,sha256=HMwseV8xjTQ__6T6yUWojx_z6yUj7Io7O4NcCCH_sz8,1970
-mlrun-1.5.0rc23.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-mlrun-1.5.0rc23.dist-info/METADATA,sha256=TZS8XvcYwhV6VUr5QKEwfNnQrKoP-uhC3verGzg5gLM,17826
-mlrun-1.5.0rc23.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-mlrun-1.5.0rc23.dist-info/entry_points.txt,sha256=ZbXmb36B9JmK7EaleP8MIAbZSOQXQV0iwKR6si0HUWk,47
-mlrun-1.5.0rc23.dist-info/top_level.txt,sha256=NObLzw3maSF9wVrgSeYBv-fgnHkAJ1kEkh12DLdd5KM,6
-mlrun-1.5.0rc23.dist-info/RECORD,,
+mlrun-1.5.1rc2.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+mlrun-1.5.1rc2.dist-info/METADATA,sha256=sHSvnEX2aOMyy9cd4agZbomHpAH7FVsFit6aup4iVAs,17825
+mlrun-1.5.1rc2.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+mlrun-1.5.1rc2.dist-info/entry_points.txt,sha256=ZbXmb36B9JmK7EaleP8MIAbZSOQXQV0iwKR6si0HUWk,47
+mlrun-1.5.1rc2.dist-info/top_level.txt,sha256=NObLzw3maSF9wVrgSeYBv-fgnHkAJ1kEkh12DLdd5KM,6
+mlrun-1.5.1rc2.dist-info/RECORD,,