nextmv 0.36.0__tar.gz → 0.36.1.dev0__tar.gz

{nextmv-0.36.0 → nextmv-0.36.1.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nextmv
-Version: 0.36.0
+Version: 0.36.1.dev0
 Summary: The all-purpose Python SDK for Nextmv
 Project-URL: Homepage, https://www.nextmv.io
 Project-URL: Documentation, https://nextmv-py.docs.nextmv.io/en/latest/nextmv/

nextmv-0.36.1.dev0/nextmv/__about__.py

@@ -0,0 +1 @@
+__version__ = "v0.36.1-dev.0"

{nextmv-0.36.0 → nextmv-0.36.1.dev0}/nextmv/cloud/batch_experiment.py

@@ -257,7 +257,7 @@ class BatchExperimentRun(BaseModel):
     repetition: int | None = None
     """Repetition number of the experiment."""
 
-    def __post_init_post_parse__(self):
+    def model_post_init(self, __context) -> None:
         """
         Logic to run after the class is initialized.
 

{nextmv-0.36.0 → nextmv-0.36.1.dev0}/nextmv/cloud/instance.py

@@ -15,6 +15,7 @@ Instance
 from datetime import datetime
 
 from nextmv.base_model import BaseModel
+from nextmv.run import RunQueuing
 
 
 class InstanceConfiguration(BaseModel):
@@ -37,6 +38,10 @@ class InstanceConfiguration(BaseModel):
         Runtime options/parameters for the application.
     secrets_collection_id : str, optional
         ID of the secrets collection to use with this instance.
+    queuing : RunQueuing, optional
+        Queuing configuration for the instance.
+    integration_id : str, optional
+        ID of the integration to use for the instance.
 
     Examples
     --------
@@ -53,6 +58,29 @@ class InstanceConfiguration(BaseModel):
     """Options of the app that the instance uses."""
     secrets_collection_id: str | None = None
     """ID of the secrets collection that the instance uses."""
+    queuing: RunQueuing | None = None
+    """Queuing configuration for the instance."""
+    integration_id: str | None = None
+    """ID of the integration to use for the instance."""
+
+    def model_post_init(self, __context) -> None:
+        """
+        Validations done after parsing the model.
+
+        Raises
+        ------
+        ValueError
+            If execution_class is an empty string.
+        """
+
+        if self.integration_id is None or self.integration_id == "":
+            return
+
+        integration_val = "integration"
+        if self.execution_class is not None and self.execution_class != "" and self.execution_class != integration_val:
+            raise ValueError(f"When integration_id is set, execution_class must be `{integration_val}` or None.")
+
+        self.execution_class = integration_val
 
 
 class Instance(BaseModel):

{nextmv-0.36.0 → nextmv-0.36.1.dev0}/nextmv/cloud/package.py

@@ -16,6 +16,7 @@ from nextmv.model import Model, ModelConfiguration, _cleanup_python_model
 _MANDATORY_FILES_PER_TYPE = {
     ManifestType.PYTHON: ["main.py"],
     ManifestType.GO: ["main"],
+    ManifestType.BINARY: ["main"],
     ManifestType.JAVA: ["main.jar"],
 }
 
@@ -277,7 +278,9 @@ def __install_dependencies(  # noqa: C901 # complexity
                 "--platform=manylinux2014_aarch64",
                 "--platform=manylinux_2_17_aarch64",
                 "--platform=manylinux_2_24_aarch64",
+                "--platform=manylinux_2_26_aarch64",
                 "--platform=manylinux_2_28_aarch64",
+                "--platform=manylinux_2_34_aarch64",
                 "--platform=linux_aarch64",
             ]
         )
@@ -287,7 +290,9 @@ def __install_dependencies(  # noqa: C901 # complexity
                 "--platform=manylinux2014_x86_64",
                 "--platform=manylinux_2_17_x86_64",
                 "--platform=manylinux_2_24_x86_64",
+                "--platform=manylinux_2_26_x86_64",
                 "--platform=manylinux_2_28_x86_64",
+                "--platform=manylinux_2_34_x86_64",
                 "--platform=linux_x86_64",
             ]
         )

{nextmv-0.36.0 → nextmv-0.36.1.dev0}/nextmv/local/executor.py

@@ -1017,6 +1017,8 @@ def __determine_entrypoint(manifest: Manifest) -> str:
         return "./main.py"
     elif manifest.type == ManifestType.GO:
         return "./main"
+    elif manifest.type == ManifestType.BINARY:
+        return "./main"
     elif manifest.type == ManifestType.JAVA:
         return "./main.jar"
     else:

{nextmv-0.36.0 → nextmv-0.36.1.dev0}/nextmv/manifest.py

@@ -118,6 +118,8 @@ class ManifestType(str, Enum):
     """Go format"""
     JAVA = "java"
     """Java format"""
+    BINARY = "binary"
+    """Binary format"""
 
 
 class ManifestRuntime(str, Enum):

{nextmv-0.36.0 → nextmv-0.36.1.dev0}/nextmv/run.py

@@ -1081,7 +1081,7 @@ class RunQueuing(BaseModel):
     queued. If False, the run will be queued.
     """
 
-    def __post_init_post_parse__(self):
+    def model_post_init(self, __context) -> None:
         """
         Validations done after parsing the model.
 
@@ -1121,6 +1121,8 @@ class RunConfiguration(BaseModel):
         ID of the secrets collection to use for the run. Defaults to None.
     queuing : RunQueuing, optional
         Queuing configuration for the run. Defaults to None.
+    integration_id : str, optional
+        ID of the integration to use for the run. Defaults to None.
 
     Examples
     --------
@@ -1150,6 +1152,27 @@ class RunConfiguration(BaseModel):
     """ID of the secrets collection to use for the run."""
     queuing: RunQueuing | None = None
     """Queuing configuration for the run."""
+    integration_id: str | None = None
+    """ID of the integration to use for the run."""
+
+    def model_post_init(self, __context) -> None:
+        """
+        Validations done after parsing the model.
+
+        Raises
+        ------
+        ValueError
+            If execution_class is an empty string.
+        """
+
+        if self.integration_id is None or self.integration_id == "":
+            return
+
+        integration_val = "integration"
+        if self.execution_class is not None and self.execution_class != "" and self.execution_class != integration_val:
+            raise ValueError(f"When integration_id is set, execution_class must be `{integration_val}` or None.")
+
+        self.execution_class = integration_val
 
     def resolve(
         self,
@@ -1292,7 +1315,7 @@ class ExternalRunResult(BaseModel):
     or `MULTI_FILE` output formats.
     """
 
-    def __post_init_post_parse__(self):
+    def model_post_init(self, __context) -> None:
         """
         Validations done after parsing the model.
 

nextmv-0.36.1.dev0/tests/cloud/test_instance.py

@@ -0,0 +1,87 @@
+import unittest
+
+from nextmv.cloud.instance import InstanceConfiguration
+
+
+class TestInstanceConfigurationValidation(unittest.TestCase):
+    """Test validation logic in InstanceConfiguration.model_post_init."""
+
+    def test_no_integration_id_no_validation(self):
+        """Test that validation is skipped when integration_id is None or empty."""
+        # With None integration_id
+        config = InstanceConfiguration(integration_id=None, execution_class="small")
+        self.assertEqual(config.execution_class, "small")
+
+        # With empty string integration_id
+        config = InstanceConfiguration(integration_id="", execution_class="large")
+        self.assertEqual(config.execution_class, "large")
+
+        # With no integration_id specified
+        config = InstanceConfiguration(execution_class="medium")
+        self.assertEqual(config.execution_class, "medium")
+
+    def test_integration_id_with_integration_execution_class(self):
+        """Test that integration_id with execution_class='integration' is valid."""
+        config = InstanceConfiguration(integration_id="int-12345", execution_class="integration")
+        self.assertEqual(config.integration_id, "int-12345")
+        self.assertEqual(config.execution_class, "integration")
+
+    def test_integration_id_with_none_execution_class(self):
+        """Test that integration_id with execution_class=None sets it to 'integration'."""
+        config = InstanceConfiguration(integration_id="int-12345", execution_class=None)
+        self.assertEqual(config.integration_id, "int-12345")
+        self.assertEqual(config.execution_class, "integration")
+
+    def test_integration_id_without_execution_class(self):
+        """Test that integration_id without execution_class sets it to 'integration'."""
+        config = InstanceConfiguration(integration_id="int-12345")
+        self.assertEqual(config.integration_id, "int-12345")
+        self.assertEqual(config.execution_class, "integration")
+
+    def test_integration_id_with_empty_execution_class(self):
+        """Test that integration_id with execution_class='' sets it to 'integration'."""
+        config = InstanceConfiguration(integration_id="int-12345", execution_class="")
+        self.assertEqual(config.integration_id, "int-12345")
+        self.assertEqual(config.execution_class, "integration")
+
+    def test_integration_id_with_invalid_execution_class_raises_error(self):
+        """Test that integration_id with non-integration execution_class raises ValueError."""
+        invalid_classes = ["small", "medium", "large", "custom", "standard"]
+
+        for execution_class in invalid_classes:
+            with self.subTest(execution_class=execution_class):
+                with self.assertRaises(ValueError) as context:
+                    InstanceConfiguration(integration_id="int-12345", execution_class=execution_class)
+
+                error_msg = str(context.exception)
+                self.assertIn("When integration_id is set", error_msg)
+                self.assertIn("execution_class must be `integration` or None", error_msg)
+
+    def test_integration_id_error_message_format(self):
+        """Test that the error message contains the expected format."""
+        with self.assertRaises(ValueError) as context:
+            InstanceConfiguration(integration_id="int-12345", execution_class="custom")
+
+        error_msg = str(context.exception)
+        # When using model_post_init, Pydantic wraps the error message
+        self.assertIn("When integration_id is set, execution_class must be `integration` or None.", error_msg)
+
+    def test_integration_id_with_other_configuration_options(self):
+        """Test that integration_id works correctly with other configuration options."""
+        config = InstanceConfiguration(
+            integration_id="int-12345", options={"max_runtime": 30}, secrets_collection_id="sc_1234567890"
+        )
+        self.assertEqual(config.integration_id, "int-12345")
+        self.assertEqual(config.execution_class, "integration")
+        self.assertEqual(config.options, {"max_runtime": 30})
+        self.assertEqual(config.secrets_collection_id, "sc_1234567890")
+
+    def test_no_integration_id_with_other_options(self):
+        """Test configuration without integration_id but with other options."""
+        config = InstanceConfiguration(
+            execution_class="small", options={"max_runtime": 60}, secrets_collection_id="sc_9876543210"
+        )
+        self.assertEqual(config.execution_class, "small")
+        self.assertEqual(config.options, {"max_runtime": 60})
+        self.assertEqual(config.secrets_collection_id, "sc_9876543210")
+        self.assertIsNone(config.integration_id)

{nextmv-0.36.0 → nextmv-0.36.1.dev0}/tests/test_run.py

@@ -8,6 +8,7 @@ from nextmv.run import (
     FormatOutput,
     Metadata,
     Run,
+    RunConfiguration,
     RunInformation,
     RunTypeConfiguration,
     run_duration,
@@ -206,3 +207,67 @@ class TestRunInformationToRun(unittest.TestCase):
 
                 run = run_info.to_run()
                 self.assertEqual(run.status_v2, status_v2)
+
+
+class TestRunConfigurationValidation(unittest.TestCase):
+    """Test validation logic in RunConfiguration.model_post_init."""
+
+    def test_no_integration_id_no_validation(self):
+        """Test that validation is skipped when integration_id is None or empty."""
+        # With None integration_id
+        config = RunConfiguration(integration_id=None, execution_class="small")
+        self.assertEqual(config.execution_class, "small")
+
+        # With empty string integration_id
+        config = RunConfiguration(integration_id="", execution_class="large")
+        self.assertEqual(config.execution_class, "large")
+
+        # With no integration_id specified
+        config = RunConfiguration(execution_class="medium")
+        self.assertEqual(config.execution_class, "medium")
+
+    def test_integration_id_with_integration_execution_class(self):
+        """Test that integration_id with execution_class='integration' is valid."""
+        config = RunConfiguration(integration_id="int-12345", execution_class="integration")
+        self.assertEqual(config.integration_id, "int-12345")
+        self.assertEqual(config.execution_class, "integration")
+
+    def test_integration_id_with_none_execution_class(self):
+        """Test that integration_id with execution_class=None sets it to 'integration'."""
+        config = RunConfiguration(integration_id="int-12345", execution_class=None)
+        self.assertEqual(config.integration_id, "int-12345")
+        self.assertEqual(config.execution_class, "integration")
+
+    def test_integration_id_without_execution_class(self):
+        """Test that integration_id without execution_class sets it to 'integration'."""
+        config = RunConfiguration(integration_id="int-12345")
+        self.assertEqual(config.integration_id, "int-12345")
+        self.assertEqual(config.execution_class, "integration")
+
+    def test_integration_id_with_empty_execution_class(self):
+        """Test that integration_id with execution_class='' sets it to 'integration'."""
+        config = RunConfiguration(integration_id="int-12345", execution_class="")
+        self.assertEqual(config.integration_id, "int-12345")
+        self.assertEqual(config.execution_class, "integration")
+
+    def test_integration_id_with_invalid_execution_class_raises_error(self):
+        """Test that integration_id with non-integration execution_class raises ValueError."""
+        invalid_classes = ["small", "medium", "large", "custom", "standard"]
+
+        for execution_class in invalid_classes:
+            with self.subTest(execution_class=execution_class):
+                with self.assertRaises(ValueError) as context:
+                    RunConfiguration(integration_id="int-12345", execution_class=execution_class)
+
+                error_msg = str(context.exception)
+                self.assertIn("When integration_id is set", error_msg)
+                self.assertIn("execution_class must be `integration` or None", error_msg)
+
+    def test_integration_id_error_message_format(self):
+        """Test that the error message contains the expected format."""
+        with self.assertRaises(ValueError) as context:
+            RunConfiguration(integration_id="int-12345", execution_class="custom")
+
+        error_msg = str(context.exception)
+        # When using model_post_init, Pydantic wraps the error message
+        self.assertIn("When integration_id is set, execution_class must be `integration` or None.", error_msg)

nextmv-0.36.0/nextmv/__about__.py

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