Update the qobj schema to support pulse gate calibrations.

qiskit/qobj/__init__.py

@@ -38,6 +38,8 @@
    QasmQobjExperimentConfig
    QasmQobjExperiment
    QasmQobjConfig
+   QasmExperimentCalibrations
+   GateCalibration
 
 Pulse
 =====
@@ -64,6 +66,9 @@
 
 import warnings
 
+from qiskit.qobj.common import QobjExperimentHeader
+from qiskit.qobj.common import QobjHeader
+
 from qiskit.qobj.pulse_qobj import PulseQobj
 from qiskit.qobj.pulse_qobj import PulseQobjInstruction
 from qiskit.qobj.pulse_qobj import PulseQobjExperimentConfig
@@ -72,13 +77,13 @@
 from qiskit.qobj.pulse_qobj import QobjMeasurementOption
 from qiskit.qobj.pulse_qobj import PulseLibraryItem
 
+from qiskit.qobj.qasm_qobj import GateCalibration
+from qiskit.qobj.qasm_qobj import QasmExperimentCalibrations
 from qiskit.qobj.qasm_qobj import QasmQobj
 from qiskit.qobj.qasm_qobj import QasmQobjInstruction
 from qiskit.qobj.qasm_qobj import QasmQobjExperiment
 from qiskit.qobj.qasm_qobj import QasmQobjConfig
-from qiskit.qobj.qasm_qobj import QobjExperimentHeader
 from qiskit.qobj.qasm_qobj import QasmQobjExperimentConfig
-from qiskit.qobj.qasm_qobj import QobjHeader
 
 from .utils import validate_qobj_against_schema
 

qiskit/qobj/common.py

@@ -0,0 +1,83 @@
+# This code is part of Qiskit.
+#
+# (C) Copyright IBM 2020.
+#
+# This code is licensed under the Apache License, Version 2.0. You may
+# obtain a copy of this license in the LICENSE.txt file in the root directory
+# of this source tree or at http://www.apache.org/licenses/LICENSE-2.0.
+#
+# Any modifications or derivative works of this code must retain this
+# copyright notice, and modified files need to carry a notice indicating
+# that they have been altered from the originals.
+# pylint: disable=invalid-name
+
+"""Module providing definitions of common Qobj classes."""
+import json
+import os
+from types import SimpleNamespace
+
+import fastjsonschema
+
+
+path_part = 'schemas/qobj_schema.json'
+path = os.path.join(
+    os.path.dirname(os.path.dirname(os.path.abspath(__file__))),
+    path_part)
+with open(path) as fd:
+    json_schema = json.loads(fd.read())
+validator = fastjsonschema.compile(json_schema)
+
+
+class QobjDictField(SimpleNamespace):
+    """A class used to represent a dictionary field in Qobj
+
+    Exists as a backwards compatibility shim around a dictionary for Qobjs
+    previously constructed using marshmallow.
+    """
+
+    def __init__(self, **kwargs):
+        """Instantiate a new Qobj dict field object.
+
+        Args:
+            kwargs: arbitrary keyword arguments that can be accessed as
+                attributes of the object.
+        """
+        self.__dict__.update(kwargs)
+
+    def to_dict(self):
+        """Return a dictionary format representation of the QASM Qobj.
+
+        Returns:
+            dict: The dictionary form of the QobjHeader.
+        """
+        return self.__dict__
+
+    @classmethod
+    def from_dict(cls, data):
+        """Create a new QobjHeader object from a dictionary.
+
+        Args:
+            data (dict): A dictionary representing the QobjHeader to create. It
+                will be in the same format as output by :func:`to_dict`.
+
+        Returns:
+            QobjDictFieldr: The QobjDictField from the input dictionary.
+        """
+
+        return cls(**data)
+
+    def __eq__(self, other):
+        if isinstance(other, self.__class__):
+            if self.__dict__ == other.__dict__:
+                return True
+        return False
+
+
+class QobjHeader(QobjDictField):
+    """A class used to represent a dictionary header in Qobj objects."""
+    pass
+
+
+class QobjExperimentHeader(QobjHeader):
+    """A class representing a header dictionary for a Qobj Experiment."""
+    pass

qiskit/qobj/pulse_qobj.py

@@ -22,10 +22,10 @@
 
 import numpy
 
-from qiskit.qobj.qasm_qobj import QobjDictField
-from qiskit.qobj.qasm_qobj import QobjHeader
-from qiskit.qobj.qasm_qobj import QobjExperimentHeader
-from qiskit.qobj.qasm_qobj import validator
+from qiskit.qobj.common import QobjDictField
+from qiskit.qobj.common import QobjHeader
+from qiskit.qobj.common import QobjExperimentHeader
+from qiskit.qobj.common import validator
 
 
 class QobjMeasurementOption: