nextmv 0.26.1__tar.gz → 0.26.2__tar.gz

{nextmv-0.26.1 → nextmv-0.26.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nextmv
-Version: 0.26.1
+Version: 0.26.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.26.2/nextmv/__about__.py

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

{nextmv-0.26.1 → nextmv-0.26.2}/nextmv/output.py

@@ -292,6 +292,10 @@ class Output:
     """Optional configuration for writing CSV files, to be used when the
     `output_format` is OutputFormat.CSV_ARCHIVE. These configurations are
     passed as kwargs to the `DictWriter` class from the `csv` module."""
+    json_configurations: Optional[dict[str, Any]] = None
+    """Optional configuration for writing JSON files, to be used when the
+    `output_format` is OutputFormat.JSON. These configurations are passed as
+    kwargs to the `json.dumps` function."""
     assets: Optional[list[Asset]] = None
     """Optional list of assets to be included in the output."""
 
@@ -342,6 +346,8 @@ class Output:
 
         if self.output_format == OutputFormat.CSV_ARCHIVE:
             output_dict["csv_configurations"] = self.csv_configurations
+        elif self.output_format == OutputFormat.JSON:
+            output_dict["json_configurations"] = self.json_configurations
 
         return output_dict
 
@@ -383,10 +389,23 @@ class LocalOutputWriter(OutputWriter):
                 "assets": assets,
             }
 
+        json_configurations = {}
+        if hasattr(output, "json_configurations") and output.json_configurations is not None:
+            json_configurations = output.json_configurations
+
+        indent, custom_serial = 2, _custom_serial
+        if "indent" in json_configurations:
+            indent = json_configurations["indent"]
+            del json_configurations["indent"]
+        if "default" in json_configurations:
+            custom_serial = json_configurations["default"]
+            del json_configurations["default"]
+
         serialized = json.dumps(
             final_output,
-            indent=2,
-            default=_custom_serial,
+            indent=indent,
+            default=custom_serial,
+            **json_configurations,
         )
 
         if path is None or path == "":

nextmv-0.26.2/tests/cloud/test_run.py

@@ -0,0 +1,18 @@
+import datetime
+import time
+import unittest
+
+from nextmv.cloud.run import run_duration
+
+
+class TestRunDuration(unittest.TestCase):
+    def test_run_duration_convenience_func(self):
+        before_t, before_dt = time.time(), datetime.datetime.now()
+        diff = 0.25
+        after_t, after_dt = before_t + diff, before_dt + datetime.timedelta(seconds=diff)
+        duration_t = run_duration(before_t, after_t)
+        duration_dt = run_duration(before_dt, after_dt)
+        self.assertAlmostEqual(duration_t, 250.0, delta=1.0)
+        self.assertAlmostEqual(duration_dt, 250.0, delta=1.0)
+        self.assertIsInstance(duration_t, int)
+        self.assertIsInstance(duration_dt, int)

{nextmv-0.26.1 → nextmv-0.26.2}/tests/test_output.py

@@ -73,6 +73,27 @@ class TestOutput(unittest.TestCase):
 
             self.assertDictEqual(got, expected)
 
+    def test_local_writer_json_stdout_with_configurations(self):
+        output = nextmv.Output(
+            output_format=nextmv.OutputFormat.JSON,
+            solution={"empanadas": "are_life"},
+            statistics={"foo": "bar"},
+            json_configurations={
+                "indent": None,
+                "separators": (",", ":"),
+                "sort_keys": True,
+            },
+        )
+        output_writer = nextmv.LocalOutputWriter()
+
+        with patch("sys.stdout", new=StringIO()) as mock_stdout:
+            output_writer.write(output, skip_stdout_reset=True)
+
+            self.assertEqual(
+                mock_stdout.getvalue(),
+                '{"assets":[],"options":{},"solution":{"empanadas":"are_life"},"statistics":{"foo":"bar"}}\n',
+            )
+
     def test_local_writer_json_stdout_with_options(self):
         options = nextmv.Options()
         options.duration = 5

nextmv-0.26.1/nextmv/__about__.py

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