nextmv 1.1.2.dev0__tar.gz → 1.1.3.dev0__tar.gz

{nextmv-1.1.2.dev0 → nextmv-1.1.3.dev0}/PKG-INFO

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

@@ -0,0 +1 @@
+__version__ = "v1.1.3.dev0"

{nextmv-1.1.2.dev0 → nextmv-1.1.3.dev0}/nextmv/cloud/sso.py

@@ -20,6 +20,39 @@ from nextmv.base_model import BaseModel
 from nextmv.cloud.client import Client
 
 
+def _resolve_metadata_document(metadata_document: str | None = None) -> str | None:
+    """
+    Resolve the SSO metadata document from a string or a file path.
+
+    Parameters
+    ----------
+    metadata_document : str, optional
+        The SSO metadata document as a string or a path to a file containing
+        the document.
+
+    Returns
+    -------
+    str, optional
+        The SSO metadata document as a string, or `None` if not provided.
+
+    Raises
+    ------
+    RuntimeError
+        If the metadata document is a file path and the file cannot be read.
+    """
+    if metadata_document is None or metadata_document == "":
+        return None
+
+    meta_path = Path(metadata_document)
+    if meta_path.is_file():
+        try:
+            return meta_path.read_text()
+        except (OSError, UnicodeDecodeError) as e:
+            raise RuntimeError(f"Failed to read metadata document from file {meta_path}: {e}") from e
+
+    return metadata_document
+
+
 class SSOConfiguration(BaseModel):
     """
     Configuration for Single Sign-On (SSO) in Nextmv Cloud.
@@ -139,7 +172,7 @@ class SSOConfiguration(BaseModel):
             If the response status code is not 2xx.
         """
 
-        metadata_document = __resolve_metadata_document(metadata_document)
+        metadata_document = _resolve_metadata_document(metadata_document)
 
         payload = {
             "allow_non_domain_users": allow_non_domain_users,
@@ -234,7 +267,7 @@ class SSOConfiguration(BaseModel):
         if metadata_url is not None and metadata_url != "":
             payload["metadata_url"] = metadata_url
         if metadata_document is not None and metadata_document != "":
-            metadata_document = __resolve_metadata_document(metadata_document)
+            metadata_document = _resolve_metadata_document(metadata_document)
             payload["metadata_document"] = metadata_document
 
         self.client.request(
@@ -242,36 +275,3 @@ class SSOConfiguration(BaseModel):
             endpoint=self.sso_endpoint,
             payload=payload,
         )
-
-
-def __resolve_metadata_document(metadata_document: str | None = None) -> str | None:
-    """
-    Resolve the SSO metadata document from a string or a file path.
-
-    Parameters
-    ----------
-    metadata_document : str, optional
-        The SSO metadata document as a string or a path to a file containing
-        the document.
-
-    Returns
-    -------
-    str, optional
-        The SSO metadata document as a string, or `None` if not provided.
-
-    Raises
-    ------
-    RuntimeError
-        If the metadata document is a file path and the file cannot be read.
-    """
-    if metadata_document is None or metadata_document == "":
-        return None
-
-    meta_path = Path(metadata_document)
-    if meta_path.is_file():
-        try:
-            return meta_path.read_text()
-        except (OSError, UnicodeDecodeError) as e:
-            raise RuntimeError(f"Failed to read metadata document from file {meta_path}: {e}") from e
-
-    return metadata_document

{nextmv-1.1.2.dev0 → nextmv-1.1.3.dev0}/nextmv/default_app/app.yaml

@@ -10,3 +10,12 @@ python:
 files:
   - src/
   - main.py
+
+configuration:
+  options:
+    items:
+      - name: details
+        option_type: bool
+        default: true
+        description: Print details to logs. Default true.
+        required: false

{nextmv-1.1.2.dev0 → nextmv-1.1.3.dev0}/nextmv/default_app/main.py

@@ -6,9 +6,9 @@ import nextmv
 input = nextmv.load()
 name = input.data["name"]
 
-options = nextmv.Options(
-    nextmv.Option("details", bool, True, "Print details to logs. Default true.", False),
-)
+# Extract options from the manifest.
+manifest = nextmv.Manifest.from_yaml(".")
+options = manifest.extract_options()
 
 ##### Insert model here
 

{nextmv-1.1.2.dev0 → nextmv-1.1.3.dev0}/tests/local/test_application.py

@@ -782,3 +782,88 @@ class TestApplicationLocalRunMethods(unittest.TestCase):
         )
 
         self.assertEqual(result, mock_result)
