PyPI - isar - Versions diffs - 1.27.1__py3-none-any.whl → 1.28.0__py3-none-any.whl - Mend

isar 1.27.1py3-none-any.whl → 1.28.0py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of isar might be problematic. Click here for more details.

Files changed (20) hide show

isar/apis/models/start_mission_definition.py CHANGED Viewed

@@ -39,9 +39,8 @@ class TaskType(str, Enum):
 class StartMissionInspectionDefinition(BaseModel):
     type: InspectionTypes = Field(default=InspectionTypes.image)
     inspection_target: InputPosition
-    analysis_type: Optional[str] = None
+    inspection_description: Optional[str] = None
     duration: Optional[float] = None
-    metadata: Optional[dict] = None
 class StartMissionTaskDefinition(BaseModel):
@@ -107,8 +106,8 @@ def to_inspection_task(task_definition: StartMissionTaskDefinition) -> TASKS:
             id=task_definition.id if task_definition.id else uuid4_string(),
             robot_pose=task_definition.pose.to_alitra_pose(),
             tag_id=task_definition.tag,
+            inspection_description=task_definition.inspection.inspection_description,
             target=task_definition.inspection.inspection_target.to_alitra_position(),
-            metadata=task_definition.inspection.metadata,
             zoom=task_definition.zoom,
         )
     elif inspection_definition.type == InspectionTypes.video:
@@ -116,9 +115,9 @@ def to_inspection_task(task_definition: StartMissionTaskDefinition) -> TASKS:
             id=task_definition.id if task_definition.id else uuid4_string(),
             robot_pose=task_definition.pose.to_alitra_pose(),
             tag_id=task_definition.tag,
+            inspection_description=task_definition.inspection.inspection_description,
             target=task_definition.inspection.inspection_target.to_alitra_position(),
             duration=inspection_definition.duration,
-            metadata=task_definition.inspection.metadata,
             zoom=task_definition.zoom,
         )
     elif inspection_definition.type == InspectionTypes.thermal_image:
@@ -126,8 +125,8 @@ def to_inspection_task(task_definition: StartMissionTaskDefinition) -> TASKS:
             id=task_definition.id if task_definition.id else uuid4_string(),
             robot_pose=task_definition.pose.to_alitra_pose(),
             tag_id=task_definition.tag,
+            inspection_description=task_definition.inspection.inspection_description,
             target=task_definition.inspection.inspection_target.to_alitra_position(),
-            metadata=task_definition.inspection.metadata,
             zoom=task_definition.zoom,
         )
     elif inspection_definition.type == InspectionTypes.thermal_video:
@@ -135,9 +134,9 @@ def to_inspection_task(task_definition: StartMissionTaskDefinition) -> TASKS:
             id=task_definition.id if task_definition.id else uuid4_string(),
             robot_pose=task_definition.pose.to_alitra_pose(),
             tag_id=task_definition.tag,
+            inspection_description=task_definition.inspection.inspection_description,
             target=task_definition.inspection.inspection_target.to_alitra_position(),
             duration=inspection_definition.duration,
-            metadata=task_definition.inspection.metadata,
             zoom=task_definition.zoom,
         )
     elif inspection_definition.type == InspectionTypes.audio:
@@ -145,16 +144,16 @@ def to_inspection_task(task_definition: StartMissionTaskDefinition) -> TASKS:
             id=task_definition.id if task_definition.id else uuid4_string(),
             robot_pose=task_definition.pose.to_alitra_pose(),
             tag_id=task_definition.tag,
+            inspection_description=task_definition.inspection.inspection_description,
             target=task_definition.inspection.inspection_target.to_alitra_position(),
             duration=inspection_definition.duration,
-            metadata=task_definition.inspection.metadata,
         )
     elif inspection_definition.type == InspectionTypes.gas_measurement:
         return TakeGasMeasurement(
             id=task_definition.id if task_definition.id else uuid4_string(),
             robot_pose=task_definition.pose.to_alitra_pose(),
             tag_id=task_definition.tag,
-            metadata=task_definition.inspection.metadata,
+            inspection_description=task_definition.inspection.inspection_description,
         )
     else:
         raise ValueError(

isar/apis/schedule/scheduling_controller.py CHANGED Viewed

@@ -1,5 +1,6 @@
 import logging
 from http import HTTPStatus
+from threading import Lock
 from dependency_injector.wiring import inject
 from fastapi import Body, HTTPException, Path
@@ -29,6 +30,7 @@ class SchedulingController:
     ):
         self.scheduling_utilities: SchedulingUtilities = scheduling_utilities
         self.logger = logging.getLogger("api")
