isar 1.25.0__py3-none-any.whl → 1.25.1__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.

Files changed (8) hide show
  1. isar/apis/models/start_mission_definition.py +92 -38
  2. {isar-1.25.0.dist-info → isar-1.25.1.dist-info}/METADATA +1 -1
  3. {isar-1.25.0.dist-info → isar-1.25.1.dist-info}/RECORD +8 -8
  4. robot_interface/models/mission/task.py +2 -2
  5. {isar-1.25.0.dist-info → isar-1.25.1.dist-info}/LICENSE +0 -0
  6. {isar-1.25.0.dist-info → isar-1.25.1.dist-info}/WHEEL +0 -0
  7. {isar-1.25.0.dist-info → isar-1.25.1.dist-info}/entry_points.txt +0 -0
  8. {isar-1.25.0.dist-info → isar-1.25.1.dist-info}/top_level.txt +0 -0
isar/apis/models/start_mission_definition.py CHANGED
@@ -46,6 +46,7 @@ class StartMissionInspectionDefinition(BaseModel):
46
46
 
47
47
 
48
48
  class StartMissionTaskDefinition(BaseModel):
49
+ id: Optional[str] = None
49
50
  type: TaskType = Field(default=TaskType.Inspection)
50
51
  pose: InputPose
51
52
  inspection: Optional[StartMissionInspectionDefinition] = None
@@ -115,48 +116,101 @@ def to_inspection_task(task_definition: StartMissionTaskDefinition) -> TASKS:
115
116
  inspection_definition = task_definition.inspection
116
117
 
117
118
  if inspection_definition.type == InspectionTypes.image:
118
- return TakeImage(
119
- robot_pose=task_definition.pose.to_alitra_pose(),
120
- tag_id=task_definition.tag,
121
- target=task_definition.inspection.inspection_target.to_alitra_position(),
122
- metadata=task_definition.inspection.metadata,
123
- zoom=task_definition.zoom,
124
- )
119
+ if task_definition.id:
120
+ return TakeImage(
121
+ id=task_definition.id,
122
+ robot_pose=task_definition.pose.to_alitra_pose(),
123
+ tag_id=task_definition.tag,
124
+ target=task_definition.inspection.inspection_target.to_alitra_position(),
125
+ metadata=task_definition.inspection.metadata,
126
+ zoom=task_definition.zoom,
127
+ )
128
+ else:
129
+ return TakeImage(
130
+ robot_pose=task_definition.pose.to_alitra_pose(),
131
+ tag_id=task_definition.tag,
132
+ target=task_definition.inspection.inspection_target.to_alitra_position(),
133
+ metadata=task_definition.inspection.metadata,
134
+ zoom=task_definition.zoom,
135
+ )
125
136
  elif inspection_definition.type == InspectionTypes.video:
126
- return TakeVideo(
127
- robot_pose=task_definition.pose.to_alitra_pose(),
128
- tag_id=task_definition.tag,
129
- target=task_definition.inspection.inspection_target.to_alitra_position(),
130
- duration=inspection_definition.duration,
131
- metadata=task_definition.inspection.metadata,
132
- zoom=task_definition.zoom,
133
- )
137
+ if task_definition.id:
138
+ return TakeVideo(
139
+ id=task_definition.id,
140
+ robot_pose=task_definition.pose.to_alitra_pose(),
141
+ tag_id=task_definition.tag,
142
+ target=task_definition.inspection.inspection_target.to_alitra_position(),
143
+ duration=inspection_definition.duration,
144
+ metadata=task_definition.inspection.metadata,
145
+ zoom=task_definition.zoom,
146
+ )
147
+ else:
148
+ return TakeVideo(
149
+ robot_pose=task_definition.pose.to_alitra_pose(),
150
+ tag_id=task_definition.tag,
151
+ target=task_definition.inspection.inspection_target.to_alitra_position(),
152
+ duration=inspection_definition.duration,
153
+ metadata=task_definition.inspection.metadata,
154
+ zoom=task_definition.zoom,
155
+ )
134
156
  elif inspection_definition.type == InspectionTypes.thermal_image:
135
- return TakeThermalImage(
136
- robot_pose=task_definition.pose.to_alitra_pose(),
137
- tag_id=task_definition.tag,
138
- target=task_definition.inspection.inspection_target.to_alitra_position(),
139
- metadata=task_definition.inspection.metadata,
140
- zoom=task_definition.zoom,
141
- )
157
+ if task_definition.id:
158
+ return TakeThermalImage(
159
+ id=task_definition.id,
160
+ robot_pose=task_definition.pose.to_alitra_pose(),
161
+ tag_id=task_definition.tag,
162
+ target=task_definition.inspection.inspection_target.to_alitra_position(),
163
+ metadata=task_definition.inspection.metadata,
164
+ zoom=task_definition.zoom,
165
+ )
166
+ else:
167
+ return TakeThermalImage(
168
+ robot_pose=task_definition.pose.to_alitra_pose(),
169
+ tag_id=task_definition.tag,
170
+ target=task_definition.inspection.inspection_target.to_alitra_position(),
171
+ metadata=task_definition.inspection.metadata,
172
+ zoom=task_definition.zoom,
173
+ )
142
174
  elif inspection_definition.type == InspectionTypes.thermal_video:
143
- return TakeThermalVideo(
144
- robot_pose=task_definition.pose.to_alitra_pose(),
145
- tag_id=task_definition.tag,
146
- target=task_definition.inspection.inspection_target.to_alitra_position(),
147
- duration=inspection_definition.duration,
148
- metadata=task_definition.inspection.metadata,
149
- zoom=task_definition.zoom,
150
- )
175
+ if task_definition.id:
176
+ return TakeThermalVideo(
177
+ id=task_definition.id,
178
+ robot_pose=task_definition.pose.to_alitra_pose(),
179
+ tag_id=task_definition.tag,
180
+ target=task_definition.inspection.inspection_target.to_alitra_position(),
181
+ duration=inspection_definition.duration,
182
+ metadata=task_definition.inspection.metadata,
183
+ zoom=task_definition.zoom,
184
+ )
185
+ else:
186
+ return TakeThermalVideo(
187
+ robot_pose=task_definition.pose.to_alitra_pose(),
188
+ tag_id=task_definition.tag,
189
+ target=task_definition.inspection.inspection_target.to_alitra_position(),
190
+ duration=inspection_definition.duration,
191
+ metadata=task_definition.inspection.metadata,
192
+ zoom=task_definition.zoom,
193
+ )
151
194
  elif inspection_definition.type == InspectionTypes.audio:
152
- return RecordAudio(
153
- robot_pose=task_definition.pose.to_alitra_pose(),
154
- tag_id=task_definition.tag,
155
- target=task_definition.inspection.inspection_target.to_alitra_position(),
156
- duration=inspection_definition.duration,
157
- metadata=task_definition.inspection.metadata,
158
- zoom=task_definition.zoom,
159
- )
195
+ if task_definition.id:
196
+ return RecordAudio(
197
+ id=task_definition.id,
198
+ robot_pose=task_definition.pose.to_alitra_pose(),
199
+ tag_id=task_definition.tag,
200
+ target=task_definition.inspection.inspection_target.to_alitra_position(),
201
+ duration=inspection_definition.duration,
202
+ metadata=task_definition.inspection.metadata,
203
+ zoom=task_definition.zoom,
204
+ )
205
+ else:
206
+ return RecordAudio(
207
+ robot_pose=task_definition.pose.to_alitra_pose(),
208
+ tag_id=task_definition.tag,
209
+ target=task_definition.inspection.inspection_target.to_alitra_position(),
210
+ duration=inspection_definition.duration,
211
+ metadata=task_definition.inspection.metadata,
212
+ zoom=task_definition.zoom,
213
+ )
160
214
  else:
161
215
  raise ValueError(
162
216
  f"Inspection type '{inspection_definition.type}' not supported"
{isar-1.25.0.dist-info → isar-1.25.1.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: isar
3
- Version: 1.25.0
3
+ Version: 1.25.1
4
4
  Summary: Integration and Supervisory control of Autonomous Robots
5
5
  Author-email: Equinor ASA <fg_robots_dev@equinor.com>
6
6
  License: Eclipse Public License version 2.0
{isar-1.25.0.dist-info → isar-1.25.1.dist-info}/RECORD RENAMED
@@ -5,7 +5,7 @@ isar/apis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
5
5
  isar/apis/api.py,sha256=vUy7QbHrKcTHjh2rkU7lqQPkCasI6umha8r6H88JiXE,13942
6
6
  isar/apis/models/__init__.py,sha256=NI1BYyN__Ogr00Qqe0XJ-9gEVPva2brXo2RJsbrS4tM,52
7
7
  isar/apis/models/models.py,sha256=HzLaWhjAv0uJRBWipIgYg_F75eaQ5jl9Pi4UnYbDJ-M,1749
8
- isar/apis/models/start_mission_definition.py,sha256=6bR3xMeWQ1B3MIIOq4vadI9jB3MEVTidabjHp8Ajmhs,6287
8
+ isar/apis/models/start_mission_definition.py,sha256=yaWICdWJrCYFIm5Aq1K3BVxD9oyVuXYaaY9hJG2aoVY,8820
9
9
  isar/apis/robot_control/robot_controller.py,sha256=en6j-dHIxUXraREz7JETqtxgHl79ks7TBgBwPKc6VQE,1019
10
10
  isar/apis/schedule/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
11
11
  isar/apis/schedule/scheduling_controller.py,sha256=JvuioSWmJohiCqfGSCDvOq-CK2Y7ACHfXLfH-UhVQJ8,11371
@@ -96,7 +96,7 @@ robot_interface/models/inspection/inspection.py,sha256=nSoKTDPRWnpaJuoKnaE_2EEJ6
96
96
  robot_interface/models/mission/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
97
97
  robot_interface/models/mission/mission.py,sha256=QZBDQiOmpb4C7nNCf1PaCWwpvAc8jrhwHSznOe2YhX8,842
98
98
  robot_interface/models/mission/status.py,sha256=C_viZWNTYOncWCdurx7Pko_D9d595QmHuJZBT8YMHUg,724
99
- robot_interface/models/mission/task.py,sha256=Yhm1T4O9N76i4dcZ8f9CoeIICzK2t4W4YQGSl7FKYAo,4943
99
+ robot_interface/models/mission/task.py,sha256=boRigdjY9dvJzHYxAweqydRGt7CUyXFcCjMVw-lrwJM,4969
100
100
  robot_interface/models/robots/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
101
101
  robot_interface/models/robots/media.py,sha256=Bo6XisTND9MOsxvJe6mWtKumFCpX6pbEBzEnAKpoIpU,232
102
102
  robot_interface/models/robots/robot_model.py,sha256=pZQsqhn9hh6XE3EjMZhWMzYqg5oJ4CJ4CXeOASKvEf8,452
@@ -106,9 +106,9 @@ robot_interface/telemetry/payloads.py,sha256=JM5E_IHkZpim_zdwc-w52D7dYFBeP4iO1-x
106
106
  robot_interface/utilities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
107
107
  robot_interface/utilities/json_service.py,sha256=nU2Q_3P9Fq9hs6F_wtUjWtHfl_g1Siy-yDhXXSKwHwg,1018
108
108
  robot_interface/utilities/uuid_string_factory.py,sha256=_NQIbBQ56w0qqO0MUDP6aPpHbxW7ATRhK8HnQiBSLkc,76
109
- isar-1.25.0.dist-info/LICENSE,sha256=3fc2-ebLwHWwzfQbulGNRdcNob3SBQeCfEVUDYxsuqw,14058
110
- isar-1.25.0.dist-info/METADATA,sha256=sbku6gFYCKKw9RliJSoVqzwoQpaegt1VBadZZIoguEY,30661
111
- isar-1.25.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
112
- isar-1.25.0.dist-info/entry_points.txt,sha256=TFam7uNNw7J0iiDYzsH2gfG0u1eV1wh3JTw_HkhgKLk,49
113
- isar-1.25.0.dist-info/top_level.txt,sha256=UwIML2RtuQKCyJJkatcSnyp6-ldDjboB9k9JgKipO-U,21
114
- isar-1.25.0.dist-info/RECORD,,
109
+ isar-1.25.1.dist-info/LICENSE,sha256=3fc2-ebLwHWwzfQbulGNRdcNob3SBQeCfEVUDYxsuqw,14058
110
+ isar-1.25.1.dist-info/METADATA,sha256=QvUtSw8nmGfn1MgIgqxHa9mzQNpH1hudpRrNwmodfwA,30661
111
+ isar-1.25.1.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
112
+ isar-1.25.1.dist-info/entry_points.txt,sha256=TFam7uNNw7J0iiDYzsH2gfG0u1eV1wh3JTw_HkhgKLk,49
113
+ isar-1.25.1.dist-info/top_level.txt,sha256=UwIML2RtuQKCyJJkatcSnyp6-ldDjboB9k9JgKipO-U,21
114
+ isar-1.25.1.dist-info/RECORD,,
robot_interface/models/mission/task.py CHANGED
@@ -38,7 +38,7 @@ class Task(BaseModel):
38
38
  status: TaskStatus = Field(default=TaskStatus.NotStarted)
39
39
  error_message: Optional[ErrorMessage] = Field(default=None)
40
40
  tag_id: Optional[str] = Field(default=None)
41
- id: str = Field(default_factory=uuid4_string)
41
+ id: str = Field(default_factory=uuid4_string, frozen=True)
42
42
 
43
43
  def is_finished(self) -> bool:
44
44
  if (
@@ -59,7 +59,7 @@ class InspectionTask(Task):
59
59
  Base class for all inspection tasks which produce results to be uploaded.
60
60
  """
61
61
 
62
- inspection_id: str = Field(default_factory=uuid4_string)
62
+ inspection_id: str = Field(default_factory=uuid4_string, frozen=True)
63
63
  robot_pose: Pose = Field(default=None, init=True)
64
64
  metadata: Optional[dict] = Field(default_factory=dict)
65
65
  zoom: Optional[ZoomDescription] = Field(default=None)
{isar-1.25.0.dist-info → isar-1.25.1.dist-info}/LICENSE RENAMED
File without changes
{isar-1.25.0.dist-info → isar-1.25.1.dist-info}/WHEEL RENAMED
File without changes