Merge branch 'more-layers' of https://github.com/SamFerracin/qiskit-i…

…bm-runtime into more-layers

qiskit_ibm_runtime/runtime_job.py

@@ -16,6 +16,7 @@
 from concurrent import futures
 import logging
 import time
+import warnings
 
 from qiskit.providers.backend import Backend
 from qiskit.providers.jobstatus import JobStatus, JOB_FINAL_STATES
@@ -34,7 +35,7 @@
 )
 from .utils.result_decoder import ResultDecoder
 from .utils.queueinfo import QueueInfo
-from .utils.deprecation import deprecate_function
+from .utils.deprecation import deprecate_function, issue_deprecation_msg
 from .api.clients import RuntimeClient
 from .api.exceptions import RequestsApiError
 from .api.client_parameters import ClientParameters
@@ -190,6 +191,15 @@ def status(self) -> JobStatus:
         Returns:
             Status of this job.
         """
+        warnings.warn(
+            (
+                "In a future release of qiskit-ibm-runtime no sooner than 3 months "
+                "after the release date of 0.30.0, RuntimeJob.status() will be returned as a string "
+                "instead of an instance of `JobStatus`."
+            ),
+            DeprecationWarning,
+            stacklevel=2,
+        )
         self._set_status_and_error_message()
         return self._status
 

release-notes/unreleased/1933.deprecation.rst

@@ -0,0 +1,2 @@
+In a future release, ``RuntimeJob.status()`` will be returned as a string instead of 
+an instance of ``JobStatus``.

test/integration/test_job.py

@@ -144,7 +144,7 @@ def test_job_backend(self, service):
     def test_job_program_id(self, service):
         """Test job program ID."""
         job = self._run_program(service)
-        self.assertEqual(self.program_ids[service.channel], job.program_id)
+        self.assertEqual(self.program_ids[service.channel], job.primitive_id)
 
     @run_integration_test
     def test_wait_for_final_state(self, service):

test/integration/test_retrieve_job.py

@@ -38,7 +38,7 @@ def test_retrieve_job_queued(self, service):
         wait_for_status(job, JobStatus.QUEUED)
         rjob = service.job(job.job_id())
         self.assertEqual(job.job_id(), rjob.job_id())
-        self.assertEqual(self.program_ids[service.channel], rjob.program_id)
+        self.assertEqual(self.program_ids[service.channel], rjob.primitive_id)
 
     @run_integration_test
     def test_retrieve_job_running(self, service):
@@ -47,7 +47,7 @@ def test_retrieve_job_running(self, service):
         wait_for_status(job, JobStatus.RUNNING)
         rjob = service.job(job.job_id())
         self.assertEqual(job.job_id(), rjob.job_id())
-        self.assertEqual(self.program_ids[service.channel], rjob.program_id)
+        self.assertEqual(self.program_ids[service.channel], rjob.primitive_id)
 
     @run_integration_test
     def test_retrieve_job_done(self, service):
@@ -56,7 +56,7 @@ def test_retrieve_job_done(self, service):
         job.wait_for_final_state()
         rjob = service.job(job.job_id())
         self.assertEqual(job.job_id(), rjob.job_id())
-        self.assertEqual(self.program_ids[service.channel], rjob.program_id)
+        self.assertEqual(self.program_ids[service.channel], rjob.primitive_id)
 
     @run_integration_test
     def test_retrieve_all_jobs(self, service):
@@ -66,7 +66,7 @@ def test_retrieve_all_jobs(self, service):
         found = False
         for rjob in rjobs:
             if rjob.job_id() == job.job_id():
-                self.assertEqual(job.program_id, rjob.program_id)
+                self.assertEqual(job.primitive_id, rjob.primitive_id)
                 self.assertEqual(job.status(), rjob.status())
                 found = True
                 break
@@ -95,7 +95,7 @@ def test_retrieve_pending_jobs(self, service):
         found = False
         for rjob in rjobs:
             if rjob.job_id() == job.job_id():
-                self.assertEqual(job.program_id, rjob.program_id)
+                self.assertEqual(job.primitive_id, rjob.primitive_id)
                 self.assertEqual(job.inputs, rjob.inputs)
                 found = True
                 break
@@ -114,7 +114,7 @@ def test_retrieve_returned_jobs(self, service):
         found = False
         for rjob in rjobs:
             if rjob.job_id() == job.job_id():
-                self.assertEqual(job.program_id, rjob.program_id)
+                self.assertEqual(job.primitive_id, rjob.primitive_id)
                 self.assertEqual(job.status(), rjob.status())
                 found = True
                 break
@@ -126,7 +126,7 @@ def test_retrieve_jobs_by_program_id(self, service):
         program_id = "sampler"
         jobs = service.jobs(program_id=program_id)
         for job in jobs:
-            self.assertEqual(program_id, job.program_id)
+            self.assertEqual(program_id, job.primitive_id)
 
     @run_integration_test
     def test_retrieve_jobs_by_job_tags(self, service):