Refactor code formatting and enhance script generation with template …

…handling in prompty.ts
microsoft · Sep 4, 2024 · b30095c · b30095c
1 parent af3bde9
commit b30095c
Show file tree

Hide file tree

Showing 2 changed files with 72 additions and 17 deletions.
diff --git a/packages/core/src/prompty.ts b/packages/core/src/prompty.ts
@@ -20,6 +20,23 @@ export interface PromptyFrontmatter {
         | JSONSchemaObject
     >
     outputs?: JSONSchemaObject
+    model?: {
+        api?: "chat" | "completion"
+        configuration?:
+            | { type?: string; name?: string; organization?: string }
+            | {
+                  type?: string
+                  api_version?: string
+                  azure_deployment: string
+                  azure_endpoint: string
+              }
+        parameters?: {
+            response_format: "json_object"
+            max_tokens?: number
+            temperature?: number
+            top_p?: number
+        }
+    }
 }
 
 export interface PromptyDocument {
@@ -89,10 +106,36 @@ export function promptyToGenAIScript(doc: PromptyDocument) {
     }
     src += messages
         .map((m) => {
-            const text = String(m.content).replace(
-                /\{\{([^\}]+)\}\}/g,
-                (m, name) => "${env.vars." + name + "}"
-            )
+            const text = String(m.content)
+                .replace(
+                    /\{\{([^\}]+)\}\}/g,
+                    (m, name) => "${env.vars." + name + "}"
+                )
+                .replace(
+                    /\{%\s*for\s+(\w+)\s+in\s+([a-zA-Z0-9\.]+)\s*%\}((.|\n)+?){%\s+endfor\s+%\}/gi,
+                    (_, item, col, temp: string) => {
+                        const varname = "env.vars." + item
+                        return (
+                            "${env.vars." +
+                            col +
+                            ".map(" +
+                            item +
+                            " => \n`" +
+                            temp
+                                .replace(/^\r?\n/, "")
+                                .replace(
+                                    /\$\{([a-z0-9.]+)\}/gi,
+                                    (_, v: string) =>
+                                        v.startsWith(varname)
+                                            ? "${" +
+                                              v.slice("env.vars.".length) +
+                                              "}"
+                                            : _
+                                ) +
+                            "`).join('')}"
+                        )
+                    }
+                )
             return `$\`${text}\``
         })
         .join("\n")

diff --git a/packages/sample/src/chat.genai.mts b/packages/sample/src/chat.genai.mts
@@ -32,20 +32,28 @@ and in a personable manner using markdown, the customers name and even add some
 # Documentation
 The following documentation should be used in the response. The response should specifically include the product id.
 
-{% for item in documentation %}
-catalog: ${env.vars.item.id}
-item: ${env.vars.item.title}
-content: ${env.vars.item.content}
-{% endfor %}
+${env.vars.documentation
+    .map(
+        (item) =>
+            `catalog: ${item.id}
+item: ${item.title}
+content: ${item.content}
+`
+    )
+    .join("")}
 
 Make sure to reference any documentation used in the response.
 
 # Previous Orders
 Use their orders as context to the question they are asking.
-{% for item in customer.orders %}
-name: ${env.vars.item.name}
-description: ${env.vars.item.description}
-{% endfor %} 
+${env.vars.customer.orders
+    .map(
+        (item) =>
+            `name: ${item.name}
+description: ${item.description}
+`
+    )
+    .join("")} 
 
 
 # Customer Context
@@ -60,7 +68,11 @@ Reference other items purchased specifically by name and description that
 would go well with the items found above. Be brief and concise and use appropriate emojis.
 
 
-{% for item in history %}
-${env.vars.item.role}:
-${env.vars.item.content}
-{% endfor %}`
+${env.vars.history
+    .map(
+        (item) =>
+            `${item.role}:
+${item.content}
+`
+    )
+    .join("")}`