isar 1.30.0__tar.gz → 1.30.1__tar.gz

{isar-1.30.0 → isar-1.30.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: isar
-Version: 1.30.0
+Version: 1.30.1
 Summary: Integration and Supervisory control of Autonomous Robots
 Author-email: Equinor ASA <fg_robots_dev@equinor.com>
 License: Eclipse Public License version 2.0

{isar-1.30.0 → isar-1.30.1}/src/isar/config/predefined_missions/default.json

@@ -9,22 +9,30 @@
           "x": -2,
           "y": -2,
           "z": 0,
-          "frame": {"name": "asset"}
+          "frame": {
+            "name": "asset"
+          }
         },
         "orientation": {
           "x": 0,
           "y": 0,
           "z": 0.4794255,
           "w": 0.8775826,
-          "frame": {"name": "asset"}
+          "frame": {
+            "name": "asset"
+          }
         },
-        "frame": {"name": "asset"}
+        "frame": {
+          "name": "asset"
+        }
       },
       "target": {
         "x": 2,
         "y": 2,
         "z": 0,
-        "frame": {"name": "asset"}
+        "frame": {
+          "name": "asset"
+        }
       }
     },
     {
@@ -34,41 +42,30 @@
           "x": -2,
           "y": 2,
           "z": 0,
-          "frame": {"name": "asset"}
+          "frame": {
+            "name": "asset"
+          }
         },
         "orientation": {
           "x": 0,
           "y": 0,
           "z": 0.4794255,
           "w": 0.8775826,
-          "frame": {"name": "asset"}
+          "frame": {
+            "name": "asset"
+          }
         },
-        "frame": {"name": "asset"}
+        "frame": {
+          "name": "asset"
+        }
       },
       "target": {
         "x": 2,
         "y": 2,
         "z": 0,
-        "frame": {"name": "asset"}
-      }
-    },
-    {
-      "type": "return_to_home",
-      "pose": {
-        "position": {
-          "x": 2,
-          "y": 2,
-          "z": 0,
-          "frame": {"name": "asset"}
-        },
-        "orientation": {
-          "x": 0,
-          "y": 0,
-          "z": 0.4794255,
-          "w": 0.8775826,
-          "frame": {"name": "asset"}
-        },
-        "frame": {"name": "asset"}
+        "frame": {
+          "name": "asset"
+        }
       }
     }
   ]

{isar-1.30.0 → isar-1.30.1}/src/isar/config/settings.py

@@ -284,6 +284,7 @@ class Settings(BaseSettings):
         "TOPIC_ISAR_ROBOT_INFO",
         "TOPIC_ISAR_ROBOT_HEARTBEAT",
         "TOPIC_ISAR_INSPECTION_RESULT",
+        "TOPIC_ISAR_INSPECTION_VALUE",
     )
     @classmethod
     def prefix_isar_topics(cls, v: Any, info: ValidationInfo):

{isar-1.30.0 → isar-1.30.1}/src/isar/state_machine/transitions/functions/start_mission.py

@@ -18,10 +18,11 @@ def put_start_mission_on_queue(state_machine: "StateMachine") -> bool:
 
 def initiate_mission(state_machine: "StateMachine") -> bool:
     state_machine.logger.info(
-        f"Initialization successful. Starting new mission: "
-        f"{state_machine.current_mission.id}"
+        "Initialization successful. Starting new mission:\n"
+        f"  Mission ID: {state_machine.current_mission.id}\n"
+        f"  Mission Name: {state_machine.current_mission.name}\n"
+        f"  Number of Tasks: {len(state_machine.current_mission.tasks)}"
     )
-    state_machine.log_mission_overview(mission=state_machine.current_mission)
 
     state_machine.current_mission.status = MissionStatus.InProgress
     state_machine.publish_mission_status()

{isar-1.30.0 → isar-1.30.1}/src/isar.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: isar
-Version: 1.30.0
+Version: 1.30.1
 Summary: Integration and Supervisory control of Autonomous Robots
 Author-email: Equinor ASA <fg_robots_dev@equinor.com>
 License: Eclipse Public License version 2.0

{isar-1.30.0 → isar-1.30.1}/tests/isar/apis/scheduler/test_scheduler_router.py

@@ -179,7 +179,7 @@ class TestStartMission:
         assert re.match(
             "Bad Request - Robot is not capable of performing mission.", response_detail
         )
-        assert re.search("return_to_home", response_detail)
+        assert re.search("take_thermal_image", response_detail)
         assert re.search("take_image", response_detail)
 
 

{isar-1.30.0 → isar-1.30.1}/tests/mocks/robot_interface.py

@@ -16,7 +16,7 @@ from robot_interface.models.inspection.inspection import (
 )
 from robot_interface.models.mission.mission import Mission
 from robot_interface.models.mission.status import MissionStatus, RobotStatus, TaskStatus
-from robot_interface.models.mission.task import InspectionTask, Task
+from robot_interface.models.mission.task import InspectionTask
 from robot_interface.models.robots.media import MediaConfig, MediaConnectionType
 from robot_interface.robot_interface import RobotInterface
 
@@ -43,9 +43,6 @@ class MockRobot(RobotInterface):
     def initiate_mission(self, mission: Mission) -> None:
         return
 
-    def initiate_task(self, task: Task) -> None:
-        return
-
     def task_status(self, task_id: str) -> TaskStatus:
         return self.task_status_return_value