nextmv 0.26.0__py3-none-any.whl → 0.26.1__py3-none-any.whl

nextmv/__about__.py

@@ -1 +1 @@
-__version__ = "v0.26.0"
+__version__ = "v0.26.1"

nextmv/cloud/__init__.py

@@ -53,6 +53,7 @@ from .run import RunType as RunType
 from .run import RunTypeConfiguration as RunTypeConfiguration
 from .run import TrackedRun as TrackedRun
 from .run import TrackedRunStatus as TrackedRunStatus
+from .run import run_duration as run_duration
 from .scenario import Scenario as Scenario
 from .scenario import ScenarioConfiguration as ScenarioConfiguration
 from .scenario import ScenarioInput as ScenarioInput

nextmv/cloud/application.py

@@ -317,18 +317,7 @@ class Application:
             # If the request was successful, the application exists.
             return True
         except requests.HTTPError as e:
-            if (
-                # Check whether the error is caused by a 404 status code - meaning the app does not exist.
-                (hasattr(e, "response") and hasattr(e.response, "status_code") and e.response.status_code == 404)
-                or
-                # Check a possibly nested exception as well.
-                (
-                    hasattr(e, "__cause__")
-                    and hasattr(e.__cause__, "response")
-                    and hasattr(e.__cause__.response, "status_code")
-                    and e.__cause__.response.status_code == 404
-                )
-            ):
+            if _is_not_exist_error(e):
                 return False
             # Re-throw the exception if it is not the expected 404 error.
             raise e from None
@@ -375,6 +364,25 @@ class Application:
 
         return Instance.from_dict(response.json())
 
+    def instance_exists(self, instance_id: str) -> bool:
+        """
+        Check if an instance exists.
+
+        Args:
+            instance_id: ID of the instance.
+
+        Returns:
+            True if the instance exists, False otherwise.
+        """
+
+        try:
+            self.instance(instance_id=instance_id)
+            return True
+        except requests.HTTPError as e:
+            if _is_not_exist_error(e):
+                return False
+            raise e
+
     def list_acceptance_tests(self) -> list[AcceptanceTest]:
         """
         List all acceptance tests.
@@ -581,6 +589,8 @@ class Application:
             id: ID of the application. Will be generated if not provided.
             description: Description of the application.
             is_workflow: Whether the application is a Decision Workflow.
+            exist_ok: If True and an application with the same ID already exists,
+                return the existing application instead of creating a new one.
 
         Returns:
             The new application.
@@ -932,6 +942,7 @@ class Application:
         name: str,
         description: Optional[str] = None,
         configuration: Optional[InstanceConfiguration] = None,
+        exist_ok: bool = False,
     ) -> Instance:
         """
         Create a new instance and associate it with a version.
@@ -942,6 +953,8 @@ class Application:
             name: Name of the instance. Will be generated if not provided.
             description: Description of the instance. Will be generated if not provided.
             configuration: Configuration to use for the instance.
+            exist_ok: If True and an instance with the same ID already exists,
+                return the existing instance instead of creating a new one.
 
         Returns:
             Instance.
@@ -950,6 +963,12 @@ class Application:
             requests.HTTPError: If the response status code is not 2xx.
         """
 
+        if exist_ok and id is None:
+            raise ValueError("If exist_ok is True, id must be provided")
+
+        if exist_ok and self.instance_exists(instance_id=id):
+            return self.instance(instance_id=id)
+
         payload = {
             "version_id": version_id,
         }
@@ -1478,6 +1497,7 @@ class Application:
         id: Optional[str] = None,
         name: Optional[str] = None,
         description: Optional[str] = None,
+        exist_ok: bool = False,
     ) -> Version:
         """
         Create a new version using the current dev binary.
@@ -1486,6 +1506,8 @@ class Application:
             id: ID of the version. Will be generated if not provided.
             name: Name of the version. Will be generated if not provided.
             description: Description of the version. Will be generated if not provided.
+            exist_ok: If True and a version with the same ID already exists,
+                return the existing version instead of creating a new one.
 
         Returns:
             Version.
@@ -1494,6 +1516,12 @@ class Application:
             requests.HTTPError: If the response status code is not 2xx.
         """
 
+        if exist_ok and id is None:
+            raise ValueError("If exist_ok is True, id must be provided")
+
+        if exist_ok and self.version_exists(version_id=id):
+            return self.version(version_id=id)
+
         payload = {}
 
         if id is not None:
@@ -2201,6 +2229,25 @@ class Application:
 
         return Version.from_dict(response.json())
 
+    def version_exists(self, version_id: str) -> bool:
+        """
+        Check if a version exists.
+
+        Args:
+            version_id: ID of the version.
+
+        Returns:
+            bool: True if the version exists, False otherwise.
+        """
+
+        try:
+            self.version(version_id=version_id)
+            return True
+        except requests.HTTPError as e:
+            if _is_not_exist_error(e):
+                return False
+            raise e
+
     def __run_result(
         self,
         run_id: str,
@@ -2436,3 +2483,29 @@ def poll(polling_options: PollingOptions, polling_func: Callable[[], tuple[any,
     raise RuntimeError(
         f"polling did not succeed after {polling_options.max_tries} tries",
     )
+
+
+def _is_not_exist_error(e: requests.HTTPError) -> bool:
+    """
+    Check if the error is a known 404 Not Found error.
+
+    Args:
+        e: HTTPError to check.
+
+    Returns:
+        True if the error is a 404 Not Found error, False otherwise.
+    """
+    if (
+        # Check whether the error is caused by a 404 status code - meaning the app does not exist.
+        (hasattr(e, "response") and hasattr(e.response, "status_code") and e.response.status_code == 404)
+        or
+        # Check a possibly nested exception as well.
+        (
+            hasattr(e, "__cause__")
+            and hasattr(e.__cause__, "response")
+            and hasattr(e.__cause__.response, "status_code")
+            and e.__cause__.response.status_code == 404
+        )
+    ):
+        return True
+    return False

nextmv/cloud/run.py

@@ -14,6 +14,38 @@ from nextmv.input import Input, InputFormat
 from nextmv.output import Output, OutputFormat
 
 
+def run_duration(
+    start: Union[datetime, float],
+    end: Union[datetime, float],
+) -> int:
+    """
+    Calculate the duration of a run in milliseconds.
+
+    Parameters
+    ----------
+    start : Union[datetime, float]
+        The start time of the run. Can be a datetime object or a float
+        representing the start time in seconds since the epoch.
+    end : Union[datetime, float]
+        The end time of the run. Can be a datetime object or a float
+        representing the end time in seconds since the epoch.
+
+    Returns
+    -------
+    int
+        The duration of the run in milliseconds.
+    """
+    if isinstance(start, float) and isinstance(end, float):
+        if start > end:
+            raise ValueError("Start time must be before end time.")
+        return int(round((end - start) * 1000))
+    if isinstance(start, datetime) and isinstance(end, datetime):
+        if start > end:
+            raise ValueError("Start time must be before end time.")
+        return int(round((end - start).total_seconds() * 1000))
+    raise TypeError("Start and end must be either datetime or float.")
+
+
 class Metadata(BaseModel):
     """Metadata of a run, whether it was successful or not."""
 
@@ -181,7 +213,7 @@ class ExternalRunResult(BaseModel):
     error_message: Optional[str] = None
     """Error message of the run."""
     execution_duration: Optional[int] = None
-    """Duration of the run, in seconds."""
+    """Duration of the run, in milliseconds."""
 
     def __post_init_post_parse__(self):
         """Validations done after parsing the model."""
@@ -246,7 +278,7 @@ class TrackedRun:
     """The status of the run being tracked"""
 
     duration: Optional[int] = None
-    """The duration of the run being tracked, in seconds."""
+    """The duration of the run being tracked, in milliseconds."""
     error: Optional[str] = None
     """An error message if the run failed. You should only specify this if the
     run failed, otherwise an exception will be raised."""

nextmv/logger.py

@@ -3,13 +3,17 @@
 import sys
 
 __original_stdout = None
+__stdout_redirected = False
 
 
 def redirect_stdout() -> None:
     """Redirect all messages written to stdout to stderr. When you do not want
     to redirect stdout anymore, call `reset_stdout`."""
 
-    global __original_stdout
+    global __original_stdout, __stdout_redirected
+    if __stdout_redirected:
+        return
+    __stdout_redirected = True
 
     __original_stdout = sys.stdout
     sys.stdout = sys.stderr
@@ -19,7 +23,10 @@ def reset_stdout() -> None:
     """Reset stdout to its original value. This function should always be
     called after `redirect_stdout` to avoid unexpected behavior."""
 
-    global __original_stdout
+    global __original_stdout, __stdout_redirected
+    if not __stdout_redirected:
+        return
+    __stdout_redirected = False
 
     if __original_stdout is None:
         sys.stdout = sys.__stdout__

{nextmv-0.26.0.dist-info → nextmv-0.26.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nextmv
-Version: 0.26.0
+Version: 0.26.1
 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.0.dist-info → nextmv-0.26.1.dist-info}/RECORD

@@ -1,30 +1,30 @@
-nextmv/__about__.py,sha256=eQqPiK0rRHZ8N7lI25IAshYTaILxk2NZzxVXgTPB1OY,24
+nextmv/__about__.py,sha256=MxqQiLafrvDHqguGRsR2SDY95UETqLzJGiFRY6QwEmk,24
 nextmv/__entrypoint__.py,sha256=5K058PICm5sx4sNMqx56auMh9yWgdIESVLzfvyIXdjs,1158
 nextmv/__init__.py,sha256=QN5e_BFkIdBkR8DiGr9T06N6mXtowT84eRUJj3_Vfrg,1459
 nextmv/base_model.py,sha256=mdaBe-epNK1cFgP4TxbOtn3So4pCi1vMTOrIBkCBp7A,1050
 nextmv/deprecated.py,sha256=ctE39pmJEfoicR-w0EdT7FPtd0cWmP3GKth-FsNn_Ks,406
 nextmv/input.py,sha256=tppXHiJM_EzR9Z1yJPc37joBvgC0RmiAFo0Ab1X5nPA,15480
-nextmv/logger.py,sha256=5qQ7E3Aaw3zzkIeiUuwYGzTcB7VhVqIzNZm5PHmdpUI,852
+nextmv/logger.py,sha256=Jo_AmYJ02WqXmsz9XTTOXZ9uenVHrPanMMqhBogxGCw,1075
 nextmv/model.py,sha256=rwBdgmKSEp1DPv43zF0azj3QnbHO6O6wKs0PIGvVS40,9861
 nextmv/options.py,sha256=IPqAIUjoKMWmoPx_e5zDcnxu7S2HVxw-SLjjUduVvZM,25302
 nextmv/output.py,sha256=rcmDivGRsInyS944ivO6SBtVFSH3RC5Nwu0qFTFRRLI,22270
-nextmv/cloud/__init__.py,sha256=O34rjrgClnIwXDE63PK4iq5ESuGQ86dJ6FPSrcUnmk0,3680
+nextmv/cloud/__init__.py,sha256=EEKJdSMMjW2yc9GwTpz-cmpgtu-Qs7p09k6NXIQPV0U,3726
 nextmv/cloud/acceptance_test.py,sha256=NtqGhj-UYibxGBbU2kfjr-lYcngojb_5VMvK2WZwibI,6620
 nextmv/cloud/account.py,sha256=mZUGzV-uMGBA5BC_FPtsiCMFuz5jxEZ3O1BbELZIm18,1841
-nextmv/cloud/application.py,sha256=BoW-n_cJ4nxpmxOq_VMdJzv7B4RSxRhApkv0_oEcEYQ,81952
+nextmv/cloud/application.py,sha256=0mTMSIze3uXMlWY7K7OYicMVox0IaC0PapLx41iVP2c,84098
 nextmv/cloud/batch_experiment.py,sha256=Ngm1XDvvAMaU9VYU5JFNxXFnt8xjE_34H5W54kO9V5c,3768
 nextmv/cloud/client.py,sha256=JUE3vD767_FFICl1vov5Mxmircci03TBL3KmT1BOZY4,9096
 nextmv/cloud/input_set.py,sha256=HTLA2acJridZbBCAVJNom8ldNo2Rfy40YQ8Coyz3bdo,1482
 nextmv/cloud/instance.py,sha256=UfyfZXfL1ugCGAB6zwZJIAi8qxI1JCUGsluwaGdjfN4,1223
 nextmv/cloud/manifest.py,sha256=lB3rwFmIKNAncaA00DelT4tDkMkIUCWEY4QJKJsx_-U,12116
 nextmv/cloud/package.py,sha256=Y3RethLiXXW7Y6_QBJDJdd7mFNaYaSBMyasIeGLav8o,12287
-nextmv/cloud/run.py,sha256=yeuaY8rAxTAhhKY0zTGQA3sKUkSiJg487QZIxPppm40,9604
+nextmv/cloud/run.py,sha256=K3zIoV7s39WO6rd882h3EM3a6fDPiiHk99zR9K8QobM,10721
 nextmv/cloud/safe.py,sha256=IUQUOlx4ulIIyP2-Fx3-gNBm9nyWOgZgaOAlRrzqaZE,2515
 nextmv/cloud/scenario.py,sha256=9gbdnQuvmerPUBCcJ-5QbLCwgbsIfBwKXE8c5359S8E,8120
 nextmv/cloud/secrets.py,sha256=kqlN4ceww_L4kVTrAU8BZykRzXINO3zhMT_BLYea6tk,1764
 nextmv/cloud/status.py,sha256=C-ax8cLw0jPeh7CPsJkCa0s4ImRyFI4NDJJxI0_1sr4,602
 nextmv/cloud/version.py,sha256=sjVRNRtohHA97j6IuyM33_DSSsXYkZPusYgpb6hlcrc,1244
-nextmv-0.26.0.dist-info/METADATA,sha256=c53wSmLfDD0omHMTPlxDkrx9DMb5RdvKMNHCByar1TA,14557
-nextmv-0.26.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-nextmv-0.26.0.dist-info/licenses/LICENSE,sha256=ZIbK-sSWA-OZprjNbmJAglYRtl5_K4l9UwAV3PGJAPc,11349
-nextmv-0.26.0.dist-info/RECORD,,
+nextmv-0.26.1.dist-info/METADATA,sha256=fHq_8Cren23n3msctySfLJMtnOl4kpC2iEmSE6Ug2t0,14557
+nextmv-0.26.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+nextmv-0.26.1.dist-info/licenses/LICENSE,sha256=ZIbK-sSWA-OZprjNbmJAglYRtl5_K4l9UwAV3PGJAPc,11349
+nextmv-0.26.1.dist-info/RECORD,,