Merge branch 'data-folder' into trace-decorator

# Conflicts:
#	client/qiskit_serverless/core/files.py

client/qiskit_serverless/core/clients/serverless_client.py

@@ -426,9 +426,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, function: QiskitFunction, provider: Optional[str] = None

client/qiskit_serverless/core/files.py

@@ -199,12 +199,40 @@ def provider_list(self, function: QiskitFunction) -> List[str]:
         return response_data.get("results", [])
 
     @_trace
-    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,"""
         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", "")
+
+    @_trace
+    def provider_delete(
+        self, file: str, function: QiskitFunction, provider: str
+    ) -> Optional[str]:
+        """Deletes file uploaded or produced by the programs,"""
+        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",