isar 1.16.11__tar.gz → 1.16.13__tar.gz

{isar-1.16.11 → isar-1.16.13}/.gitignore

@@ -132,6 +132,7 @@ dmypy.json
 
 .vscode
 **/node_modules
+*.code-workspace
 
 # Temporary result folders
 results

{isar-1.16.11 → isar-1.16.13}/Dockerfile

@@ -1,40 +1,35 @@
 FROM python:3.10-slim AS builder
 
+WORKDIR /app
 RUN apt-get update
 RUN apt-get install -y --no-install-recommends build-essential gcc
 RUN python -m pip install --upgrade pip
 
-ENV VIRTUAL_ENV=/venv
-RUN python -m venv --copies $VIRTUAL_ENV
-ENV PATH="$VIRTUAL_ENV/bin:$PATH"
+RUN python -m venv /opt/venv
+ENV PATH="/opt/venv/bin:$PATH"
 
 # Install dependencies before ISAR to cache pip installation
-RUN mkdir -p src
-COPY setup.py README.md ./
+COPY . .
 RUN pip install .
 
 # Install the base isar-robot package
 RUN pip install isar-robot
 
-COPY . .
-
-RUN pip install .
-
 FROM python:3.10-slim
-COPY --from=builder $VIRTUAL_ENV $VIRTUAL_ENV
-ENV PATH="$VIRTUAL_ENV/bin:$PATH"
-
 WORKDIR /app
+COPY --from=builder /opt/venv /opt/venv
+ENV PATH="/opt/venv/bin:$PATH"
 
 EXPOSE 3000
 
 # Env variable for ISAR to know it is running in docker
 ENV IS_DOCKER=true
 
-# # Add non-root user
+# Add non-root user
 RUN useradd --create-home --shell /bin/bash 1000
 RUN chown -R 1000 /app
 RUN chmod 755 /app
 USER 1000
 
+COPY . .
 CMD python main.py

{isar-1.16.11 → isar-1.16.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: isar
-Version: 1.16.11
+Version: 1.16.13
 Summary: Integration and Supervisory control of Autonomous Robots
 Home-page: https://github.com/equinor/isar
 Author: Equinor ASA

{isar-1.16.11 → isar-1.16.13}/src/isar.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: isar
-Version: 1.16.11
+Version: 1.16.13
 Summary: Integration and Supervisory control of Autonomous Robots
 Home-page: https://github.com/equinor/isar
 Author: Equinor ASA

{isar-1.16.11 → isar-1.16.13}/src/robot_interface/models/exceptions/robot_exceptions.py

@@ -19,6 +19,7 @@ class ErrorReason(str, Enum):
     RobotTransformException: str = "robot_transform_exception"
     RobotUnknownErrorException: str = "robot_unknown_error_exception"
     RobotDisconnectedException: str = "robot_disconnected_exception"
+    RobotMissionNotSupportedException: str = "robot_mission_not_supported_exception"
 
 
 @dataclass
@@ -219,3 +220,14 @@ class RobotDisconnectedException(RobotException):
         )
 
     pass
+
+
+# An exception which should be thrown by the robot package if the robot is given a mission type it cannot run, such as a localisation mission
+class RobotMissionNotSupportedException(RobotException):
+    def __init__(self, error_description: str) -> None:
+        super().__init__(
+            error_reason=ErrorReason.RobotMissionNotSupportedException,
+            error_description=error_description,
+        )
+
+    pass