Implement 27 and 28

Signed-off-by: David Weik <[email protected]>

Author: Criptic

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## SAS Portal Framework for SAS Viya v1.2.2
+
+- Fix: Prompt Builder now prevents the creation of scoring files with invalid Python package names
+- Add: validate-python-package-name utility function
+- Change: For variables in a manifested prompt auto trimming was added to remove leading and trailing blanks
+
 ## SAS Portal Framework for SAS Viya v1.2.1
 
 - Fix: The SCR Module Scorer object had a bug where it would parse a string beginning with a number as a number and remove the text

index.html

@@ -114,6 +114,7 @@
         <script src="./js/utility/get-formatted-datetime.js"></script>
         <script src="./js/utility/copy-file.js"></script>
         <script src="./js/utility/copy-report.js"></script>
+        <script src="./js/utility/validate-pyhton-package-name.js"></script>
 
         <!-- Import Object Builder -->
         <script src="./js/objects/add-text-objects.js"></script>

js/objects/add-prompt-builder.js

@@ -940,7 +940,7 @@ async function addPromptBuilderObject(promptBuilderObject, paneID, promptBuilder
                 }
                 scoreCodeInput += promptInputs[i].name;
                 if (promptInputs[i].name !== 'API_KEY') {
-                    scoreCodeUserPrompt += `${promptInputs[i].name}: {${promptInputs[i].name}}`
+                    scoreCodeUserPrompt += `${promptInputs[i].name}: {str(${promptInputs[i].name}).strip()}`
                 }
             }
             // Create the options string for the score code
@@ -991,9 +991,10 @@ async function addPromptBuilderObject(promptBuilderObject, paneID, promptBuilder
             for(let i = 0; i < modelVariables.length; i++) {
                 deleteModelVariable(window.VIYA, promptExperimentRunModel, modelVariables[i].id);
             }
+            let validatedModelName = validateAndCorrectPackageName(promptExperimentRunModelName);
             let manifestPromptInputResponseObject = await createModelContent(VIYA, promptExperimentRunModel, promptInputs, 'inputVar.json', 'inputVariables');
             let manifestPromptOutputResponseObject = await createModelContent(VIYA, promptExperimentRunModel, outputVars, 'outputVar.json', 'outputVariables');
-            let manifestPromptScoreCodeResponseObject = await createModelContent(VIYA, promptExperimentRunModel, mainfestPromptScoreCodeBlob, `${promptExperimentRunModelName}.py`, 'score', 'text/x-python');
+            let manifestPromptScoreCodeResponseObject = await createModelContent(VIYA, promptExperimentRunModel, mainfestPromptScoreCodeBlob, `${validatedModelName.correctedName}.py`, 'score', 'text/x-python');
         } else {
             promptExperimentResultTargetContainer.innerText = `${promptBuilderInterfaceText?.promptBuilderCreateModelNoBestPrompt}`
         }

js/utility/validate-pyhton-package-name.js

@@ -0,0 +1,31 @@
+/**
+ * A function that checks a string for being a valid Python package name:
+ * - https://peps.python.org/pep-0508/
+ * - https://peps.python.org/pep-0008/
+ * @param {String} name - Potential name of the variable
+ * @returns {Object} - has two attributes isValid {Boolean} and correctedName {String}
+ */
+function validateAndCorrectPackageName(inputString) {
+  // Convert to lowercase and replace invalid characters with hyphens
+  let correctedName = inputString.toLowerCase().replace(/[^a-z0-9-]/g, '-');
+
+  // Remove leading/trailing and consecutive hyphens
+  correctedName = correctedName.replace(/^-+|-+$/g, '').replace(/-{2,}/g, '-');
+
+  // Determine if the original input was already valid
+  const isValid = inputString === correctedName;
+
+  // Handle edge case of an empty corrected name
+  if (correctedName === '') {
+    return {
+      isValid: false,
+      correctedName: 'invalid-package-name'
+    };
+  }
+
+  // 5. Return the result object
+  return {
+    isValid: isValid,
+    correctedName: correctedName
+  };
+}