Skip to content

Commit

Permalink
Revert "Kaito Deployment & UX Updates (#963)" (#990)
Browse files Browse the repository at this point in the history 
This reverts commit 5517b1f.
  • Loading branch information
@Tatsinnit
Tatsinnit authored Oct 14, 2024
1 parent 5517b1f commit 9e92e4a
Show file tree
Hide file tree
Showing 24 changed files with 194 additions and 1,598 deletions.
2 changes: 0 additions & 2 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 2 additions & 15 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -312,10 +312,6 @@
"command": "aks.aksKaitoGenerateYaml",
"title": "Create Kaito Workspace"
},
{
"command": "aks.aksKaitoCreateCRD",
"title": "Create Kaito Workspace"
},
{
"command": "aks.aksKaito",
"title": "Install Kaito"
Expand Down Expand Up @@ -417,11 +413,6 @@
"submenu": "aks.networkTroubleshootingSubMenu",
"when": "view == kubernetes.cloudExplorer && viewItem =~ /aks\\.cluster/i",
"group": "9@3"
},
{
"submenu": "aks.kaitoInstallSubMenu",
"when": "view == kubernetes.cloudExplorer && viewItem =~ /aks\\.cluster/i",
"group": "9@3"
}
],
"aks.createClusterSubMenu": [
Expand All @@ -436,11 +427,11 @@
],
"aks.kaitoInstallSubMenu": [
{
"command": "aks.aksKaito",
"command": "aks.aksKaitoGenerateYaml",
"group": "navigation"
},
{
"command": "aks.aksKaitoCreateCRD",
"command": "aks.aksKaito",
"group": "navigation"
}
],
Expand Down Expand Up @@ -543,10 +534,6 @@
{
"id": "aks.networkTroubleshootingSubMenu",
"label": "Troubleshoot Network Health"
},
{
"id": "aks.kaitoInstallSubMenu",
"label": "Deploy a LLM with KAITO (Beta)"
}
]
},
Expand Down
120 changes: 60 additions & 60 deletions resources/kaitollmconfig/kaitollmconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
"falcon-40b"
],
"llama2": [
"llama-2-7b",
"llama-2-13b",
"llama-2-70b"
"llama2-7b",
"llama2-13b",
"llama2-70b"
],
"llama2chat": [
"llama-2-7b-chat",
"llama-2-13b-chat",
"llama-2-70b-chat"
"llma2chat": [
"llama2-7b-chat",
"llama2-13b-chat",
"llama2-70b-chat"
],
"mistral": [
"mistral-7b-instruct",
Expand All @@ -36,121 +36,121 @@
{
"family": "falcon",
"modelName": "falcon-7b-instruct",
"kaitoVersion": "v0.0.1+",
"kaitoVersion": "1.0",
"minimumGpu": "Standard_NC12s_v3",
"modelSource": "https://huggingface.co/tiiuae/falcon-7b-instruct"
"modelSource": "https://huggingface.co/tiiuae/falcon-7b-instruct/commit/cf4b3c42ce2fdfe24f753f0f0d179202fea59c99"
},
{
"family": "falcon",
"modelName": "falcon-7b",
"kaitoVersion": "v0.0.1+",
"kaitoVersion": "1.0",
"minimumGpu": "Standard_NC12s_v3",
"modelSource": "https://huggingface.co/tiiuae/falcon-7b"
"modelSource": "https://huggingface.co/tiiuae/falcon-7b/commit/898df1396f35e447d5fe44e0a3ccaaaa69f30d36"
},
{
"family": "falcon",
"modelName": "falcon-40b-instruct",
"kaitoVersion": "v0.0.1+",
"minimumGpu": "Standard_NC96ads_A100_v4",
"modelSource": "https://huggingface.co/tiiuae/falcon-40b-instruct"
"kaitoVersion": "1.0",
"minimumGpu": "Standard_NC12s_v3",
"modelSource": "https://huggingface.co/tiiuae/falcon-40b-instruct/commit/ecb78d97ac356d098e79f0db222c9ce7c5d9ee5f"
},
{
"family": "falcon",
"modelName": "falcon-40b",
"kaitoVersion": "v0.0.1+",
"minimumGpu": "Standard_NC96ads_A100_v4",
"modelSource": "https://huggingface.co/tiiuae/falcon-40b"
"kaitoVersion": "1.0",
"minimumGpu": "Standard_NC12s_v3",
"modelSource": "https://huggingface.co/tiiuae/falcon-40b/commit/4a70170c215b36a3cce4b4253f6d0612bb7d4146"
},
{
"family": "llama2",
"modelName": "llama-2-7b",
"kaitoVersion": "v0.0.1+",
"modelName": "llama2-7b",
"kaitoVersion": "1.0",
"minimumGpu": "Standard_NC12s_v3",
"modelSource": "https://huggingface.co/meta-llama/Llama-2-7b"
"modelSource": "https://huggingface.co/meta-llama"
},
{
"family": "llama2",
"modelName": "llama-2-13b",
"kaitoVersion": "v0.0.1+",
"modelName": "llama2-13b",
"kaitoVersion": "1.0",
"minimumGpu": "Standard_NC12s_v3",
"modelSource": "https://huggingface.co/meta-llama/Llama-2-13b"
"modelSource": "https://huggingface.co/meta-llama"
},
{
"family": "llama2",
"modelName": "llama-2-70b",
"kaitoVersion": "v0.0.1+",
"minimumGpu": "Standard_NC96ads_A100_v4",
"modelSource": "https://huggingface.co/meta-llama/Llama-2-70b"
"modelName": "llama2-70b",
"kaitoVersion": "1.0",
"minimumGpu": "Standard_NC12s_v3",
"modelSource": "https://huggingface.co/meta-llama"
},
{
"family": "llama2chat",
"modelName": "llama-2-7b-chat",
"kaitoVersion": "v0.0.1+",
"family": "llma2chat",
"modelName": "llama2-7b-chat",
"kaitoVersion": "1.0",
"minimumGpu": "Standard_NC12s_v3",
"modelSource": "https://huggingface.co/meta-llama/Llama-2-7b-chat"
"modelSource": "https://huggingface.co/meta-llama"
},
{
"family": "llama2chat",
"modelName": "llama-2-13b-chat",
"kaitoVersion": "v0.0.1+",
"family": "llma2chat",
"modelName": "llama2-13b-chat",
"kaitoVersion": "1.0",
"minimumGpu": "Standard_NC12s_v3",
"modelSource": "https://huggingface.co/meta-llama/Llama-2-13b-chat"
"modelSource": "https://huggingface.co/meta-llama"
},
{
"family": "llama2chat",
"modelName": "llama-2-70b-chat",
"kaitoVersion": "v0.0.1+",
"minimumGpu": "Standard_NC96ads_A100_v4",
"modelSource": "https://huggingface.co/meta-llama/Llama-2-70b-chat"
"family": "llma2chat",
"modelName": "llama2-70b-chat",
"kaitoVersion": "1.0",
"minimumGpu": "Standard_NC12s_v3",
"modelSource": "https://huggingface.co/meta-llama"
},
{
"family": "mistral",
"modelName": "mistral-7b-instruct",
"kaitoVersion": "v0.2.0+",
"kaitoVersion": "1.0",
"minimumGpu": "Standard_NC12s_v3",
"modelSource": "https://huggingface.co/mistralai/Mistral-7B-Instruct-v0.3"
"modelSource": "https://huggingface.co/mistralai/Mistral-7B-Instruct-v0.3/commit/0417f4babd26db0b5ed07c1d0bc85658ab526ea3"
},
{
"family": "mistral",
"modelName": "mistral-7b",
"kaitoVersion": "v0.2.0+",
"kaitoVersion": "1.0",
"minimumGpu": "Standard_NC12s_v3",
"modelSource": "https://huggingface.co/mistralai/Mistral-7B-v0.3"
"modelSource": "https://huggingface.co/mistralai/Mistral-7B-v0.3/commit/c882233d224d27b727b3d9299b12a9aab9dda6f7"
},
{
"family": "phi-2",
"modelName": "phi-2",
"kaitoVersion": "v0.2.0+",
"minimumGpu": "Standard_NC6s_v3",
"modelSource": "https://huggingface.co/microsoft/phi-2"
"kaitoVersion": "1.0",
"minimumGpu": "Standard_NC12s_v3",
"modelSource": "https://huggingface.co/microsoft/phi-2/commit/b10c3eba545ad279e7208ee3a5d644566f001670"
},
{
"family": "phi-3",
"family": "phi-3",
"modelName": "phi-3-mini-4k-instruct",
"kaitoVersion": "v0.3.0+",
"minimumGpu": "Standard_NC6s_v3",
"modelSource": "https://huggingface.co/microsoft/Phi-3-mini-4k-instruct"
"kaitoVersion": "1.0",
"minimumGpu": "Standard_NC12s_v3",
"modelSource": "https://huggingface.co/microsoft/Phi-3-mini-4k-instruct/commit/d269012bea6fbe38ce7752c8940fea010eea3383"
},
{
"family": "phi-3",
"modelName": "phi-3-mini-128k-instruct",
"kaitoVersion": "v0.3.0+",
"minimumGpu": "Standard_NC6s_v3",
"modelSource": "https://huggingface.co/microsoft/Phi-3-mini-128k-instruct"
"kaitoVersion": "1.0",
"minimumGpu": "Standard_NC12s_v3",
"modelSource": "https://huggingface.co/microsoft/Phi-3-mini-128k-instruct/commit/5be6479b4bc06a081e8f4c6ece294241ccd32dec"
},
{
"family": "phi-3",
"modelName": "phi-3-medium-4k-instruct",
"kaitoVersion": "v0.3.0+",
"minimumGpu": "Standard_NC24ads_A100_v4",
"modelSource": "https://huggingface.co/microsoft/Phi-3-medium-4k-instruct"
"kaitoVersion": "1.0",
"minimumGpu": "Standard_NC12s_v3",
"modelSource": "https://huggingface.co/microsoft/Phi-3-medium-4k-instruct/commit/d194e4e74ffad5a5e193e26af25bcfc80c7f1ffc"
},
{
"family": "phi-3",
"modelName": "phi-3-medium-128k-instruct",
"kaitoVersion": "v0.3.0+",
"minimumGpu": "Standard_NC24ads_A100_v4",
"modelSource": "https://huggingface.co/microsoft/Phi-3-medium-128k-instruct"
"kaitoVersion": "1.0",
"minimumGpu": "Standard_NC12s_v3",
"modelSource": "https://huggingface.co/microsoft/Phi-3-medium-128k-instruct/commit/cae1d42b5577398fd1be9f0746052562ae552886"
}
],
"docref": "https://github.com/Azure/kaito/blob/main/presets/models/supported_models.yaml"
Expand Down
4 changes: 2 additions & 2 deletions src/commands/aksKaito/aksKaito.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,13 @@ export default async function aksKaito(_context: IActionContext, target: unknown
const cloudExplorer = await k8s.extension.cloudExplorer.v1;
const clusterExplorer = await k8s.extension.clusterExplorer.v1;
const kubectl = await k8s.extension.kubectl.v1;
const maintarget = target;

const sessionProvider = await getReadySessionProvider();
if (failed(sessionProvider)) {
vscode.window.showErrorMessage(sessionProvider.error);
return;
}

if (!cloudExplorer.available) {
vscode.window.showWarningMessage(`Cloud explorer is unavailable.`);
return;
Expand Down Expand Up @@ -78,7 +79,6 @@ export default async function aksKaito(_context: IActionContext, target: unknown
filterKaitoPodNames.succeeded ? filterKaitoPodNames.result : [],
kubectl,
kubeConfigFile.filePath,
maintarget,
);

panel.show(dataProvider);
Expand Down
87 changes: 0 additions & 87 deletions src/commands/aksKaito/aksKaitoCreateCRD.ts
View file

This file was deleted.

2 changes: 1 addition & 1 deletion src/commands/aksKaito/akskaitoGenerateYaml.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ function listKaitoSUpportedModel() {
const modelList = [
kaitoSupporterModel.modelsupported.falcon,
kaitoSupporterModel.modelsupported.llama2,
kaitoSupporterModel.modelsupported.llama2chat,
kaitoSupporterModel.modelsupported.llma2chat,
kaitoSupporterModel.modelsupported.mistral,
kaitoSupporterModel.modelsupported["phi-2"],
kaitoSupporterModel.modelsupported["phi-3"],
Expand Down
Loading

0 comments on commit 9e92e4a

Please sign in to comment.