Skip to content

Commit 72509c9

Browse files
authored
ODSC-50486/print out model deployment id when calling predict (#491)
1 parent 407f3d2 commit 72509c9

File tree

1 file changed

+15
-44
lines changed

1 file changed

+15
-44
lines changed

ads/model/service/oci_datascience_model_deployment.py

Lines changed: 15 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,11 @@ def wrapper(self, *args, **kwargs):
6767
return decorator
6868

6969

70-
class MissingModelDeploymentIdError(Exception): # pragma: no cover
70+
class MissingModelDeploymentIdError(Exception): # pragma: no cover
7171
pass
7272

7373

74-
class MissingModelDeploymentWorkflowIdError(Exception): # pragma: no cover
74+
class MissingModelDeploymentWorkflowIdError(Exception): # pragma: no cover
7575
pass
7676

7777

@@ -175,32 +175,23 @@ def activate(
175175
The `OCIDataScienceModelDeployment` instance (self).
176176
"""
177177
dsc_model_deployment = OCIDataScienceModelDeployment.from_id(self.id)
178-
if (
179-
dsc_model_deployment.lifecycle_state
180-
== self.LIFECYCLE_STATE_ACTIVE
181-
):
178+
if dsc_model_deployment.lifecycle_state == self.LIFECYCLE_STATE_ACTIVE:
182179
raise Exception(
183180
f"Model deployment {dsc_model_deployment.id} is already in active state."
184181
)
185182

186-
if (
187-
dsc_model_deployment.lifecycle_state
188-
== self.LIFECYCLE_STATE_INACTIVE
189-
):
183+
if dsc_model_deployment.lifecycle_state == self.LIFECYCLE_STATE_INACTIVE:
190184
logger.info(f"Activating model deployment `{self.id}`.")
191185
response = self.client.activate_model_deployment(
192186
self.id,
193187
)
194188

195189
if wait_for_completion:
196-
197190
self.workflow_req_id = response.headers.get("opc-work-request-id", None)
198191

199192
try:
200193
self.wait_for_progress(
201-
self.workflow_req_id,
202-
max_wait_time,
203-
poll_interval
194+
self.workflow_req_id, max_wait_time, poll_interval
204195
)
205196
except Exception as e:
206197
logger.error(
@@ -241,21 +232,17 @@ def create(
241232
response = self.client.create_model_deployment(create_model_deployment_details)
242233
self.update_from_oci_model(response.data)
243234
logger.info(f"Creating model deployment `{self.id}`.")
235+
print(f"Model Deployment OCID: {self.id}")
244236

245237
if wait_for_completion:
246-
247238
self.workflow_req_id = response.headers.get("opc-work-request-id", None)
248239

249240
try:
250241
self.wait_for_progress(
251-
self.workflow_req_id,
252-
max_wait_time,
253-
poll_interval
242+
self.workflow_req_id, max_wait_time, poll_interval
254243
)
255244
except Exception as e:
256-
logger.error(
257-
"Error while trying to create model deployment: " + str(e)
258-
)
245+
logger.error("Error while trying to create model deployment: " + str(e))
259246

260247
return self.sync()
261248

@@ -287,32 +274,23 @@ def deactivate(
287274
The `OCIDataScienceModelDeployment` instance (self).
288275
"""
289276
dsc_model_deployment = OCIDataScienceModelDeployment.from_id(self.id)
290-
if (
291-
dsc_model_deployment.lifecycle_state
292-
== self.LIFECYCLE_STATE_INACTIVE
293-
):
277+
if dsc_model_deployment.lifecycle_state == self.LIFECYCLE_STATE_INACTIVE:
294278
raise Exception(
295279
f"Model deployment {dsc_model_deployment.id} is already in inactive state."
296280
)
297281

298-
if (
299-
dsc_model_deployment.lifecycle_state
300-
== self.LIFECYCLE_STATE_ACTIVE
301-
):
282+
if dsc_model_deployment.lifecycle_state == self.LIFECYCLE_STATE_ACTIVE:
302283
logger.info(f"Deactivating model deployment `{self.id}`.")
303284
response = self.client.deactivate_model_deployment(
304285
self.id,
305286
)
306287

307288
if wait_for_completion:
308-
309289
self.workflow_req_id = response.headers.get("opc-work-request-id", None)
310290

311291
try:
312292
self.wait_for_progress(
313-
self.workflow_req_id,
314-
max_wait_time,
315-
poll_interval
293+
self.workflow_req_id, max_wait_time, poll_interval
316294
)
317295
except Exception as e:
318296
logger.error(
@@ -355,7 +333,7 @@ def delete(
355333
dsc_model_deployment = OCIDataScienceModelDeployment.from_id(self.id)
356334
if dsc_model_deployment.lifecycle_state in [
357335
self.LIFECYCLE_STATE_DELETED,
358-
self.LIFECYCLE_STATE_DELETING
336+
self.LIFECYCLE_STATE_DELETING,
359337
]:
360338
raise Exception(
361339
f"Model deployment {dsc_model_deployment.id} is either deleted or being deleted."
@@ -374,19 +352,14 @@ def delete(
374352
)
375353

376354
if wait_for_completion:
377-
378355
self.workflow_req_id = response.headers.get("opc-work-request-id", None)
379356

380357
try:
381358
self.wait_for_progress(
382-
self.workflow_req_id,
383-
max_wait_time,
384-
poll_interval
359+
self.workflow_req_id, max_wait_time, poll_interval
385360
)
386361
except Exception as e:
387-
logger.error(
388-
"Error while trying to delete model deployment: " + str(e)
389-
)
362+
logger.error("Error while trying to delete model deployment: " + str(e))
390363

391364
return self.sync()
392365

@@ -440,9 +413,7 @@ def update(
440413
)
441414
self.workflow_req_id = response.headers.get("opc-work-request-id", None)
442415
except Exception as e:
443-
logger.error(
444-
"Error while trying to update model deployment: " + str(e)
445-
)
416+
logger.error("Error while trying to update model deployment: " + str(e))
446417

447418
return self.sync()
448419

0 commit comments

Comments
 (0)