Refactor and enhance configurations in prompty.ts and update script m…

…odels in sample package
microsoft · Sep 4, 2024 · 2822fe4 · 2822fe4
1 parent b30095c
commit 2822fe4
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 9 deletions.
diff --git a/packages/core/src/prompty.ts b/packages/core/src/prompty.ts
@@ -22,14 +22,14 @@ export interface PromptyFrontmatter {
     outputs?: JSONSchemaObject
     model?: {
         api?: "chat" | "completion"
-        configuration?:
-            | { type?: string; name?: string; organization?: string }
-            | {
-                  type?: string
-                  api_version?: string
-                  azure_deployment: string
-                  azure_endpoint: string
-              }
+        configuration?: {
+            type?: string
+            name?: string
+            organization?: string
+            api_version?: string
+            azure_deployment: string
+            azure_endpoint: string
+        }
         parameters?: {
             response_format: "json_object"
             max_tokens?: number
@@ -83,15 +83,29 @@ export function promptyParse(text: string): PromptyDocument {
 
 export function promptyToGenAIScript(doc: PromptyDocument) {
     const { frontmatter, messages } = doc
-    const { name, description, tags, sample, inputs, outputs } = frontmatter
+    const { name, description, tags, sample, inputs, outputs, model } =
+        frontmatter
+    const {
+        api = "chat",
+        configuration,
+        parameters: modelParameters,
+    } = model ?? {}
     const parameters = inputs ? structuredClone(inputs) : undefined
     if (parameters && sample && typeof sample === "object")
         for (const p in sample) {
             const s = sample[p]
             if (s !== undefined && parameters[p].type !== "object")
                 parameters[p].default = s
         }
+
+    let modelName: string = undefined
+    if (api !== "chat") throw new Error("completion api not supported")
+    if (configuration?.azure_deployment)
+        modelName = `azure:${configuration.azure_deployment}`
+    else if (configuration?.type) modelName = `openai:${configuration.type}`
+
     const meta = deleteUndefinedValues(<PromptArgs>{
+        model: modelName,
         title: name,
         description,
         tags,

diff --git a/packages/sample/src/basic.genai.mts b/packages/sample/src/basic.genai.mts
@@ -1,4 +1,5 @@
 script({
+    model: "azure:gpt-4o",
     title: "Basic Prompt",
     description: "A basic prompt that uses the chat API to answer questions",
     parameters: {

diff --git a/packages/sample/src/chat.genai.mts b/packages/sample/src/chat.genai.mts
@@ -1,4 +1,5 @@
 script({
+    model: "azure:gpt-35-turbo",
     title: "Contoso Chat Prompt",
     description: "A retail assistent for Contoso Outdoors products retailer.",
     parameters: {