isar 1.23.4__tar.gz → 1.24.0__tar.gz

{isar-1.23.4 → isar-1.24.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: isar
-Version: 1.23.4
+Version: 1.24.0
 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.23.4 → isar-1.24.0}/requirements.txt

@@ -12,7 +12,7 @@ anyio==4.6.2.post1
     # via
     #   httpx
     #   starlette
-azure-core==1.31.0
+azure-core==1.32.0
     # via
     #   azure-identity
     #   azure-keyvault-secrets
@@ -24,7 +24,7 @@ azure-identity==1.19.0
     #   opencensus-ext-azure
 azure-keyvault-secrets==4.9.0
     # via isar (pyproject.toml)
-azure-storage-blob==12.23.1
+azure-storage-blob==12.24.0
     # via isar (pyproject.toml)
 backoff==2.2.1
     # via isar (pyproject.toml)
@@ -54,23 +54,23 @@ dacite==1.8.1
     # via
     #   alitra
     #   isar (pyproject.toml)
-fastapi==0.115.4
+fastapi==0.115.5
     # via
     #   fastapi-azure-auth
     #   isar (pyproject.toml)
 fastapi-azure-auth==5.0.1
     # via isar (pyproject.toml)
-google-api-core==2.22.0
+google-api-core==2.23.0
     # via opencensus
-google-auth==2.35.0
+google-auth==2.36.0
     # via google-api-core
-googleapis-common-protos==1.65.0
+googleapis-common-protos==1.66.0
     # via google-api-core
 h11==0.14.0
     # via
     #   httpcore
     #   uvicorn
-httpcore==1.0.6
+httpcore==1.0.7
     # via httpx
 httpx==0.27.2
     # via fastapi-azure-auth
@@ -85,13 +85,13 @@ isodate==0.7.2
     # via
     #   azure-keyvault-secrets
     #   azure-storage-blob
-msal==1.31.0
+msal==1.31.1
     # via
     #   azure-identity
     #   msal-extensions
 msal-extensions==1.2.0
     # via azure-identity
-numpy==2.1.2
+numpy==2.1.3
     # via
     #   alitra
     #   isar (pyproject.toml)
@@ -130,16 +130,16 @@ pyasn1-modules==0.4.1
     # via google-auth
 pycparser==2.22
     # via cffi
-pydantic==2.9.2
+pydantic==2.10.1
     # via
     #   fastapi
     #   isar (pyproject.toml)
     #   pydantic-settings
-pydantic-core==2.23.4
+pydantic-core==2.27.1
     # via pydantic
-pydantic-settings==2.6.0
+pydantic-settings==2.6.1
     # via isar (pyproject.toml)
-pyjwt[crypto]==2.9.0
+pyjwt[crypto]==2.10.0
     # via
     #   fastapi-azure-auth
     #   isar (pyproject.toml)
@@ -174,7 +174,7 @@ sniffio==1.3.1
     # via
     #   anyio
     #   httpx
-starlette==0.41.2
+starlette==0.41.3
     # via fastapi
 transitions==0.9.2
     # via isar (pyproject.toml)
@@ -189,7 +189,7 @@ typing-extensions==4.12.2
     #   pydantic-core
 urllib3==2.2.3
     # via requests
-uvicorn==0.32.0
+uvicorn==0.32.1
     # via isar (pyproject.toml)
-wrapt==1.16.0
+wrapt==1.17.0
     # via opencensus-ext-requests

{isar-1.23.4 → isar-1.24.0}/src/isar/config/settings.py

@@ -144,9 +144,7 @@ class Settings(BaseSettings):
     UPLOAD_INSPECTIONS_ASYNC: bool = Field(default=False)
 
     # URL to storage account for Azure Blob Storage
-    BLOB_STORAGE_ACCOUNT_URL: str = Field(
-        default="https://eqrobotdevstorage.blob.core.windows.net"
-    )
+    BLOB_STORAGE_ACCOUNT: str = Field(default="eqrobotdevstorage")
 
     # Name of blob container in Azure Blob Storage [slimm test]
     BLOB_CONTAINER: str = Field(default="test")

