isar 1.30.3__tar.gz → 1.30.4__tar.gz

{isar-1.30.3 → isar-1.30.4}/PKG-INFO

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

{isar-1.30.3 → isar-1.30.4}/requirements.txt

@@ -174,7 +174,7 @@ starlette==0.46.2
     # via fastapi
 transitions==0.9.3
     # via isar (pyproject.toml)
-typing-extensions==4.14.0
+typing-extensions==4.14.1
     # via
     #   azure-core
     #   azure-identity

{isar-1.30.3 → isar-1.30.4}/src/isar/apis/api.py

@@ -1,4 +1,7 @@
+import json
 import logging
+import time
+from datetime import datetime, timezone
 from http import HTTPStatus
 from logging import Logger
 from typing import List, Union
@@ -24,6 +27,9 @@ from isar.config.configuration_error import ConfigurationError
 from isar.config.keyvault.keyvault_error import KeyvaultError
 from isar.config.keyvault.keyvault_service import Keyvault
 from isar.config.settings import settings
+from robot_interface.telemetry.mqtt_client import MqttClientInterface
+from robot_interface.telemetry.payloads import StartUpMessagePayload
+from robot_interface.utilities.json_service import EnhancedJSONEncoder
 
 HTTP_URL = COMMON_ATTRIBUTES["HTTP_URL"]
 HTTP_STATUS_CODE = COMMON_ATTRIBUTES["HTTP_STATUS_CODE"]
@@ -37,6 +43,7 @@ class API:
         scheduling_controller: SchedulingController,
         robot_controller: RobotController,
         keyvault: Keyvault,
+        mqtt_publisher: MqttClientInterface,
         port: int = settings.API_PORT,
         azure_ai_logging_enabled: bool = settings.LOG_HANDLER_APPLICATION_INSIGHTS_ENABLED,
     ) -> None:
@@ -47,22 +54,31 @@ class API:
         self.host: str = "0.0.0.0"  # Locking uvicorn to use 0.0.0.0
         self.port: int = port
         self.azure_ai_logging_enabled: bool = azure_ai_logging_enabled
+        self.mqtt_publisher: MqttClientInterface = mqtt_publisher
 
         self.logger: Logger = logging.getLogger("api")
 
         self.app: FastAPI = self._create_app()
+        self.server = self._setup_server()
 
     def get_app(self) -> FastAPI:
         return self.app
 
-    def run_app(self) -> None:
-        uvicorn.run(
+    def _setup_server(self) -> uvicorn.Server:
+        config = uvicorn.Config(
             self.app,
             port=self.port,
             host=self.host,
             reload=False,
             log_config=None,
         )
+        return uvicorn.Server(config)
+
+    def wait_for_api_server_ready(self) -> None:
+        while not self.server.started:
+            time.sleep(0.01)
+        self.logger.info("Uvicorn server has been started")
+        self._publish_startup_message()
 
     def _create_app(self) -> FastAPI:
         tags_metadata = [
@@ -73,7 +89,10 @@ class API:
         ]
         app = FastAPI(
             openapi_tags=tags_metadata,
-            on_startup=[self.authenticator.load_config, self._log_startup_message],
+            on_startup=[
+                self.authenticator.load_config,
+                self._log_startup_message,
+            ],
             swagger_ui_oauth2_redirect_url="/oauth2-redirect",
             swagger_ui_init_oauth={
                 "usePkceWithAuthorizationCodeGrant": True,
@@ -349,3 +368,21 @@ class API:
                 )
 
             return response
+
+    def _publish_startup_message(self) -> None:
+        if not self.mqtt_publisher:
+            return
+
+        payload: StartUpMessagePayload = StartUpMessagePayload(
+            isar_id=settings.ISAR_ID,
+            timestamp=datetime.now(timezone.utc),
+        )
+
+        self.logger.info("Publishing startup message to MQTT broker")
+
+        self.mqtt_publisher.publish(
+            topic=settings.TOPIC_ISAR_STARTUP,
+            payload=json.dumps(payload, cls=EnhancedJSONEncoder),
+            qos=1,
+            retain=True,
+        )

{isar-1.30.3 → isar-1.30.4}/src/isar/config/settings.py

@@ -211,6 +211,7 @@ class Settings(BaseSettings):
     TOPIC_ISAR_ROBOT_HEARTBEAT: str = Field(
         default="robot_heartbeat", validate_default=True
     )
+    TOPIC_ISAR_STARTUP: str = Field(default="startup", validate_default=True)
 
     # Logging
 
@@ -261,6 +262,7 @@ class Settings(BaseSettings):
         "TOPIC_ISAR_ROBOT_HEARTBEAT",
         "TOPIC_ISAR_INSPECTION_RESULT",
         "TOPIC_ISAR_INSPECTION_VALUE",
+        "TOPIC_ISAR_STARTUP",
     )
     @classmethod
     def prefix_isar_topics(cls, v: Any, info: ValidationInfo):

{isar-1.30.3 → isar-1.30.4}/src/isar/modules.py

@@ -45,6 +45,16 @@ class ApplicationContainer(containers.DeclarativeContainer):
     )
     robot_utilities = providers.Singleton(RobotUtilities, robot=robot_interface)
 
+    # Mqtt client
+    mqtt_client = (
+        providers.Singleton(
+            MqttPublisher,
+            mqtt_queue=providers.Callable(events.provided.mqtt_queue),
+        )
+        if settings.MQTT_ENABLED
+        else None
+    )
+
     # API and controllers
     authenticator = providers.Singleton(Authenticator)
     scheduling_utilities = providers.Singleton(
@@ -65,6 +75,7 @@ class ApplicationContainer(containers.DeclarativeContainer):
         scheduling_controller=scheduling_controller,
         robot_controller=robot_controller,
         keyvault=keyvault,
+        mqtt_publisher=mqtt_client,
     )
 
     # Storage
@@ -77,16 +88,6 @@ class ApplicationContainer(containers.DeclarativeContainer):
         storage_handlers_temp.append(blob_storage)
     storage_handlers = providers.List(*storage_handlers_temp)
 
-    # Mqtt client
-    mqtt_client = (
-        providers.Singleton(
-            MqttPublisher,
-            mqtt_queue=providers.Callable(events.provided.mqtt_queue),
-        )
-        if settings.MQTT_ENABLED
-        else None
-    )
-
     # State machine
     task_selector = providers.Singleton(
         SequentialTaskSelector

{isar-1.30.3 → isar-1.30.4}/src/isar/script.py

@@ -160,13 +160,15 @@ def start() -> None:
             threads.extend(publishers)
 
     api: API = injector.api()
-    api_thread: Thread = Thread(target=api.run_app, name="ISAR API", daemon=True)
+    api_thread: Thread = Thread(target=api.server.run, name="ISAR API", daemon=True)
     threads.append(api_thread)
 
     for thread in threads:
         thread.start()
         logger.info("Started thread: %s", thread.name)
 
+    api.wait_for_api_server_ready()
+
     while True:
         for thread in threads:
             if not thread.is_alive():

{isar-1.30.3 → isar-1.30.4}/src/isar/state_machine/transitions/functions/start_mission.py

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

{isar-1.30.3 → isar-1.30.4}/src/isar.egg-info/PKG-INFO

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

{isar-1.30.3 → isar-1.30.4}/src/robot_interface/telemetry/payloads.py

@@ -132,3 +132,9 @@ class InspectionValuePayload:
     y: float
     z: float
     timestamp: datetime
+
+
+@dataclass
+class StartUpMessagePayload:
+    isar_id: str
+    timestamp: datetime