Client - files delete refactor

client/qiskit_serverless/core/clients/serverless_client.py

@@ -429,9 +429,15 @@ def provider_file_download(
             file, download_location, function, target_name
         )
 
-    def file_delete(self, file: str, provider: Optional[str] = None):
+    def file_delete(
+        self, file: str, function: QiskitFunction, provider: Optional[str] = None
+    ):
+        """Deletes file uploaded or produced by the programs,"""
+        return self._files_client.delete(file, function, provider)
+
+    def provider_file_delete(self, file: str, function: QiskitFunction, provider: str):
         """Deletes file uploaded or produced by the programs,"""
-        return self._files_client.delete(file, provider)
+        return self._files_client.provider_delete(file, function, provider)
 
     def file_upload(self, file: str, provider: Optional[str] = None):
         """Upload file."""

client/qiskit_serverless/core/files.py

@@ -179,14 +179,43 @@ def provider_list(self, function: QiskitFunction) -> List[str]:
             )
         return response_data.get("results", [])
 
-    def delete(self, file: str, provider: Optional[str] = None) -> Optional[str]:
+    def delete(
+        self, file: str, function: QiskitFunction, provider: Optional[str] = None
+    ) -> Optional[str]:
         """Deletes file uploaded or produced by the programs,"""
         tracer = trace.get_tracer("client.tracer")
         with tracer.start_as_current_span("files.delete"):
             response_data = safe_json_request_as_dict(
                 request=lambda: requests.delete(
                     os.path.join(self._files_url, "delete"),
-                    data={"file": file, "provider": provider},
+                    params={
+                        "file": file,
+                        "function": function.title,
+                        "provider": provider,
+                    },
+                    headers={
+                        "Authorization": f"Bearer {self._token}",
+                        "format": "json",
+                    },
+                    timeout=REQUESTS_TIMEOUT,
+                )
+            )
+        return response_data.get("message", "")
+
+    def provider_delete(
+        self, file: str, function: QiskitFunction, provider: str
+    ) -> Optional[str]:
+        """Deletes file uploaded or produced by the programs,"""
+        tracer = trace.get_tracer("client.tracer")
+        with tracer.start_as_current_span("files.provider_delete"):
+            response_data = safe_json_request_as_dict(
+                request=lambda: requests.delete(
+                    os.path.join(self._files_url, "provider", "delete"),
+                    params={
+                        "file": file,
+                        "function": function.title,
+                        "provider": provider,
+                    },
                     headers={
                         "Authorization": f"Bearer {self._token}",
                         "format": "json",

gateway/tests/fixtures/files_fixtures.json

@@ -79,6 +79,20 @@
             ]
         }
     },
+    {
+        "model": "api.program",
+        "pk": "1eecd6ff-97cb-45dc-aeda-1cf7689cb0d4",
+        "fields": {
+            "created": "2023-02-01T15:30:43.281796Z",
+            "title": "ProgramDelete",
+            "image": "icr.io/awesome-namespace/awesome-title",
+            "author": 2,
+            "provider": "bfe8aa6a-2127-4123-bf57-5b547293cbea",
+            "instances": [
+                101
+            ]
+        }
+    },
     {
         "model": "api.program",
         "pk": "5b7deef6-45e2-4142-9e31-efb9e32e3592",