{isar-1.23.4 → isar-1.24.0}/src/isar/script.py

@@ -109,10 +109,10 @@ def start():
 
     if settings.UPLOAD_INSPECTIONS_ASYNC:
 
-        def inspections_callback(inspection: Inspection):
+        def inspections_callback(inspection: Inspection, mission: Mission):
             message: Tuple[Inspection, Mission] = (
                 inspection,
-                state_machine.current_mission,
+                mission,
             )
             state_machine.queues.upload_queue.put(message)
 

{isar-1.23.4 → isar-1.24.0}/src/isar/state_machine/states/idle.py

@@ -71,7 +71,7 @@ class Idle(State):
                 time.sleep(self.state_machine.sleep_time)
                 continue
 
-            except (RobotException,) as e:
+            except RobotException as e:
                 self.logger.error(
                     f"Failed to get robot status because: {e.error_description}"
                 )

{isar-1.23.4 → isar-1.24.0}/src/isar/state_machine/states/monitor.py

@@ -49,6 +49,7 @@ class Monitor(State):
         if self.task_status_thread:
             self.task_status_thread.wait_for_thread()
         self.task_status_thread = None
+        self.request_status_failure_counter = 0
 
     def _run(self) -> None:
         transition: Callable

{isar-1.23.4 → isar-1.24.0}/src/isar/state_machine/states/offline.py

@@ -48,7 +48,7 @@ class Offline(State):
                 time.sleep(self.state_machine.sleep_time)
                 continue
 
-            except (RobotException,) as e:
+            except RobotException as e:
                 self.logger.error(
                     f"Failed to get robot status because: {e.error_description}"
                 )

{isar-1.23.4 → isar-1.24.0}/src/isar/storage/blob_storage.py

@@ -59,7 +59,7 @@ class BlobStorage(StorageInterface):
 
         absolute_inspection_path = {
             "source": "blob",
-            "blob_storage_account_url": settings.BLOB_STORAGE_ACCOUNT_URL,
+            "storage_account": settings.BLOB_STORAGE_ACCOUNT,
             "blob_container": settings.BLOB_CONTAINER,
             "blob_name": blob_client.blob_name,
         }

{isar-1.23.4 → isar-1.24.0}/src/isar/storage/uploader.py

@@ -155,7 +155,8 @@ class Uploader:
                 "robot_name": settings.ROBOT_NAME,
                 "inspection_id": inspection.id,
                 "inspection_path": inspection_path,
-                "analysis_type": inspection.metadata.analysis_type,
+                "installation_code": settings.PLANT_SHORT_NAME,
+                "analysis_to_be_run": inspection.metadata.analysis_type,
                 "timestamp": datetime.now(timezone.utc),
             },
             cls=EnhancedJSONEncoder,

{isar-1.23.4 → isar-1.24.0}/src/isar.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: isar
-Version: 1.23.4
+Version: 1.24.0
 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.23.4 → isar-1.24.0}/src/robot_interface/robot_interface.py

@@ -182,14 +182,14 @@ class RobotInterface(metaclass=ABCMeta):
 
     @abstractmethod
     def register_inspection_callback(
-        self, callback_function: Callable[[Inspection], None]
+        self, callback_function: Callable[[Inspection, Mission], None]
     ) -> None:
         """Register a function which should be run when inspection data is received
         asynchronously. This function should expect to receive an Inspection from.
 
         Parameters
         ----------
-        callback_function : Callable[[Inspection]
+        callback_function : Callable[[Inspection, Mission], None]
 
         Returns
         -------

{isar-1.23.4 → isar-1.24.0}/tests/mocks/robot_interface.py

@@ -63,7 +63,7 @@ class MockRobot(RobotInterface):
         return image
 
     def register_inspection_callback(
-        self, callback_function: Callable[[Inspection], None]
+        self, callback_function: Callable[[Inspection, Mission], None]
     ) -> None:
         return