Skip to content

Commit

Permalink
Remove overwrite_existing fields in CreateQuantumProgramRequest and C…
Browse files Browse the repository at this point in the history
…reateQuantumJobRequest (#6160)

* Remove overwrite_existing fields in CreateQuantumProgramRequest and CreateQuantumJobRequest

* Fix formatting
  • Loading branch information
verult committed Jun 23, 2023
1 parent 6c251a3 commit 374947d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 20 deletions.
12 changes: 4 additions & 8 deletions cirq-google/cirq_google/engine/engine_client.py
Expand Up @@ -220,9 +220,7 @@ async def create_program_async(
if labels:
program.labels.update(labels)

request = quantum.CreateQuantumProgramRequest(
parent=parent_name, quantum_program=program, overwrite_existing_source_code=False
)
request = quantum.CreateQuantumProgramRequest(parent=parent_name, quantum_program=program)
program = await self._send_request_async(self.grpc_client.create_quantum_program, request)
return _ids_from_program_name(program.name)[1], program

Expand Down Expand Up @@ -277,7 +275,7 @@ async def list_programs_async(
val = _date_or_time_to_filter_expr('created_before', created_before)
filters.append(f"create_time <= {val}")
if has_labels is not None:
for (k, v) in has_labels.items():
for k, v in has_labels.items():
filters.append(f"labels.{k}:{v}")
request = quantum.ListQuantumProgramsRequest(
parent=_project_name(project_id), filter=" AND ".join(filters)
Expand Down Expand Up @@ -471,9 +469,7 @@ async def create_job_async(
if labels:
job.labels.update(labels)
request = quantum.CreateQuantumJobRequest(
parent=_program_name_from_ids(project_id, program_id),
quantum_job=job,
overwrite_existing_run_context=False,
parent=_program_name_from_ids(project_id, program_id), quantum_job=job
)
job = await self._send_request_async(self.grpc_client.create_quantum_job, request)
return _ids_from_job_name(job.name)[2], job
Expand Down Expand Up @@ -528,7 +524,7 @@ async def list_jobs_async(
val = _date_or_time_to_filter_expr('created_before', created_before)
filters.append(f"create_time <= {val}")
if has_labels is not None:
for (k, v) in has_labels.items():
for k, v in has_labels.items():
filters.append(f"labels.{k}:{v}")
if execution_states is not None:
state_filter = []
Expand Down
13 changes: 1 addition & 12 deletions cirq-google/cirq_google/engine/engine_client_test.py
Expand Up @@ -56,7 +56,6 @@ def test_create_program(client_constructor):
description='A program',
labels=labels,
),
overwrite_existing_source_code=False,
)
)

Expand All @@ -67,7 +66,6 @@ def test_create_program(client_constructor):
quantum_program=quantum.QuantumProgram(
name='projects/proj/programs/prog', code=code, description='A program'
),
overwrite_existing_source_code=False,
)
)

Expand All @@ -78,7 +76,6 @@ def test_create_program(client_constructor):
quantum_program=quantum.QuantumProgram(
name='projects/proj/programs/prog', code=code, labels=labels
),
overwrite_existing_source_code=False,
)
)

Expand All @@ -87,16 +84,13 @@ def test_create_program(client_constructor):
quantum.CreateQuantumProgramRequest(
parent='projects/proj',
quantum_program=quantum.QuantumProgram(name='projects/proj/programs/prog', code=code),
overwrite_existing_source_code=False,
)
)

assert client.create_program('proj', program_id=None, code=code) == ('prog', result)
grpc_client.create_quantum_program.assert_called_with(
quantum.CreateQuantumProgramRequest(
parent='projects/proj',
quantum_program=quantum.QuantumProgram(code=code),
overwrite_existing_source_code=False,
parent='projects/proj', quantum_program=quantum.QuantumProgram(code=code)
)
)

Expand Down Expand Up @@ -387,7 +381,6 @@ def test_create_job(client_constructor):
description='A job',
labels=labels,
),
overwrite_existing_run_context=False,
)
)

Expand All @@ -409,7 +402,6 @@ def test_create_job(client_constructor):
),
description='A job',
),
overwrite_existing_run_context=False,
)
)

Expand All @@ -430,7 +422,6 @@ def test_create_job(client_constructor):
),
labels=labels,
),
overwrite_existing_run_context=False,
)
)

Expand All @@ -451,7 +442,6 @@ def test_create_job(client_constructor):
),
),
),
overwrite_existing_run_context=False,
)
)

Expand All @@ -475,7 +465,6 @@ def test_create_job(client_constructor):
),
),
),
overwrite_existing_run_context=False,
)
)

Expand Down

0 comments on commit 374947d

Please sign in to comment.