+        self.start_mission_lock: Lock = Lock()
     def start_mission_by_id(
         self,
@@ -67,46 +69,76 @@ class SchedulingController:
         self.logger.info("Received request to start new mission")
         if not mission_definition:
-            error_message: str = (
+            error_message_no_mission_definition: str = (
                 "Unprocessable entity - 'mission_definition' empty or invalid"
             )
-            self.logger.error(error_message)
+            self.logger.error(error_message_no_mission_definition)
             raise HTTPException(
-                status_code=HTTPStatus.UNPROCESSABLE_ENTITY, detail=error_message
+                status_code=HTTPStatus.UNPROCESSABLE_ENTITY,
+                detail=error_message_no_mission_definition,
             )
-        state: States = self.scheduling_utilities.get_state()
-        self.scheduling_utilities.verify_state_machine_ready_to_receive_mission(state)
+        if not self.start_mission_lock.acquire(blocking=False):
+            error_message_another_mission_starting: str = (
+                "Conflict - Another mission is currently being started"
+            )
+            self.logger.warning(error_message_another_mission_starting)
+            raise HTTPException(
+                status_code=HTTPStatus.CONFLICT,
+                detail=error_message_another_mission_starting,
+            )
         try:
-            mission: Mission = to_isar_mission(
-                start_mission_definition=mission_definition
+            state: States = self.scheduling_utilities.get_state()
+            self.scheduling_utilities.verify_state_machine_ready_to_receive_mission(
+                state
             )
-        except MissionPlannerError as e:
-            error_message = f"Bad Request - Cannot create ISAR mission: {e}"
-            self.logger.warning(error_message)
-            raise HTTPException(
-                status_code=HTTPStatus.BAD_REQUEST,
-                detail=error_message,
+            try:
+                mission: Mission = to_isar_mission(
+                    start_mission_definition=mission_definition
+                )
+            except MissionPlannerError as e:
+                error_message = f"Bad Request - Cannot create ISAR mission: {e}"
+                self.logger.warning(error_message)
+                raise HTTPException(
+                    status_code=HTTPStatus.BAD_REQUEST,
+                    detail=error_message,
+                )
+            self.scheduling_utilities.verify_robot_capable_of_mission(
+                mission=mission, robot_capabilities=robot_settings.CAPABILITIES
             )
-        self.scheduling_utilities.verify_robot_capable_of_mission(
-            mission=mission, robot_capabilities=robot_settings.CAPABILITIES
-        )
+            self.logger.info("Starting mission: %s", mission.id)
+            self.scheduling_utilities.start_mission(mission=mission)
+            return self._api_response(mission)
-        self.logger.info("Starting mission: %s", mission.id)
-        self.scheduling_utilities.start_mission(mission=mission)
-        return self._api_response(mission)
+        finally:
+            self.start_mission_lock.release()
     def return_home(self) -> None:
         self.logger.info("Received request to return home")
-        state: States = self.scheduling_utilities.get_state()
-        self.scheduling_utilities.verify_state_machine_ready_to_receive_return_home_mission(
-            state
-        )
+        if not self.start_mission_lock.acquire(blocking=False):
+            error_message_another_mission_starting: str = (
+                "Conflict - Another mission is currently being started"
+            )
+            self.logger.warning(error_message_another_mission_starting)
+            raise HTTPException(
+                status_code=HTTPStatus.CONFLICT,
+                detail=error_message_another_mission_starting,
+            )
+        try:
+            state: States = self.scheduling_utilities.get_state()
+            self.scheduling_utilities.verify_state_machine_ready_to_receive_return_home_mission(
+                state
+            )
-        self.scheduling_utilities.return_home()
+            self.scheduling_utilities.return_home()
+        finally:
+            self.start_mission_lock.release()
     def pause_mission(self) -> ControlMissionResponse:
         self.logger.info("Received request to pause current mission")

isar/config/predefined_mission_definition/default_exr.json CHANGED Viewed

@@ -28,7 +28,6 @@
                             "z": 0.6145,
                             "frame_name": "robot"
                         },
-                        "analysis_types": "CarSeal, Rust",
                         "metadata": {
                             "zoom": "2x"
                         }
@@ -41,7 +40,6 @@
                             "z": 0.6145,
                             "frame_name": "robot"
                         },
-                        "analysis_types": "GasDetection",
                         "duration": 10
                     }
                 ]

