isar 1.23.4__py3-none-any.whl → 1.24.0__py3-none-any.whl

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/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/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/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/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/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/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.dist-info → isar-1.24.0.dist-info}/METADATA

@@ -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
@@ -101,7 +101,7 @@ Classifier: Topic :: Software Development :: Libraries
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: alitra >=1.1.3
+Requires-Dist: alitra>=1.1.3
 Requires-Dist: azure-identity
 Requires-Dist: azure-keyvault-secrets
 Requires-Dist: azure-storage-blob
@@ -116,7 +116,7 @@ Requires-Dist: opencensus-ext-azure
 Requires-Dist: opencensus-ext-logging
 Requires-Dist: opencensus-ext-requests
 Requires-Dist: paho-mqtt
-Requires-Dist: pydantic-settings
+Requires-Dist: pydantic_settings
 Requires-Dist: pydantic
 Requires-Dist: PyJWT
 Requires-Dist: python-dotenv
@@ -126,18 +126,18 @@ Requires-Dist: requests
 Requires-Dist: transitions
 Requires-Dist: uvicorn
 Provides-Extra: dev
-Requires-Dist: black ; extra == 'dev'
-Requires-Dist: flake8 ; extra == 'dev'
-Requires-Dist: mypy ; extra == 'dev'
-Requires-Dist: myst-parser ; extra == 'dev'
-Requires-Dist: pip-tools ; extra == 'dev'
-Requires-Dist: pre-commit ; extra == 'dev'
-Requires-Dist: pytest-dotenv ; extra == 'dev'
-Requires-Dist: pytest-mock ; extra == 'dev'
-Requires-Dist: pytest-xdist ; extra == 'dev'
-Requires-Dist: pytest ; extra == 'dev'
-Requires-Dist: requests-mock ; extra == 'dev'
-Requires-Dist: sphinx ; extra == 'dev'
+Requires-Dist: black; extra == "dev"
+Requires-Dist: flake8; extra == "dev"
+Requires-Dist: mypy; extra == "dev"
+Requires-Dist: myst-parser; extra == "dev"
+Requires-Dist: pip-tools; extra == "dev"
+Requires-Dist: pre-commit; extra == "dev"
+Requires-Dist: pytest-dotenv; extra == "dev"
+Requires-Dist: pytest-mock; extra == "dev"
+Requires-Dist: pytest-xdist; extra == "dev"
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: requests-mock; extra == "dev"
+Requires-Dist: sphinx; extra == "dev"
 
 # ISAR
 

