merging dev to test

DSL/DMapper/training/hbs/get_models.handlebars

@@ -5,7 +5,8 @@
             "name": "{{ this.fileName }}",
             "lastTrained": "{{ this.trainedDate }}",
             "state": "{{ this.state }}",
-            "versionNumber": "{{ this.versionNumber }}"
+            "versionNumber": "{{ this.versionNumber }}",
+            "description": "{{ this.description }}"
         }{{#unless @last}},{{/unless}}
     {{/each}}
-]
+]

DSL/Liquibase/changelog/20250103092721_add_description_to_llm_trainings.sql

@@ -0,0 +1,4 @@
+-- liquibase formatted sql
+-- changeset ahmedyasser:20250103092721
+ALTER TABLE llm_trainings
+ADD COLUMN description TEXT;

DSL/Resql/training/POST/add-llm-trainings.sql

@@ -1,2 +1,2 @@
-INSERT INTO llm_trainings (model_type, state, trained_date, file_name, version_number, model_version, test_report, cross_validation_report, created, training_data_checksum)
-VALUES (:model_type, :state, TO_TIMESTAMP(:trained_date,'YYYY-MM-DD"T"HH24:MI:SS'), :file_name, :version_number , :model_version, :test_report, :cross_validation_report, CURRENT_TIMESTAMP, :training_data_checksum);
+INSERT INTO llm_trainings (model_type, state, trained_date, file_name, version_number, model_version, test_report, cross_validation_report, created, training_data_checksum, description)
+VALUES (:model_type, :state, TO_TIMESTAMP(:trained_date,'YYYY-MM-DD"T"HH24:MI:SS'), :file_name, :version_number , :model_version, :test_report, :cross_validation_report, CURRENT_TIMESTAMP, :training_data_checksum, :description);

DSL/Resql/training/POST/get-last-deployed-model.sql

@@ -1,7 +1,7 @@
-SELECT id, model_type, state, trained_date, file_name, version_number, model_version, test_report, cross_validation_report, created
+SELECT id, model_type, state, trained_date, file_name, version_number, model_version, test_report, cross_validation_report, created, description
 FROM llm_trainings
 WHERE id = (
   SELECT max(id)
   FROM llm_trainings
-  WHERE status = 'DEPLOYED'
+  WHERE state = 'DEPLOYED'
 );

DSL/Resql/training/POST/get-last-processing-model.sql

@@ -8,7 +8,8 @@ SELECT
   file_name,
   version_number,
   test_report,
-  created
+  created,
+  description
 FROM llm_trainings
 WHERE trained_date = (SELECT max(trained_date) FROM llm_trainings WHERE state = 'PROCESSING')
 LIMIT 1;

DSL/Resql/training/POST/get-latest-ready-model.sql

@@ -8,7 +8,8 @@ SELECT
   test_report,
   cross_validation_report,
   created,
