isar 1.26.1__py3-none-any.whl → 1.26.2__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of isar might be problematic. Click here for more details.
- isar/apis/schedule/scheduling_controller.py +3 -3
- isar/apis/security/authentication.py +1 -1
- isar/modules.py +1 -1
- isar/script.py +1 -1
- isar/services/service_connections/mqtt/mqtt_client.py +2 -2
- isar/state_machine/state_machine.py +3 -3
- isar/state_machine/states/off.py +1 -1
- isar/state_machine/transitions/pause.py +1 -1
- isar/state_machine/transitions/resume.py +1 -1
- isar/storage/blob_storage.py +2 -2
- isar/storage/slimm_storage.py +1 -1
- {isar-1.26.1.dist-info → isar-1.26.2.dist-info}/METADATA +1 -1
- {isar-1.26.1.dist-info → isar-1.26.2.dist-info}/RECORD +17 -17
- {isar-1.26.1.dist-info → isar-1.26.2.dist-info}/WHEEL +1 -1
- {isar-1.26.1.dist-info → isar-1.26.2.dist-info}/entry_points.txt +0 -0
- {isar-1.26.1.dist-info → isar-1.26.2.dist-info}/licenses/LICENSE +0 -0
- {isar-1.26.1.dist-info → isar-1.26.2.dist-info}/top_level.txt +0 -0
|
@@ -38,7 +38,7 @@ class SchedulingController:
|
|
|
38
38
|
description="ID-number for predefined mission",
|
|
39
39
|
),
|
|
40
40
|
) -> StartMissionResponse:
|
|
41
|
-
self.logger.info(
|
|
41
|
+
self.logger.info("Received request to start mission with id %s", mission_id)
|
|
42
42
|
|
|
43
43
|
state: States = self.scheduling_utilities.get_state()
|
|
44
44
|
self.scheduling_utilities.verify_state_machine_ready_to_receive_mission(state)
|
|
@@ -49,7 +49,7 @@ class SchedulingController:
|
|
|
49
49
|
mission=mission, robot_capabilities=robot_settings.CAPABILITIES
|
|
50
50
|
)
|
|
51
51
|
|
|
52
|
-
self.logger.info(
|
|
52
|
+
self.logger.info("Starting mission with ISAR Mission ID: '%s'", mission.id)
|
|
53
53
|
|
|
54
54
|
self.scheduling_utilities.start_mission(mission=mission)
|
|
55
55
|
|
|
@@ -94,7 +94,7 @@ class SchedulingController:
|
|
|
94
94
|
mission=mission, robot_capabilities=robot_settings.CAPABILITIES
|
|
95
95
|
)
|
|
96
96
|
|
|
97
|
-
self.logger.info(
|
|
97
|
+
self.logger.info("Starting mission: %s", mission.id)
|
|
98
98
|
self.scheduling_utilities.start_mission(mission=mission)
|
|
99
99
|
return self._api_response(mission)
|
|
100
100
|
|
|
@@ -48,7 +48,7 @@ class Authenticator:
|
|
|
48
48
|
self.logger = logging.getLogger("api")
|
|
49
49
|
self.authentication_enabled: bool = authentication_enabled
|
|
50
50
|
enabled_string = "enabled" if self.authentication_enabled else "disabled"
|
|
51
|
-
self.logger.info(
|
|
51
|
+
self.logger.info("API authentication is %s", enabled_string)
|
|
52
52
|
|
|
53
53
|
def should_authenticate(self) -> bool:
|
|
54
54
|
return self.authentication_enabled
|
isar/modules.py
CHANGED
|
@@ -242,6 +242,6 @@ def get_injector() -> Injector:
|
|
|
242
242
|
)
|
|
243
243
|
|
|
244
244
|
logger: Logger = logging.getLogger("modules")
|
|
245
|
-
logger.info(
|
|
245
|
+
logger.info("Loaded the following module configurations: %s", module_overview)
|
|
246
246
|
|
|
247
247
|
return Injector(injector_modules)
|
isar/script.py
CHANGED
|
@@ -99,9 +99,9 @@ class MqttClient(MqttClientInterface):
|
|
|
99
99
|
)
|
|
100
100
|
def connect(self, host: str, port: int) -> None:
|
|
101
101
|
self.logger.info("Attempting to connect to MQTT Broker")
|
|
102
|
-
self.logger.info(
|
|
102
|
+
self.logger.info("Host: %s, Port: %s", host, port)
|
|
103
103
|
self.client.connect(host=host, port=port)
|
|
104
104
|
|
|
105
105
|
def publish(self, topic: str, payload: str, qos: int = 0, retain: bool = False):
|
|
106
|
-
self.logger.debug(
|
|
106
|
+
self.logger.debug("Publishing message to topic: %s", topic)
|
|
107
107
|
self.client.publish(topic=topic, payload=payload, qos=qos, retain=retain)
|
|
@@ -230,7 +230,7 @@ class StateMachine(object):
|
|
|
230
230
|
for i, transition in enumerate(list(self.transitions_list))
|
|
231
231
|
]
|
|
232
232
|
)
|
|
233
|
-
self.logger.info(
|
|
233
|
+
self.logger.info("State transitions:\n %s", state_transitions)
|
|
234
234
|
self.reset_state_machine()
|
|
235
235
|
|
|
236
236
|
def begin(self):
|
|
@@ -253,7 +253,7 @@ class StateMachine(object):
|
|
|
253
253
|
self.current_state = States(self.state) # type: ignore
|
|
254
254
|
update_shared_state(self.shared_state.state, self.current_state)
|
|
255
255
|
self._log_state_transition(self.current_state)
|
|
256
|
-
self.logger.info(
|
|
256
|
+
self.logger.info("State: %s", self.current_state)
|
|
257
257
|
self.publish_status()
|
|
258
258
|
|
|
259
259
|
def reset_state_machine(self) -> None:
|
|
@@ -373,7 +373,7 @@ class StateMachine(object):
|
|
|
373
373
|
)
|
|
374
374
|
log_statement: str = "\n".join(log_statements)
|
|
375
375
|
|
|
376
|
-
self.logger.info(
|
|
376
|
+
self.logger.info("Mission overview:\n%s", log_statement)
|
|
377
377
|
|
|
378
378
|
def _make_control_mission_response(self) -> ControlMissionResponse:
|
|
379
379
|
return ControlMissionResponse(
|
isar/state_machine/states/off.py
CHANGED
|
@@ -8,7 +8,7 @@ from robot_interface.models.mission.status import MissionStatus, TaskStatus
|
|
|
8
8
|
|
|
9
9
|
|
|
10
10
|
def pause_mission(state_machine: "StateMachine") -> bool:
|
|
11
|
-
state_machine.logger.info(
|
|
11
|
+
state_machine.logger.info("Pausing mission: %s", state_machine.current_mission.id)
|
|
12
12
|
state_machine.current_mission.status = MissionStatus.Paused
|
|
13
13
|
state_machine.current_task.status = TaskStatus.Paused
|
|
14
14
|
|
|
@@ -8,7 +8,7 @@ from robot_interface.models.mission.status import MissionStatus, TaskStatus
|
|
|
8
8
|
|
|
9
9
|
|
|
10
10
|
def resume_mission(state_machine: "StateMachine") -> bool:
|
|
11
|
-
state_machine.logger.info(
|
|
11
|
+
state_machine.logger.info("Resuming mission: %s", state_machine.current_mission.id)
|
|
12
12
|
state_machine.current_mission.status = MissionStatus.InProgress
|
|
13
13
|
state_machine.current_mission.error_message = None
|
|
14
14
|
state_machine.current_task.status = TaskStatus.InProgress
|
isar/storage/blob_storage.py
CHANGED
|
@@ -18,7 +18,7 @@ class BlobStorage(StorageInterface):
|
|
|
18
18
|
@inject
|
|
19
19
|
def __init__(
|
|
20
20
|
self, keyvault: Keyvault, container_name: str = settings.BLOB_CONTAINER
|
|
21
|
-
):
|
|
21
|
+
) -> None:
|
|
22
22
|
self.keyvault = keyvault
|
|
23
23
|
self.storage_connection_string = self.keyvault.get_secret(
|
|
24
24
|
"AZURE-STORAGE-CONNECTION-STRING"
|
|
@@ -71,7 +71,7 @@ class BlobStorage(StorageInterface):
|
|
|
71
71
|
self.storage_connection_string
|
|
72
72
|
)
|
|
73
73
|
except Exception as e:
|
|
74
|
-
self.logger.error(
|
|
74
|
+
self.logger.error("Unable to retrieve blob service client. Error: %s", e)
|
|
75
75
|
raise e
|
|
76
76
|
|
|
77
77
|
def _get_container_client(
|
isar/storage/slimm_storage.py
CHANGED
|
@@ -87,7 +87,7 @@ class SlimmStorage(StorageInterface):
|
|
|
87
87
|
},
|
|
88
88
|
)
|
|
89
89
|
guid = json.loads(response.text)["guid"]
|
|
90
|
-
self.logger.info(
|
|
90
|
+
self.logger.info("SLIMM upload GUID: %s", guid)
|
|
91
91
|
except (RequestException, HTTPError) as e:
|
|
92
92
|
self.logger.warning(
|
|
93
93
|
f"Failed to upload inspection: {inspection.id} to SLIMM due to a "
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
isar/__init__.py,sha256=cH8p8bVveu3FUL6kBhldcSlLaoHgD82Kd0-SwSNfGXw,87
|
|
2
|
-
isar/modules.py,sha256=
|
|
3
|
-
isar/script.py,sha256=
|
|
2
|
+
isar/modules.py,sha256=PCHSJ8JSt4WeR_8UBPnu_OFHNNUr8ETidC-WfSRcMpo,7707
|
|
3
|
+
isar/script.py,sha256=sOZINSPjv6JHfPfHLKunl5BpMfoz83r7ZpwuWclA_mg,6158
|
|
4
4
|
isar/apis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
5
5
|
isar/apis/api.py,sha256=ARf7-GsjTSqWj9UOSiEJ1YnSF-fH7Tr0-mkkfL10MZ4,12620
|
|
6
6
|
isar/apis/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
@@ -8,9 +8,9 @@ isar/apis/models/models.py,sha256=HzLaWhjAv0uJRBWipIgYg_F75eaQ5jl9Pi4UnYbDJ-M,17
|
|
|
8
8
|
isar/apis/models/start_mission_definition.py,sha256=rGpdb51LIrGRE5RjBONWflumow4ev8oTbDTx5Ph2_Pc,6210
|
|
9
9
|
isar/apis/robot_control/robot_controller.py,sha256=D8LVMU8TRLohn1nlw2NQXjOxYmzjsOwjm_kr6f-h2VY,1259
|
|
10
10
|
isar/apis/schedule/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
11
|
-
isar/apis/schedule/scheduling_controller.py,sha256=
|
|
11
|
+
isar/apis/schedule/scheduling_controller.py,sha256=ky3Wk-WSLgtQz9b9cvt7as4uMJmEJOVJD2NxRxN5-9Q,7802
|
|
12
12
|
isar/apis/security/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
13
|
-
isar/apis/security/authentication.py,sha256=
|
|
13
|
+
isar/apis/security/authentication.py,sha256=sBdknpvE_3qSd6L-Saq6Oza12vpAmCQiyyAS2rWgHtQ,1992
|
|
14
14
|
isar/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
15
15
|
isar/config/configuration_error.py,sha256=rO6WOhafX6xvVib8WxV-eY483Z0PpN-9PxGsq5ATfKc,46
|
|
16
16
|
isar/config/log.py,sha256=zHFLmGWQRn8TrcsxUS6KHpJt2JE86kYazU7b-bkcN9o,2285
|
|
@@ -61,7 +61,7 @@ isar/services/auth/azure_credentials.py,sha256=9PlwGe5FrPRbW2dp0go7LMp8_l_FRvL8x
|
|
|
61
61
|
isar/services/service_connections/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
62
62
|
isar/services/service_connections/request_handler.py,sha256=0LxC0lu_HXeEf_xmJWjfEsh14oAUI97cpG1IWtBlcs4,4278
|
|
63
63
|
isar/services/service_connections/mqtt/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
64
|
-
isar/services/service_connections/mqtt/mqtt_client.py,sha256=
|
|
64
|
+
isar/services/service_connections/mqtt/mqtt_client.py,sha256=se8uLvjy-cElM-WhmHEPXfEA8u05huOLnkcOCYRpcE4,3551
|
|
65
65
|
isar/services/service_connections/mqtt/robot_heartbeat_publisher.py,sha256=_bUOG7CfqBlCRvG4vh2XGoMXucBxsJarFIeXIKOH1aw,1019
|
|
66
66
|
isar/services/service_connections/mqtt/robot_info_publisher.py,sha256=AxokGk51hRPTxxD2r0P9braPJCMrf1InaCxrUBKkF4g,1402
|
|
67
67
|
isar/services/service_connections/stid/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
@@ -71,31 +71,31 @@ isar/services/utilities/robot_utilities.py,sha256=4-ob4kcIiRN_GXFDBMwBadfbwpYqKE
|
|
|
71
71
|
isar/services/utilities/scheduling_utilities.py,sha256=WaQXEK_cmPM9KNP3aBZGVnZCi97kR-M_rJWyWIGWZa4,8238
|
|
72
72
|
isar/services/utilities/threaded_request.py,sha256=py4G-_RjnIdHljmKFAcQ6ddqMmp-ZYV39Ece-dqRqjs,1874
|
|
73
73
|
isar/state_machine/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
74
|
-
isar/state_machine/state_machine.py,sha256=
|
|
74
|
+
isar/state_machine/state_machine.py,sha256=1ZomEjZelMDFHalZpK8e3Xex2Am_FsqwPFUTrfLeX6o,15248
|
|
75
75
|
isar/state_machine/states_enum.py,sha256=uqa3VD2Ig0PR5xG7s4-q5OLWiGdvEn-KYClv3KpRJ68,276
|
|
76
76
|
isar/state_machine/states/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
77
77
|
isar/state_machine/states/blocked_protective_stop.py,sha256=_InOhfCwCshrdUOquDy-js0cMrk8ddgPsHbHMLJzlNU,1540
|
|
78
78
|
isar/state_machine/states/idle.py,sha256=0E9vFMXVJ7u2det3aN17KaNIBosA0zHr5mHIZqPL7dU,2771
|
|
79
79
|
isar/state_machine/states/monitor.py,sha256=v-gPPjxmhNDpA2IKa7X1rm_xZC84pqHmgfSqCodz8PY,9153
|
|
80
|
-
isar/state_machine/states/off.py,sha256=
|
|
80
|
+
isar/state_machine/states/off.py,sha256=4d2rMaXK19Xi9eE8PrRLXrDv_hri_B1B0mYsk5L5RHo,545
|
|
81
81
|
isar/state_machine/states/offline.py,sha256=-4PgEm52rnOXqhFYy0phXfPaNq99xkeBm_ylla-jPeU,1380
|
|
82
82
|
isar/state_machine/states/paused.py,sha256=r0jXxlTIwsVw8eR3vNRPMjz-rzKepyaCrzquKLd0E9o,1156
|
|
83
83
|
isar/state_machine/states/stop.py,sha256=bGtukno8n_f6nHqW6Zow4e21TYA72Vvmhj8coUFBLYM,2147
|
|
84
84
|
isar/state_machine/transitions/fail_mission.py,sha256=_6HqBMALDinFZ4yh5GMpeqqgV5tw5i8OVMj5UDdqesg,495
|
|
85
85
|
isar/state_machine/transitions/finish_mission.py,sha256=TRQrk7HdllmAkwsp25HRZAFAk46Y1hLx3jmkIAKrHDI,1442
|
|
86
|
-
isar/state_machine/transitions/pause.py,sha256=
|
|
87
|
-
isar/state_machine/transitions/resume.py,sha256=
|
|
86
|
+
isar/state_machine/transitions/pause.py,sha256=aoDkq2nV6wBY0YQX3KbjvBR1ojP2o_SCRT_gfz0BulI,889
|
|
87
|
+
isar/state_machine/transitions/resume.py,sha256=9KQjH_6YBGyxFhb7G5dgDe3WH0xHawhEIw6yTVEm9os,998
|
|
88
88
|
isar/state_machine/transitions/start_mission.py,sha256=BJdJvk0O5kq2DZkRHroVtkBziMivNTsZVX3KLJ-m7YQ,2524
|
|
89
89
|
isar/state_machine/transitions/stop.py,sha256=NzPvr6C1tmDqji5XJf5vw9up_Ow7ApuhjAzDVlJLZPw,1368
|
|
90
90
|
isar/state_machine/transitions/utils.py,sha256=Wa72Ocq4QT1E6qkpEJZQ3h5o33pGvx7Tlkt2JZ2Grbk,314
|
|
91
91
|
isar/storage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
92
|
-
isar/storage/blob_storage.py,sha256=
|
|
92
|
+
isar/storage/blob_storage.py,sha256=o4pdrG9P-rFAlmKg9Vuj2NckmIDgBvhKhpv1yOWH-F8,3208
|
|
93
93
|
isar/storage/local_storage.py,sha256=Bnmoi5gyN8r-oRh0aHrOdGqaH3JqRScFKMRXYojW5kY,1855
|
|
94
|
-
isar/storage/slimm_storage.py,sha256=
|
|
94
|
+
isar/storage/slimm_storage.py,sha256=945p97i1d974lLRl3bo9XYD8awc0x2FxiM6vnGA9T3w,9032
|
|
95
95
|
isar/storage/storage_interface.py,sha256=DYDry4I7aZpDHJhsBF6s8zrgokFAc7fdKJKfA8AvL7o,828
|
|
96
96
|
isar/storage/uploader.py,sha256=mJ-ax_6SvNpM2fG8WdyOUVKSB_J_nedJlCTJ_Xg2E4c,6543
|
|
97
97
|
isar/storage/utilities.py,sha256=fitsdQ1ox5gr9fk9VuSk_iTBiEAIS8NZAnHabUZORh0,3173
|
|
98
|
-
isar-1.26.
|
|
98
|
+
isar-1.26.2.dist-info/licenses/LICENSE,sha256=3fc2-ebLwHWwzfQbulGNRdcNob3SBQeCfEVUDYxsuqw,14058
|
|
99
99
|
robot_interface/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
100
100
|
robot_interface/robot_interface.py,sha256=Bkk-joyIzRHxv8iZt7FLPFnlE8chlJad9vgjwc-fDkw,8786
|
|
101
101
|
robot_interface/test_robot_interface.py,sha256=FV1urn7SbsMyWBIcTKjsBwAG4IsXeZ6pLHE0mA9EGGs,692
|
|
@@ -119,8 +119,8 @@ robot_interface/telemetry/payloads.py,sha256=m55aFrIczI-PDwQXvsFA6M7YNCTy83w7Ff-
|
|
|
119
119
|
robot_interface/utilities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
120
120
|
robot_interface/utilities/json_service.py,sha256=qkzVkb60Gi_pto-b5n1vNzCrQze2yqgIJqSLNLYj1Fg,1034
|
|
121
121
|
robot_interface/utilities/uuid_string_factory.py,sha256=_NQIbBQ56w0qqO0MUDP6aPpHbxW7ATRhK8HnQiBSLkc,76
|
|
122
|
-
isar-1.26.
|
|
123
|
-
isar-1.26.
|
|
124
|
-
isar-1.26.
|
|
125
|
-
isar-1.26.
|
|
126
|
-
isar-1.26.
|
|
122
|
+
isar-1.26.2.dist-info/METADATA,sha256=tYUxPEqRTzHxD7YpOR76LGsjXy5UfILPCvFJOIXKTQ8,30252
|
|
123
|
+
isar-1.26.2.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
|
|
124
|
+
isar-1.26.2.dist-info/entry_points.txt,sha256=TFam7uNNw7J0iiDYzsH2gfG0u1eV1wh3JTw_HkhgKLk,49
|
|
125
|
+
isar-1.26.2.dist-info/top_level.txt,sha256=UwIML2RtuQKCyJJkatcSnyp6-ldDjboB9k9JgKipO-U,21
|
|
126
|
+
isar-1.26.2.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|