Run refactorization

client/quantum_serverless/core/job.py

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

gateway/api/serializers.py

@@ -50,7 +50,7 @@ def update(self, instance, validated_data):
         )
         instance.entrypoint = validated_data.get("entrypoint")
         instance.dependencies = validated_data.get("dependencies", "[]")
-        instance.env_vars = validated_data.get("env_vars", "{}")
+        instance.env_vars = validated_data.get("env_vars", {})
         instance.artifact = validated_data.get("artifact")
         instance.author = validated_data.get("author")
         instance.save()
@@ -138,9 +138,9 @@ def create(self, validated_data):
         pass
 
 
-class RunExistingJobSerializer(serializers.ModelSerializer):
+class RunJobSerializer(serializers.ModelSerializer):
     """
-    Job serializer for the /run_existing end-point
+    Job serializer for the /run and /run_existing end-point
     """
 
     class Meta:
@@ -187,3 +187,72 @@ class RuntimeJobSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = RuntimeJob
+
+
+class RunProgramSerializer(serializers.Serializer):
+    """
+    Program serializer for the /run end-point
+    """
+
+    title = serializers.CharField(max_length=255, allow_blank=False)
+    entrypoint = serializers.CharField(max_length=255)
+    artifact = serializers.FileField(allow_empty_file=False, use_url=False)
+    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
+
+    def retrieve_one_by_title(self, title, author):
+        """
+        This method returns a Program entry if it finds an entry searching by the title, if not None
+        """
+        return (
+            Program.objects.filter(title=title, author=author)
+            .order_by("-created")
+            .first()
+        )
+
+    def create(self, validated_data):
+        pass
+
+    def update(self, instance, validated_data):
+        pass
+
+
+class RunProgramModelSerializer(serializers.ModelSerializer):
+    """
+    Program model serializer for the /run end-point
+    """
+
+    arguments = serializers.CharField(read_only=True)
+    config = serializers.CharField(read_only=True)
+
+    class Meta:
+        model = Program
+
+    def create(self, validated_data):
+        title = validated_data.get("title")
+        logger.info("Creating program [%s] with RunProgramSerializer", title)
+        env_vars = validated_data.get("env_vars")
+        if env_vars:
+            encrypted_env_vars = encrypt_env_vars(json.loads(env_vars))
+            validated_data["env_vars"] = json.dumps(encrypted_env_vars)
+        return Program.objects.create(**validated_data)
+
+    def update(self, instance, validated_data):
+        logger.info("Updating program [%s] with RunProgramSerializer", instance.title)
+        instance.entrypoint = validated_data.get("entrypoint")
+        instance.dependencies = validated_data.get("dependencies", "[]")
+        instance.env_vars = validated_data.get("env_vars", {})
+        instance.artifact = validated_data.get("artifact")
+        instance.author = validated_data.get("author")
+        instance.save()
+        return instance

gateway/api/v1/serializers.py

@@ -55,12 +55,12 @@ class Meta(serializers.JobConfigSerializer.Meta):
         ]
 
 
-class RunExistingJobSerializer(serializers.RunExistingJobSerializer):
+class RunJobSerializer(serializers.RunJobSerializer):
     """
-    RunExistingJobSerializer is used by the /run_existing end-point
+    RunJobSerializer is used by the /run and /run_existing end-points
     """
 
-    class Meta(serializers.RunExistingJobSerializer.Meta):
+    class Meta(serializers.RunJobSerializer.Meta):
         fields = ["id", "result", "status", "program", "created", "arguments"]
 
 
@@ -84,3 +84,24 @@ class RuntimeJobSerializer(serializers.RuntimeJobSerializer):
 
     class Meta(serializers.RuntimeJobSerializer.Meta):
         fields = ["job", "runtime_job"]
+
+
+class RunProgramSerializer(serializers.RunProgramSerializer):
+    """
+    RunProgram serializer is used in /run end-point
+    """
+
+
+class RunProgramModelSerializer(serializers.RunProgramModelSerializer):
+    """
+    RunProgram model serializer is used in /run end-point
+    """
+
+    class Meta(serializers.RunProgramModelSerializer.Meta):
+        fields = [
+            "title",
+            "entrypoint",
+            "artifact",
+            "dependencies",
+            "env_vars",
+        ]