isar 1.18.0__py3-none-any.whl → 1.19.1__py3-none-any.whl

isar/__init__.py

@@ -1,6 +1,6 @@
-from pkg_resources import DistributionNotFound, get_distribution
+from importlib.metadata import PackageNotFoundError, distribution
 
 try:
-    __version__ = get_distribution(__name__).version
-except DistributionNotFound:
+    __version__ = distribution(__name__).version
+except PackageNotFoundError:
     pass  # package is not installed

isar/config/log.py

@@ -1,6 +1,6 @@
-import importlib.resources as pkg_resources
 import logging
 import logging.config
+from importlib.resources import as_file, files
 
 import yaml
 from opencensus.ext.azure.log_exporter import AzureLogHandler
@@ -14,8 +14,9 @@ from isar.config.settings import settings
 
 def setup_loggers(keyvault: Keyvault) -> None:
     log_levels: dict = settings.LOG_LEVELS
-    with pkg_resources.path("isar.config", "logging.conf") as path:
-        log_config = yaml.safe_load(open(path))
+    source = files("isar").joinpath("config").joinpath("logging.conf")
+    with as_file(source) as f:
+        log_config = yaml.safe_load(open(f))
 
     logging.config.dictConfig(log_config)
 

isar/config/settings.py

@@ -1,5 +1,5 @@
-import importlib.resources as pkg_resources
 import os
+from importlib.resources import as_file, files
 from typing import Any, List, Optional
 
 from dotenv import load_dotenv
@@ -14,11 +14,12 @@ from robot_interface.telemetry.payloads import VideoStream
 class Settings(BaseSettings):
     def __init__(self) -> None:
         try:
-            with pkg_resources.path(f"isar.config", "settings.env") as path:
-                env_file_path = path
+            source = files("isar").joinpath("config").joinpath("settings.env")
+            with as_file(source) as eml:
+                env_file = eml
         except ModuleNotFoundError:
-            env_file_path = None
-        super().__init__(_env_file=env_file_path)
+            env_file = None
+        super().__init__(_env_file=env_file)
 
     # Determines which robot package ISAR will attempt to import
     # Name must match with an installed python package in the local environment
@@ -229,14 +230,13 @@ class Settings(BaseSettings):
     DATA_CLASSIFICATION: str = Field(default="internal")
 
     # List of MQTT Topics
-    TOPIC_ISAR_STATE: str = Field(default="state", validate_default=True)
+    TOPIC_ISAR_STATUS: str = Field(default="status", validate_default=True)
     TOPIC_ISAR_MISSION: str = Field(default="mission", validate_default=True)
     TOPIC_ISAR_TASK: str = Field(default="task", validate_default=True)
     TOPIC_ISAR_STEP: str = Field(default="step", validate_default=True)
     TOPIC_ISAR_INSPECTION_RESULT: str = Field(
         default="inspection_result", validate_default=True
     )
