isar 1.25.1__py3-none-any.whl → 1.25.3__py3-none-any.whl

isar/apis/models/__init__.py

@@ -1 +0,0 @@
-from .models import InputPose, StartMissionResponse

isar/apis/robot_control/robot_controller.py

@@ -1,15 +1,10 @@
 import logging
-from typing import List
 
 from injector import inject
 
-from isar.apis.models.models import (
-    RobotInfoResponse,
-    TaskResponse,
-)
+from isar.apis.models.models import RobotInfoResponse
 from isar.config.settings import robot_settings, settings
 from isar.services.utilities.robot_utilities import RobotUtilities
-from robot_interface.models.mission.task import Task
 
 
 class RobotController:

isar/apis/schedule/scheduling_controller.py

@@ -6,11 +6,11 @@ from alitra import Pose
 from fastapi import Body, HTTPException, Path
 from injector import inject
 
-from isar.apis.models import InputPose, StartMissionResponse
 from isar.apis.models.models import (
     ControlMissionResponse,
-    RobotInfoResponse,
     TaskResponse,
+    InputPose,
+    StartMissionResponse,
 )
 from isar.apis.models.start_mission_definition import (
     StartMissionDefinition,

isar/config/settings.py

@@ -8,7 +8,7 @@ from pydantic_settings import BaseSettings, SettingsConfigDict
 
 from isar.config import predefined_missions
 from robot_interface.models.robots.robot_model import RobotModel
-from robot_interface.telemetry.payloads import DocumentInfo, VideoStream
+from robot_interface.telemetry.payloads import DocumentInfo
 
 
 class Settings(BaseSettings):
@@ -194,22 +194,6 @@ class Settings(BaseSettings):
     # Info about robot documentation
     DOCUMENTATION: List[DocumentInfo] = Field(default=[])
 
-    # Endpoints to reach video streams for the robot
-    VIDEO_STREAMS: List[VideoStream] = Field(
-        default=[
-            VideoStream(
-                name="Front camera",
-                url="http://localhost:5000/videostream/front",
-                type="turtlebot",
-            ),
-            VideoStream(
-                name="Rear camera",
-                url="http://localhost:5000/videostream/rear",
-                type="turtlebot",
-            ),
-        ]
-    )
-
     # Data scheme the robot should adhere to
     # Options [DS0001]
     DATA_SCHEME: str = Field(default="DS0001")

isar/mission_planner/sequential_task_selector.py

@@ -4,7 +4,7 @@ from isar.mission_planner.task_selector_interface import (
     TaskSelectorInterface,
     TaskSelectorStop,
 )
-from robot_interface.models.mission.task import TASKS, Task
+from robot_interface.models.mission.task import TASKS
 
 
 class SequentialTaskSelector(TaskSelectorInterface):

isar/mission_planner/task_selector_interface.py

@@ -1,7 +1,7 @@
 from abc import ABCMeta, abstractmethod
 from typing import List
 
-from robot_interface.models.mission.task import TASKS, Task
+from robot_interface.models.mission.task import TASKS
 
 
 class TaskSelectorInterface(metaclass=ABCMeta):

isar/models/communication/queues/__init__.py

@@ -1,4 +0,0 @@
-from .queue_io import QueueIO
-from .queue_timeout_error import QueueTimeoutError
-from .queues import Queues
-from .status_queue import StatusQueue

isar/models/communication/queues/status_queue.py

@@ -11,8 +11,8 @@ class StatusQueue(Queue):
         if not self._qsize():
             raise Empty
         with self.mutex:
-            l = list(self.queue)
-            return l.pop()
+            queueList = list(self.queue)
+            return queueList.pop()
 
     def update(self, item: Any):
         with self.mutex:

isar/modules.py

@@ -7,8 +7,8 @@ from typing import Dict, List, Tuple, Union
 from injector import Injector, Module, multiprovider, provider, singleton
 
 from isar.apis.api import API
-from isar.apis.schedule.scheduling_controller import SchedulingController
 from isar.apis.robot_control.robot_controller import RobotController
+from isar.apis.schedule.scheduling_controller import SchedulingController
 from isar.apis.security.authentication import Authenticator
 from isar.config.keyvault.keyvault_service import Keyvault
 from isar.config.settings import settings
@@ -18,8 +18,8 @@ from isar.mission_planner.sequential_task_selector import SequentialTaskSelector
 from isar.mission_planner.task_selector_interface import TaskSelectorInterface
 from isar.models.communication.queues.queues import Queues
 from isar.services.service_connections.request_handler import RequestHandler
-from isar.services.utilities.scheduling_utilities import SchedulingUtilities
 from isar.services.utilities.robot_utilities import RobotUtilities
+from isar.services.utilities.scheduling_utilities import SchedulingUtilities
 from isar.state_machine.state_machine import StateMachine
 from isar.storage.blob_storage import BlobStorage
 from isar.storage.local_storage import LocalStorage
@@ -70,9 +70,10 @@ class RobotModule(Module):
     @provider
     @singleton
     def provide_robot_interface(self) -> RobotInterface:
-        robot_package_name: str = settings.ROBOT_PACKAGE
-        robot: ModuleType = import_module(robot_package_name)
-        return robot.robotinterface.Robot()  # type: ignore
+        robot_interface: ModuleType = import_module(
+            f"{settings.ROBOT_PACKAGE}.robotinterface"
+        )
+        return robot_interface.Robot()  # type: ignore
 
 
 class QueuesModule(Module):

isar/services/service_connections/mqtt/robot_info_publisher.py

@@ -22,7 +22,6 @@ class RobotInfoPublisher:
                 robot_serial_number=settings.SERIAL_NUMBER,
                 robot_asset=settings.PLANT_SHORT_NAME,
                 documentation=settings.DOCUMENTATION,
-                video_streams=settings.VIDEO_STREAMS,
                 host=settings.API_HOST_VIEWED_EXTERNALLY,
                 port=settings.API_PORT,
                 capabilities=robot_settings.CAPABILITIES,

isar/services/utilities/scheduling_utilities.py

@@ -17,7 +17,11 @@ from isar.mission_planner.mission_planner_interface import (
     MissionPlannerInterface,
 )
 from isar.models.communication.message import StartMissionMessage
-from isar.models.communication.queues import QueueIO, Queues, QueueTimeoutError
+from isar.models.communication.queues.queue_io import QueueIO
+from isar.models.communication.queues.queues import Queues
+from isar.models.communication.queues.queue_timeout_error import (
+    QueueTimeoutError,
+)
 from isar.services.utilities.queue_utilities import QueueUtilities
 from isar.state_machine.states_enum import States
 from robot_interface.models.mission.mission import Mission
@@ -101,7 +105,7 @@ class SchedulingUtilities:
         is_capable: bool = True
         missing_capabilities: Set[str] = set()
         for task in mission.tasks:
-            if not task.type in robot_capabilities:
+            if task.type not in robot_capabilities:
                 is_capable = False
                 missing_capabilities.add(task.type)
 

isar/state_machine/state_machine.py

@@ -18,16 +18,14 @@ from isar.mission_planner.task_selector_interface import (
 )
 from isar.models.communication.message import StartMissionMessage
 from isar.models.communication.queues.queues import Queues
-from isar.state_machine.states import (
-    Idle,
-    Initialize,
-    Initiate,
-    Monitor,
-    Off,
-    Offline,
-    Paused,
-    Stop,
-)
+from isar.state_machine.states.idle import Idle
+from isar.state_machine.states.initialize import Initialize
+from isar.state_machine.states.initiate import Initiate
+from isar.state_machine.states.monitor import Monitor
+from isar.state_machine.states.off import Off
+from isar.state_machine.states.offline import Offline
+from isar.state_machine.states.paused import Paused
+from isar.state_machine.states.stop import Stop
 from isar.state_machine.states_enum import States
 from robot_interface.models.exceptions.robot_exceptions import ErrorMessage
 from robot_interface.models.initialize.initialize_params import InitializeParams

isar/state_machine/states/__init__.py

@@ -1,8 +0,0 @@
-from .idle import Idle
-from .initialize import Initialize
-from .initiate import Initiate
-from .monitor import Monitor
-from .off import Off
-from .offline import Offline
-from .paused import Paused
-from .stop import Stop

isar/state_machine/states/monitor.py

@@ -110,7 +110,8 @@ class Monitor(State):
 
             if not isinstance(status, TaskStatus):
                 self.logger.error(
-                    f"Received an invalid status update when monitoring mission. Only TaskStatus is expected."
+                    f"Received an invalid status update {status} when monitoring mission. "
+                    "Only TaskStatus is expected."
                 )
                 break
 

isar/storage/blob_storage.py

@@ -47,7 +47,7 @@ class BlobStorage(StorageInterface):
     def _upload_file(self, path: Path, data: bytes) -> Union[str, dict]:
         blob_client = self._get_blob_client(path)
         try:
-            blob_properties = blob_client.upload_blob(data=data)
+            blob_client.upload_blob(data=data)
         except ResourceExistsError as e:
             self.logger.error(
                 f"Blob {path.as_posix()} already exists in container. Error: {e}"

isar/storage/uploader.py

@@ -8,7 +8,7 @@ from typing import List, Union
 from injector import inject
 
 from isar.config.settings import settings
-from isar.models.communication.queues import Queues
+from isar.models.communication.queues.queues import Queues
 from isar.storage.storage_interface import StorageException, StorageInterface
 from robot_interface.models.inspection.inspection import Inspection
 from robot_interface.models.mission.mission import Mission

{isar-1.25.1.dist-info → isar-1.25.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: isar
-Version: 1.25.1
+Version: 1.25.3
 Summary: Integration and Supervisory control of Autonomous Robots
 Author-email: Equinor ASA <fg_robots_dev@equinor.com>
 License: Eclipse Public License version 2.0
@@ -127,9 +127,7 @@ Requires-Dist: transitions
 Requires-Dist: uvicorn
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
-Requires-Dist: flake8; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
-Requires-Dist: myst-parser; extra == "dev"
 Requires-Dist: pip-tools; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: pytest-dotenv; extra == "dev"
@@ -137,7 +135,7 @@ Requires-Dist: pytest-mock; extra == "dev"
 Requires-Dist: pytest-xdist; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: requests-mock; extra == "dev"
-Requires-Dist: sphinx; extra == "dev"
+Requires-Dist: ruff; extra == "dev"
 
 # ISAR
 

{isar-1.25.1.dist-info → isar-1.25.3.dist-info}/RECORD

@@ -1,14 +1,14 @@
 isar/__init__.py,sha256=cH8p8bVveu3FUL6kBhldcSlLaoHgD82Kd0-SwSNfGXw,87
-isar/modules.py,sha256=da1oE79leMID2cQKrVgahFyo-NAqNa_UA0PNHCA3Zt8,7361
+isar/modules.py,sha256=BeBg2kJi1q-7DzupOM3jFloeMScRk7qkNog9-yGwV5c,7355
 isar/script.py,sha256=MRC_w1kzWuutE9C7QNVtPhKbsld-uWKiMrcUWufiNzQ,5988
 isar/apis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 isar/apis/api.py,sha256=vUy7QbHrKcTHjh2rkU7lqQPkCasI6umha8r6H88JiXE,13942
-isar/apis/models/__init__.py,sha256=NI1BYyN__Ogr00Qqe0XJ-9gEVPva2brXo2RJsbrS4tM,52
+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=yaWICdWJrCYFIm5Aq1K3BVxD9oyVuXYaaY9hJG2aoVY,8820
-isar/apis/robot_control/robot_controller.py,sha256=en6j-dHIxUXraREz7JETqtxgHl79ks7TBgBwPKc6VQE,1019
+isar/apis/robot_control/robot_controller.py,sha256=w0giQf8k1TCL_J_kAcBB8Tgk02laWDCiDiFE8E5sPrg,915
 isar/apis/schedule/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-isar/apis/schedule/scheduling_controller.py,sha256=JvuioSWmJohiCqfGSCDvOq-CK2Y7ACHfXLfH-UhVQJ8,11371
+isar/apis/schedule/scheduling_controller.py,sha256=9S7OtFCfO0hR9gWtj2u2oqa2Hxj9ynpcXxgqdk5liQ4,11328
 isar/apis/security/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 isar/apis/security/authentication.py,sha256=TI8U9Y_L6ihHLMeM50ZONd5EPfuHdw_XMU_Q987W4AY,1975
 isar/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -16,7 +16,7 @@ isar/config/configuration_error.py,sha256=rO6WOhafX6xvVib8WxV-eY483Z0PpN-9PxGsq5
 isar/config/log.py,sha256=zHFLmGWQRn8TrcsxUS6KHpJt2JE86kYazU7b-bkcN9o,2285
 isar/config/logging.conf,sha256=mYO1xf27gAopEMHhGzY7-mwyfN16rwRLkPNMvy3zn2g,1127
 isar/config/settings.env,sha256=hJFfyl4S84nmcyf70Pz8nbGlPf4KTVx0UkgP3uf6T8E,534
-isar/config/settings.py,sha256=lbpuXAyeSCHFcEuIQvbqwyJIOp23Rtdqpajf_HrUjbU,13491
+isar/config/settings.py,sha256=NdFZSRTEeULulvU8tX904YblUFxZPwQpLu1opA5hbNE,12998
 isar/config/certs/ca-cert.pem,sha256=qoNljfad_qcMxhXJIUMLd7nT-Qwf_d4dYSdoOFEOE8I,2179
 isar/config/keyvault/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 isar/config/keyvault/keyvault_error.py,sha256=zvPCsZLjboxsxthYkxpRERCTFxYV8R5WmACewAUQLwk,41
@@ -38,16 +38,16 @@ isar/config/predefined_missions/default_turtlebot.json,sha256=8Vk1_0P0BBsG0vwh4v
 isar/mission_planner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 isar/mission_planner/local_planner.py,sha256=45zVP3hzUHdZ5Ty4KWRL85_AUWiTmBhTtlsAruUDMD4,2561
 isar/mission_planner/mission_planner_interface.py,sha256=UgpPIM4FbrWOD7fGY3Ul64k3uYb8wo0FwSWGewYoVbc,485
-isar/mission_planner/sequential_task_selector.py,sha256=lzBPV97wGBfqwpEh4l_7qhijx56yQtOmIM9DhIMOGFY,649
-isar/mission_planner/task_selector_interface.py,sha256=mzZEQfvU9BLCo_pu3fXXuYIjwjdjcr0vJ2pUCtFsr68,713
+isar/mission_planner/sequential_task_selector.py,sha256=66agRPHuJnEa1vArPyty4muTasAZ50XPjjrSaTdY_Cc,643
+isar/mission_planner/task_selector_interface.py,sha256=pnLeaGPIuyXThcflZ_A7YL2b2xQjFT88hAZidkMomxU,707
 isar/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 isar/models/communication/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 isar/models/communication/message.py,sha256=yN4SXYM-W_6u3Cf9yuAE3jy4e6mMrL3yUr-iVV4r55E,241
-isar/models/communication/queues/__init__.py,sha256=JqwWbdBQnBeIEhSTjBOkl-O3bYBVBSmjPcWUdscsobw,146
+isar/models/communication/queues/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 isar/models/communication/queues/queue_io.py,sha256=AnHWUCkZ0tunkxKKeBarq-OUkRM97IaMfA-a1pmf1cQ,394
 isar/models/communication/queues/queue_timeout_error.py,sha256=rF8TlNF7RHS_ueTZ5mp7aFkhLY1j0dcwMwH-Ba6lVpE,45
 isar/models/communication/queues/queues.py,sha256=FzoqlT4AQ4Q5Jufh6yRPV2uq5iUZd1odrpjBl77yU5o,803
-isar/models/communication/queues/status_queue.py,sha256=K_i01uzCu1eciDt9QlDXLBINJnuRLqm6fzrM-PY6qD0,467
+isar/models/communication/queues/status_queue.py,sha256=-6MDxrZ9dUIJgOMAluSJDyaM50xE1ylhoJZOnPIw8hs,483
 isar/models/mission_metadata/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 isar/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 isar/services/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -57,58 +57,59 @@ isar/services/service_connections/request_handler.py,sha256=0LxC0lu_HXeEf_xmJWjf
 isar/services/service_connections/mqtt/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 isar/services/service_connections/mqtt/mqtt_client.py,sha256=N6o9U1PUmMJdHz-EDI8TA28gnMTVmNoxo_BKlfGyzeU,3547
 isar/services/service_connections/mqtt/robot_heartbeat_publisher.py,sha256=_bUOG7CfqBlCRvG4vh2XGoMXucBxsJarFIeXIKOH1aw,1019
-isar/services/service_connections/mqtt/robot_info_publisher.py,sha256=5G6ahslydhO2Z4Ug3abf5KVHeOiWdWBMxwraRbJZS_I,1456
+isar/services/service_connections/mqtt/robot_info_publisher.py,sha256=AxokGk51hRPTxxD2r0P9braPJCMrf1InaCxrUBKkF4g,1402
 isar/services/service_connections/stid/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 isar/services/utilities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 isar/services/utilities/queue_utilities.py,sha256=Pw3hehSwkXJNeDv-bDVDfs58VOwtt3i5hpiJ2ZpphuQ,1225
 isar/services/utilities/robot_utilities.py,sha256=4-ob4kcIiRN_GXFDBMwBadfbwpYqKEkyzyC40wzvmko,555
-isar/services/utilities/scheduling_utilities.py,sha256=UUMxhudY2mQRG6Edjq6BG7oxwlqmcu5h6fMyw4Vhl_o,8376
+isar/services/utilities/scheduling_utilities.py,sha256=xQ1UqxxTRk2VpTVj7mL_ux9xqoaiSd45W7VAPmpXSfU,8509
 isar/services/utilities/threaded_request.py,sha256=py4G-_RjnIdHljmKFAcQ6ddqMmp-ZYV39Ece-dqRqjs,1874
 isar/state_machine/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-isar/state_machine/state_machine.py,sha256=9QO1g-uAI6jYuKq9e7a9CoDRAQHNJ-crZ9NuTnaS_wU,21788
+isar/state_machine/state_machine.py,sha256=xACcd64parrom84vqZvofNdGoPWRi6drHxI3CIxQHrY,22067
 isar/state_machine/states_enum.py,sha256=BlrUcBWkM5K6D_UZXRwTaUgGpAagWmVZH6HhDBGzVU4,278
-isar/state_machine/states/__init__.py,sha256=kErbKPDTwNfCLijvdyN6_AuOqDwR23nu9F0Qovsnir4,218
+isar/state_machine/states/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 isar/state_machine/states/idle.py,sha256=YKTOPVJUTGp-XR3N8FSm1s5ol3zoTmGs0THUMiO5h6A,3298
 isar/state_machine/states/initialize.py,sha256=TVXV5Ps3N4_flM88j9pQiX88kZgLzLwzlJy_6hPbgcA,2359
 isar/state_machine/states/initiate.py,sha256=j1wvSC3zVODgRkKOVsQROiuWkjihSBtwCs5GsoivLvc,5655
-isar/state_machine/states/monitor.py,sha256=pN52wtrrcrXxz913ZcFEELwaStL-eTZ6IIDiYw6oqe0,10253
+isar/state_machine/states/monitor.py,sha256=03h8OHFQ00_BuR_M7FOVeA4h_lJE2L1x37t0SyGZoX8,10285
 isar/state_machine/states/off.py,sha256=jjqN_oJMpBtWuY7hP-c9f0w3p2CYCfe-NpmYHHPnmyI,544
 isar/state_machine/states/offline.py,sha256=IfEZ6-kl6OfJSRT1eKHOey7AU23tKiSHqpwGqclmH_c,2166
 isar/state_machine/states/paused.py,sha256=TIg1iJvAxGUIfzE_qWp0wrq4Ka0a3zEf3GNwIWLIK0M,1177
 isar/state_machine/states/stop.py,sha256=WVyjhndHcccy7_P9bU7SXyZB3qphsGahdSymaghGc08,3348
 isar/storage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-isar/storage/blob_storage.py,sha256=8sfG1I23nPyVy6uZOq0O0FycZBjsSDIuAWdCVdVMEeM,3217
+isar/storage/blob_storage.py,sha256=L885tgwHeeIp8raIz20Hhbc1IMsQP0wK6HOX9I4sZlw,3199
 isar/storage/local_storage.py,sha256=Bnmoi5gyN8r-oRh0aHrOdGqaH3JqRScFKMRXYojW5kY,1855
 isar/storage/slimm_storage.py,sha256=iVtc7w_VPFoe0fWyPpI9kjau3C1rn7w2n5EJaqloFIU,8991
 isar/storage/storage_interface.py,sha256=DYDry4I7aZpDHJhsBF6s8zrgokFAc7fdKJKfA8AvL7o,828
-isar/storage/uploader.py,sha256=JBlgaHYdFFUPlkx0eI0HBhP93fr9PIPTaYp6HG0iMeU,6509
+isar/storage/uploader.py,sha256=ztcxDFCUxGu2mkRasB_3mxG-CNBp2RfGqczEEYR4gks,6516
 isar/storage/utilities.py,sha256=fitsdQ1ox5gr9fk9VuSk_iTBiEAIS8NZAnHabUZORh0,3173
 robot_interface/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-robot_interface/robot_interface.py,sha256=KtvWp1MDYgepG3uR9i8pt66zifhaXFl0nInClzL1FG0,9679
+robot_interface/robot_interface.py,sha256=UEhzAj1kXOdyYiWjz8zxEo5BHMHRE-ZHalPFfv-qBfw,9697
 robot_interface/test_robot_interface.py,sha256=FV1urn7SbsMyWBIcTKjsBwAG4IsXeZ6pLHE0mA9EGGs,692
 robot_interface/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 robot_interface/models/exceptions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 robot_interface/models/exceptions/robot_exceptions.py,sha256=7s9X7GaQVhQiTnXLi-a51qRUX9CU7F4rEUMoRBiWF_I,10548
-robot_interface/models/initialize/__init__.py,sha256=rz5neEDr59GDbzzI_FF0DId-C-I-50l113P-h-C_QBY,48
+robot_interface/models/initialize/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 robot_interface/models/initialize/initialize_params.py,sha256=2eG5Aq5bDKU6tVkaUMAoc46GERBgyaKkqv6yLupdRLc,164
-robot_interface/models/inspection/__init__.py,sha256=14wfuj4XZazrigKD7fL98khFKz-eckIpEgPcYRj40Kg,227
+robot_interface/models/inspection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 robot_interface/models/inspection/inspection.py,sha256=nSoKTDPRWnpaJuoKnaE_2EEJ6oH4dQkqEuECcQTvVhI,2059
 robot_interface/models/mission/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 robot_interface/models/mission/mission.py,sha256=QZBDQiOmpb4C7nNCf1PaCWwpvAc8jrhwHSznOe2YhX8,842
 robot_interface/models/mission/status.py,sha256=C_viZWNTYOncWCdurx7Pko_D9d595QmHuJZBT8YMHUg,724
-robot_interface/models/mission/task.py,sha256=boRigdjY9dvJzHYxAweqydRGt7CUyXFcCjMVw-lrwJM,4969
+robot_interface/models/mission/task.py,sha256=dk_CYaABD9WxQswd1xX3D5AHpcXwREwnloREEg1JbI0,4980
 robot_interface/models/robots/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+robot_interface/models/robots/battery_state.py,sha256=BuZcgC3NaHDU-2WrjZBER2Ps96CnLy3vE2P4v4NajN4,108
 robot_interface/models/robots/media.py,sha256=Bo6XisTND9MOsxvJe6mWtKumFCpX6pbEBzEnAKpoIpU,232
 robot_interface/models/robots/robot_model.py,sha256=pZQsqhn9hh6XE3EjMZhWMzYqg5oJ4CJ4CXeOASKvEf8,452
 robot_interface/telemetry/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 robot_interface/telemetry/mqtt_client.py,sha256=DkzYZNWFaJkG3AVc0dM4Bj52hZEQj-14Q75zqzQcv9A,2988
-robot_interface/telemetry/payloads.py,sha256=JM5E_IHkZpim_zdwc-w52D7dYFBeP4iO1-xupOkHcFQ,1562
+robot_interface/telemetry/payloads.py,sha256=WMR4VtL-K0JmUA22OcCaZ_RJwT5X2UfcLuwSNg9Skno,1580
 robot_interface/utilities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 robot_interface/utilities/json_service.py,sha256=nU2Q_3P9Fq9hs6F_wtUjWtHfl_g1Siy-yDhXXSKwHwg,1018
 robot_interface/utilities/uuid_string_factory.py,sha256=_NQIbBQ56w0qqO0MUDP6aPpHbxW7ATRhK8HnQiBSLkc,76
-isar-1.25.1.dist-info/LICENSE,sha256=3fc2-ebLwHWwzfQbulGNRdcNob3SBQeCfEVUDYxsuqw,14058
-isar-1.25.1.dist-info/METADATA,sha256=QvUtSw8nmGfn1MgIgqxHa9mzQNpH1hudpRrNwmodfwA,30661
-isar-1.25.1.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-isar-1.25.1.dist-info/entry_points.txt,sha256=TFam7uNNw7J0iiDYzsH2gfG0u1eV1wh3JTw_HkhgKLk,49
-isar-1.25.1.dist-info/top_level.txt,sha256=UwIML2RtuQKCyJJkatcSnyp6-ldDjboB9k9JgKipO-U,21
-isar-1.25.1.dist-info/RECORD,,
+isar-1.25.3.dist-info/LICENSE,sha256=3fc2-ebLwHWwzfQbulGNRdcNob3SBQeCfEVUDYxsuqw,14058
+isar-1.25.3.dist-info/METADATA,sha256=vr0jDbMJpedOe28_CMWh5-5aEPkbjEKhBQh61sdPFa0,30578
+isar-1.25.3.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+isar-1.25.3.dist-info/entry_points.txt,sha256=TFam7uNNw7J0iiDYzsH2gfG0u1eV1wh3JTw_HkhgKLk,49
+isar-1.25.3.dist-info/top_level.txt,sha256=UwIML2RtuQKCyJJkatcSnyp6-ldDjboB9k9JgKipO-U,21
+isar-1.25.3.dist-info/RECORD,,

robot_interface/models/initialize/__init__.py

@@ -1 +0,0 @@
-from .initialize_params import InitializeParams

robot_interface/models/inspection/__init__.py

@@ -1,13 +0,0 @@
-from .inspection import (
-    Audio,
-    Image,
-    ImageMetadata,
-    Inspection,
-    InspectionMetadata,
-    ThermalImage,
-    ThermalImageMetadata,
-    ThermalVideo,
-    ThermalVideoMetadata,
-    Video,
-    VideoMetadata,
-)

robot_interface/models/mission/task.py

@@ -5,7 +5,7 @@ from alitra import Pose, Position
 from pydantic import BaseModel, Field
 
 from robot_interface.models.exceptions.robot_exceptions import ErrorMessage
-from robot_interface.models.inspection import (
+from robot_interface.models.inspection.inspection import (
     Audio,
     Image,
     Inspection,

robot_interface/models/robots/battery_state.py

@@ -0,0 +1,6 @@
+from enum import Enum
+
+
+class BatteryState(Enum):
+    Normal: str = "Normal"
+    Charging: str = "Charging"

robot_interface/robot_interface.py

@@ -3,7 +3,7 @@ from queue import Queue
 from threading import Thread
 from typing import Callable, List, Optional
 
-from robot_interface.models.initialize import InitializeParams
+from robot_interface.models.initialize.initialize_params import InitializeParams
 from robot_interface.models.inspection.inspection import Inspection
 from robot_interface.models.mission.mission import Mission
 from robot_interface.models.mission.status import RobotStatus, TaskStatus

robot_interface/telemetry/payloads.py

@@ -1,11 +1,12 @@
 from dataclasses import dataclass
 from datetime import datetime
-from typing import List
+from typing import List, Optional
 
 from alitra import Pose
 from transitions import State
 
 from robot_interface.models.mission.status import RobotStatus
+from robot_interface.models.robots.battery_state import BatteryState
 
 
 @dataclass
@@ -30,6 +31,7 @@ class TelemetryPosePayload(TelemetryPayload):
 @dataclass
 class TelemetryBatteryPayload(TelemetryPayload):
     battery_level: float
+    battery_state: Optional[BatteryState] = None
 
 
 @dataclass
@@ -48,13 +50,6 @@ class DocumentInfo:
     url: str
 
 
-@dataclass
-class VideoStream:
-    name: str
-    url: str
-    type: str
-
-
 @dataclass
 class RobotStatusPayload:
     isar_id: str
@@ -76,7 +71,6 @@ class RobotInfoPayload:
     robot_serial_number: str
     robot_asset: str
     documentation: List[DocumentInfo]
-    video_streams: List[VideoStream]
     host: str
     port: int
     capabilities: List[str]