isar/config/predefined_mission_definition/default_mission.json CHANGED Viewed

@@ -28,7 +28,6 @@
                             "z": 0,
                             "frame_name": "robot"
                         },
-                        "analysis_types": "CarSeal, Rust",
                         "metadata": {
                             "zoom": "2x"
                         }
@@ -41,8 +40,6 @@
                             "z": 0,
                             "frame_name": "robot"
                         },
-                        "analysis_types": "GasDetection"
-                        ,
                         "duration": 10
                     }
                 ]
@@ -72,8 +69,7 @@
                             "y": 0,
                             "z": 0,
                             "frame_name": "robot"
-                        },
-                        "analysis_types": "ColdSpot,HotSpot"
+                        }
                     },
                     {
                         "type": "Video",

isar/config/predefined_mission_definition/default_turtlebot.json CHANGED Viewed

@@ -28,8 +28,6 @@
                             "z": 0,
                             "frame": "robot"
                         },
-                        "analysis_types": "CarSeal, Rust"
-                        ,
                         "metadata": {
                             "zoom": "2x"
                         }
@@ -41,8 +39,7 @@
                             "y": 4.9,
                             "z": 0,
                             "frame": "robot"
-                        },
-                        "analysis_types": "GasDetection"
+                        }
                     }
                 ]
             },
@@ -72,9 +69,7 @@
                             "y": 5.2,
                             "z": 0,
                             "frame": "robot"
-                        },
-                        "analysis_types": "ColdSpot, HotSpot"
+                        }
                     }
                 ]
             },
@@ -104,8 +99,7 @@
                             "y": 5.2,
                             "z": 0,
                             "frame": "robot"
-                        },
-                        "analysis_types": "ColdSpot, HotSpot"
+                        }
                     },
                     {
                         "type": "ThermalImage",
@@ -114,8 +108,7 @@
                             "y": 1.9,
                             "z": 0,
                             "frame": "robot"
-                        },
-                        "analysis_types": "ColdSpot, HotSpot"
+                        }
                     }
                 ]
             }

isar/state_machine/states/stopping.py CHANGED Viewed

@@ -6,7 +6,6 @@ from typing import TYPE_CHECKING, Optional
 from transitions import State
 from isar.models.communication.queues.queue_utils import check_for_event
-from isar.services.utilities.threaded_request import ThreadedRequest
 from robot_interface.models.exceptions.robot_exceptions import ErrorMessage
 if TYPE_CHECKING:
@@ -19,7 +18,6 @@ class Stopping(State):
         self.state_machine: "StateMachine" = state_machine
         self.logger = logging.getLogger("state_machine")
         self.events = self.state_machine.events
-        self.stop_thread: Optional[ThreadedRequest] = None
         self._count_number_retries: int = 0
         self.signal_state_machine_to_stop = state_machine.signal_state_machine_to_stop
         self.stopping_return_home_mission: bool = False
@@ -33,9 +31,6 @@ class Stopping(State):
         self._run()
     def stop(self) -> None:
-        if self.stop_thread:
-            self.stop_thread.wait_for_thread()
-        self.stop_thread = None
         self._count_number_retries = 0
         self.stopping_return_home_mission = False

isar/state_machine/transitions/functions/stop.py CHANGED Viewed

@@ -34,7 +34,16 @@ def stop_mission_cleanup(state_machine: "StateMachine") -> bool:
         state_machine._make_control_mission_response()
     )
     state_machine.events.api_requests.stop_mission.output.put(stopped_mission_response)
     state_machine.publish_task_status(task=state_machine.current_task)
     state_machine._finalize()
     return True