-    TOPIC_ISAR_ROBOT_STATUS: str = Field(default="robot_status", validate_default=True)
     TOPIC_ISAR_ROBOT_INFO: str = Field(default="robot_info", validate_default=True)
     TOPIC_ISAR_ROBOT_HEARTBEAT: str = Field(
         default="robot_heartbeat", validate_default=True
@@ -284,11 +284,10 @@ class Settings(BaseSettings):
         }
 
     @field_validator(
-        "TOPIC_ISAR_STATE",
+        "TOPIC_ISAR_STATUS",
         "TOPIC_ISAR_MISSION",
         "TOPIC_ISAR_TASK",
         "TOPIC_ISAR_STEP",
-        "TOPIC_ISAR_ROBOT_STATUS",
         "TOPIC_ISAR_ROBOT_INFO",
         "TOPIC_ISAR_ROBOT_HEARTBEAT",
         "TOPIC_ISAR_INSPECTION_RESULT",
@@ -312,13 +311,16 @@ settings = Settings()
 class RobotSettings(BaseSettings):
     def __init__(self) -> None:
         try:
-            with pkg_resources.path(
-                f"{settings.ROBOT_PACKAGE}.config", "settings.env"
-            ) as path:
-                env_file_path = path
+            source = (
+                files(f"{settings.ROBOT_PACKAGE}")
+                .joinpath("config")
+                .joinpath("settings.env")
+            )
+            with as_file(source) as eml:
+                env_file = eml
         except ModuleNotFoundError:
-            env_file_path = None
-        super().__init__(_env_file=env_file_path)
+            env_file = None
+        super().__init__(_env_file=env_file)
 
     # ISAR steps the robot is capable of performing
     # This should be set in the robot package settings.env file

isar/services/service_connections/mqtt/robot_heartbeat_publisher.py

@@ -1,6 +1,6 @@
 import json
 import time
-from datetime import datetime
+from datetime import UTC, datetime
 from queue import Queue
 
 from isar.config.settings import settings
@@ -18,7 +18,7 @@ class RobotHeartbeatPublisher:
             payload: RobotHeartbeatPayload = RobotHeartbeatPayload(
                 isar_id=settings.ISAR_ID,
                 robot_name=settings.ROBOT_NAME,
-                timestamp=datetime.utcnow(),
+                timestamp=datetime.now(UTC),
             )
 
             self.mqtt_publisher.publish(

isar/services/service_connections/mqtt/robot_info_publisher.py

@@ -1,6 +1,6 @@
 import json
 import time
-from datetime import datetime
+from datetime import UTC, datetime
 from queue import Queue
 
 from isar.config.settings import robot_settings, settings
@@ -25,7 +25,7 @@ class RobotInfoPublisher:
                 host=settings.API_HOST_VIEWED_EXTERNALLY,
                 port=settings.API_PORT,
                 capabilities=robot_settings.CAPABILITIES,
-                timestamp=datetime.utcnow(),
+                timestamp=datetime.now(UTC),
             )
 
             self.mqtt_publisher.publish(

isar/state_machine/state_machine.py

@@ -2,7 +2,7 @@ import json
 import logging
 import queue
 from collections import deque
-from datetime import datetime
+from datetime import UTC, datetime
 from typing import Deque, List, Optional
 
 from alitra import Pose
@@ -24,6 +24,7 @@ from isar.state_machine.states import (
     Initiate,
     Monitor,
     Off,
+    Offline,
     Paused,
     Stop,
 )
@@ -31,7 +32,12 @@ 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
 from robot_interface.models.mission.mission import Mission
-from robot_interface.models.mission.status import MissionStatus, StepStatus, TaskStatus
+from robot_interface.models.mission.status import (
+    MissionStatus,
+    RobotStatus,
+    StepStatus,
+    TaskStatus,
+)
 from robot_interface.models.mission.step import Step
 from robot_interface.models.mission.task import Task
 from robot_interface.robot_interface import RobotInterface
@@ -88,6 +94,7 @@ class StateMachine(object):
         self.monitor_state: State = Monitor(self)
         self.initiate_state: State = Initiate(self)
         self.off_state: State = Off(self)
+        self.offline_state: State = Offline(self)
 
         self.states: List[State] = [
             self.off_state,
@@ -97,6 +104,7 @@ class StateMachine(object):
             self.monitor_state,
             self.stop_state,
             self.paused_state,
+            self.offline_state,
         ]
 
         self.machine = Machine(self, states=self.states, initial="off", queued=True)
@@ -194,6 +202,18 @@ class StateMachine(object):
                     "dest": self.idle_state,
                     "before": self._mission_stopped,
                 },
+                {
+                    "trigger": "robot_turned_offline",
+                    "source": [self.idle_state],
+                    "dest": self.offline_state,
+                    "before": self._offline,
+                },
+                {
+                    "trigger": "robot_turned_online",
+                    "source": self.offline_state,
+                    "dest": self.idle_state,
+                    "before": self._online,
+                },
             ]
         )
 
@@ -239,6 +259,12 @@ class StateMachine(object):
     def _off(self) -> None:
         return
 
+    def _offline(self) -> None:
+        return
+
+    def _online(self) -> None:
+        return
+
     def _resume(self) -> None:
         self.logger.info(f"Resuming mission: {self.current_mission.id}")
         self.current_mission.status = MissionStatus.InProgress
@@ -417,7 +443,7 @@ class StateMachine(object):
         self.send_state_status()
         self._log_state_transition(self.current_state)
         self.logger.info(f"State: {self.current_state}")
-        self.publish_state()
+        self.publish_status()
 
     def reset_state_machine(self) -> None:
         self.logger.info("Resetting state machine")
@@ -482,7 +508,7 @@ class StateMachine(object):
                 "error_description": (
                     error_message.error_description if error_message else None
                 ),
-                "timestamp": datetime.utcnow(),
+                "timestamp": datetime.now(UTC),
             },
             cls=EnhancedJSONEncoder,
         )
@@ -490,7 +516,8 @@ class StateMachine(object):
         self.mqtt_publisher.publish(
             topic=settings.TOPIC_ISAR_MISSION,
             payload=payload,
-            retain=False,
+            qos=1,
+            retain=True,
         )
 
     def publish_task_status(self, task: Task) -> None:
@@ -514,7 +541,7 @@ class StateMachine(object):
                 "error_description": (
                     error_message.error_description if error_message else None
                 ),
-                "timestamp": datetime.utcnow(),
+                "timestamp": datetime.now(UTC),
             },
             cls=EnhancedJSONEncoder,
         )