+
+
+class TestDefaultApp(unittest.TestCase):
+    """Test the default app runs correctly with manifest-based options."""
+
+    def test_default_app_runs_with_manifest_options(self):
+        """Test that the default app runs successfully with options extracted from manifest."""
+        with tempfile.TemporaryDirectory() as temp_dir:
+            # Initialize a new app (copies default_app structure)
+            app_name = "test-default-app"
+            app = Application.initialize(
+                src=app_name,
+                description="Test default application",
+                destination=temp_dir,
+            )
+
+            # Verify the manifest has the options defined
+            manifest = app.manifest
+            self.assertIsNotNone(manifest.configuration)
+            self.assertIsNotNone(manifest.configuration.options)
+            self.assertIsNotNone(manifest.configuration.options.items)
+            self.assertEqual(len(manifest.configuration.options.items), 1)
+            self.assertEqual(manifest.configuration.options.items[0].name, "details")
+            self.assertEqual(manifest.configuration.options.items[0].option_type, "bool")
+            self.assertEqual(manifest.configuration.options.items[0].default, True)
+
+            # Prepare input data for the run
+            input_data = {
+                "name": "Earth",
+                "radius": 6371,
+                "distance": 149.6,
+            }
+
+            # Run the application
+            run_id = app.new_run(input=input_data)
+            self.assertIsNotNone(run_id)
+
+            # Wait for run to complete and check results
+            result = app.run_result_with_polling(
+                run_id=run_id,
+                polling_options=PollingOptions(max_duration=30.0, delay=0.1),
+            )
+
+            # Verify the run succeeded
+            self.assertIsNotNone(result)
+            self.assertEqual(result.metadata.status_v2, StatusV2.succeeded)
+
+            # Verify the solution contains the expected message
+            self.assertIsNotNone(result.output)
+            self.assertIn("solution", result.output)
+            self.assertIn("message", result.output["solution"])
+            self.assertEqual(result.output["solution"]["message"], "Hello, Earth")
+
+            # Verify metrics were generated
+            self.assertIn("metrics", result.output)
+            self.assertIn("value", result.output["metrics"])
+            self.assertEqual(result.output["metrics"]["value"], 1.23)
+            self.assertIn("message", result.output["metrics"])
+            self.assertEqual(result.output["metrics"]["message"], "Hello, Earth")
+
+    def test_default_app_options_extraction(self):
+        """Test that options can be extracted from the default app manifest."""
+        with tempfile.TemporaryDirectory() as temp_dir:
+            # Initialize a new app
+            app_name = "test-options-extraction"
+            app = Application.initialize(
+                src=app_name,
+                description="Test options extraction",
+                destination=temp_dir,
+            )
+
+            # Get the manifest and extract options
+            manifest = app.manifest
+            options = manifest.extract_options(should_parse=False)
+
+            # Verify options were extracted correctly
+            self.assertIsNotNone(options)
+            self.assertEqual(len(options.options), 1)
+
+            details_option = options.options[0]
+            self.assertEqual(details_option.name, "details")
+            self.assertEqual(details_option.option_type, bool)
+            self.assertEqual(details_option.default, True)
+            self.assertEqual(details_option.description, "Print details to logs. Default true.")
+            self.assertEqual(details_option.required, False)

nextmv-1.1.2.dev0/nextmv/__about__.py

@@ -1 +0,0 @@
-__version__ = "v1.1.2.dev0"