From 4ddc8ed58fdf5b341029a797863ebeda1d3121cb Mon Sep 17 00:00:00 2001
From: Adam Fekete <adam@fekete.co.uk>
Date: Wed, 31 Jul 2024 09:03:19 +0000
Subject: [PATCH] Fixing ai toolkit plugin
---
default_plugins.txt | 2 +-
gui/tests/env.js | 43 ++++++++++++--------------
ops/kubernetes/nomad-prod-develop.yaml | 7 +++++
ops/kubernetes/nomad-prod.yaml | 7 +++++
4 files changed, 35 insertions(+), 24 deletions(-)
diff --git a/default_plugins.txt b/default_plugins.txt
index 5f7bd4f230..3f53a4dcee 100644
--- a/default_plugins.txt
+++ b/default_plugins.txt
@@ -1,5 +1,5 @@
git+https://github.com/FAIRmat-NFDI/nomad-perovskite-solar-cells-database.git@f394d21abafeb659729af0c94e5f90949fce01c1
git+https://github.com/FAIRmat-NFDI/nomad-porous-materials.git@795a53f35ffa52604cf7971c16cc3d4f9ce80f2f
-git+https://github.com/FAIRmat-NFDI/nomad-aitoolkit.git@70e6261c746e579ad0f177a965d16134efb50c35
+git+https://github.com/FAIRmat-NFDI/nomad-aitoolkit.git@b203f8eb28dc4b6771a39d5c5b7ad3d9d8583ac8
nomad-simulations==0.0.1
pynxtools[convert]==0.5.0
diff --git a/gui/tests/env.js b/gui/tests/env.js
index 7de352a0c5..2d4351f800 100644
--- a/gui/tests/env.js
+++ b/gui/tests/env.js
@@ -2642,10 +2642,10 @@ window.nomadEnv = {
"entry_id",
"entry_type",
"authors",
- "data.name#nomad_aitoolkit.schema.package.AIToolkitNotebook",
- "data.category#nomad_aitoolkit.schema.package.AIToolkitNotebook",
- "data.platform#nomad_aitoolkit.schema.package.AIToolkitNotebook",
- "data.date#nomad_aitoolkit.schema.package.AIToolkitNotebook"
+ "data.name#nomad_aitoolkit.schema.AIToolkitNotebook",
+ "data.category#nomad_aitoolkit.schema.AIToolkitNotebook",
+ "data.platform#nomad_aitoolkit.schema.AIToolkitNotebook",
+ "data.date#nomad_aitoolkit.schema.AIToolkitNotebook"
],
"options": {
"entry_id": {
@@ -2659,19 +2659,19 @@ window.nomadEnv = {
"label": "Authors",
"align": "left"
},
- "data.name#nomad_aitoolkit.schema.package.AIToolkitNotebook": {
+ "data.name#nomad_aitoolkit.schema.AIToolkitNotebook": {
"label": "Name",
"align": "left"
},
- "data.category#nomad_aitoolkit.schema.package.AIToolkitNotebook": {
+ "data.category#nomad_aitoolkit.schema.AIToolkitNotebook": {
"label": "Category",
"align": "left"
},
- "data.platform#nomad_aitoolkit.schema.package.AIToolkitNotebook": {
+ "data.platform#nomad_aitoolkit.schema.AIToolkitNotebook": {
"label": "Platform",
"align": "left"
},
- "data.date#nomad_aitoolkit.schema.package.AIToolkitNotebook": {
+ "data.date#nomad_aitoolkit.schema.AIToolkitNotebook": {
"label": "Last update",
"align": "left",
"format": {
@@ -2681,10 +2681,10 @@ window.nomadEnv = {
}
},
"selected": [
- "data.name#nomad_aitoolkit.schema.package.AIToolkitNotebook",
+ "data.name#nomad_aitoolkit.schema.AIToolkitNotebook",
"authors",
- "data.category#nomad_aitoolkit.schema.package.AIToolkitNotebook",
- "data.date#nomad_aitoolkit.schema.package.AIToolkitNotebook"
+ "data.category#nomad_aitoolkit.schema.AIToolkitNotebook",
+ "data.date#nomad_aitoolkit.schema.AIToolkitNotebook"
]
},
"rows": {
@@ -2726,10 +2726,7 @@ window.nomadEnv = {
},
"filters": {
"include": [
- "*#nomad_aitoolkit.schema.package.AIToolkitNotebook"
- ],
- "exclude": [
- "*#nomad.datamodel.metainfo.eln.BasicEln"
+ "*#nomad_aitoolkit.schema.AIToolkitNotebook"
]
},
"dashboard": {
@@ -2778,7 +2775,7 @@ window.nomadEnv = {
"minW": 3
}
},
- "quantity": "data.category#nomad_aitoolkit.schema.package.AIToolkitNotebook",
+ "quantity": "data.category#nomad_aitoolkit.schema.AIToolkitNotebook",
"scale": "linear",
"showinput": true
},
@@ -2827,7 +2824,7 @@ window.nomadEnv = {
"minW": 3
}
},
- "quantity": "data.methods.name#nomad_aitoolkit.schema.package.AIToolkitNotebook",
+ "quantity": "data.methods.name#nomad_aitoolkit.schema.AIToolkitNotebook",
"scale": "linear",
"showinput": true
},
@@ -2876,7 +2873,7 @@ window.nomadEnv = {
"minW": 3
}
},
- "quantity": "data.systems.name#nomad_aitoolkit.schema.package.AIToolkitNotebook",
+ "quantity": "data.systems.name#nomad_aitoolkit.schema.AIToolkitNotebook",
"scale": "linear",
"showinput": true
}
@@ -2884,13 +2881,13 @@ window.nomadEnv = {
},
"filters_locked": {
"section_defs.definition_qualified_name": [
- "nomad_aitoolkit.schema.package.AIToolkitNotebook"
+ "nomad_aitoolkit.schema.AIToolkitNotebook"
]
}
}
},
- "nomad_aitoolkit.schema:package": {
- "id": "nomad_aitoolkit.schema:package",
+ "nomad_aitoolkit:aitoolkit": {
+ "id": "nomad_aitoolkit:aitoolkit",
"entry_point_type": "schema_package",
"name": "AIToolkit",
"description": "Describes the basic schemas for AI Toolkit notebooks.",
@@ -4520,12 +4517,12 @@ window.nomadEnv = {
"documentation": null,
"entry_points": [
"nomad_aitoolkit.apps:aitoolkit",
- "nomad_aitoolkit.schema:package"
+ "nomad_aitoolkit:aitoolkit"
],
"homepage": null,
"name": "nomad_aitoolkit",
"repository": "https://github.com/FAIRmat-NFDI/nomad-aitoolkit",
- "version": "0.1.0"
+ "version": "0.1.1"
},
"nomad_porous_materials": {
"description": "NOMAD plugin for porous materials",
diff --git a/ops/kubernetes/nomad-prod-develop.yaml b/ops/kubernetes/nomad-prod-develop.yaml
index 565cf041f9..0733fd6f51 100644
--- a/ops/kubernetes/nomad-prod-develop.yaml
+++ b/ops/kubernetes/nomad-prod-develop.yaml
@@ -22,6 +22,13 @@ nomad:
north:
enabled: true
+ plugins:
+ entry_points:
+ options:
+ 'nomad_aitoolkit.apps:aitoolkit':
+ upload_ids:
+ - hHA2lM5HRy2ZN_La6TPGjg
+
image:
tag: "prod"
diff --git a/ops/kubernetes/nomad-prod.yaml b/ops/kubernetes/nomad-prod.yaml
index 4bfa0a6853..ec1606f9fe 100644
--- a/ops/kubernetes/nomad-prod.yaml
+++ b/ops/kubernetes/nomad-prod.yaml
@@ -13,6 +13,13 @@ nomad:
north:
enabled: true
+ plugins:
+ entry_points:
+ options:
+ 'nomad_aitoolkit.apps:aitoolkit':
+ upload_ids:
+ - hHA2lM5HRy2ZN_La6TPGjg
+
image:
tag: "prod"
--
GitLab