feat(cloud.ai): rework ai training routes + notebook routes (#324)

ref: MLS-1708 Rework AI Training Routes + Notebook routes Signed-off-by: Adrien Carreira <[email protected]>
ovh-ux · May 26, 2021 · 1040f41 · 1040f41
1 parent 1aa8f26
commit 1040f41
Show file tree

Hide file tree

Showing 16 changed files with 75 additions and 11 deletions.
diff --git a/...apabilities/training/feature/cloud-project-ai-capabilities-training-feature.v6.service.js b/...apabilities/training/feature/cloud-project-ai-capabilities-training-feature.v6.service.js
@@ -1,7 +1,7 @@
 angular
   .module('ovh-api-services')
   .service('OvhApiCloudProjectAiCapabilitiesTrainingFeatureV6', ($resource) => {
-    const resource = $resource('/cloud/project/:serviceName/ai/capabilities/training/feature', {
+    const resource = $resource('/cloud/project/:serviceName/ai/capabilities/feature', {
       serviceName: '@serviceName',
     });
 

diff --git a/...es/training/presetImage/cloud-project-ai-capabilities-training-preset-image.v6.service.js b/...es/training/presetImage/cloud-project-ai-capabilities-training-preset-image.v6.service.js
@@ -1,7 +1,7 @@
 angular
   .module('ovh-api-services')
   .service('OvhApiCloudProjectAiCapabilitiesTrainingPresetImageV6', ($resource) => {
-    const resource = $resource('/cloud/project/:serviceName/ai/capabilities/training/presetImage', {
+    const resource = $resource('/cloud/project/:serviceName/ai/job/capabilities/presetImage', {
       serviceName: '@serviceName',
     });
 

diff --git a/.../capabilities/training/region/cloud-project-ai-capabilities-training-region.v6.service.js b/.../capabilities/training/region/cloud-project-ai-capabilities-training-region.v6.service.js
@@ -1,7 +1,7 @@
 angular
   .module('ovh-api-services')
   .service('OvhApiCloudProjectAiCapabilitiesTrainingRegionV6', ($resource) => {
-    const resource = $resource('/cloud/project/:serviceName/ai/capabilities/training/region', {
+    const resource = $resource('/cloud/project/:serviceName/ai/capabilities/region', {
       serviceName: '@serviceName',
     });
 

diff --git a/...ities/training/region/gpu/cloud-project-ai-capabilities-training-region-gpu.v6.service.js b/...ities/training/region/gpu/cloud-project-ai-capabilities-training-region-gpu.v6.service.js
@@ -1,6 +1,6 @@
 angular
   .module('ovh-api-services')
-  .service('OvhApiCloudProjectAiCapabilitiesTrainingRegionGpuV6', ($resource) => $resource('/cloud/project/:serviceName/ai/capabilities/training/region/:region/gpu', {
+  .service('OvhApiCloudProjectAiCapabilitiesTrainingRegionGpuV6', ($resource) => $resource('/cloud/project/:serviceName/ai/capabilities/region/:region/gpu', {
     serviceName: '@serviceName',
     region: '@region',
   }));
diff --git a/...ning/region/resource/cloud-project-ai-capabilities-training-region-resource.v6.service.js b/...ning/region/resource/cloud-project-ai-capabilities-training-region-resource.v6.service.js
@@ -1,6 +1,6 @@
 angular
   .module('ovh-api-services')
-  .service('OvhApiCloudProjectAiCapabilitiesTrainingRegionResourceV6', ($resource) => $resource('/cloud/project/:serviceName/ai/capabilities/training/region/:region/resource', {
+  .service('OvhApiCloudProjectAiCapabilitiesTrainingRegionResourceV6', ($resource) => $resource('/cloud/project/:serviceName/ai/capabilities/region/:region/resource', {
     serviceName: '@serviceName',
     region: '@region',
   }));
diff --git a/src/api/cloud/project/ai/cloud-project-ai.service.js b/src/api/cloud/project/ai/cloud-project-ai.service.js
@@ -2,6 +2,7 @@ angular
   .module('ovh-api-services')
   .service('OvhApiCloudProjectAi', ($injector) => ({
     Serving: () => $injector.get('OvhApiCloudProjectAiServing'),
+    Notebook: () => $injector.get('OvhApiCloudProjectAiNotebook'),
     Capabilities: () => $injector.get('OvhApiCloudProjectAiCapabilities'),
     Training: () => $injector.get('OvhApiCloudProjectAiTraining'),
   }));
diff --git a/.../cloud/project/ai/notebook/capabilities/cloud-project-ai-notebook-capabilities.service.js b/.../cloud/project/ai/notebook/capabilities/cloud-project-ai-notebook-capabilities.service.js
@@ -0,0 +1,6 @@
+angular
+  .module('ovh-api-services')
+  .service('OvhApiCloudProjectAiNotebookCapabilities', ($injector) => ({
+    Editor: () => $injector.get('OvhApiCloudProjectAiNotebookCapabilitiesEditor'),
+    Framework: () => $injector.get('OvhApiCloudProjectAiNotebookCapabilitiesFramework'),
+  }));
diff --git a/.../ai/notebook/capabilities/editor/cloud-project-ai-notebook-capabilities-editor.service.js b/.../ai/notebook/capabilities/editor/cloud-project-ai-notebook-capabilities-editor.service.js
@@ -0,0 +1,5 @@
+angular
+  .module('ovh-api-services')
+  .service('OvhApiCloudProjectAiNotebookCapabilitiesEditor', ($injector) => ({
+    v6: () => $injector.get('OvhApiCloudProjectAiNotebookCapabilitiesEditorV6'),
+  }));
diff --git a/.../notebook/capabilities/editor/cloud-project-ai-notebook-capabilities-editor.v6.service.js b/.../notebook/capabilities/editor/cloud-project-ai-notebook-capabilities-editor.v6.service.js
@@ -0,0 +1,9 @@
+angular
+  .module('ovh-api-services')
+  .service('OvhApiCloudProjectAiNotebookCapabilitiesEditorV6', ($resource) => {
+    const resource = $resource('/cloud/project/:serviceName/ai/notebook/capabilities/editor', {
+      serviceName: '@serviceName',
+    });
+
+    return resource;
+  });
diff --git a/...tebook/capabilities/framework/cloud-project-ai-notebook-capabilities-framework.service.js b/...tebook/capabilities/framework/cloud-project-ai-notebook-capabilities-framework.service.js
@@ -0,0 +1,5 @@
+angular
+  .module('ovh-api-services')
+  .service('OvhApiCloudProjectAiNotebookCapabilitiesFramework', ($injector) => ({
+    v6: () => $injector.get('OvhApiCloudProjectAiNotebookCapabilitiesFrameworkV6'),
+  }));
diff --git a/...ook/capabilities/framework/cloud-project-ai-notebook-capabilities-framework.v6.service.js b/...ook/capabilities/framework/cloud-project-ai-notebook-capabilities-framework.v6.service.js
@@ -0,0 +1,9 @@
+angular
+  .module('ovh-api-services')
+  .service('OvhApiCloudProjectAiNotebookCapabilitiesFrameworkV6', ($resource) => {
+    const resource = $resource('/cloud/project/:serviceName/ai/notebook/capabilities/framework', {
+      serviceName: '@serviceName',
+    });
+
+    return resource;
+  });
diff --git a/src/api/cloud/project/ai/notebook/cloud-project-ai-notebook.service.js b/src/api/cloud/project/ai/notebook/cloud-project-ai-notebook.service.js
@@ -0,0 +1,6 @@
+angular
+  .module('ovh-api-services')
+  .service('OvhApiCloudProjectAiNotebook', ($injector) => ({
+    v6: () => $injector.get('OvhApiCloudProjectAiNotebookV6'),
+    Capabilities: () => $injector.get('OvhApiCloudProjectAiNotebookCapabilities'),
+  }));
diff --git a/src/api/cloud/project/ai/notebook/cloud-project-ai-notebook.v6.service.js b/src/api/cloud/project/ai/notebook/cloud-project-ai-notebook.v6.service.js
@@ -0,0 +1,19 @@
+angular
+  .module('ovh-api-services')
+  .service('OvhApiCloudProjectAiNotebookV6', ($resource) => $resource('/cloud/project/:serviceName/ai/notebook/:notebookId', {
+    serviceName: '@serviceName',
+    notebookId: '@notebookId',
+  }, {
+    start: {
+      method: 'PUT',
+      url: '/cloud/project/:serviceName/ai/notebook/:notebookId/start',
+    },
+    stop: {
+      method: 'PUT',
+      url: '/cloud/project/:serviceName/ai/notebook/:notebookId/stop',
+    },
+    log: {
+      method: 'GET',
+      url: '/cloud/project/:serviceName/ai/notebook/:notebookId/log',
+    },
+  }));
diff --git a/...d/project/ai/training/authorization/cloud-project-ai-training-authorization.v6.service.js b/...d/project/ai/training/authorization/cloud-project-ai-training-authorization.v6.service.js
@@ -1,6 +1,6 @@
 angular
   .module('ovh-api-services')
-  .service('OvhApiCloudProjectAiTrainingAuthorizationV6', ($resource) => $resource('/cloud/project/:serviceName/ai/training/authorization', {
+  .service('OvhApiCloudProjectAiTrainingAuthorizationV6', ($resource) => $resource('/cloud/project/:serviceName/ai/authorization', {
     serviceName: '@serviceName',
   }, {
     save: {

diff --git a/src/api/cloud/project/ai/training/job/cloud-project-ai-training-job.v6.service.js b/src/api/cloud/project/ai/training/job/cloud-project-ai-training-job.v6.service.js
@@ -1,15 +1,19 @@
 angular
   .module('ovh-api-services')
-  .service('OvhApiCloudProjectAiTrainingJobV6', ($resource) => $resource('/cloud/project/:serviceName/ai/training/job/:jobId', {
+  .service('OvhApiCloudProjectAiTrainingJobV6', ($resource) => $resource('/cloud/project/:serviceName/ai/job/:jobId', {
     serviceName: '@serviceName',
     jobId: '@jobId',
   }, {
     kill: {
-      method: 'POST',
-      url: '/cloud/project/:serviceName/ai/training/job/:jobId/kill',
+      method: 'PUT',
+      url: '/cloud/project/:serviceName/ai/job/:jobId/kill',
     },
     logs: {
       method: 'GET',
-      url: '/cloud/project/:serviceName/ai/training/job/:jobId/logs',
+      url: '/cloud/project/:serviceName/ai/job/:jobId/logs',
+    },
+    log: {
+      method: 'GET',
+      url: '/cloud/project/:serviceName/ai/job/:jobId/log',
     },
   }));
diff --git a/src/api/cloud/project/ai/training/registry/cloud-project-ai-training-registry.v6.service.js b/src/api/cloud/project/ai/training/registry/cloud-project-ai-training-registry.v6.service.js
@@ -1,6 +1,6 @@
 angular
   .module('ovh-api-services')
-  .service('OvhApiCloudProjectAiTrainingRegistryV6', ($resource) => $resource('/cloud/project/:serviceName/ai/training/registry/:registryId', {
+  .service('OvhApiCloudProjectAiTrainingRegistryV6', ($resource) => $resource('/cloud/project/:serviceName/ai/registry/:registryId', {
     serviceName: '@serviceName',
     registryId: '@registryId',
   }));