fix: deleting a model generates an error (#677)

Fixes #649 Signed-off-by: Jeff MAURY <jmaury@redhat.com>
containers · Mar 26, 2024 · 2409db5 · 2409db5
1 parent 593dd88
commit 2409db5
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/packages/backend/src/managers/modelsManager.spec.ts b/packages/backend/src/managers/modelsManager.spec.ts
@@ -380,9 +380,17 @@ test('deleteLocalModel deletes the model folder', async () => {
   await manager.deleteLocalModel('model-id-1');
   // check that the model's folder is removed from disk
   if (process.platform === 'win32') {
-    expect(rmSpy).toBeCalledWith('C:\\home\\user\\aistudio\\models\\model-id-1', { recursive: true });
+    expect(rmSpy).toBeCalledWith('C:\\home\\user\\aistudio\\models\\model-id-1', {
+      recursive: true,
+      force: true,
+      maxRetries: 3,
+    });
   } else {
-    expect(rmSpy).toBeCalledWith('/home/user/aistudio/models/model-id-1', { recursive: true });
+    expect(rmSpy).toBeCalledWith('/home/user/aistudio/models/model-id-1', {
+      recursive: true,
+      force: true,
+      maxRetries: 3,
+    });
   }
   expect(postMessageMock).toHaveBeenCalledTimes(3);
   // check that a new state is sent with the model removed
@@ -430,9 +438,17 @@ test('deleteLocalModel fails to delete the model folder', async () => {
   await manager.deleteLocalModel('model-id-1');
   // check that the model's folder is removed from disk
   if (process.platform === 'win32') {
-    expect(rmSpy).toBeCalledWith('C:\\home\\user\\aistudio\\models\\model-id-1', { recursive: true });
+    expect(rmSpy).toBeCalledWith('C:\\home\\user\\aistudio\\models\\model-id-1', {
+      recursive: true,
+      force: true,
+      maxRetries: 3,
+    });
   } else {
-    expect(rmSpy).toBeCalledWith('/home/user/aistudio/models/model-id-1', { recursive: true });
+    expect(rmSpy).toBeCalledWith('/home/user/aistudio/models/model-id-1', {
+      recursive: true,
+      force: true,
+      maxRetries: 3,
+    });
   }
   expect(postMessageMock).toHaveBeenCalledTimes(3);
   // check that a new state is sent with the model non removed

diff --git a/packages/backend/src/managers/modelsManager.ts b/packages/backend/src/managers/modelsManager.ts
@@ -159,7 +159,7 @@ export class ModelsManager implements Disposable {
       model.state = 'deleting';
       await this.sendModelsInfo();
       try {
-        await fs.promises.rm(modelDir, { recursive: true });
+        await fs.promises.rm(modelDir, { recursive: true, force: true, maxRetries: 3 });
         this.telemetry.logUsage('model.delete', { 'model.id': modelId });
         model.file = model.state = undefined;
       } catch (err: unknown) {