@@ -522,7 +549,8 @@ class StateMachine(object):
         self.mqtt_publisher.publish(
             topic=settings.TOPIC_ISAR_TASK,
             payload=payload,
-            retain=False,
+            qos=1,
+            retain=True,
         )
 
     def publish_step_status(self, step: Step) -> None:
@@ -548,7 +576,7 @@ class StateMachine(object):
                 "error_description": (
                     error_message.error_description if error_message else None
                 ),
-                "timestamp": datetime.utcnow(),
+                "timestamp": datetime.now(UTC),
             },
             cls=EnhancedJSONEncoder,
         )
@@ -556,28 +584,38 @@ class StateMachine(object):
         self.mqtt_publisher.publish(
             topic=settings.TOPIC_ISAR_STEP,
             payload=payload,
-            retain=False,
+            qos=1,
+            retain=True,
         )
 
-    def publish_state(self) -> None:
+    def publish_status(self) -> None:
         if not self.mqtt_publisher:
             return
         payload: str = json.dumps(
             {
                 "isar_id": settings.ISAR_ID,
                 "robot_name": settings.ROBOT_NAME,
-                "state": self.current_state,
-                "timestamp": datetime.utcnow(),
+                "status": self._current_status(),
+                "timestamp": datetime.now(UTC),
             },
             cls=EnhancedJSONEncoder,
         )
 
         self.mqtt_publisher.publish(
-            topic=settings.TOPIC_ISAR_STATE,
+            topic=settings.TOPIC_ISAR_STATUS,
             payload=payload,
-            retain=False,
+            qos=1,
+            retain=True,
         )
 
+    def _current_status(self) -> RobotStatus:
+        if self.current_state == States.Idle:
+            return RobotStatus.Available
+        elif self.current_state == States.Offline:
+            return RobotStatus.Offline
+        else:
+            return RobotStatus.Busy
+
     def _log_state_transition(self, next_state):
         """Logs all state transitions that are not self-transitions."""
         self.transitions_list.append(next_state)

isar/state_machine/states/__init__.py

@@ -3,5 +3,6 @@ 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/idle.py

@@ -1,10 +1,17 @@
 import logging
 import time
-from typing import Optional, TYPE_CHECKING
+from typing import TYPE_CHECKING, Optional
 
 from transitions import State
 
+from isar.config.settings import settings
 from isar.models.communication.message import StartMissionMessage
+from isar.services.utilities.threaded_request import (
+    ThreadedRequest,
+    ThreadedRequestNotFinishedError,
+)
+from robot_interface.models.exceptions.robot_exceptions import RobotException
+from robot_interface.models.mission.status import RobotStatus
 
 if TYPE_CHECKING:
     from isar.state_machine.state_machine import StateMachine
@@ -15,13 +22,17 @@ class Idle(State):
         super().__init__(name="idle", on_enter=self.start, on_exit=self.stop)
         self.state_machine: "StateMachine" = state_machine
         self.logger = logging.getLogger("state_machine")
+        self.robot_status_thread: Optional[ThreadedRequest] = None
+        self.last_robot_status_poll_time: float = time.time()
 
     def start(self) -> None:
         self.state_machine.update_state()
         self._run()
 
     def stop(self) -> None:
-        pass
+        if self.robot_status_thread:
+            self.robot_status_thread.wait_for_thread()
+        self.robot_status_thread = None
 
     def _run(self) -> None:
         while True:
@@ -37,4 +48,38 @@ class Idle(State):
                 break
             time.sleep(self.state_machine.sleep_time)
 
+            time_from_last_robot_status_poll = (
+                time.time() - self.last_robot_status_poll_time
+            )
+            if (
+                time_from_last_robot_status_poll
+                < settings.ROBOT_API_STATUS_POLL_INTERVAL
+            ):
+                continue
+
+            if not self.robot_status_thread:
+                self.robot_status_thread = ThreadedRequest(
+                    request_func=self.state_machine.robot.robot_status
+                )
+                self.robot_status_thread.start_thread(
+                    name="State Machine Offline Get Robot Status"
+                )
+
+            try:
+                robot_status: RobotStatus = self.robot_status_thread.get_output()
+            except ThreadedRequestNotFinishedError:
+                time.sleep(self.state_machine.sleep_time)
+                continue
+
+            except (RobotException,) as e:
+                self.logger.error(
+                    f"Failed to get robot status because: {e.error_description}"
+                )
+
+            self.last_robot_status_poll_time = time.time()
+
+            if robot_status == RobotStatus.Offline:
+                transition = self.state_machine.robot_turned_offline  # type: ignore
+                break
+
         transition()

isar/state_machine/states/monitor.py

@@ -1,7 +1,7 @@
 import logging
 import time
 from copy import deepcopy
