isar 1.19.0__tar.gz → 1.19.1__tar.gz

{isar-1.19.0 → isar-1.19.1}/.github/workflows/project_automations.yml

@@ -19,7 +19,7 @@ jobs:
     if: github.event_name == 'issues' && github.event.action == 'opened' || github.event.action == 'reopened'
     steps:
       - name: 'Move issue to "Todo"'
-        uses: leonsteinhaeuser/project-beta-automations@v1.0.2
+        uses: leonsteinhaeuser/project-beta-automations@v2.1.0
         with:
           gh_token: ${{ secrets.MY_GITHUB_TOKEN }}
           organization: equinor
@@ -32,7 +32,7 @@ jobs:
     if: github.event_name == 'issues' && github.event.action == 'closed'
     steps:
       - name: 'Moved issue to "Done"'
-        uses: leonsteinhaeuser/project-beta-automations@v1.0.2
+        uses: leonsteinhaeuser/project-beta-automations@v2.1.0
         with:
           gh_token: ${{ secrets.MY_GITHUB_TOKEN }}
           organization: equinor
@@ -45,7 +45,7 @@ jobs:
     if: github.event_name == 'pull_request' && github.event.action == 'opened' || github.event.action == 'reopened' || github.event.action == 'review_requested'
     steps:
       - name: 'Move PR to "In Progress"'
-        uses: leonsteinhaeuser/project-beta-automations@v1.0.2
+        uses: leonsteinhaeuser/project-beta-automations@v2.1.0
         with:
           gh_token: ${{ secrets.MY_GITHUB_TOKEN }}
           organization: equinor
@@ -58,7 +58,7 @@ jobs:
     if: github.event_name == 'pull_request' && github.event.action == 'ready_for_review'
     steps:
       - name: 'Move PR to "Review"'
-        uses: leonsteinhaeuser/project-beta-automations@v1.0.2
+        uses: leonsteinhaeuser/project-beta-automations@v2.1.0
         with:
           gh_token: ${{ secrets.MY_GITHUB_TOKEN }}
           organization: equinor
@@ -71,7 +71,7 @@ jobs:
     if: github.event_name == 'pull_request' && github.event.action == 'closed'
     steps:
       - name: 'Move PR to "Done"'
-        uses: leonsteinhaeuser/project-beta-automations@v1.0.2
+        uses: leonsteinhaeuser/project-beta-automations@v2.1.0
         with:
           gh_token: ${{ secrets.MY_GITHUB_TOKEN }}
           organization: equinor

{isar-1.19.0 → isar-1.19.1}/.github/workflows/publish_isar_base_image.yml

@@ -27,10 +27,10 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Log in to the Container registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
@@ -38,12 +38,12 @@ jobs:
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: Dockerfile

{isar-1.19.0 → isar-1.19.1}/.github/workflows/pythonpackage.yml

@@ -14,13 +14,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.10", "3.11", "3.12"]
+        python-version: ["3.11", "3.12"]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 

{isar-1.19.0 → isar-1.19.1}/.github/workflows/pythonpublish.yml

@@ -8,9 +8,9 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v5
         with:
           python-version: "3.x"
       - name: Install dependencies

isar-1.19.1/.github/workflows/stale.yml

@@ -0,0 +1,32 @@
+# This workflow warns and then closes issues and PRs that have had no activity for a specified amount of time.
+#
+# You can adjust the behavior by modifying this file.
+# For more information, see:
+# https://github.com/actions/stale
+name: Mark stale issues and pull requests
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "35 8 * * *"
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+
+    steps:
+      - name: Close Stale Issues
+        uses: actions/stale@v9
+        with:
+          repo-token: ${{ secrets.STALE_ISSUE_TOKEN }}
+          stale-issue-message: "This issue has automatically been marked as stale as there has been no activity for 60 days."
+          stale-pr-message: "This pull request has automatically been marked as stale as there has been no activity for 30 days."
+          stale-issue-label: "stale"
+          stale-pr-label: "stale"
+          close-issue-message: "This issue has been closed automatically due to a lack of activity."
+          close-pr-message: "This pull request has been closed automatically due to a lack of activity."
+          days-before-pr-stale: 30
+          days-before-close: -1

{isar-1.19.0 → isar-1.19.1}/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.10-slim AS builder
+FROM python:3.12-slim AS builder
 
 WORKDIR /app
 RUN apt-get update
@@ -15,7 +15,7 @@ RUN pip install .
 # Install the base isar-robot package
 RUN pip install isar-robot
 
-FROM python:3.10-slim
+FROM python:3.12-slim
 WORKDIR /app
 COPY --from=builder /opt/venv /opt/venv
 ENV PATH="/opt/venv/bin:$PATH"

{isar-1.19.0 → isar-1.19.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: isar
-Version: 1.19.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

{isar-1.19.0 → isar-1.19.1}/setup.py

@@ -66,5 +66,5 @@ setup(
             "sphinx",
         ]
     },
-    python_requires=">=3.10",
+    python_requires=">=3.11",
 )

isar-1.19.1/src/isar/__init__.py

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

{isar-1.19.0 → isar-1.19.1}/src/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-1.19.0 → isar-1.19.1}/src/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
@@ -310,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-1.19.0 → isar-1.19.1}/src/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-1.19.0 → isar-1.19.1}/src/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-1.19.0 → isar-1.19.1}/src/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
@@ -508,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,
         )
@@ -516,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:
@@ -540,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,
         )
@@ -548,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:
@@ -574,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,
         )
@@ -582,7 +584,8 @@ class StateMachine(object):
         self.mqtt_publisher.publish(
             topic=settings.TOPIC_ISAR_STEP,
             payload=payload,
-            retain=False,
+            qos=1,
+            retain=True,
         )
 
     def publish_status(self) -> None:
@@ -593,7 +596,7 @@ class StateMachine(object):
                 "isar_id": settings.ISAR_ID,
                 "robot_name": settings.ROBOT_NAME,
                 "status": self._current_status(),
-                "timestamp": datetime.utcnow(),
+                "timestamp": datetime.now(UTC),
             },
             cls=EnhancedJSONEncoder,
         )
@@ -601,7 +604,8 @@ class StateMachine(object):
         self.mqtt_publisher.publish(
             topic=settings.TOPIC_ISAR_STATUS,
             payload=payload,
-            retain=False,
+            qos=1,
+            retain=True,
         )
 
     def _current_status(self) -> RobotStatus:

{isar-1.19.0 → isar-1.19.1}/src/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-1.19.0 → isar-1.19.1}/src/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.19.0 → isar-1.19.1}/src/isar.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: isar
-Version: 1.19.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

{isar-1.19.0 → isar-1.19.1}/src/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-1.19.0 → isar-1.19.1}/tests/integration/turtlebot/test_successful_mission.py

@@ -1,7 +1,7 @@
 import shutil
 import time
 from copy import deepcopy
-from datetime import datetime, timedelta
+from datetime import UTC, datetime, timedelta
 from pathlib import Path
 from typing import List
 
@@ -102,9 +102,9 @@ def test_successful_mission(
     mission_id: str = state_machine_thread.state_machine.current_mission.id
     mission: Mission = deepcopy(state_machine_thread.state_machine.current_mission)
 
-    start_time: datetime = datetime.utcnow()
+    start_time: datetime = datetime.now(UTC)
     while state_machine_thread.state_machine.current_state != States.Idle:
-        if (datetime.utcnow() - start_time) > integration_test_timeout:
+        if (datetime.now(UTC) - start_time) > integration_test_timeout:
             raise TimeoutError
         time.sleep(5)
 

isar-1.19.0/.github/workflows/stale.yml

@@ -1,33 +0,0 @@
-# This workflow warns and then closes issues and PRs that have had no activity for a specified amount of time.
-#
-# You can adjust the behavior by modifying this file.
-# For more information, see:
-# https://github.com/actions/stale
-name: Mark stale issues and pull requests
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '35 8 * * *'
-
-jobs:
-  stale:
-
-    runs-on: ubuntu-latest
-    permissions:
-      issues: write
-      pull-requests: write
-
-    steps:
-    - name: Close Stale Issues
-      uses: actions/stale@v9.0.0
-      with:
-        repo-token: ${{ secrets.STALE_ISSUE_TOKEN }}
-        stale-issue-message: 'This issue has automatically been marked as stale as there has been no activity for 60 days.'
-        stale-pr-message: 'This pull request has automatically been marked as stale as there has been no activity for 30 days.'
-        stale-issue-label: 'stale'
-        stale-pr-label: 'stale'
-        close-issue-message: 'This issue has been closed automatically due to a lack of activity.'
-        close-pr-message: 'This pull request has been closed automatically due to a lack of activity.'
-        days-before-pr-stale: 30
-        days-before-close: -1

isar-1.19.0/src/isar/__init__.py

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