{isar-1.23.4.dist-info → isar-1.24.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
 isar/__init__.py,sha256=cH8p8bVveu3FUL6kBhldcSlLaoHgD82Kd0-SwSNfGXw,87
 isar/modules.py,sha256=aO8bLSC4i_Qo4bOJ6aFfwAZRTJAw8o9SOOfkceUGCiU,6708
-isar/script.py,sha256=UT-JVu25vOiGaTjGR7hESlfBBITZF6dCy4frtMSUc6Y,5969
+isar/script.py,sha256=9cIRRTnuMbIAj435tGyoSpTkyGL4huCxfppvMtV2p4Y,5965
 isar/apis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 isar/apis/api.py,sha256=PYJggz9Xh0alo2DWU3QD4lEBQY3PkEs335JE2qG87WQ,13170
 isar/apis/models/__init__.py,sha256=NI1BYyN__Ogr00Qqe0XJ-9gEVPva2brXo2RJsbrS4tM,52
@@ -15,7 +15,7 @@ isar/config/configuration_error.py,sha256=rO6WOhafX6xvVib8WxV-eY483Z0PpN-9PxGsq5
 isar/config/log.py,sha256=zHFLmGWQRn8TrcsxUS6KHpJt2JE86kYazU7b-bkcN9o,2285
 isar/config/logging.conf,sha256=mYO1xf27gAopEMHhGzY7-mwyfN16rwRLkPNMvy3zn2g,1127
 isar/config/settings.env,sha256=hJFfyl4S84nmcyf70Pz8nbGlPf4KTVx0UkgP3uf6T8E,534
-isar/config/settings.py,sha256=0FA0hXqfcJHcfbCJVbbGvSUJGfFX5a0PGTTq8TI6hnw,13539
+isar/config/settings.py,sha256=lbpuXAyeSCHFcEuIQvbqwyJIOp23Rtdqpajf_HrUjbU,13491
 isar/config/certs/ca-cert.pem,sha256=ijutWtGOAnKx3xPydNLOVoCLip3tGkNKUpr6pTPQfJA,2179
 isar/config/keyvault/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 isar/config/keyvault/keyvault_error.py,sha256=zvPCsZLjboxsxthYkxpRERCTFxYV8R5WmACewAUQLwk,41
@@ -70,23 +70,23 @@ isar/state_machine/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 isar/state_machine/state_machine.py,sha256=A7qAaXEnErmPQ7--sM7w9VabceS0qJOProlmwMb9iaU,21299
 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=iAKESjETKUt9x3inE7TAPIohVM1iRsYyJjOoBeB3sVw,3079
+isar/state_machine/states/idle.py,sha256=TVUVtoFwe3-InO4tEupa1_MNG3bviLuMxmHV7FX7Js0,3076
 isar/state_machine/states/initialize.py,sha256=TVXV5Ps3N4_flM88j9pQiX88kZgLzLwzlJy_6hPbgcA,2359
 isar/state_machine/states/initiate.py,sha256=j1wvSC3zVODgRkKOVsQROiuWkjihSBtwCs5GsoivLvc,5655
-isar/state_machine/states/monitor.py,sha256=mQyJrmsjuMFwcit10SPmJFEbDAMRoSAtFUlooWb6vT0,9530
+isar/state_machine/states/monitor.py,sha256=4gCSf_FpHcxPiaaAuOJ5Tqhw79kqcaY5e_fg0nmA83I,9578
 isar/state_machine/states/off.py,sha256=jjqN_oJMpBtWuY7hP-c9f0w3p2CYCfe-NpmYHHPnmyI,544
-isar/state_machine/states/offline.py,sha256=ur5wDo4NWRLn7n-p5IUY6aSYcGApmqe_0IbRRywA6qA,2169
+isar/state_machine/states/offline.py,sha256=IfEZ6-kl6OfJSRT1eKHOey7AU23tKiSHqpwGqclmH_c,2166
 isar/state_machine/states/paused.py,sha256=TIg1iJvAxGUIfzE_qWp0wrq4Ka0a3zEf3GNwIWLIK0M,1177
 isar/state_machine/states/stop.py,sha256=WVyjhndHcccy7_P9bU7SXyZB3qphsGahdSymaghGc08,3348
 isar/storage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-isar/storage/blob_storage.py,sha256=oKdml1VVN8iTr-d_5H4Lz5E7zrhJRknCzOxHD-tO7m8,3230
+isar/storage/blob_storage.py,sha256=8sfG1I23nPyVy6uZOq0O0FycZBjsSDIuAWdCVdVMEeM,3217
 isar/storage/local_storage.py,sha256=Bnmoi5gyN8r-oRh0aHrOdGqaH3JqRScFKMRXYojW5kY,1855
 isar/storage/slimm_storage.py,sha256=Hp7ZIgZgIR4KAFjzxDKfgMZjPZwP2kmdc1gG8zVcsMk,8966
 isar/storage/storage_interface.py,sha256=DYDry4I7aZpDHJhsBF6s8zrgokFAc7fdKJKfA8AvL7o,828
-isar/storage/uploader.py,sha256=_f-uIiL5ye6GLc7nYQxHrqDXrIquoL_t5tt9SSaYoDA,6440
+isar/storage/uploader.py,sha256=JBlgaHYdFFUPlkx0eI0HBhP93fr9PIPTaYp6HG0iMeU,6509
 isar/storage/utilities.py,sha256=AGqOzhnyPXSStpJjBstqQ4QgUoHJioQB2DJ1NqeWn_w,3136
 robot_interface/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-robot_interface/robot_interface.py,sha256=H1hsuiFDcB5tTfan3VsXQyWy2jArWeBkMTr1VvZ4vIs,9061
+robot_interface/robot_interface.py,sha256=TJjB1FNXxkKxen5zwfXdAUqqlTZ1pAl6St9SuCiwv1E,9086
 robot_interface/test_robot_interface.py,sha256=FV1urn7SbsMyWBIcTKjsBwAG4IsXeZ6pLHE0mA9EGGs,692
 robot_interface/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 robot_interface/models/exceptions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -108,9 +108,9 @@ robot_interface/telemetry/payloads.py,sha256=FafpIwsOvcTNtaBZqyOX7r5EjG7nZ2uLNhy
 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.23.4.dist-info/LICENSE,sha256=3fc2-ebLwHWwzfQbulGNRdcNob3SBQeCfEVUDYxsuqw,14058
-isar-1.23.4.dist-info/METADATA,sha256=QffW0qReds1tlXA-Zb7bzrWkezchNIx2IiK1rkXhz6s,30674
-isar-1.23.4.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-isar-1.23.4.dist-info/entry_points.txt,sha256=TFam7uNNw7J0iiDYzsH2gfG0u1eV1wh3JTw_HkhgKLk,49
-isar-1.23.4.dist-info/top_level.txt,sha256=UwIML2RtuQKCyJJkatcSnyp6-ldDjboB9k9JgKipO-U,21
-isar-1.23.4.dist-info/RECORD,,
+isar-1.24.0.dist-info/LICENSE,sha256=3fc2-ebLwHWwzfQbulGNRdcNob3SBQeCfEVUDYxsuqw,14058
+isar-1.24.0.dist-info/METADATA,sha256=qqbu0Z7e1Fs45oQLR1Cj4TokH5F5swLBwUuCfJVQulE,30661
+isar-1.24.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+isar-1.24.0.dist-info/entry_points.txt,sha256=TFam7uNNw7J0iiDYzsH2gfG0u1eV1wh3JTw_HkhgKLk,49
+isar-1.24.0.dist-info/top_level.txt,sha256=UwIML2RtuQKCyJJkatcSnyp6-ldDjboB9k9JgKipO-U,21
+isar-1.24.0.dist-info/RECORD,,

{isar-1.23.4.dist-info → isar-1.24.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.3.0)
+Generator: setuptools (75.6.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

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
         -------