-from typing import Callable, Optional, Sequence, TYPE_CHECKING, Tuple, Union
+from typing import TYPE_CHECKING, Callable, Optional, Sequence, Tuple, Union
 
 from injector import inject
 from transitions import State
@@ -14,11 +14,11 @@ from isar.services.utilities.threaded_request import (
 )
 from robot_interface.models.exceptions.robot_exceptions import (
     ErrorMessage,
+    RobotCommunicationTimeoutException,
     RobotException,
     RobotMissionStatusException,
     RobotRetrieveInspectionException,
     RobotStepStatusException,
-    RobotCommunicationTimeoutException,
 )
 from robot_interface.models.inspection.inspection import Inspection
 from robot_interface.models.mission.mission import Mission
@@ -131,8 +131,6 @@ class Monitor(State):
                     f"Retrieving the status failed because: {e.error_description}"
                 )
 
-            self.request_status_failure_counter = 0
-
             if isinstance(status, StepStatus):
                 self.state_machine.current_step.status = status
             elif isinstance(status, MissionStatus):
@@ -158,6 +156,7 @@ class Monitor(State):
             else:
                 if isinstance(status, StepStatus):
                     if self._step_finished(self.state_machine.current_step):
+                        self.state_machine.update_current_step()
                         self.state_machine.current_task.update_task_status()
                     else:  # If not all steps are done
                         self.state_machine.current_task.status = TaskStatus.InProgress
@@ -166,7 +165,6 @@ class Monitor(State):
                         self.state_machine.current_task
                     )
                     if self.state_machine.current_task.status == TaskStatus.Successful:
-                        self.state_machine.update_remaining_steps()
                         try:
                             self.state_machine.current_task = (
                                 self.state_machine.task_selector.next_task()

isar/state_machine/states/offline.py

@@ -0,0 +1,62 @@
+import logging
+import time
+from typing import TYPE_CHECKING, Optional
+
+from transitions import State
+
+from isar.config.settings import settings
+from isar.services.utilities.threaded_request import (
+    ThreadedRequest,
+    ThreadedRequestNotFinishedError,
+)
+from robot_interface.models.exceptions.robot_exceptions import RobotException
+from robot_interface.models.mission.status import RobotStatus
+
+if TYPE_CHECKING:
+    from isar.state_machine.state_machine import StateMachine
+
+
+class Offline(State):
+    def __init__(self, state_machine: "StateMachine") -> None:
+        super().__init__(name="offline", on_enter=self.start, on_exit=self.stop)
+        self.state_machine: "StateMachine" = state_machine
+        self.logger = logging.getLogger("state_machine")
+        self.robot_status_thread: Optional[ThreadedRequest] = None
+
+    def start(self) -> None:
+        self.state_machine.update_state()
+        self._run()
+
+    def stop(self) -> None:
+        if self.robot_status_thread:
+            self.robot_status_thread.wait_for_thread()
+        self.robot_status_thread = None
+
+    def _run(self) -> None:
+        while True:
+            if not self.robot_status_thread:
+                self.robot_status_thread = ThreadedRequest(
+                    request_func=self.state_machine.robot.robot_status
+                )
+                self.robot_status_thread.start_thread(
+                    name="State Machine Offline Get Robot Status"
+                )
+
+            try:
+                robot_status: RobotStatus = self.robot_status_thread.get_output()
+            except ThreadedRequestNotFinishedError:
+                time.sleep(self.state_machine.sleep_time)
+                continue
+
+            except (RobotException,) as e:
+                self.logger.error(
+                    f"Failed to get robot status because: {e.error_description}"
+                )
+
+            if robot_status != RobotStatus.Offline:
+                transition = self.state_machine.robot_turned_online  # type: ignore
+                break
+
+            time.sleep(settings.ROBOT_API_STATUS_POLL_INTERVAL)
+
+        transition()

isar/state_machine/states_enum.py

@@ -9,6 +9,7 @@ class States(str, Enum):
     Monitor = "monitor"
     Paused = "paused"
     Stop = "stop"
+    Offline = "offline"
 
     def __repr__(self):
         return self.value

isar/storage/uploader.py

@@ -1,7 +1,7 @@
 import json
 import logging
 from dataclasses import dataclass
-from datetime import datetime, timedelta
+from datetime import UTC, datetime, timedelta
 from queue import Empty, Queue
 from typing import List, Union
 
@@ -22,12 +22,12 @@ class UploaderQueueItem:
     mission: Mission
     storage_handler: StorageInterface
     _retry_count: int
-    _next_retry_time: datetime = datetime.utcnow()
+    _next_retry_time: datetime = datetime.now(UTC)
 
     def increment_retry(self, max_wait_time: int) -> None:
         self._retry_count += 1
         seconds_until_retry: int = min(2**self._retry_count, max_wait_time)
-        self._next_retry_time = datetime.utcnow() + timedelta(
+        self._next_retry_time = datetime.now(UTC) + timedelta(
             seconds=seconds_until_retry
         )
 
@@ -35,10 +35,10 @@ class UploaderQueueItem:
         return self._retry_count
 
     def is_ready_for_upload(self) -> bool:
-        return datetime.utcnow() >= self._next_retry_time
+        return datetime.now(UTC) >= self._next_retry_time
 
     def seconds_until_retry(self) -> int:
-        return max(0, int((self._next_retry_time - datetime.utcnow()).total_seconds()))
+        return max(0, int((self._next_retry_time - datetime.now(UTC)).total_seconds()))
 
 
 class Uploader:
@@ -154,12 +154,13 @@ class Uploader:
                 "inspection_id": inspection.id,
                 "inspection_path": inspection_path,
                 "analysis_type": inspection.metadata.analysis_type,
-                "timestamp": datetime.utcnow(),
+                "timestamp": datetime.now(UTC),
             },
             cls=EnhancedJSONEncoder,
         )
         self.mqtt_publisher.publish(
             topic=settings.TOPIC_ISAR_INSPECTION_RESULT,
             payload=payload,
-            retain=False,
+            qos=1,
+            retain=True,
         )