+def stop_return_home_mission_cleanup(state_machine: "StateMachine") -> bool:
+    if state_machine.current_mission is None:
+        state_machine._queue_empty_response()
+        state_machine.reset_state_machine()
+        return True
+    state_machine._finalize()
+    return True

isar/state_machine/transitions/mission.py CHANGED Viewed

@@ -15,6 +15,7 @@ from isar.state_machine.transitions.functions.start_mission import (
 )
 from isar.state_machine.transitions.functions.stop import (
     stop_mission_cleanup,
+    stop_return_home_mission_cleanup,
     trigger_stop_mission_event,
 )
 from isar.state_machine.transitions.functions.utils import def_transition
@@ -59,7 +60,7 @@ def get_mission_transitions(state_machine: "StateMachine") -> List[dict]:
             "trigger": "return_home_mission_stopped",
             "source": state_machine.stopping_state,
             "dest": state_machine.robot_standing_still_state,
-            "before": def_transition(state_machine, stop_mission_cleanup),
+            "before": def_transition(state_machine, stop_return_home_mission_cleanup),
         },
         {
             "trigger": "request_mission_start",

isar/storage/slimm_storage.py CHANGED Viewed

@@ -125,13 +125,11 @@ class SlimmStorage(StorageInterface):
                 "ImageMetadata.CameraOrientation2": str(array_of_orientation[1]),
                 "ImageMetadata.CameraOrientation3": str(array_of_orientation[2]),
                 "ImageMetadata.CameraOrientation4": str(array_of_orientation[3]),
-                "ImageMetadata.AnalysisMethods": (
-                    inspection.metadata.additional["analysis_type"]
-                    if inspection.metadata.additional
-                    and inspection.metadata.additional["analysis_type"]
+                "ImageMetadata.Description": (
+                    inspection.metadata.inspection_description
+                    if inspection.metadata.inspection_description
                     else "N/A"
                 ),
-                "ImageMetadata.Description": str(inspection.metadata.additional),
                 "ImageMetadata.FunctionalLocation": (
                     inspection.metadata.tag_id  # noqa: E501
                     if inspection.metadata.tag_id
@@ -175,13 +173,11 @@ class SlimmStorage(StorageInterface):
                 "VideoMetadata.CameraOrientation2": str(array_of_orientation[1]),
                 "VideoMetadata.CameraOrientation3": str(array_of_orientation[2]),
                 "VideoMetadata.CameraOrientation4": str(array_of_orientation[3]),
-                "VideoMetadata.AnalysisMethods": (
-                    inspection.metadata.additional["analysis_type"]
-                    if inspection.metadata.additional
-                    and inspection.metadata.additional["analysis_type"]
+                "VideoMetadata.Description": (
+                    inspection.metadata.inspection_description
+                    if inspection.metadata.inspection_description
                     else "N/A"
                 ),
-                "VideoMetadata.Description": str(inspection.metadata.additional),
                 "VideoMetadata.FunctionalLocation": (
                     inspection.metadata.tag_id  # noqa: E501
                     if inspection.metadata.tag_id

isar/storage/uploader.py CHANGED Viewed

@@ -163,8 +163,10 @@ class Uploader:
             inspection_id=inspection.id,
             inspection_path=inspection_path,
             installation_code=settings.PLANT_SHORT_NAME,
-            analysis_to_be_run=inspection.metadata.analysis_type,
-            timestamp=datetime.now(timezone.utc),
+            tag_id=inspection.metadata.tag_id,
+            inspection_type=type(inspection).__name__,
+            inspection_description=inspection.metadata.inspection_description,
+            timestamp=inspection.metadata.start_time,
         )
         self.mqtt_publisher.publish(
             topic=settings.TOPIC_ISAR_INSPECTION_RESULT,

isar/storage/utilities.py CHANGED Viewed

@@ -1,5 +1,4 @@
 import json
-import time
 from datetime import datetime, timezone
 from pathlib import Path
 from typing import Tuple
@@ -41,11 +40,7 @@ def construct_metadata_file(
             "plant_name": settings.PLANT_NAME,
             "isar_id": settings.ISAR_ID,
             "robot_name": settings.ROBOT_NAME,
-            "analysis_type": (
-                inspection.metadata.additional["analysis_type"]
-                if inspection.metadata.additional
-                else "N/A"
-            ),
+            "inspection_description": inspection.metadata.inspection_description,
         },
         "data": [
             {
@@ -71,12 +66,16 @@ def construct_metadata_file(
 def get_filename(inspection: Inspection) -> str:
-    inspection_type: str = type(inspection).__name__
+    utc_time: str = datetime.now(timezone.utc).strftime("%Y%m%d-%H%M%S")
     tag: str = inspection.metadata.tag_id if inspection.metadata.tag_id else "no-tag"
-    epoch_time: int = int(time.time())
-    return f"{tag}__{inspection_type}__{epoch_time}"
+    inspection_type: str = type(inspection).__name__
+    inspection_description: str = inspection.metadata.inspection_description.replace(
+        " ", "-"
+    )
+    return f"{tag}__{inspection_type}__{inspection_description}__{utc_time}"
 def get_foldername(mission: Mission) -> str:
+    utc_date: str = datetime.now(timezone.utc).strftime("%Y-%m-%d")
     mission_name: str = mission.name.replace(" ", "-")
-    return f"{datetime.now(timezone.utc).date()}__{settings.PLANT_SHORT_NAME}__{mission_name}__{mission.id}"
+    return f"{utc_date}__{settings.PLANT_SHORT_NAME}__{mission_name}__{mission.id}"

{isar-1.27.1.dist-info → isar-1.28.0.dist-info}/METADATA RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: isar
-Version: 1.27.1
+Version: 1.28.0
 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.27.1.dist-info → isar-1.28.0.dist-info}/RECORD RENAMED Viewed

@@ -5,10 +5,10 @@ isar/apis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 isar/apis/api.py,sha256=1-RmRH7NReCpOo_NSwP5hS2lDQm6_Dx2ZWe2460GhJY,13770
 isar/apis/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 isar/apis/models/models.py,sha256=HzLaWhjAv0uJRBWipIgYg_F75eaQ5jl9Pi4UnYbDJ-M,1749
-isar/apis/models/start_mission_definition.py,sha256=rGnMOSStAgGCEYG9jyQiVd0yxXZPwmf3Z4SOZJOyt-k,6011
+isar/apis/models/start_mission_definition.py,sha256=5Ri4rW0iu8_PffMYaNCj-epVIKyg7TMttkos8UaUCLc,6152
 isar/apis/robot_control/robot_controller.py,sha256=7EVukShJDhYez12wYeGWZXH-BrfQ4Wu2so0-fSWN2Zo,1277
 isar/apis/schedule/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-isar/apis/schedule/scheduling_controller.py,sha256=6QNn3dMu--UCvUfiPEqt9pD6rjjj9_8Mt5E6ECv6kcU,8351
+isar/apis/schedule/scheduling_controller.py,sha256=ggoWjYKxgMwJ5trs8gsU8SGj6CQlmb7Ee1SjRg7hSTw,9671
 isar/apis/security/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 isar/apis/security/authentication.py,sha256=Se2puhe2TUBmfio2RLma52-VSLRhqvWgu0Cd1bhdwMo,2000
 isar/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -29,9 +29,9 @@ isar/config/maps/klab_compressor.json,sha256=1Vrk5u_l4WXjrTtG4YfXlrCPbOoRs4TtYHO
 isar/config/maps/klab_turtlebot.json,sha256=HcB79XFEdY0Wm96EssIFO4TMyAWzc2KENoqN7TbTT0k,823
 isar/config/maps/turtleworld.json,sha256=EKLMpSK9Gu2lAN-E9l41XOaO3f9Su5n_I97mA6z7sWY,764
 isar/config/predefined_mission_definition/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-isar/config/predefined_mission_definition/default_exr.json,sha256=L3-kqjfgXoULDUgGsD3Zci7m3wdbwAuSrn4yaH4aPIA,1667
-isar/config/predefined_mission_definition/default_mission.json,sha256=nEk1ql17RAs2I5Ws2wA-0GJ6oqJco-Q0Q0vhf4k6ajc,2926
-isar/config/predefined_mission_definition/default_turtlebot.json,sha256=Ka379MLu8qiGIa6Fu-8p8A4OgHVccLkKYSX0RthUOeI,4060
+isar/config/predefined_mission_definition/default_exr.json,sha256=diSi4KMnGQY01ZumYUBZDvrekgl4bgiTk-9YPXVeBCY,1550
+isar/config/predefined_mission_definition/default_mission.json,sha256=NAspX-kTaHh9VygJGrytJGNjebEIPbiTnWHhj7qt9rk,2722
+isar/config/predefined_mission_definition/default_turtlebot.json,sha256=20ee7q1EIx7bIIojMucSwdBafuCG5sewbMQn9gJuPEo,3704
 isar/config/predefined_missions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 isar/config/predefined_missions/default.json,sha256=EDMfPQi2D_517jlfeU2BBFySkbvhYG7uEK6cbiK7DRM,1464
 isar/config/predefined_missions/default_turtlebot.json,sha256=8Vk1_0P0BBsG0vwh4vwIYINiiWioErHZ0Ppjq3ctaPM,2143
@@ -82,9 +82,9 @@ isar/state_machine/states/offline.py,sha256=aqHv8EH68pfq4yTIxOxxDW7VMkPWcQZX3fNg
 isar/state_machine/states/paused.py,sha256=NgEl48GjLvnqGfPipYZZ6Yj8vdTb-fFLAK2tUu8i9j8,1461
 isar/state_machine/states/returning_home.py,sha256=UErxB5xQMtjHtCmg-GLJutli2D6Lc29tbhdNcdxIC2M,6973
 isar/state_machine/states/robot_standing_still.py,sha256=h2a0CTxXIjE8YKT9_8hkU80q0caq4TYCxHaOYB54cKc,3378
-isar/state_machine/states/stopping.py,sha256=fxebBwB5rgRQQ1BPpmqrPBo0PxVvFdlXuQAidOGa4nY,3074
+isar/state_machine/states/stopping.py,sha256=Y44kEw-xB9_63eP6utAMY0RegrIz_1nL5cSI3cfaXEg,2838
 isar/state_machine/states/unknown_status.py,sha256=tOwfHW_4bKKkUTpKD7qc5gIwGT_fTXaCNxXcogGw-wo,2416
-isar/state_machine/transitions/mission.py,sha256=B2d409Q8rJfG4kIY7ZWQWnyxB81xinCUsvm_VWfxMr4,4817
+isar/state_machine/transitions/mission.py,sha256=JJt_v84xFS60cMDIz_MsE6GRLBwpxx2JM5BTIB2O05Q,4867
 isar/state_machine/transitions/return_home.py,sha256=LeOMnckUUQYzBYRidD2ge6M0KdxGDTgo-ioXR7_9r8A,2714
 isar/state_machine/transitions/robot_status.py,sha256=c1ceyWRGCtx-KTDtxHXRD7oPbt8TQ2ej24A0wyim8vc,2720
 isar/state_machine/transitions/functions/fail_mission.py,sha256=_6HqBMALDinFZ4yh5GMpeqqgV5tw5i8OVMj5UDdqesg,495
@@ -94,16 +94,16 @@ isar/state_machine/transitions/functions/resume.py,sha256=9KQjH_6YBGyxFhb7G5dgDe
 isar/state_machine/transitions/functions/return_home.py,sha256=UlniwYvpz74hxqgN0TyVv3LCmiMsqsosKEtEGLqkNj0,1139
 isar/state_machine/transitions/functions/robot_status.py,sha256=xhKZ5u_X8uDvnhvGnAIABuKaPXeVqFjkgj4H2Om-j_A,1013
 isar/state_machine/transitions/functions/start_mission.py,sha256=w8UDiq9pOHu-ei61ng6rWGjfrh6nk_qSokEVdzBHwzY,2516
-isar/state_machine/transitions/functions/stop.py,sha256=NzPvr6C1tmDqji5XJf5vw9up_Ow7ApuhjAzDVlJLZPw,1368
+isar/state_machine/transitions/functions/stop.py,sha256=aIj3EPnpgNLdsJwOK1ehhI1TpenQa9JjBxZH0Nm6dLg,1649
 isar/state_machine/transitions/functions/utils.py,sha256=Wa72Ocq4QT1E6qkpEJZQ3h5o33pGvx7Tlkt2JZ2Grbk,314
 isar/storage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 isar/storage/blob_storage.py,sha256=Qci6bO508nlTHKPuPtVU5QcvGA4T7mv8cFrKWRcfw4g,3226
 isar/storage/local_storage.py,sha256=Bnmoi5gyN8r-oRh0aHrOdGqaH3JqRScFKMRXYojW5kY,1855
-isar/storage/slimm_storage.py,sha256=DJVvTce4cb8m0_b_r6yog41UuxO_9VKb1hYCZUTEhR0,9050
+isar/storage/slimm_storage.py,sha256=4YsQ1RBztfx6n3pEblwb5G3ndoQN_IZm7bujRktpTx4,8748
 isar/storage/storage_interface.py,sha256=DYDry4I7aZpDHJhsBF6s8zrgokFAc7fdKJKfA8AvL7o,828
-isar/storage/uploader.py,sha256=M7FEr0iLsrSil8SqP7vmB3hswIOA2HTrnakj6aOQbvg,6749
-isar/storage/utilities.py,sha256=fitsdQ1ox5gr9fk9VuSk_iTBiEAIS8NZAnHabUZORh0,3173
-isar-1.27.1.dist-info/licenses/LICENSE,sha256=3fc2-ebLwHWwzfQbulGNRdcNob3SBQeCfEVUDYxsuqw,14058
+isar/storage/uploader.py,sha256=XoNnDS7_ILRZMGnQCBpRERmgSbFYPfgKRYk1tNHSFxQ,6868
+isar/storage/utilities.py,sha256=LL9XOUUYPHUQndM7pGrV-_utUQuraK-_8DDseOpVnWQ,3266
+isar-1.28.0.dist-info/licenses/LICENSE,sha256=3fc2-ebLwHWwzfQbulGNRdcNob3SBQeCfEVUDYxsuqw,14058
 robot_interface/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 robot_interface/robot_interface.py,sha256=Bkk-joyIzRHxv8iZt7FLPFnlE8chlJad9vgjwc-fDkw,8786
 robot_interface/test_robot_interface.py,sha256=FV1urn7SbsMyWBIcTKjsBwAG4IsXeZ6pLHE0mA9EGGs,692
@@ -112,23 +112,23 @@ robot_interface/models/exceptions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeR
 robot_interface/models/exceptions/robot_exceptions.py,sha256=VrsWPf4g0qN5sJRKhc3ER_Wt5drK0MZRuECU-csIlDA,10026
 robot_interface/models/initialize/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 robot_interface/models/inspection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-robot_interface/models/inspection/inspection.py,sha256=Q8vyiTMV2Ws1B4N10kQ3C1AZkck0Mh5pwOyWux7OQms,2318
+robot_interface/models/inspection/inspection.py,sha256=AKyca_j2TMQSF-LEjU1_obZTpFS03e8xSH9qWqVVmg4,2254
 robot_interface/models/mission/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 robot_interface/models/mission/mission.py,sha256=MQ9p5cuclLXexaZu9bkDh5-aN99eunvYC0vP-Z_kUwI,960
 robot_interface/models/mission/status.py,sha256=UOCARLfLxLFXJEjfIH7aXYXO7xajOKBJsxz-Wd6gZQ4,740
-robot_interface/models/mission/task.py,sha256=Vbyp8JzyoLA2Q90TyEAGWUg6BrV0OBhEm0ut0iBwwXc,4859
+robot_interface/models/mission/task.py,sha256=tEvgq15lcRA0AHHtQGNe-GWc_e-V5BlDsA4IYJ1djN0,4864
 robot_interface/models/robots/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 robot_interface/models/robots/battery_state.py,sha256=ktOtJ8ltdK0k_i7BoqYfhc5dbOzIG6Oo-uWC67fCWio,98
 robot_interface/models/robots/media.py,sha256=8A-CuuubfngzPprs6zWB9hSaqe3jzgsE8rcCzRX2Uto,227
 robot_interface/models/robots/robot_model.py,sha256=-0jNKWPcEgtF_2klb1It3u0SCoAR0hSW9nce58Zq0Co,417
 robot_interface/telemetry/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 robot_interface/telemetry/mqtt_client.py,sha256=ueXdtIFNCwciTj4spvdJj9emd-IOmUuJjpsXQSSWZPY,2987
-robot_interface/telemetry/payloads.py,sha256=m55aFrIczI-PDwQXvsFA6M7YNCTy83w7Ff-HIaZNbwI,2329
+robot_interface/telemetry/payloads.py,sha256=75hR-FYwmcbQVqorLzaStOrx_6DI3_CTxFpNIe2xFUc,2394
 robot_interface/utilities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 robot_interface/utilities/json_service.py,sha256=qkzVkb60Gi_pto-b5n1vNzCrQze2yqgIJqSLNLYj1Fg,1034
 robot_interface/utilities/uuid_string_factory.py,sha256=_NQIbBQ56w0qqO0MUDP6aPpHbxW7ATRhK8HnQiBSLkc,76
-isar-1.27.1.dist-info/METADATA,sha256=J0bZTm8PtuwbF7a1PPyftqKwPHUks3sh6tkUh72blJU,30709
-isar-1.27.1.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
-isar-1.27.1.dist-info/entry_points.txt,sha256=TFam7uNNw7J0iiDYzsH2gfG0u1eV1wh3JTw_HkhgKLk,49
-isar-1.27.1.dist-info/top_level.txt,sha256=UwIML2RtuQKCyJJkatcSnyp6-ldDjboB9k9JgKipO-U,21
-isar-1.27.1.dist-info/RECORD,,
+isar-1.28.0.dist-info/METADATA,sha256=09XJIgb9-ljtOphZvTKF8KEWCELC672HU9_9K1ad6uw,30709
+isar-1.28.0.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+isar-1.28.0.dist-info/entry_points.txt,sha256=TFam7uNNw7J0iiDYzsH2gfG0u1eV1wh3JTw_HkhgKLk,49
+isar-1.28.0.dist-info/top_level.txt,sha256=UwIML2RtuQKCyJJkatcSnyp6-ldDjboB9k9JgKipO-U,21
+isar-1.28.0.dist-info/RECORD,,

{isar-1.27.1.dist-info → isar-1.28.0.dist-info}/WHEEL RENAMED Viewed

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.0.0)
+Generator: setuptools (80.7.1)
 Root-Is-Purelib: true
 Tag: py3-none-any

robot_interface/models/inspection/inspection.py CHANGED Viewed

@@ -12,9 +12,8 @@ class InspectionMetadata(ABC):
     start_time: datetime
     pose: Pose
     file_type: str
-    analysis_type: Optional[str] = field(default=None, init=False)
     tag_id: Optional[str] = field(default=None, init=False)
-    additional: Optional[dict] = field(default_factory=dict, init=False)
+    inspection_description: Optional[str] = field(default=None, init=False)
 @dataclass

robot_interface/models/mission/task.py CHANGED Viewed

@@ -61,7 +61,7 @@ class InspectionTask(Task):
     inspection_id: str = Field(default_factory=uuid4_string, frozen=True)
     robot_pose: Pose = Field(default=None, init=True)
-    metadata: Optional[dict] = Field(default_factory=dict)
+    inspection_description: Optional[str] = Field(default=None)
     zoom: Optional[ZoomDescription] = Field(default=None)
     @staticmethod

robot_interface/telemetry/payloads.py CHANGED Viewed

@@ -111,5 +111,7 @@ class InspectionResultPayload:
     inspection_id: str
     inspection_path: Union[str, dict]
     installation_code: str
-    analysis_to_be_run: Optional[str]
+    tag_id: Optional[str]
+    inspection_type: Optional[str]
+    inspection_description: Optional[str]
     timestamp: datetime

{isar-1.27.1.dist-info → isar-1.28.0.dist-info}/entry_points.txt RENAMED Viewed

File without changes

{isar-1.27.1.dist-info → isar-1.28.0.dist-info}/licenses/LICENSE RENAMED Viewed

File without changes

{isar-1.27.1.dist-info → isar-1.28.0.dist-info}/top_level.txt RENAMED Viewed

File without changes

isar 1.27.1__py3-none-any.whl → 1.28.0__py3-none-any.whl

Potentially problematic release.

isar 1.27.1py3-none-any.whl → 1.28.0py3-none-any.whl