✨ minor improvements

include/mqss/client.h

@@ -48,7 +48,7 @@ class MQSSClient {
 private:
   std::unique_ptr<JobResult> waitForJobResult(const JobRequest& job,
                                               size_t poll_seconds);
-
+  bool mIsHpc;
   std::unique_ptr<MQSSBaseClient> mClient;
 
 public:

include/mqss/job.h

@@ -31,7 +31,7 @@ class JobRequest {
 
 public:
   virtual ~JobRequest() = default;
-  virtual nlohmann::json toJson() const = 0;
+  virtual nlohmann::json toJson(bool isHpc) const = 0;
   virtual std::string getPath() const = 0;
   std::string getUuid() const { return mUuid; }
   void setUuid(const std::string& uuid) { mUuid = uuid; }
@@ -70,7 +70,7 @@ class CircuitJobRequest : public JobRequest {
   void setQueued(bool queued) { mQueued = queued; }
   bool isQueued() const { return mQueued; }
 
-  nlohmann::json toJson() const;
+  nlohmann::json toJson(bool isHpc) const;
 
   std::string getPath() const { return "job"; }
 };
@@ -102,7 +102,7 @@ class HamiltonianJobRequest : public JobRequest {
   }
   std::string getCoefficientsString() const { return mCoefficientsStr; }
 
-  nlohmann::json toJson() const;
+  nlohmann::json toJson(bool isHpc) const;
 
   std::string getPath() const { return "hamiltonian_job"; }
 };

src/client.cpp

@@ -30,7 +30,8 @@
 using namespace mqss::client;
 // GCOVR_EXCL_START
 MQSSClient::MQSSClient(const std::string& token,
-                       const std::string& url_or_queue, bool is_hpc) {
+                       const std::string& url_or_queue, bool is_hpc)
+    : mIsHpc(is_hpc) {
   if (is_hpc) {
     mClient = std::make_unique<MQSSHPCClient>(token, url_or_queue);
   } else {
@@ -67,7 +68,7 @@ MQSSClient::getResourceInfo(const std::string& resource) const {
 }
 std::optional<std::string> MQSSClient::submitJob(JobRequest& job) {
   std::string path = job.getPath();
-  std::string result = mClient->post(path, job.toJson());
+  std::string result = mClient->post(path, job.toJson(mIsHpc));
   if (result.empty() || !nlohmann::json::accept(result))
     return std::nullopt;
 

src/job.cpp

@@ -31,14 +31,18 @@
 
 using namespace mqss::client;
 
-nlohmann::json CircuitJobRequest::toJson() const {
-
-  return {{"circuit", mCircuit},
-          {"circuit_format", mCircuitFormat},
-          {"resource_name", mResourceName},
-          {"shots", mShots},
-          {"no_modify", mNoModify},
-          {"queued", mQueued}};
+nlohmann::json CircuitJobRequest::toJson(bool isHpc) const {
+  nlohmann::json circuit = mCircuit;
+
+  if (isHpc) {
+    circuit = nlohmann::json::array({mCircuit});
+  }
+
+  return {
+      {"circuit", std::move(circuit)},  {"circuit_format", mCircuitFormat},
+      {"resource_name", mResourceName}, {"shots", mShots},
+      {"no_modify", mNoModify},         {"queued", mQueued},
+  };
 }
 
 CircuitJobRequest::CircuitJobRequest(std::string circuit,
@@ -57,7 +61,7 @@ HamiltonianJobRequest::HamiltonianJobRequest(std::string resourceName,
       mInteractionStr(std::move(interactionStr)),
       mCoefficientsStr(std::move(coefficientsStr)) {}
 
-nlohmann::json HamiltonianJobRequest::toJson() const {
+nlohmann::json HamiltonianJobRequest::toJson(bool isHpc) const {
 
   return {{"resource_name", mResourceName},
           {"interaction_str", mInteractionStr},

src/resource.cpp

@@ -159,7 +159,9 @@ Resource::Resource(std::string name, unsigned qubitCount, bool online,
 Resource::Resource(const nlohmann::json& json) {
 
   std::string name = json.value("name", "");
-  unsigned qubitCount = json.value("qubits", 0);
+  unsigned qubitCount = json.contains("qubits") && json["qubits"].is_number()
+                            ? json["qubits"].get<unsigned>()
+                            : 0;
   bool online = json.value("online", false);
 
   std::vector<std::vector<int>> couplingMap =

tests/integration/c++/job_integration_test.cpp

@@ -29,7 +29,7 @@
 
 #define MQSS_HPC_QUEUENAME std::getenv("MQSS_HPC_QUEUENAME")
 #define MQSS_API_TOKEN std::getenv("MQSS_API_TOKEN")
-#define MQSS_API_URL "https://portal-test.quantum.lrz.de:4000/v1"
+#define MQSS_API_URL "https://portal.quantum.lrz.de:4000/v1/"
 
 struct ClientCtorParam {
   std::string token;