nextmv 0.28.1.dev0__tar.gz → 0.28.2__tar.gz

{nextmv-0.28.1.dev0 → nextmv-0.28.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nextmv
-Version: 0.28.1.dev0
+Version: 0.28.2
 Summary: The all-purpose Python SDK for Nextmv
 Project-URL: Homepage, https://www.nextmv.io
 Project-URL: Documentation, https://www.nextmv.io/docs/python-sdks/nextmv/installation

nextmv-0.28.2/nextmv/__about__.py

@@ -0,0 +1 @@
+__version__ = "v0.28.2"

{nextmv-0.28.1.dev0 → nextmv-0.28.2}/nextmv/cloud/manifest.py

@@ -33,7 +33,7 @@ FILE_NAME
 
 import os
 from enum import Enum
-from typing import Any, Optional
+from typing import Any, Optional, Union
 
 import yaml
 from pydantic import AliasChoices, Field
@@ -282,7 +282,9 @@ class ManifestPython(BaseModel):
     ----------
     pip_requirements : Optional[str], default=None
         Path to a requirements.txt file containing (additional) Python
-        dependencies that will be bundled with the app.
+        dependencies that will be bundled with the app. Alternatively, you can provide a
+        list of strings, each representing a package to install, e.g.,
+        `["nextmv==0.28.2", "ortools==9.12.4544"]`.
         Aliases: `pip-requirements`.
     model : Optional[ManifestPythonModel], default=None
         Information about an encoded decision model as handled via mlflow. This
@@ -299,7 +301,7 @@ class ManifestPython(BaseModel):
     'requirements.txt'
     """
 
-    pip_requirements: Optional[str] = Field(
+    pip_requirements: Optional[Union[str, list[str]]] = Field(
         serialization_alias="pip-requirements",
         validation_alias=AliasChoices("pip-requirements", "pip_requirements"),
         default=None,

{nextmv-0.28.1.dev0 → nextmv-0.28.2}/nextmv/cloud/package.py

@@ -233,11 +233,25 @@ def __install_dependencies(
         return
 
     pip_requirements = manifest.python.pip_requirements
+
     if pip_requirements is None or pip_requirements == "":
+        # If no pip requirements are specified, we do not install any dependencies.
         return
 
-    if not os.path.isfile(os.path.join(app_dir, pip_requirements)):
-        raise FileNotFoundError(f"pip requirements file '{pip_requirements}' not found in '{app_dir}'")
+    if isinstance(pip_requirements, list):
+        # If pip_requirements is a list, we write it to a temporary file so that we can
+        # pass it to pip.
+        pip_requirements_file = os.path.join(temp_dir, "requirements.txt")
+        with open(pip_requirements_file, "w") as f:
+            for requirement in pip_requirements:
+                f.write(requirement + "\n")
+        pip_requirements = pip_requirements_file
+    elif isinstance(pip_requirements, str):
+        # If pip_requirements is a string, we expect it to be a file path to a
+        # requirements file.
+        pip_requirements = pip_requirements.strip()
+        if not os.path.isfile(os.path.join(app_dir, pip_requirements)):
+            raise FileNotFoundError(f"pip requirements file '{pip_requirements}' not found in '{app_dir}'")
 
     py_cmd = __get_python_command()
     dep_dir = os.path.join(".nextmv", "python", "deps")

{nextmv-0.28.1.dev0 → nextmv-0.28.2}/nextmv/options.py

@@ -575,7 +575,7 @@ class Options:
 
         self._parse()
 
-    def merge(self, new: "Options") -> "Options":
+    def merge(self, *new: "Options", skip_parse: bool = False) -> "Options":
         """
         Merges the current options with the new options.
 
@@ -587,7 +587,11 @@ class Options:
         Parameters
         ----------
         new : Options
-            The new options to merge with the current options.
+            The new options to merge with the current options. At least one new option set
+            is required to merge. Multiple `Options` instances can be passed.
+        skip_parse : bool, optional
+            If True, the merged options will not be parsed after merging. This is useful
+            if you want to merge further options after this merge. The default is False.
 
         Returns
         -------
@@ -605,11 +609,14 @@ class Options:
         --------
         >>> opt1 = Options(Option("duration", str, "30s"))
         >>> opt2 = Options(Option("threads", int, 4))
-        >>> merged = opt1.merge(opt2)
+        >>> opt3 = Options(Option("verbose", bool, False))
+        >>> merged = opt1.merge(opt2, opt3)
         >>> merged.duration
         '30s'
         >>> merged.threads
         4
+        >>> merged.verbose
+        False
         """
 
         if self.PARSED:
@@ -617,14 +624,24 @@ class Options:
                 "base options have already been parsed, cannot merge. See `Options.parse()` for more information."
             )
 
-        if new.PARSED:
-            raise RuntimeError(
-                "new options have already been parsed, cannot merge. See `Options.parse()` for more information."
-            )
+        if not new:
+            raise ValueError("at least one new Options instance is required to merge")
 
-        self.options += new.options
+        for i, opt in enumerate(new):
+            if not isinstance(opt, Options):
+                raise TypeError(f"expected an <Options> object, but got {type(opt)} in index {i}")
+            if opt.PARSED:
+                raise RuntimeError(
+                    f"new options at index {i} have already been parsed, cannot merge. "
+                    + "See `Options.parse()` for more information."
+                )
 
-        self._parse()
+        # Add the new options to the current options.
+        for n in new:
+            self.options += n.options
+
+        if not skip_parse:
+            self.parse()
 
         return self
 

{nextmv-0.28.1.dev0 → nextmv-0.28.2}/tests/test_options.py

@@ -588,6 +588,69 @@ class TestParameter(unittest.TestCase):
         self.assertEqual(opt.foo2, 3)
         self.assertEqual(opt.bar2, 4)
 
+    def test_merge_lazy(self):
+        opt1 = nextmv.Options(
+            nextmv.Parameter("foo1", int, default=1),
+            nextmv.Parameter("bar1", int, default=2),
+        )
+        self.assertFalse(opt1.PARSED)
+
+        opt2 = nextmv.Options(
+            nextmv.Parameter("foo2", int, default=3),
+            nextmv.Parameter("bar2", int, default=4),
+        )
+        self.assertFalse(opt2.PARSED)
+
+        opt3 = nextmv.Options(
+            nextmv.Parameter("foo3", int, default=5),
+            nextmv.Parameter("bar3", int, default=6),
+        )
+        self.assertFalse(opt3.PARSED)
+
+        opt = opt1.merge(opt2, skip_parse=True)
+        self.assertFalse(opt.PARSED)
+
+        opt = opt.merge(opt3, skip_parse=True)
+        self.assertFalse(opt.PARSED)
+
+        opt.parse()
+        self.assertTrue(opt.PARSED)
+
+        self.assertEqual(opt.foo1, 1)
+        self.assertEqual(opt.bar1, 2)
+        self.assertEqual(opt.foo2, 3)
+        self.assertEqual(opt.bar2, 4)
+        self.assertEqual(opt.foo3, 5)
+        self.assertEqual(opt.bar3, 6)
+
+    def test_merge_multi(self):
+        opt1 = nextmv.Options(
+            nextmv.Parameter("foo1", int, default=1),
+            nextmv.Parameter("bar1", int, default=2),
+        )
+        self.assertFalse(opt1.PARSED)
+
+        opt2 = nextmv.Options(
+            nextmv.Parameter("foo2", int, default=3),
+            nextmv.Parameter("bar2", int, default=4),
+        )
+        self.assertFalse(opt2.PARSED)
+
+        opt3 = nextmv.Options(
+            nextmv.Parameter("foo3", int, default=5),
+            nextmv.Parameter("bar3", int, default=6),
+        )
+        self.assertFalse(opt3.PARSED)
+
+        opt1.merge(opt2, opt3)
+        self.assertTrue(opt1.PARSED)
+        self.assertEqual(opt1.foo1, 1)
+        self.assertEqual(opt1.bar1, 2)
+        self.assertEqual(opt1.foo2, 3)
+        self.assertEqual(opt1.bar2, 4)
+        self.assertEqual(opt1.foo3, 5)
+        self.assertEqual(opt1.bar3, 6)
+
     def test_cant_merge(self):
         opt1 = nextmv.Options(
             nextmv.Parameter("foo1", int, default=1),

nextmv-0.28.1.dev0/nextmv/__about__.py

@@ -1 +0,0 @@
-__version__ = "v0.28.1.dev0"