nextmv 0.28.3.dev0__tar.gz → 0.28.3.dev1__tar.gz

{nextmv-0.28.3.dev0 → nextmv-0.28.3.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nextmv
-Version: 0.28.3.dev0
+Version: 0.28.3.dev1
 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.3.dev1/nextmv/__about__.py

@@ -0,0 +1 @@
+__version__ = "v0.28.3.dev1"

{nextmv-0.28.3.dev0 → nextmv-0.28.3.dev1}/nextmv/cloud/application.py

@@ -66,7 +66,6 @@ from nextmv.logger import log
 from nextmv.model import Model, ModelConfiguration
 from nextmv.options import Options
 from nextmv.output import Output
-from nextmv.serialization import serialize_json
 
 # Maximum size of the run input/output in bytes. This constant defines the
 # maximum allowed size for run inputs and outputs. When the size exceeds this
@@ -1589,7 +1588,7 @@ class Application:
                     if isinstance(v, str):
                         options_dict[k] = v
                     else:
-                        options_dict[k] = serialize_json(v)
+                        options_dict[k] = json.dumps(v)
 
         payload = {}
         if upload_id_used:
@@ -2831,7 +2830,7 @@ class Application:
         """
 
         if isinstance(input, dict):
-            input = serialize_json(input)
+            input = json.dumps(input)
 
         self.client.upload_to_presigned_url(
             url=upload_url.upload_url,
@@ -3175,7 +3174,7 @@ class Application:
         raise ValueError(f"Unknown scenario input type: {scenario.scenario_input.scenario_input_type}")
 
 
-def poll(polling_options: PollingOptions, polling_func: Callable[[], tuple[Any, bool]]) -> Any:
+def poll(polling_options: PollingOptions, polling_func: Callable[[], tuple[Any, bool]]) -> Any:  # noqa: C901
     """
     Poll a function until it succeeds or the polling strategy is exhausted.
 
@@ -3254,6 +3253,7 @@ def poll(polling_options: PollingOptions, polling_func: Callable[[], tuple[Any,
     stopped = False
 
     # Begin the polling process.
+    max_reached = False
     for ix in range(polling_options.max_tries):
         # Check is we should stop polling according to the stop callback.
         if polling_options.stop is not None and polling_options.stop():
@@ -3280,12 +3280,24 @@ def poll(polling_options: PollingOptions, polling_func: Callable[[], tuple[Any,
             )
 
         # Calculate the delay.
-        delay = polling_options.delay  # Base
-        delay += polling_options.backoff * (2**ix)  # Add exponential backoff.
-        delay += random.uniform(0, polling_options.jitter)  # Add jitter.
+        delay = 0.0
+        if max_reached:
+            # If we already reached the maximum, we don't want to further calculate the
+            # delay to avoid overflows.
+            delay = polling_options.max_delay
+            delay += random.uniform(0, polling_options.jitter)  # Add jitter.
+        else:
+            delay = polling_options.delay  # Base
+            delay += polling_options.backoff * (2**ix)  # Add exponential backoff.
+            delay += random.uniform(0, polling_options.jitter)  # Add jitter.
+
+        # We cannot exceed the max delay.
+        if delay >= polling_options.max_delay:
+            max_reached = True
+            delay = polling_options.max_delay
 
-        # Sleep for the calculated delay. We cannot exceed the max delay.
-        sleep_duration = min(delay, polling_options.max_delay)
+        # Sleep for the calculated delay.
+        sleep_duration = delay
         if polling_options.verbose:
             log(f"polling | sleeping for duration: {sleep_duration}")
 

{nextmv-0.28.3.dev0 → nextmv-0.28.3.dev1}/nextmv/cloud/client.py

@@ -14,6 +14,7 @@ get_size(obj)
     Finds the size of an object in bytes.
 """
 
+import json
 import os
 from dataclasses import dataclass, field
 from typing import IO, Any, Optional, Union
@@ -23,8 +24,6 @@ import requests
 import yaml
 from requests.adapters import HTTPAdapter, Retry
 
-from nextmv.serialization import serialize_json
-
 _MAX_LAMBDA_PAYLOAD_SIZE: int = 500 * 1024 * 1024
 """int: Maximum size of the payload handled by the Nextmv Cloud API.
 
@@ -294,11 +293,7 @@ class Client:
         if data is not None:
             kwargs["data"] = data
         if payload is not None:
-            if isinstance(payload, (dict, list)):
-                data = serialize_json(payload)
-                kwargs["data"] = data
-            else:
-                raise ValueError("payload must be a dictionary or a list")
+            kwargs["json"] = payload
         if query_params is not None:
             kwargs["params"] = query_params
 
@@ -346,7 +341,7 @@ class Client:
 
         upload_data: Optional[str] = None
         if isinstance(data, dict):
-            upload_data = serialize_json(data)
+            upload_data = json.dumps(data, separators=(",", ":"))
         elif isinstance(data, str):
             upload_data = data
         else:
@@ -441,7 +436,7 @@ def get_size(obj: Union[dict[str, Any], IO[bytes], str]) -> int:
     """
 
     if isinstance(obj, dict):
-        obj_str = serialize_json(obj)
+        obj_str = json.dumps(obj, separators=(",", ":"))
         return len(obj_str.encode("utf-8"))
 
     elif hasattr(obj, "read"):

{nextmv-0.28.3.dev0 → nextmv-0.28.3.dev1}/nextmv/cloud/run.py

@@ -39,6 +39,7 @@ run_duration(start, end)
     Calculate the duration of a run in milliseconds.
 """
 
+import json
 from dataclasses import dataclass
 from datetime import datetime
 from enum import Enum
@@ -50,7 +51,6 @@ from nextmv.base_model import BaseModel
 from nextmv.cloud.status import Status, StatusV2
 from nextmv.input import Input, InputFormat
 from nextmv.output import Output, OutputFormat
-from nextmv.serialization import serialize_json
 
 
 def run_duration(start: Union[datetime, float], end: Union[datetime, float]) -> int:
@@ -628,7 +628,7 @@ class TrackedRun:
                 raise ValueError("Input.input_format must be JSON.")
         elif isinstance(self.input, dict):
             try:
-                _ = serialize_json(self.input)
+                _ = json.dumps(self.input)
             except (TypeError, OverflowError) as e:
                 raise ValueError("Input is dict[str, Any] but it is not JSON serializable") from e
 
@@ -637,7 +637,7 @@ class TrackedRun:
                 raise ValueError("Output.output_format must be JSON.")
         elif isinstance(self.output, dict):
             try:
-                _ = serialize_json(self.output)
+                _ = json.dumps(self.output)
             except (TypeError, OverflowError) as e:
                 raise ValueError("Output is dict[str, Any] but it is not JSON serializable") from e
 

{nextmv-0.28.3.dev0 → nextmv-0.28.3.dev1}/nextmv/input.py

@@ -33,7 +33,6 @@ from typing import Any, Optional, Union
 
 from nextmv.deprecated import deprecated
 from nextmv.options import Options
-from nextmv.serialization import serialize_json
 
 
 class InputFormat(str, Enum):
@@ -140,7 +139,7 @@ class Input:
 
         if self.input_format == InputFormat.JSON:
             try:
-                _ = serialize_json(self.data)
+                _ = json.dumps(self.data)
             except (TypeError, OverflowError) as e:
                 raise ValueError(
                     f"Input has input_format InputFormat.JSON and "

{nextmv-0.28.3.dev0 → nextmv-0.28.3.dev1}/nextmv/output.py

@@ -42,6 +42,8 @@ write
 
 import copy
 import csv
+import datetime
+import json
 import os
 import sys
 from dataclasses import dataclass
@@ -54,7 +56,6 @@ from nextmv.base_model import BaseModel
 from nextmv.deprecated import deprecated
 from nextmv.logger import reset_stdout
 from nextmv.options import Options
-from nextmv.serialization import serialize_json
 
 
 class RunStatistics(BaseModel):
@@ -643,7 +644,7 @@ class Output:
 
         if self.output_format == OutputFormat.JSON:
             try:
-                _ = serialize_json(self.solution)
+                _ = json.dumps(self.solution, default=_custom_serial)
             except (TypeError, OverflowError) as e:
                 raise ValueError(
                     f"Output has output_format OutputFormat.JSON and "
@@ -721,6 +722,12 @@ class Output:
             and self.csv_configurations != {}
         ):
             output_dict["csv_configurations"] = self.csv_configurations
+        elif (
+            self.output_format == OutputFormat.JSON
+            and self.json_configurations is not None
+            and self.json_configurations != {}
+        ):
+            output_dict["json_configurations"] = self.json_configurations
 
         return output_dict
 
@@ -815,9 +822,19 @@ class LocalOutputWriter(OutputWriter):
         if hasattr(output, "json_configurations") and output.json_configurations is not None:
             json_configurations = output.json_configurations
 
-        serialized = serialize_json(
+        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(
             output_dict,
-            json_configurations=json_configurations,
+            indent=indent,
+            default=custom_serial,
+            **json_configurations,
         )
 
         if path is None or path == "":
@@ -860,17 +877,13 @@ class LocalOutputWriter(OutputWriter):
         if not os.path.exists(dir_path):
             os.makedirs(dir_path)
 
-        json_configurations = {}
-        if hasattr(output, "json_configurations") and output.json_configurations is not None:
-            json_configurations = output.json_configurations
-
-        serialized = serialize_json(
+        serialized = json.dumps(
             {
                 "options": output_dict.get("options", {}),
                 "statistics": output_dict.get("statistics", {}),
                 "assets": output_dict.get("assets", []),
             },
-            json_configurations=json_configurations,
+            indent=2,
         )
         print(serialized, file=sys.stdout)
 
@@ -1105,3 +1118,32 @@ def write(
     """
 
     writer.write(output, path, skip_stdout_reset)
+
+
+def _custom_serial(obj: Any) -> str:
+    """
+    JSON serializer for objects not serializable by default json serializer.
+
+    This function provides custom serialization for datetime objects, converting
+    them to ISO format strings.
+
+    Parameters
+    ----------
+    obj : Any
+        The object to serialize.
+
+    Returns
+    -------
+    str
+        The serialized representation of the object.
+
+    Raises
+    ------
+    TypeError
+        If the object type is not supported for serialization.
+    """
+
+    if isinstance(obj, (datetime.datetime | datetime.date)):
+        return obj.isoformat()
+
+    raise TypeError(f"Type {type(obj)} not serializable")

{nextmv-0.28.3.dev0 → nextmv-0.28.3.dev1}/tests/test_output.py

@@ -118,6 +118,13 @@ class TestOutput(unittest.TestCase):
         result = output.to_dict()
         self.assertEqual(result["assets"][0]["name"], "asset3")
 
+        # Test with JSON configurations
+        json_config = {"indent": 4, "sort_keys": True}
+        output = nextmv.Output(output_format=nextmv.OutputFormat.JSON, json_configurations=json_config)
+        result = output.to_dict()
+        self.assertEqual(result["json_configurations"]["indent"], 4)
+        self.assertEqual(result["json_configurations"]["sort_keys"], True)
+
         # Test with CSV configurations
         csv_config = {"delimiter": ";", "quoting": csv.QUOTE_NONNUMERIC}
         output = nextmv.Output(output_format=nextmv.OutputFormat.CSV_ARCHIVE, csv_configurations=csv_config)
@@ -176,6 +183,7 @@ class TestOutput(unittest.TestCase):
         self.assertEqual(result["assets"][0]["name"], "asset1")
         self.assertEqual(result["assets"][0]["visual"]["schema"], "chartjs")
         self.assertEqual(result["solution"]["value"], 42)
+        self.assertEqual(result["json_configurations"]["indent"], 4)
 
     def test_local_writer_json_stdout_default(self):
         output = nextmv.Output(
@@ -254,7 +262,7 @@ class TestOutput(unittest.TestCase):
 
             self.assertEqual(
                 mock_stdout.getvalue(),
-                '{"assets":[],"options":{},"solution":{"empanadas":"are_life"},"statistics":{"foo":"bar"}}\n',
+                '{"assets":[],"json_configurations":{"separators":[",",":"],"sort_keys":true},"options":{},"solution":{"empanadas":"are_life"},"statistics":{"foo":"bar"}}\n',
             )
 
     def test_local_writer_json_stdout_with_options(self):

nextmv-0.28.3.dev0/nextmv/__about__.py

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

nextmv-0.28.3.dev0/nextmv/serialization.py

@@ -1,67 +0,0 @@
-import datetime
-import json
-from typing import Any, Union
-
-
-def serialize_json(
-    obj: Union[dict, list],
-    json_configurations: dict[str, Any] = None,
-) -> str:
-    """
-    Serialize a Python object (dict or list) to a JSON string.
-
-    Parameters
-    ----------
-    obj : Union[dict, list]
-        The Python object to serialize.
-    json_configurations : dict, optional
-        Additional configurations for JSON serialization. This allows customization
-        of the Python `json.dumps` function. You can specify parameters like `indent`
-        for pretty printing or `default` for custom serialization functions.
-
-    Returns
-    -------
-    str
-        A JSON string representation of the object.
-    """
-
-    # Apply some default configuration if not provided
-    json_configurations = json_configurations or {}
-    if "default" not in json_configurations:
-        json_configurations["default"] = _custom_serial
-    if "separators" not in json_configurations:
-        json_configurations["separators"] = (",", ":")
-
-    return json.dumps(
-        obj,
-        **json_configurations,
-    )
-
-
-def _custom_serial(obj: Any) -> str:
-    """
-    JSON serializer for objects not serializable by default json serializer.
-
-    This function provides custom serialization for datetime objects, converting
-    them to ISO format strings.
-
-    Parameters
-    ----------
-    obj : Any
-        The object to serialize.
-
-    Returns
-    -------
-    str
-        The serialized representation of the object.
-
-    Raises
-    ------
-    TypeError
-        If the object type is not supported for serialization.
-    """
-
-    if isinstance(obj, (datetime.datetime, datetime.date)):
-        return obj.isoformat()
-
-    raise TypeError(f"Type {type(obj)} not serializable")

nextmv-0.28.3.dev0/tests/test_serialization.py

@@ -1,53 +0,0 @@
-import datetime
-import json
-import unittest
-
-import nextmv.serialization
-
-
-class TestSerialization(unittest.TestCase):
-    """Tests for the common serialization functionality."""
-
-    def test_default_serialization(self):
-        """Test the default serialization"""
-
-        data = {
-            "name": "Test",
-            "value": 42,
-            "timestamp": nextmv.serialization._custom_serial(datetime.datetime(2023, 10, 1)),
-        }
-        serialized = nextmv.serialization.serialize_json(data)
-        expected = json.dumps(
-            {
-                "name": "Test",
-                "value": 42,
-                "timestamp": "2023-10-01T00:00:00",
-            },
-            separators=(",", ":"),
-        )
-        self.assertEqual(serialized, expected)
-
-    def test_custom_serialization(self):
-        """Test custom serialization with additional configurations"""
-
-        data = {
-            "name": "Test",
-            "value": 42,
-            "timestamp": nextmv.serialization._custom_serial(datetime.datetime(2023, 10, 1)),
-        }
-        json_configurations = {
-            "indent": 2,
-            "default": nextmv.serialization._custom_serial,
-            "separators": (",", ": "),
-        }
-        serialized = nextmv.serialization.serialize_json(data, json_configurations)
-        expected = json.dumps(
-            {
-                "name": "Test",
-                "value": 42,
-                "timestamp": "2023-10-01T00:00:00",
-            },
-            indent=2,
-            separators=(",", ": "),
-        )
-        self.assertEqual(serialized, expected)