MDL-66004 Fix delete_dir for server-mode

moodlemlbackend/VERSION

@@ -1 +1 @@
-2.2.0
+2.2.1

moodlemlbackend/webapp/s3.py

@@ -71,15 +71,16 @@ def get_model_dir(self, hashkey, fetch_model=False):
 
     def delete_dir(self):
 
-        s3 = boto3.client('s3')
+        s3 = boto3.resource('s3')
 
         bucketname = os.environ["MOODLE_MLBACKEND_PYTHON_S3_BUCKET_NAME"]
+        bucket = s3.Bucket(bucketname)
 
         # Objectkey will equal uniquemodelid so we delete all files matching
         # uniquemodelid/ namespace.
         objectkey = self.object_key(False)
-        for key in s3.listobjects(Bucket=bucketname, Prefix=objectkey + '/'):
-            key.delete()
+
+        bucket.objects.filter(Prefix=objectkey + '/').delete()
 
     def object_key(self, hashkey=False):
 

webapp.py

@@ -160,7 +160,7 @@ def import_model():
 @setup_base_dir(storage, False, False)
 def deletemodel():
     # All processing is delegated to delete_dir as it is file system dependant.
-    storage.delete_dir
+    storage.delete_dir()
     return 'Ok', 200