change pending_tasks to pending_jobs

backend/oqtopus_cloud/common/models/device.py

@@ -22,13 +22,12 @@ class Device(Base):
         id (str): The unique identifier of the device.
         device_type (str): The type of the device (QPU or simulator).
         status (str): The status of the device (AVAILABLE or NOT_AVAILABLE).
-        restart_at (datetime): The date and time when the device is scheduled to restart.
-        pending_tasks (int): The number of pending tasks for the device.
+        available_at (datetime): The date and time when the device is scheduled to restart.
+        pending_jobs (int): The number of pending jobs for the device.
         n_qubits (int): The number of qubits of the device.
-        n_nodes (int): The number of nodes of the device.
         basis_gates (str): The basis gates supported by the device.
         instructions (str): The supported instructions of the device.
-        calibration_data (str): The calibration data of the device.
+        device_info (str): The infomation of the device.
         calibrated_at (datetime): The date and time when the device was last calibrated.
         description (str): The description of the device.
     """
@@ -48,25 +47,22 @@ class Device(Base):
     )
     status: Mapped[enum.Enum] = mapped_column(
         Enum(
-            "AVAILABLE",
-            "NOT_AVAILABLE",
+            "available",
+            "unavailable",
         ),
         nullable=False,
-        default="NOT_AVAILABLE",
+        default="unavailable",
     )
-    restart_at: Mapped[datetime.datetime] = mapped_column(
+    available_at: Mapped[datetime.datetime] = mapped_column(
         nullable=True,
     )
-    pending_tasks: Mapped[int] = mapped_column(
+    pending_jobs: Mapped[int] = mapped_column(
         nullable=False,
         default=0,
     )
     n_qubits: Mapped[int] = mapped_column(
         nullable=False,
     )
-    n_nodes: Mapped[int] = mapped_column(
-        nullable=True,
-    )
     basis_gates: Mapped[str] = mapped_column(
         String(256),
         nullable=False,
@@ -75,7 +71,7 @@ class Device(Base):
         String(64),
         nullable=False,
     )
-    calibration_data: Mapped[str]
+    device_info: Mapped[str]
     calibrated_at: Mapped[datetime.datetime]
     description: Mapped[str] = mapped_column(
         String(128),

backend/oqtopus_cloud/provider/routers/devices.py

@@ -71,7 +71,7 @@ def update_device_status(
     return DeviceDataUpdateResponse(message="Device's data updated")
 
 
-def update_device_pending_tasks(
+def update_device_pending_jobs(
     device: Device, request: DevicePendingTasksUpdate, db: Session
 ) -> DeviceDataUpdateResponse | ErrorResponse:
     """
@@ -88,12 +88,12 @@ def update_device_pending_tasks(
     Raises:
         BadRequest: If the new number of pending tasks is not provided or is less than 0.
     """
-    n_pending_tasks = request.nPendingTasks
-    if n_pending_tasks is None:
+    n_pending_jobs = request.nPendingTasks
+    if n_pending_jobs is None:
         return BadRequestResponse("nPendingTasks is required")
-    if n_pending_tasks < 0:
+    if n_pending_jobs < 0:
         return BadRequestResponse("nPendingTasks must be greater than or equal to 0")
-    device.pending_tasks = n_pending_tasks
+    device.pending_jobs = n_pending_jobs
     db.commit()
     return DeviceDataUpdateResponse(message="Device's data updated")
 
@@ -166,7 +166,7 @@ def update_device(
         if isinstance(request.root, DeviceStatusUpdate):
             return update_device_status(device, request.root, db)
         elif isinstance(request.root, DevicePendingTasksUpdate):
-            return update_device_pending_tasks(
+            return update_device_pending_jobs(
                 device,
                 request.root,
                 db,

backend/oqtopus_cloud/provider/schemas/devices.py

@@ -28,7 +28,7 @@ class DevicePendingTasksUpdate(BaseModel):
         Literal["DevicePendingTasksUpdate"],
         Field(examples=["DevicePendingTasksUpdate"]),
     ]
-    n_pending_tasks: Optional[int] = None
+    n_pending_jobs: Optional[int] = None
 
 
 class DeviceCalibrationUpdate(BaseModel):

backend/oqtopus_cloud/user/routers/devices.py

@@ -84,7 +84,7 @@ def get_device(
     "device_type": "device_type",
     "status": "status",
     "available_at": "available_at",
-    "pending_tasks": "n_pending_tasks",
+    "pending_jobs": "n_pending_jobs",
     "n_qubits": "n_qubits",
     "n_nodes": "n_nodes",
     "basis_gates": "basis_gates",

backend/oqtopus_cloud/user/schemas/devices.py

@@ -24,7 +24,7 @@ class DeviceInfo(BaseModel):
     """
     Parameter mandatory and valid for 'unavailable' devices
     """
-    n_pending_tasks: Annotated[Optional[int], Field(None, examples=[8])]
+    n_pending_jobs: Annotated[Optional[int], Field(None, examples=[8])]
     n_qubits: Annotated[Optional[int], Field(None, examples=[39])]
     basis_gates: Annotated[
         Optional[list[str]],

backend/tests/oqtopus_cloud/common/test_model_util.py

@@ -10,7 +10,7 @@ def _get_model_dict():
         "device_type": "simulator",
         "status": "AVAILABLE",
         "restart_at": datetime(2023, 1, 2, 12, 34, 56),
-        "pending_tasks": 8,
+        "pending_jobs": 8,
         "n_qubits": 39,
         "n_nodes": 512,
         "basis_gates": ["x", "sx", "rz", "cx"],
@@ -44,7 +44,7 @@ def test_model_to_schema_dict():
         "device_type": "deviceType",  # transform field name
         "status": "status",
         "restart_at": "restart_at",
-        "pending_tasks": "pending_tasks",
+        "pending_jobs": "pending_jobs",
         "n_qubits": "n_qubits",
         "n_nodes": "n_nodes",
         "basis_gates": "basis_gates",

backend/tests/oqtopus_cloud/provider/conftest.py

@@ -55,7 +55,7 @@ def insert_initial_data(db: Session):
             device_type="QPU",
             status="NOT_AVAILABLE",
             restart_at=datetime(2024, 3, 4, 12, 34, 56),
-            pending_tasks=0,
+            pending_jobs=0,
             n_qubits=64,
             n_nodes=0,
             basis_gates='["sx", "rx", "rzx90", "id"]',

backend/tests/oqtopus_cloud/provider/routers/test_devices.py

@@ -7,7 +7,7 @@
 )
 from oqtopus_cloud.provider.routers.devices import (
     update_device_calibration,
-    update_device_pending_tasks,
+    update_device_pending_jobs,
     update_device_status,
 )
 from oqtopus_cloud.provider.schemas.devices import (
@@ -42,7 +42,7 @@ def _get_model():
         "device_type": "QPU",
         "status": "AVAILABLE",
         "restart_at": datetime(2023, 1, 2, 12, 34, 56),
-        "pending_tasks": 8,
+        "pending_jobs": 8,
         "n_qubits": 39,
         "n_nodes": 512,
         "basis_gates": '["x", "sx", "rz", "cx"]',
@@ -54,7 +54,7 @@ def _get_model():
     return Device(**mode_dict)
 
 
-def test_update_device_pending_tasks(test_db):
+def test_update_device_pending_jobs(test_db):
     # Arrange
     test_db.add(_get_model())
     test_db.commit()
@@ -63,7 +63,7 @@ def test_update_device_pending_tasks(test_db):
     request = DevicePendingTasksUpdate(
         command="DevicePendingTasksUpdate", nPendingTasks=8
     )
-    actual = update_device_pending_tasks(device=device, request=request, db=test_db)
+    actual = update_device_pending_jobs(device=device, request=request, db=test_db)
     # Assert
     expected = DeviceDataUpdateResponse(message="Device's data updated")
     assert actual == expected

backend/tests/oqtopus_cloud/provider/routers/test_results.py

@@ -46,7 +46,7 @@ def _get_device_model():
         "device_type": "QPU",
         "status": "AVAILABLE",
         "restart_at": datetime(2023, 1, 2, 12, 34, 56),
-        "pending_tasks": 8,
+        "pending_jobs": 8,
         "n_qubits": 39,
         "n_nodes": 512,
         "basis_gates": '["x", "sx", "rz", "cx"]',

backend/tests/oqtopus_cloud/provider/routers/test_tasks.py

@@ -53,7 +53,7 @@ def _get_device_model():
         "device_type": "QPU",
         "status": "AVAILABLE",
         "restart_at": datetime(2023, 1, 2, 12, 34, 56),
-        "pending_tasks": 8,
+        "pending_jobs": 8,
         "n_qubits": 39,
         "n_nodes": 512,
         "basis_gates": '["x", "sx", "rz", "cx"]',

backend/tests/oqtopus_cloud/user/conftest.py

@@ -55,7 +55,7 @@ def insert_initial_data(db: Session):
             device_type="QPU",
             status="NOT_AVAILABLE",
             restart_at=datetime(2024, 3, 4, 12, 34, 56),
-            pending_tasks=0,
+            pending_jobs=0,
             n_qubits=64,
             n_nodes=0,
             basis_gates='["sx", "rx", "rzx90", "id"]',

backend/tests/oqtopus_cloud/user/routers/test_devices.py

@@ -53,7 +53,7 @@ def _get_model():
         "device_type": "simulator",
         "status": "AVAILABLE",
         "restart_at": datetime(2023, 1, 2, 12, 34, 56),
-        "pending_tasks": 8,
+        "pending_jobs": 8,
         "n_qubits": 39,
         "n_nodes": 512,
         "basis_gates": '["x", "sx", "rz", "cx"]',