Fix some issues related "config"

client/qiskit_serverless/core/job.py

@@ -427,11 +427,11 @@ def run(  # pylint: disable=too-many-locals
                     "arguments": json.dumps(arguments or {}, cls=QiskitObjectsEncoder),
                     "dependencies": json.dumps(program.dependencies or []),
                     "env_vars": json.dumps(program.env_vars or {}),
-                }
+                }  # type: Dict[str, Any]
                 if config:
-                    data["config"] = json.dumps(asdict(config))
+                    data["config"] = asdict(config)
                 else:
-                    data["config"] = "{}"
+                    data["config"] = asdict(Configuration())
 
                 response_data = safe_json_request(
                     request=lambda: requests.post(
@@ -499,7 +499,7 @@ def run_existing(
             if config:
                 data["config"] = asdict(config)
             else:
-                data["config"] = {}
+                data["config"] = asdict(Configuration())
 
             response_data = safe_json_request(
                 request=lambda: requests.post(

gateway/api/serializers.py

@@ -206,15 +206,7 @@ class RunProgramSerializer(serializers.Serializer):
     dependencies = serializers.CharField(allow_blank=False)
     arguments = serializers.CharField(allow_blank=False)
     env_vars = serializers.CharField(allow_blank=False)
-    config = serializers.CharField(allow_blank=False)
-
-    def to_representation(self, instance):
-        """
-        Transforms string `config` to JSON
-        """
-        representation = super().to_representation(instance)
-        representation["config"] = json.loads(representation["config"])
-        return representation
+    config = serializers.DictField()
 
     def retrieve_one_by_title(self, title, author):
         """
@@ -239,7 +231,7 @@ class RunProgramModelSerializer(serializers.ModelSerializer):
     """
 
     arguments = serializers.CharField(read_only=True)
-    config = serializers.CharField(read_only=True)
+    config = serializers.JSONField(read_only=True)
 
     class Meta:
         model = Program

gateway/requirements.txt

@@ -1,3 +1,4 @@
+cryptography>=42.0.5
 djangorestframework>=3.14.0
 django-allauth>=0.61.1
 django-allow-cidr>=0.7.1

gateway/tests/api/test_v1_program.py

@@ -71,47 +71,6 @@ def test_run_existing(self):
         self.assertEqual(job.config.workers, None)
         self.assertEqual(job.config.auto_scaling, True)
 
-    def test_run(self):
-        """Tests run authorized."""
-
-        fake_file = ContentFile(b"print('Hello World')")
-        fake_file.name = "test_run.tar"
-
-        user = models.User.objects.get(username="test_user")
-        self.client.force_authenticate(user=user)
-
-        arguments = json.dumps({"MY_ARGUMENT_KEY": "MY_ARGUMENT_VALUE"})
-        env_vars = json.dumps({"MY_ENV_VAR_KEY": "MY_ENV_VAR_VALUE"})
-        programs_response = self.client.post(
-            "/api/v1/programs/run/",
-            data={
-                "title": "Program",
-                "entrypoint": "program.py",
-                "arguments": arguments,
-                "dependencies": "[]",
-                "env_vars": env_vars,
-                "config": json.dumps(
-                    {
-                        "workers": None,
-                        "min_workers": 1,
-                        "max_workers": 5,
-                        "auto_scaling": True,
-                    }
-                ),
-                "artifact": fake_file,
-            },
-        )
-        job_id = programs_response.data.get("id")
-        job = Job.objects.get(id=job_id)
-        self.assertEqual(job.status, Job.QUEUED)
-        self.assertEqual(job.arguments, arguments)
-        self.assertEqual(job.program.dependencies, "[]")
-        self.assertEqual(job.program.env_vars, env_vars)
-        self.assertEqual(job.config.min_workers, 1)
-        self.assertEqual(job.config.max_workers, 5)
-        self.assertEqual(job.config.workers, None)
-        self.assertEqual(job.config.auto_scaling, True)
-
     def test_runtime_job(self):
         """Tests run existing authorized."""
 

gateway/tests/api/test_v1_serializers.py

@@ -254,7 +254,7 @@ def test_run_program_serializer_fails_at_validation(self):
         self.assertFalse(serializer.is_valid())
         errors = serializer.errors
         self.assertListEqual(
-            ["dependencies", "arguments", "env_vars", "config"], list(errors.keys())
+            ["dependencies", "arguments", "env_vars"], list(errors.keys())
         )
 
     def test_run_program_serializer_config_json(self):
@@ -282,7 +282,7 @@ def test_run_program_serializer_config_json(self):
             "dependencies": "[]",
             "arguments": "{}",
             "env_vars": "{}",
-            "config": json.dumps(assert_json),
+            "config": assert_json,
         }
         data["artifact"] = upload_file