tdp/cli/commands/browse.py

@@ -6,7 +6,7 @@
 
 import click
 
-from tdp.cli.queries import (
+from tdp.queries import (
     get_deployment,
     get_deployments,
     get_operation_records,

tdp/cli/commands/deploy.py

@@ -8,7 +8,7 @@
 
 import click
 
-from tdp.cli.queries import (
+from tdp.queries import (
     get_planned_deployment,
     get_sch_status,
 )

tdp/cli/commands/plan/dag.py

@@ -7,7 +7,7 @@
 
 import click
 
-from tdp.cli.queries import get_planned_deployment
+from tdp.queries import get_planned_deployment
 from tdp.cli.session import get_session
 from tdp.cli.utils import (
     collections,

tdp/cli/commands/plan/edit.py

@@ -11,7 +11,7 @@
 
 import click
 
-from tdp.cli.queries import get_planned_deployment
+from tdp.queries import get_planned_deployment
 from tdp.cli.session import get_session
 from tdp.cli.utils import collections, database_dsn, parse_file
 from tdp.core.models.deployment_model import DeploymentModel

tdp/cli/commands/plan/import_file.py

@@ -8,7 +8,7 @@
 
 import click
 
-from tdp.cli.queries import get_planned_deployment
+from tdp.queries import get_planned_deployment
 from tdp.cli.session import get_session
 from tdp.cli.utils import collections, database_dsn, parse_file
 from tdp.core.models.deployment_model import DeploymentModel

tdp/cli/commands/plan/ops.py

@@ -7,7 +7,7 @@
 
 import click
 
-from tdp.cli.queries import get_planned_deployment
+from tdp.queries import get_planned_deployment
 from tdp.cli.session import get_session
 from tdp.cli.utils import (
     collections,

tdp/cli/commands/plan/reconfigure.py

@@ -7,7 +7,7 @@
 
 import click
 
-from tdp.cli.queries import get_planned_deployment, get_sch_status
+from tdp.queries import get_planned_deployment, get_sch_status
 from tdp.cli.session import get_session
 from tdp.cli.utils import (
     collections,

tdp/cli/commands/plan/resume.py

@@ -7,7 +7,7 @@
 
 import click
 
-from tdp.cli.queries import (
+from tdp.queries import (
     get_deployment,
     get_last_deployment,
     get_planned_deployment,

tdp/cli/commands/status/edit.py

@@ -11,7 +11,7 @@
     _common_status_options,
     _print_sch_status_logs,
 )
-from tdp.cli.queries import get_sch_status
+from tdp.queries import get_sch_status
 from tdp.cli.session import get_session
 from tdp.cli.utils import check_services_cleanliness, hosts
 from tdp.core.cluster_status import ClusterStatus

tdp/cli/commands/status/generate_stales.py

@@ -11,7 +11,7 @@
     _common_status_options,
     _print_sch_status_logs,
 )
-from tdp.cli.queries import get_sch_status
+from tdp.queries import get_sch_status
 from tdp.cli.session import get_session
 from tdp.cli.utils import check_services_cleanliness
 from tdp.core.cluster_status import ClusterStatus

tdp/cli/commands/status/show.py

@@ -11,7 +11,7 @@
     _common_status_options,
     _print_sch_status_logs,
 )
-from tdp.cli.queries import get_sch_status
+from tdp.queries import get_sch_status
 from tdp.cli.session import get_session
 from tdp.cli.utils import check_services_cleanliness, hosts
 from tdp.core.cluster_status import ClusterStatus

tdp/cli/commands/vars/edit.py

@@ -7,7 +7,7 @@
 
 import click
 
-from tdp.cli.queries import get_sch_status
+from tdp.queries import get_sch_status
 from tdp.cli.session import get_session
 from tdp.cli.utils import (
     collections,

tdp/cli/test_get_sch_status.py

@@ -8,7 +8,7 @@
 
 from sqlalchemy.orm import Session
 
-from tdp.cli.queries import get_sch_status
+from tdp.queries import get_sch_status
 from tdp.core.models import (
     SCHStatusLogModel,
     SCHStatusLogSourceEnum,

tdp/cli/queries.py → tdp/queries.py

@@ -405,7 +405,8 @@ def get_deployment(session: Session, deployment_id: int) -> DeploymentModel:
         The deployment.
 
     Raises:
-        NoResultFound: If the deployment does not exist."""
+        NoResultFound: If the deployment does not exist.
+    """
     try:
         return session.query(DeploymentModel).filter_by(id=deployment_id).one()
     except NoResultFound as e:
@@ -442,9 +443,15 @@ def get_planned_deployment(session: Session) -> Optional[DeploymentModel]:
         session: The database session.
 
     Returns:
-        The planned deployment or None if there is no planned deployment.
+        The planned deployment.
+
+    Raises:
+        NoResultFound: No planned deployment if none.
     """
-    return session.query(DeploymentModel).filter_by(state="PLANNED").one_or_none()
+    try:
+        return session.query(DeploymentModel).filter_by(state="PLANNED").one_or_none()
+    except NoResultFound as e:
+        raise Exception("No planned deployment.") from e
 
 
 def get_running_deployment(session: Session) -> Optional[DeploymentModel]:
@@ -455,14 +462,20 @@ def get_running_deployment(session: Session) -> Optional[DeploymentModel]:
 
     Returns:
         The running deployment or NoResultFound if there is no running deployment.
+
+    Raises:
+        NoResultFound: If there is no running deployment.
     """
-    return (
-        session.query(DeploymentModel)
-        .where(DeploymentModel.state == "Running")
-        .order_by(DeploymentModel.id.desc())
-        .limit(1)
-        .one()
-    )
+    try:
+        return (
+            session.query(DeploymentModel)
+            .where(DeploymentModel.state == "Running")
+            .order_by(DeploymentModel.id.desc())
+            .limit(1)
+            .one()
+        )
+    except NoResultFound as e:
+        raise Exception("No running deployment.") from e
 
 
 def get_operation_records(
@@ -507,10 +520,15 @@ def get_operation_order(
         The matching operation record.
 
     Raises:
-        NoResultFound: If the operation does not exist.
+        NoResultFound: If the operation order does not exist.
     """
-    return (
-        session.query(OperationModel)
-        .filter_by(deployment_id=deployment_id, operation_order=operation_order)
-        .one()
-    )
+    try:
+        return (
+            session.query(OperationModel)
+            .filter_by(deployment_id=deployment_id, operation_order=operation_order)
+            .one()
+        )
+    except NoResultFound as e:
+        raise Exception(
+            f"Operation {operation_order} does not exist in deployment {deployment_id}."
+        ) from e