-  training_data_checksum
+  training_data_checksum,
+  description
 FROM llm_trainings
 WHERE trained_date = (SELECT MAX(trained_date) FROM llm_trainings)
 AND NOT EXISTS (

DSL/Resql/training/POST/get-llm-model-by-filename.sql

@@ -1,8 +1,107 @@
-SELECT id, model_type, state, trained_date, file_name, version_number, model_version, test_report, cross_validation_report, created, training_data_checksum
-FROM llm_trainings lt
-WHERE file_name = :fileName
-AND created = (
-  SELECT MAX(created)
-  FROM llm_trainings
-  WHERE file_name LIKE :fileName
-);
+WITH max_ids AS (
+    SELECT
+        MAX(id) AS id,
+        version_number
+    FROM llm_trainings
+    GROUP BY version_number
+), deployed_model AS (
+    SELECT 
+        id,
+        model_type,
+        state,
+        trained_date,
+        file_name,
+        version_number,
+        model_version, 
+        test_report,
+        cross_validation_report,
+        created,
+        training_data_checksum,
+        description
+    FROM llm_trainings
+    WHERE state = 'DEPLOYED'
+    AND NOT EXISTS (
+        SELECT 1
+        FROM llm_trainings AS lt
+        WHERE llm_trainings.version_number = lt.version_number
+        AND lt.state = 'DELETED' 
+    )
+    ORDER BY created DESC
+    LIMIT 1
+), latest_ready_activating_models AS (
+  SELECT 
+    lt.id, lt.model_type,
+    CASE 
+        WHEN lt.state = 'ACTIVATING' THEN 'ACTIVATING'
+        WHEN lt.state = 'DELETED' THEN 'DELETED'
+        WHEN lt.file_name = '' THEN 'DELETED'
+        ELSE 'READY'
+    END AS state,
+    lt.trained_date, 
+    lt.file_name, 
+    lt.version_number, 
+    lt.model_version, 
+    lt.test_report, 
+    lt.created, 
+    lt.cross_validation_report, 
+    lt.training_data_checksum,
+    lt.description
+    FROM llm_trainings lt
+    JOIN max_ids mi ON lt.id = mi.id
+    where mi.id NOT IN (
+        SELECT id
+        FROM deployed_model
+    )
+    AND NOT EXISTS (
+        SELECT 1
+        FROM llm_trainings AS lt
+        WHERE mi.version_number = lt.version_number
+        AND lt.state = 'DELETED' 
+    )
+)
+SELECT 
+    model_type,
+    state,
+    trained_date,
+    file_name,
+    version_number,
+    model_version, 
+    test_report,
+    cross_validation_report,
+    created,
+    training_data_checksum,
+    description
+FROM (
+    SELECT 
+        model_type,
+        state,
+        trained_date,
+        file_name,
+        version_number,
+        model_version, 
+        test_report,
+        cross_validation_report,
+        created,
+        training_data_checksum,
+        description
+    FROM latest_ready_activating_models
+    UNION ALL
+    SELECT 
+        model_type,
+        state,
+        trained_date,
+        file_name,
+        version_number,
+        model_version, 
+        test_report,
+        cross_validation_report,
+        created,
+        training_data_checksum,
+        description
+    FROM deployed_model
+) AS combined_results
+WHERE state <> 'DELETED'
+AND file_name LIKE :fileName
+ORDER BY 
+    CAST(SPLIT_PART(version_number, '_', 1) AS INTEGER), 
+    CAST(SPLIT_PART(version_number, '_', 2) AS INTEGER);

DSL/Resql/training/POST/get-llm-trainings.sql

@@ -15,7 +15,8 @@ WITH max_ids AS (
         model_version, 
         test_report,
         cross_validation_report,
-        created
+        created,
+        description
     FROM llm_trainings
     WHERE state = 'DEPLOYED'
     AND NOT EXISTS (
@@ -42,7 +43,8 @@ WITH max_ids AS (
     lt.test_report, 
     lt.created, 
     lt.cross_validation_report, 
-    lt.training_data_checksum
+    lt.training_data_checksum,
+    lt.description
     FROM llm_trainings lt
     JOIN max_ids mi ON lt.id = mi.id
     where mi.id NOT IN (
@@ -65,7 +67,8 @@ SELECT
     model_version, 
     test_report,
     cross_validation_report,
-    created
+    created,
+    description
 FROM (
     SELECT 
         model_type,
@@ -76,7 +79,8 @@ FROM (
         model_version, 
         test_report,
         cross_validation_report,
-        created
+        created,
+        description
     FROM latest_ready_activating_models
     UNION ALL
     SELECT 
@@ -88,7 +92,8 @@ FROM (
         model_version, 
         test_report,
         cross_validation_report,
-        created
+        created,
+        description
     FROM deployed_model
 ) AS combined_results
 where state <> 'DELETED'

DSL/Ruuter.private/training/GET/rasa/model/add-new-model-already-trained.yml

@@ -27,6 +27,7 @@ updateInDatabase:
       cross_validation_report: ${dbModelResult.response.body[0].crossValidationReport}
       trained_date: ${dbModelResult.response.body[0].trainedDate}
       training_data_checksum: ${dbModelResult.response.body[0].trainingDataChecksum}
+      description: ${dbModelResult.response.body[0].description}
   result: dbModelResult
 
 clearModelList:

DSL/Ruuter.private/training/GET/rasa/model/add-new-model-cross-validating.yml

@@ -27,6 +27,7 @@ updateInDatabase:
       cross_validation_report: ${dbModelResult.response.body[0].crossValidationReport}
       trained_date: ${dbModelResult.response.body[0].trainedDate}
       training_data_checksum: ""
+      description: ${dbModelResult.response.body[0].description}
   result: dbModelResult
 
 clearModelList:

DSL/Ruuter.private/training/GET/rasa/model/add-new-model-error.yml

@@ -27,6 +27,7 @@ updateInDatabase:
       cross_validation_report: ${dbModelResult.response.body[0].crossValidationReport}
       trained_date: ${dbModelResult.response.body[0].trainedDate}
       training_data_checksum: ""
+      description: ${dbModelResult.response.body[0].description}
   result: dbModelResult
 
 clearModelList:

DSL/Ruuter.private/training/GET/rasa/model/add-new-model-processing.yml

@@ -52,6 +52,7 @@ updateInDatabase:
       cross_validation_report: ""
       trained_date: ${new Date().toISOString()}
       training_data_checksum: ""
+      description: ""
   result: dbResult
   next: clearModelList
 
@@ -69,6 +70,7 @@ insertToDatabase:
       cross_validation_report: ""
       trained_date: ${new Date().toISOString()}
       training_data_checksum: ""
+      description: ""
   result: dbResult
 
 clearModelList:

DSL/Ruuter.private/training/GET/rasa/model/add-new-model-testing.yml

@@ -27,6 +27,7 @@ updateInDatabase:
       cross_validation_report: ${dbModelResult.response.body[0].crossValidationReport}
       trained_date: ${dbModelResult.response.body[0].trainedDate}
       training_data_checksum: ""
+      description: ${dbModelResult.response.body[0].description}
   result: dbModelResult
 
 clearModelList:

DSL/Ruuter.private/training/POST/rasa/model/add-model-description.yml

@@ -0,0 +1,44 @@
+declaration:
+  call: declare
+  version: 0.1
+  description: "Adds a description to an existing model in the database"
+  method: post
+  accepts: json
+  returns: json
+  namespace: training
+  allowlist:
+    body:
+      - field: fileName
+        type: string
+        description: "Model file name"
+      - field: description
+        type: string
+        description: "Model description to be added"  
+
+getModelByFilenameFromDb:
+  call: http.post
+  args:
+    url: "[#TRAINING_RESQL]/get-llm-model-by-filename"
+    body:
+      fileName: ${incoming.body.fileName}
+  result: dbResult
+
+updateInDatabase:
+  call: http.post
+  args:
+    url: "[#TRAINING_RESQL]/add-llm-trainings"
+    body:
+      model_type: ${dbResult.response.body[0].modelType}
+      state: ${dbResult.response.body[0].state}
+      file_name: ${dbResult.response.body[0].fileName}
+      version_number: ${dbResult.response.body[0].versionNumber}
+      model_version: ${dbResult.response.body[0].modelVersion}
+      test_report: ${dbResult.response.body[0].testReport}
+      cross_validation_report: ${dbResult.response.body[0].crossValidationReport}
+      trained_date: ${dbResult.response.body[0].trainedDate}
+      training_data_checksum: ${dbResult.response.body[0].trainingDataChecksum}
+      description: ${incoming.body.description}
+  result: dbModelResult
+
+return_result:
+  return: "Model description added successfully"

DSL/Ruuter.private/training/POST/rasa/model/add-new-model-deployed.yml

@@ -34,6 +34,7 @@ updateInDatabase:
       cross_validation_report: ${dbResult.response.body[0].crossValidationReport}
       trained_date: ${dbResult.response.body[0].trainedDate}
       training_data_checksum: ""
+      description: ${dbResult.response.body[0].description}
   result: dbModelResult
 
 clearModelList:

DSL/Ruuter.private/training/POST/rasa/model/add-new-model-ready.yml

@@ -41,6 +41,7 @@ updateInDatabase:
       cross_validation_report: ${JSON.stringify(incoming.body.crossValidationReport)}
       trained_date: ${dbModelResult.response.body[0].trainedDate}
       training_data_checksum: ${incoming.body.trainingDataChecksum}
+      description: ${dbModelResult.response.body[0].description}
   result: dbModelResult
 
 clearModelList:

DSL/Ruuter.private/training/POST/rasa/model/trained-model.yml

@@ -37,6 +37,7 @@ updateInDatabase:
       cross_validation_report: ${dbResult.response.body[0].crossValidationReport}
       trained_date: ${dbResult.response.body[0].trainedDate}
       training_data_checksum: ""
+      description: ${dbResult.response.body[0].description}
   result: dbModelResult
 
 loadTrainedModel:

GUI/src/components/Tooltip/Tooltip.scss

@@ -3,6 +3,8 @@
 @import 'src/styles/settings/variables/typography';
 
 .tooltip {
+  white-space: pre-line;
+  word-wrap: break-word;
   background-color: get-color(white);
   padding: 4px;
   border-radius: 4px;