Merge branch 'main' into mps

Author: ACE07-Sev

cirq-google/cirq_google/engine/engine_client.py

@@ -211,7 +211,7 @@ async def list_programs_async(
         created_before: datetime.datetime | datetime.date | None = None,
         created_after: datetime.datetime | datetime.date | None = None,
         has_labels: dict[str, str] | None = None,
-    ):
+    ) -> list[quantum.QuantumProgram]:
         """Returns a list of previously executed quantum programs.
 
         Args:
@@ -242,7 +242,7 @@ async def list_programs_async(
         request = quantum.ListQuantumProgramsRequest(
             parent=_project_name(project_id), filter=" AND ".join(filters)
         )
-        return await self._send_request_async(self.grpc_client.list_quantum_programs, request)
+        return await self._send_list_request_async(self.grpc_client.list_quantum_programs, request)
 
     list_programs = duet.sync(list_programs_async)
 
@@ -485,7 +485,7 @@ async def list_jobs_async(
         execution_states: set[quantum.ExecutionStatus.State] | None = None,
         executed_processor_ids: list[str] | None = None,
         scheduled_processor_ids: list[str] | None = None,
-    ):
+    ) -> list[quantum.QuantumJob]:
         """Returns the list of jobs for a given program.
 
         Args:
@@ -545,7 +545,7 @@ async def list_jobs_async(
             program_id = "-"
         parent = _program_name_from_ids(project_id, program_id)
         request = quantum.ListQuantumJobsRequest(parent=parent, filter=" AND ".join(filters))
-        return await self._send_request_async(self.grpc_client.list_quantum_jobs, request)
+        return await self._send_list_request_async(self.grpc_client.list_quantum_jobs, request)
 
     list_jobs = duet.sync(list_jobs_async)
 

cirq-google/cirq_google/engine/engine_client_test.py

@@ -157,7 +157,7 @@ def test_list_program(client_constructor, default_engine_client):
         quantum.QuantumProgram(name='projects/proj/programs/prog1'),
         quantum.QuantumProgram(name='projects/proj/programs/prog2'),
     ]
-    grpc_client.list_quantum_programs.return_value = results
+    grpc_client.list_quantum_programs.return_value = _AsyncIterable(results)
 
     assert default_engine_client.list_programs(project_id='proj') == results
     grpc_client.list_quantum_programs.assert_called_with(
@@ -1252,7 +1252,7 @@ def test_list_jobs(client_constructor, default_engine_client):
         quantum.QuantumJob(name='projects/proj/programs/prog1/jobs/job1'),
         quantum.QuantumJob(name='projects/proj/programs/prog1/jobs/job2'),
     ]
-    grpc_client.list_quantum_jobs.return_value = results
+    grpc_client.list_quantum_jobs.return_value = _AsyncIterable(results)
 
     assert default_engine_client.list_jobs(project_id='proj', program_id='prog1') == results
     grpc_client.list_quantum_jobs.assert_called_with(
@@ -1265,6 +1265,15 @@ def test_list_jobs(client_constructor, default_engine_client):
     )
 
 
+class _AsyncIterable:
+    def __init__(self, items):
+        self.items = items
+
+    async def __aiter__(self):
+        for item in self.items:
+            yield item
+
+
 @pytest.mark.parametrize(
     'expected_filter, '
     'created_after, '

cirq-google/cirq_google/engine/engine_program.py

@@ -361,7 +361,9 @@ async def get_circuit_async(self) -> cirq.Circuit:
         Returns:
             The program's cirq Circuit.
         """
-        if self._program is None or self._program.code is None:
+        # The code field is an any_pb2.Any and is always set. But if the program has not
+        # been fetched this field may be empty, which we can see by checking the type_url.
+        if self._program is None or not self._program.code or not self._program.code.type_url:
             self._program = await self.context.client.get_program_async(
                 self.project_id, self.program_id, True
             )

cirq-google/cirq_google/engine/engine_program_test.py

@@ -298,12 +298,14 @@ def test_get_circuit_v1(get_program_async):
 
 
 @mock.patch('cirq_google.engine.engine_client.EngineClient.get_program_async')
-def test_get_circuit_v2(get_program_async):
+@pytest.mark.parametrize("include_empty_program", [False, True])
+def test_get_circuit_v2(get_program_async, include_empty_program: bool) -> None:
     circuit = cirq.Circuit(
         cirq.X(cirq.GridQubit(5, 2)) ** 0.5, cirq.measure(cirq.GridQubit(5, 2), key='result')
     )
 
-    program = cg.EngineProgram('a', 'b', EngineContext())
+    program_msg = quantum.QuantumProgram() if include_empty_program else None
+    program = cg.EngineProgram('a', 'b', EngineContext(), _program=program_msg)
     get_program_async.return_value = quantum.QuantumProgram(code=_PROGRAM_V2)
     cirq.testing.assert_circuits_with_terminal_measurements_are_equivalent(
         program.get_circuit(), circuit