isar/storage/utilities.py

@@ -1,6 +1,6 @@
 import json
 import time
-from datetime import datetime
+from datetime import UTC, datetime
 from pathlib import Path
 from typing import Tuple
 
@@ -37,7 +37,7 @@ def construct_metadata_file(
             "mission_id": mission.id,
             "mission_name": mission.name,
             "plant_name": settings.PLANT_NAME,
-            "mission_date": datetime.utcnow().date(),
+            "mission_date": datetime.now(UTC).date(),
             "isar_id": settings.ISAR_ID,
             "robot_name": settings.ROBOT_NAME,
             "analysis_type": (
@@ -80,4 +80,4 @@ def get_filename(
 
 def get_foldername(mission: Mission) -> str:
     mission_name: str = mission.name.replace(" ", "-")
-    return f"{datetime.utcnow().date()}__{settings.PLANT_SHORT_NAME}__{mission_name}__{mission.id}"
+    return f"{datetime.now(UTC).date()}__{settings.PLANT_SHORT_NAME}__{mission_name}__{mission.id}"

{isar-1.18.0.dist-info → isar-1.19.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: isar
-Version: 1.18.0
+Version: 1.19.1
 Summary: Integration and Supervisory control of Autonomous Robots
 Home-page: https://github.com/equinor/isar
 Author: Equinor ASA
@@ -12,7 +12,7 @@ Classifier: Programming Language :: Python
 Classifier: Topic :: Scientific/Engineering
 Classifier: Topic :: Scientific/Engineering :: Physics
 Classifier: Topic :: Software Development :: Libraries
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: alitra >=1.1.3
@@ -415,6 +415,17 @@ ISAR_MQTT_PASSWORD
 
 If not specified the password will default to an empty string.
 
+## Running several ISAR instances locally
+
+To run several ISAR instances in parallel locally:
+1. Generate a guid: https://www.guidgenerator.com/
+2. Open a new terminal in the isar folder
+3. Run the following command before running main.py:
+
+```
+export ISAR_API_PORT=port_name_higher_than_1024 ISAR_ISAR_ID=guid ISAR_ROBOT_NAME=random_robot_name
+```
+
 # Contributions
 
 Equinor welcomes all kinds of contributions, including code, bug reports, issues, feature requests, and documentation

{isar-1.18.0.dist-info → isar-1.19.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-isar/__init__.py,sha256=oXTcQpZYQ7jkRIem-Nq3hw9DrveoIV3-8k697XN16rA,190
+isar/__init__.py,sha256=vGRSvnHq6l7PIQJcAKYS-sM_YIl1D77m4SGMFjyX8lY,187
 isar/modules.py,sha256=aO8bLSC4i_Qo4bOJ6aFfwAZRTJAw8o9SOOfkceUGCiU,6708
 isar/apis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 isar/apis/api.py,sha256=vSXfkWR7iITWbh4BsDzjEDtQrz6KS-vi2S8AeaeDc3Q,13112
@@ -11,10 +11,10 @@ isar/apis/security/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 isar/apis/security/authentication.py,sha256=TI8U9Y_L6ihHLMeM50ZONd5EPfuHdw_XMU_Q987W4AY,1975
 isar/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 isar/config/configuration_error.py,sha256=rO6WOhafX6xvVib8WxV-eY483Z0PpN-9PxGsq5ATfKc,46
-isar/config/log.py,sha256=39G_Cue0qvw0Uv-1NYXvQ83yivPIKcAv-bGNNREFw5o,2251
+isar/config/log.py,sha256=zHFLmGWQRn8TrcsxUS6KHpJt2JE86kYazU7b-bkcN9o,2285
 isar/config/logging.conf,sha256=mYO1xf27gAopEMHhGzY7-mwyfN16rwRLkPNMvy3zn2g,1127
 isar/config/settings.env,sha256=-kivj0osAAKlInnY81ugySTlcImhVABbnj9kUoBDLu8,535
-isar/config/settings.py,sha256=eiVXkjcKpUDOTchzWYooaZZ3xdEXjD8Uv4V7ynHuXwY,13201
+isar/config/settings.py,sha256=pZrZGe60WoMNl_SlCzJFavU3Qqil_ocCuaKcKfDn0KM,13175
 isar/config/certs/ca-cert.pem,sha256=gSBTyY0tKSFnssyvrvbFvHpQwii0kEkBryklVmevdtc,2029
 isar/config/keyvault/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 isar/config/keyvault/keyvault_error.py,sha256=zvPCsZLjboxsxthYkxpRERCTFxYV8R5WmACewAUQLwk,41
@@ -58,23 +58,23 @@ isar/services/service_connections/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeR
 isar/services/service_connections/request_handler.py,sha256=0LxC0lu_HXeEf_xmJWjfEsh14oAUI97cpG1IWtBlcs4,4278
 isar/services/service_connections/mqtt/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 isar/services/service_connections/mqtt/mqtt_client.py,sha256=Aib0lqaddxW9aVXXYD7wGL9jIpr2USCCH91SQgFdIG4,3548
-isar/services/service_connections/mqtt/robot_heartbeat_publisher.py,sha256=TxvpLA_qfyXwwN58h2X-eomTnhbFPhqfjamPxBz084E,1000
-isar/services/service_connections/mqtt/robot_info_publisher.py,sha256=d5HQ6Hfp5E21kaj1IJsFMWXecbzvH8iYByZhOucR004,1383
-isar/services/service_connections/mqtt/robot_status_publisher.py,sha256=KPxRrdtu-yLQolQ7DejC1v1NCeELUzrK_ZoiEpsrqD4,4425
+isar/services/service_connections/mqtt/robot_heartbeat_publisher.py,sha256=0Qjo2wRZZoooXG-UE4z8YJc9QCCz6v-9YAqHRJgx-kE,1005
+isar/services/service_connections/mqtt/robot_info_publisher.py,sha256=f1vhBNPlx6p3Au8l7OsWIJXRM_xjA8qcLHvnkwCtRBM,1388
 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/scheduling_utilities.py,sha256=LFimEmacML3J9q-FNLfKPhcAr-R3f2rkYkbsoro0Gyo,8434
 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=yud8FODucCFLVkK1E4NfKZ5YCrFb8IRfk752Nn_WTIY,22606
-isar/state_machine/states_enum.py,sha256=ks1A8gO7DOpLbSe6Vzq4-BfTCU78IsQZyoEJwQ9Wg4M,254
-isar/state_machine/states/__init__.py,sha256=gUikQDu-O-lmunwzwcN9gN6VaEmlCFlqqgdNfFAfXBc,189
-isar/state_machine/states/idle.py,sha256=tfciqI7NPDVF8WMe5qbSO3c-xDzUTQYLmJinb9e0JS8,1231
+isar/state_machine/state_machine.py,sha256=-i7m2xVcgL3cW6AIMGAom97wzt433MXM8EQEGUykAJA,23653
+isar/state_machine/states_enum.py,sha256=BlrUcBWkM5K6D_UZXRwTaUgGpAagWmVZH6HhDBGzVU4,278
+isar/state_machine/states/__init__.py,sha256=kErbKPDTwNfCLijvdyN6_AuOqDwR23nu9F0Qovsnir4,218
+isar/state_machine/states/idle.py,sha256=_nrM17s4artaHezanl28_WcNyJod1_hkCyzAqZlPQiE,3034
 isar/state_machine/states/initialize.py,sha256=Vx7OxWZI_xEkRwHWFh9ymxK_7mDH0Wayt09dGGqBJWk,2359
 isar/state_machine/states/initiate.py,sha256=b0Fq3tN6TZMg5j4192OsYdGbphTXWCkftBsFX57mhrw,5652
-isar/state_machine/states/monitor.py,sha256=iuGiIEWSp6_rC6CLz5DNfb71Dttlo0KFxfg7xYwiZYE,10665
+isar/state_machine/states/monitor.py,sha256=wJCBJo0xc42pzI8mUtOIsPsAK5V82oY3h9uiy-EkNr4,10609
 isar/state_machine/states/off.py,sha256=jjqN_oJMpBtWuY7hP-c9f0w3p2CYCfe-NpmYHHPnmyI,544
+isar/state_machine/states/offline.py,sha256=wEMMIwM4JWfmDjI7pe9yKce_Mfz9aXqs6WEkxn8cx5I,2125
 isar/state_machine/states/paused.py,sha256=xVZM9WMt90FTiP5forSlA3eJ5Vt9LzZYCFDQDPIocKA,1004
 isar/state_machine/states/stop.py,sha256=Sxdo4FGhxc2Pj91jidYtVIjpSNklbEf1sJYJ6x51HgE,3348
 isar/storage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -82,8 +82,8 @@ isar/storage/blob_storage.py,sha256=oKdml1VVN8iTr-d_5H4Lz5E7zrhJRknCzOxHD-tO7m8,
 isar/storage/local_storage.py,sha256=fLzVuwvdEk9l8z7od1qX2p5MeWzcsx-vN4yWvelZeFM,1836
 isar/storage/slimm_storage.py,sha256=Hp7ZIgZgIR4KAFjzxDKfgMZjPZwP2kmdc1gG8zVcsMk,8966
 isar/storage/storage_interface.py,sha256=DYDry4I7aZpDHJhsBF6s8zrgokFAc7fdKJKfA8AvL7o,828
-isar/storage/uploader.py,sha256=Jpjml4fwPOeApHWfYWEO4gCfIxJKotujUTz2-5TTCt0,6345
-isar/storage/utilities.py,sha256=xnJHT_lu985k0Jlq7_Seu_nWVlocOCVAR8yz2zLkv5Q,3108
+isar/storage/uploader.py,sha256=te3GyiSeu96MhbiqQ7ueIMUPLSKblx3UqYAshkxfVIE,6368
+isar/storage/utilities.py,sha256=eTyY56WCTda5YswE9znWNeNEoTbT3jokNbwcLVmmQjA,3113
 robot_interface/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 robot_interface/robot_interface.py,sha256=i2qw1V9mLO-ljtS7LiRliQ7XNmmBJIwD4NG8mDfwMEI,8317
 robot_interface/test_robot_interface.py,sha256=FV1urn7SbsMyWBIcTKjsBwAG4IsXeZ6pLHE0mA9EGGs,692
@@ -102,13 +102,13 @@ robot_interface/models/mission/task.py,sha256=bjp-m_Ak6tzgUIQvbGe90Mnwt6QhofTgFx
 robot_interface/models/robots/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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=p82lvfCqLyBHQ2n4jhWGRNb0RktAn4ptL8FZkASGGl4,2753
+robot_interface/telemetry/mqtt_client.py,sha256=AHBmOpVvoo6pY5uXwyBY7SooN_cnpuS0DMkfLUPwpl8,2743
 robot_interface/telemetry/payloads.py,sha256=eMK7mjZPsLY6yvu7AK-OcdvkeUpChzDrySDY7IjQ9RM,1464
 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.18.0.dist-info/LICENSE,sha256=3fc2-ebLwHWwzfQbulGNRdcNob3SBQeCfEVUDYxsuqw,14058
-isar-1.18.0.dist-info/METADATA,sha256=wjDHWKgNqxMggWZ3Rboq-AFVnuuRLeY7j0lzV3py7Z0,14751
-isar-1.18.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-isar-1.18.0.dist-info/top_level.txt,sha256=UwIML2RtuQKCyJJkatcSnyp6-ldDjboB9k9JgKipO-U,21
-isar-1.18.0.dist-info/RECORD,,
+isar-1.19.1.dist-info/LICENSE,sha256=3fc2-ebLwHWwzfQbulGNRdcNob3SBQeCfEVUDYxsuqw,14058
+isar-1.19.1.dist-info/METADATA,sha256=kZ4uX6V3gxK6sUg-sNnXAzi0JYmvgOm5G38ISMy88xs,15101
+isar-1.19.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+isar-1.19.1.dist-info/top_level.txt,sha256=UwIML2RtuQKCyJJkatcSnyp6-ldDjboB9k9JgKipO-U,21
+isar-1.19.1.dist-info/RECORD,,

robot_interface/telemetry/mqtt_client.py

@@ -1,13 +1,11 @@
+import json
 import time
 from abc import ABCMeta, abstractmethod
+from datetime import UTC, datetime
 from queue import Queue
-from typing import Callable, Tuple, Type
-from datetime import datetime
-import json
+from typing import Callable, Tuple
 
-from robot_interface.models.exceptions.robot_exceptions import (
-    RobotTelemetryException,
-)
+from robot_interface.models.exceptions.robot_exceptions import RobotTelemetryException
 from robot_interface.telemetry.payloads import CloudHealthPayload
 from robot_interface.utilities.json_service import EnhancedJSONEncoder
 
@@ -75,7 +73,7 @@ class MqttTelemetryPublisher(MqttClientInterface):
                 topic = self.topic
             except RobotTelemetryException:
                 payload = json.dumps(
-                    CloudHealthPayload(isar_id, robot_name, datetime.utcnow()),
+                    CloudHealthPayload(isar_id, robot_name, datetime.now(UTC)),
                     cls=EnhancedJSONEncoder,
                 )
                 topic = self.cloud_healt_topic

isar/services/service_connections/mqtt/robot_status_publisher.py

@@ -1,119 +0,0 @@
-import json
-import logging
-import time
-from datetime import datetime
-from logging import Logger
-from queue import Queue
-from threading import Thread
-from typing import Optional
-
-from isar.config.settings import settings
-from isar.state_machine.state_machine import StateMachine
-from isar.state_machine.states_enum import States
-from robot_interface.models.exceptions.robot_exceptions import (
-    RobotAPIException,
-    RobotCommunicationException,
-    RobotException,
-)
-from robot_interface.models.mission.status import RobotStatus
-from robot_interface.robot_interface import RobotInterface
-from robot_interface.telemetry.mqtt_client import MqttPublisher
-from robot_interface.telemetry.payloads import RobotStatusPayload
-from robot_interface.utilities.json_service import EnhancedJSONEncoder
-
-
-class RobotStatusPublisher:
-    def __init__(
-        self, mqtt_queue: Queue, robot: RobotInterface, state_machine: StateMachine
-    ):
-        self.mqtt_publisher: MqttPublisher = MqttPublisher(mqtt_queue=mqtt_queue)
-        self.robot: RobotInterface = robot
-        self.state_machine: StateMachine = state_machine
-
-    def _get_combined_robot_status(
-        self, robot_status: RobotStatus, current_state: States
-    ) -> RobotStatus:
-        if robot_status == RobotStatus.Offline:
-            return RobotStatus.Offline
-        elif current_state == States.Idle and robot_status == RobotStatus.Available:
-            return RobotStatus.Available
-        elif robot_status == RobotStatus.Blocked:
-            return RobotStatus.Blocked
-        elif current_state != States.Idle or robot_status == RobotStatus.Busy:
-            return RobotStatus.Busy
-        return None
-
-    def run(self) -> None:
-        robot_status_monitor: RobotStatusMonitor = RobotStatusMonitor(robot=self.robot)
-        robot_status_thread: Thread = Thread(
-            target=robot_status_monitor.run,
-            name="Robot Status Monitor",
-            daemon=True,
-        )
-        robot_status_thread.start()
-
-        previous_robot_status: Optional[RobotStatus] = None
-
-        while True:
-            time.sleep(settings.ROBOT_STATUS_PUBLISH_INTERVAL)
-
-            combined_status: RobotStatus = self._get_combined_robot_status(
-                robot_status=robot_status_monitor.robot_status,
-                current_state=self.state_machine.current_state,
-            )
-
-            if previous_robot_status:
-                if previous_robot_status == combined_status:
-                    continue
-
-            payload: RobotStatusPayload = RobotStatusPayload(
-                isar_id=settings.ISAR_ID,
-                robot_name=settings.ROBOT_NAME,
-                robot_status=combined_status,
-                previous_robot_status=previous_robot_status,
-                current_isar_state=self.state_machine.current_state,
-                current_mission_id=(
-                    self.state_machine.current_mission.id
-                    if self.state_machine.current_mission
-                    else None
-                ),
-                current_task_id=(
-                    self.state_machine.current_task.id
-                    if self.state_machine.current_task
-                    else None
-                ),
-                current_step_id=(
-                    self.state_machine.current_step.id
-                    if self.state_machine.current_step
-                    else None
-                ),
-                timestamp=datetime.utcnow(),
-            )
-
-            self.mqtt_publisher.publish(
-                topic=settings.TOPIC_ISAR_ROBOT_STATUS,
-                payload=json.dumps(payload, cls=EnhancedJSONEncoder),
-            )
-
-            previous_robot_status = combined_status
-
-
-class RobotStatusMonitor:
-    def __init__(self, robot: RobotInterface):
-        self.robot: RobotInterface = robot
-        self.robot_status: RobotStatus = RobotStatus.Offline
-        self.logger: Logger = logging.getLogger("robot_status_monitor")
-
-    def run(self) -> None:
-        while True:
-            try:
-                self.robot_status = self.robot.robot_status()
-            except (
-                RobotCommunicationException,
-                RobotAPIException,
-                RobotException,
-            ) as e:
-                self.logger.error(
-                    f"Failed to get robot status because: {e.error_description}"
-                )
-            time.sleep(settings.ROBOT_API_STATUS_POLL_INTERVAL)