isar 1.25.6__tar.gz → 1.25.7__tar.gz

{isar-1.25.6 → isar-1.25.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: isar
-Version: 1.25.6
+Version: 1.25.7
 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.25.6 → isar-1.25.7}/src/isar/apis/api.py

@@ -301,6 +301,14 @@ class API:
             methods=["GET"],
             dependencies=[authentication_dependency],
             summary="Generates a media stream connection config",
+            responses={
+                HTTPStatus.OK.value: {
+                    "description": "Media stream was successfully generated",
+                },
+                HTTPStatus.NO_CONTENT.value: {
+                    "description": "Robot has no media config",
+                },
+            },
         )
 
         return router

{isar-1.25.6 → isar-1.25.7}/src/isar/apis/robot_control/robot_controller.py

@@ -5,6 +5,7 @@ from injector import inject
 from isar.apis.models.models import RobotInfoResponse
 from isar.config.settings import robot_settings, settings
 from isar.services.utilities.robot_utilities import RobotUtilities
+from fastapi import HTTPException
 
 
 class RobotController:
@@ -17,7 +18,13 @@ class RobotController:
         self.logger = logging.getLogger("api")
 
     def generate_media_config(self):
-        return self.robot_utilities.generate_media_config()
+        media_config = self.robot_utilities.generate_media_config()
+        if media_config is None:
+            raise HTTPException(
+                status_code=204,
+                detail="Robot has no media config",
+            )
+        return media_config
 
     def get_info(self):
         return RobotInfoResponse(

{isar-1.25.6 → isar-1.25.7}/src/isar/state_machine/states/monitor.py

@@ -69,6 +69,7 @@ class Monitor(State):
                 )
             try:
                 status: TaskStatus = self.task_status_thread.get_output()
+                self.request_status_failure_counter = 0
             except ThreadedRequestNotFinishedError:
                 time.sleep(self.state_machine.sleep_time)
                 continue
@@ -196,7 +197,6 @@ class Monitor(State):
         )
 
     def _report_task_status(self, task: Task) -> None:
-        self.request_status_failure_counter = 0
         if task.status == TaskStatus.Failed:
             self.logger.warning(
                 f"Task: {str(task.id)[:8]} was reported as failed by the robot"

{isar-1.25.6 → isar-1.25.7}/src/isar.egg-info/PKG-INFO

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