fix settings dialog not existing in vscode (#750)

BoundaryML · Jul 3, 2024 · c94e355 · c94e355
1 parent c3305dd
commit c94e355
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 6 deletions.
diff --git a/integ-tests/baml_src/test-files/functions/output/optional.baml b/integ-tests/baml_src/test-files/functions/output/optional.baml
@@ -16,7 +16,7 @@ class OptionalTest_ReturnType {
 } 
 
 function OptionalTest_Function(input: string) -> (OptionalTest_ReturnType?)[]
-{
+{ 
   client GPT35
   prompt #"
     Return a JSON blob with this schema: 

diff --git a/integ-tests/python/baml_client/inlinedbaml.py b/integ-tests/python/baml_client/inlinedbaml.py
@@ -54,7 +54,7 @@
     "test-files/functions/output/enum.baml": "enum EnumOutput {\n  ONE\n  TWO\n  THREE\n\n  @@alias(\"VALUE_ENUM\")\n}\n\nfunction FnEnumOutput(input: string) -> EnumOutput {\n  client GPT35\n  prompt #\"\n    Choose one of these values randomly. Before you give the answer, write out an unrelated haiku about the ocean.\n\n    {{ctx.output_format(prefix=null)}}\n  \"#\n}\n\ntest FnEnumOutput {\n  functions [FnEnumOutput]\n  args {\n    input \"example input\"\n  }\n}\n",
     "test-files/functions/output/int.baml": "   ",
     "test-files/functions/output/optional-class.baml": "class ClassOptionalOutput {\n  prop1 string\n  prop2 string\n}\n\nfunction FnClassOptionalOutput(input: string) -> ClassOptionalOutput? {\n  client GPT35\n  prompt #\"\n    Return a json blob for the following input:\n    {{input}}\n\n    {{ctx.output_format}}\n\n    JSON:\n  \"#\n}\n\n\nclass Blah {\n  prop4 string?\n}\n\nclass ClassOptionalOutput2 {\n  prop1 string?\n  prop2 string?\n  prop3 Blah?\n}\n\nfunction FnClassOptionalOutput2(input: string) -> ClassOptionalOutput2? {\n  client GPT35\n  prompt #\"\n    Return a json blob for the following input:\n    {{input}}\n\n    {{ctx.output_format}}\n\n    JSON:\n  \"#\n}\n\ntest FnClassOptionalOutput2 {\n  functions [FnClassOptionalOutput2, FnClassOptionalOutput]\n  args {\n    input \"example input\"\n  }\n}\n",
-    "test-files/functions/output/optional.baml": "class OptionalTest_Prop1 {\n  omega_a string\n  omega_b int\n}\n\nenum OptionalTest_CategoryType {\n  Aleph\n  Beta\n  Gamma\n}\n \nclass OptionalTest_ReturnType {\n  omega_1 OptionalTest_Prop1?\n  omega_2 string?\n  omega_3 (OptionalTest_CategoryType?)[]\n} \n \nfunction OptionalTest_Function(input: string) -> (OptionalTest_ReturnType?)[]\n{\n  client GPT35\n  prompt #\"\n    Return a JSON blob with this schema: \n    {{ctx.output_format}}\n\n    JSON:\n  \"#\n}\n\ntest OptionalTest_Function {\n  functions [OptionalTest_Function]\n  args {\n    input \"example input\"\n  }\n}\n",
+    "test-files/functions/output/optional.baml": "class OptionalTest_Prop1 {\n  omega_a string\n  omega_b int\n}\n\nenum OptionalTest_CategoryType {\n  Aleph\n  Beta\n  Gamma\n}\n \nclass OptionalTest_ReturnType {\n  omega_1 OptionalTest_Prop1?\n  omega_2 string?\n  omega_3 (OptionalTest_CategoryType?)[]\n} \n \nfunction OptionalTest_Function(input: string) -> (OptionalTest_ReturnType?)[]\n{ \n  client GPT35\n  prompt #\"\n    Return a JSON blob with this schema: \n    {{ctx.output_format}}\n\n    JSON:\n  \"#\n}\n\ntest OptionalTest_Function {\n  functions [OptionalTest_Function]\n  args {\n    input \"example input\"\n  }\n}\n",
     "test-files/functions/output/string-list.baml": "function FnOutputStringList(input: string) -> string[] {\n  client GPT35\n  prompt #\"\n    Return a list of strings in json format like [\"string1\", \"string2\", \"string3\"].\n\n    JSON:\n  \"#\n}\n\ntest FnOutputStringList {\n  functions [FnOutputStringList]\n  args {\n    input \"example input\"\n  }\n}\n",
     "test-files/functions/output/unions.baml": "class UnionTest_ReturnType {\n  prop1 string | bool\n  prop2 (float | bool)[]\n  prop3 (bool[] | int[])\n}\n\nfunction UnionTest_Function(input: string | bool) -> UnionTest_ReturnType {\n  client GPT35\n  prompt #\"\n    Return a JSON blob with this schema: \n    {{ctx.output_format}}\n\n    JSON:\n  \"#\n}\n\ntest UnionTest_Function {\n  functions [UnionTest_Function]\n  args {\n    input \"example input\"\n  }\n}\n",
     "test-files/functions/prompts/no-chat-messages.baml": "\n\nfunction PromptTestClaude(input: string) -> string {\n  client Claude\n  prompt #\"\n    Tell me a haiku about {{ input }}\n  \"#\n}\n\n\nfunction PromptTestStreaming(input: string) -> string {\n  client GPT35\n  prompt #\"\n    Tell me a short story about {{ input }}\n  \"#\n}\n\ntest TestName {\n  functions [PromptTestStreaming]\n  args {\n    input #\"\n      hello world\n    \"#\n  }\n}\n",

diff --git a/integ-tests/ruby/baml_client/inlined.rb b/integ-tests/ruby/baml_client/inlined.rb
@@ -54,7 +54,7 @@ module Inlined
         "test-files/functions/output/enum.baml" => "enum EnumOutput {\n  ONE\n  TWO\n  THREE\n\n  @@alias(\"VALUE_ENUM\")\n}\n\nfunction FnEnumOutput(input: string) -> EnumOutput {\n  client GPT35\n  prompt #\"\n    Choose one of these values randomly. Before you give the answer, write out an unrelated haiku about the ocean.\n\n    {{ctx.output_format(prefix=null)}}\n  \"#\n}\n\ntest FnEnumOutput {\n  functions [FnEnumOutput]\n  args {\n    input \"example input\"\n  }\n}\n",
         "test-files/functions/output/int.baml" => "   ",
         "test-files/functions/output/optional-class.baml" => "class ClassOptionalOutput {\n  prop1 string\n  prop2 string\n}\n\nfunction FnClassOptionalOutput(input: string) -> ClassOptionalOutput? {\n  client GPT35\n  prompt #\"\n    Return a json blob for the following input:\n    {{input}}\n\n    {{ctx.output_format}}\n\n    JSON:\n  \"#\n}\n\n\nclass Blah {\n  prop4 string?\n}\n\nclass ClassOptionalOutput2 {\n  prop1 string?\n  prop2 string?\n  prop3 Blah?\n}\n\nfunction FnClassOptionalOutput2(input: string) -> ClassOptionalOutput2? {\n  client GPT35\n  prompt #\"\n    Return a json blob for the following input:\n    {{input}}\n\n    {{ctx.output_format}}\n\n    JSON:\n  \"#\n}\n\ntest FnClassOptionalOutput2 {\n  functions [FnClassOptionalOutput2, FnClassOptionalOutput]\n  args {\n    input \"example input\"\n  }\n}\n",
-        "test-files/functions/output/optional.baml" => "class OptionalTest_Prop1 {\n  omega_a string\n  omega_b int\n}\n\nenum OptionalTest_CategoryType {\n  Aleph\n  Beta\n  Gamma\n}\n \nclass OptionalTest_ReturnType {\n  omega_1 OptionalTest_Prop1?\n  omega_2 string?\n  omega_3 (OptionalTest_CategoryType?)[]\n} \n \nfunction OptionalTest_Function(input: string) -> (OptionalTest_ReturnType?)[]\n{\n  client GPT35\n  prompt #\"\n    Return a JSON blob with this schema: \n    {{ctx.output_format}}\n\n    JSON:\n  \"#\n}\n\ntest OptionalTest_Function {\n  functions [OptionalTest_Function]\n  args {\n    input \"example input\"\n  }\n}\n",
+        "test-files/functions/output/optional.baml" => "class OptionalTest_Prop1 {\n  omega_a string\n  omega_b int\n}\n\nenum OptionalTest_CategoryType {\n  Aleph\n  Beta\n  Gamma\n}\n \nclass OptionalTest_ReturnType {\n  omega_1 OptionalTest_Prop1?\n  omega_2 string?\n  omega_3 (OptionalTest_CategoryType?)[]\n} \n \nfunction OptionalTest_Function(input: string) -> (OptionalTest_ReturnType?)[]\n{ \n  client GPT35\n  prompt #\"\n    Return a JSON blob with this schema: \n    {{ctx.output_format}}\n\n    JSON:\n  \"#\n}\n\ntest OptionalTest_Function {\n  functions [OptionalTest_Function]\n  args {\n    input \"example input\"\n  }\n}\n",
         "test-files/functions/output/string-list.baml" => "function FnOutputStringList(input: string) -> string[] {\n  client GPT35\n  prompt #\"\n    Return a list of strings in json format like [\"string1\", \"string2\", \"string3\"].\n\n    JSON:\n  \"#\n}\n\ntest FnOutputStringList {\n  functions [FnOutputStringList]\n  args {\n    input \"example input\"\n  }\n}\n",
         "test-files/functions/output/unions.baml" => "class UnionTest_ReturnType {\n  prop1 string | bool\n  prop2 (float | bool)[]\n  prop3 (bool[] | int[])\n}\n\nfunction UnionTest_Function(input: string | bool) -> UnionTest_ReturnType {\n  client GPT35\n  prompt #\"\n    Return a JSON blob with this schema: \n    {{ctx.output_format}}\n\n    JSON:\n  \"#\n}\n\ntest UnionTest_Function {\n  functions [UnionTest_Function]\n  args {\n    input \"example input\"\n  }\n}\n",
         "test-files/functions/prompts/no-chat-messages.baml" => "\n\nfunction PromptTestClaude(input: string) -> string {\n  client Claude\n  prompt #\"\n    Tell me a haiku about {{ input }}\n  \"#\n}\n\n\nfunction PromptTestStreaming(input: string) -> string {\n  client GPT35\n  prompt #\"\n    Tell me a short story about {{ input }}\n  \"#\n}\n\ntest TestName {\n  functions [PromptTestStreaming]\n  args {\n    input #\"\n      hello world\n    \"#\n  }\n}\n",

diff --git a/integ-tests/typescript/baml_client/inlinedbaml.ts b/integ-tests/typescript/baml_client/inlinedbaml.ts
@@ -55,7 +55,7 @@ const fileMap = {
   "test-files/functions/output/enum.baml": "enum EnumOutput {\n  ONE\n  TWO\n  THREE\n\n  @@alias(\"VALUE_ENUM\")\n}\n\nfunction FnEnumOutput(input: string) -> EnumOutput {\n  client GPT35\n  prompt #\"\n    Choose one of these values randomly. Before you give the answer, write out an unrelated haiku about the ocean.\n\n    {{ctx.output_format(prefix=null)}}\n  \"#\n}\n\ntest FnEnumOutput {\n  functions [FnEnumOutput]\n  args {\n    input \"example input\"\n  }\n}\n",
   "test-files/functions/output/int.baml": "   ",
   "test-files/functions/output/optional-class.baml": "class ClassOptionalOutput {\n  prop1 string\n  prop2 string\n}\n\nfunction FnClassOptionalOutput(input: string) -> ClassOptionalOutput? {\n  client GPT35\n  prompt #\"\n    Return a json blob for the following input:\n    {{input}}\n\n    {{ctx.output_format}}\n\n    JSON:\n  \"#\n}\n\n\nclass Blah {\n  prop4 string?\n}\n\nclass ClassOptionalOutput2 {\n  prop1 string?\n  prop2 string?\n  prop3 Blah?\n}\n\nfunction FnClassOptionalOutput2(input: string) -> ClassOptionalOutput2? {\n  client GPT35\n  prompt #\"\n    Return a json blob for the following input:\n    {{input}}\n\n    {{ctx.output_format}}\n\n    JSON:\n  \"#\n}\n\ntest FnClassOptionalOutput2 {\n  functions [FnClassOptionalOutput2, FnClassOptionalOutput]\n  args {\n    input \"example input\"\n  }\n}\n",
-  "test-files/functions/output/optional.baml": "class OptionalTest_Prop1 {\n  omega_a string\n  omega_b int\n}\n\nenum OptionalTest_CategoryType {\n  Aleph\n  Beta\n  Gamma\n}\n \nclass OptionalTest_ReturnType {\n  omega_1 OptionalTest_Prop1?\n  omega_2 string?\n  omega_3 (OptionalTest_CategoryType?)[]\n} \n \nfunction OptionalTest_Function(input: string) -> (OptionalTest_ReturnType?)[]\n{\n  client GPT35\n  prompt #\"\n    Return a JSON blob with this schema: \n    {{ctx.output_format}}\n\n    JSON:\n  \"#\n}\n\ntest OptionalTest_Function {\n  functions [OptionalTest_Function]\n  args {\n    input \"example input\"\n  }\n}\n",
+  "test-files/functions/output/optional.baml": "class OptionalTest_Prop1 {\n  omega_a string\n  omega_b int\n}\n\nenum OptionalTest_CategoryType {\n  Aleph\n  Beta\n  Gamma\n}\n \nclass OptionalTest_ReturnType {\n  omega_1 OptionalTest_Prop1?\n  omega_2 string?\n  omega_3 (OptionalTest_CategoryType?)[]\n} \n \nfunction OptionalTest_Function(input: string) -> (OptionalTest_ReturnType?)[]\n{ \n  client GPT35\n  prompt #\"\n    Return a JSON blob with this schema: \n    {{ctx.output_format}}\n\n    JSON:\n  \"#\n}\n\ntest OptionalTest_Function {\n  functions [OptionalTest_Function]\n  args {\n    input \"example input\"\n  }\n}\n",
   "test-files/functions/output/string-list.baml": "function FnOutputStringList(input: string) -> string[] {\n  client GPT35\n  prompt #\"\n    Return a list of strings in json format like [\"string1\", \"string2\", \"string3\"].\n\n    JSON:\n  \"#\n}\n\ntest FnOutputStringList {\n  functions [FnOutputStringList]\n  args {\n    input \"example input\"\n  }\n}\n",
   "test-files/functions/output/unions.baml": "class UnionTest_ReturnType {\n  prop1 string | bool\n  prop2 (float | bool)[]\n  prop3 (bool[] | int[])\n}\n\nfunction UnionTest_Function(input: string | bool) -> UnionTest_ReturnType {\n  client GPT35\n  prompt #\"\n    Return a JSON blob with this schema: \n    {{ctx.output_format}}\n\n    JSON:\n  \"#\n}\n\ntest UnionTest_Function {\n  functions [UnionTest_Function]\n  args {\n    input \"example input\"\n  }\n}\n",
   "test-files/functions/prompts/no-chat-messages.baml": "\n\nfunction PromptTestClaude(input: string) -> string {\n  client Claude\n  prompt #\"\n    Tell me a haiku about {{ input }}\n  \"#\n}\n\n\nfunction PromptTestStreaming(input: string) -> string {\n  client GPT35\n  prompt #\"\n    Tell me a short story about {{ input }}\n  \"#\n}\n\ntest TestName {\n  functions [PromptTestStreaming]\n  args {\n    input #\"\n      hello world\n    \"#\n  }\n}\n",

diff --git a/typescript/playground-common/src/shared/SettingsDialog.tsx b/typescript/playground-common/src/shared/SettingsDialog.tsx
@@ -181,7 +181,7 @@ export const ShowSettingsButton: React.FC<{ iconClassName: string }> = ({ iconCl
 
   const button = (
     <Button
-      className='relative h-fit px-2 py-1 bg-transparent text-vscode-button-foreground hover:bg-vscode-button-hoverBackground'
+      className='relative px-2 py-1 bg-transparent h-fit text-vscode-button-foreground hover:bg-vscode-button-hoverBackground'
       onClick={() => setShowSettings(true)}
     >
       <SettingsIcon className='w-4' /> Env Vars

diff --git a/typescript/vscode-ext/packages/package.json b/typescript/vscode-ext/packages/package.json
@@ -2,7 +2,7 @@
   "name": "baml-extension",
   "displayName": "Baml",
   "description": "BAML is a DSL for AI applications.",
-  "version": "0.46.0",
+  "version": "0.46.1",
   "publisher": "Boundary",
   "repository": "https://github.com/BoundaryML/baml",
   "homepage": "https://www.boundaryml.com",

diff --git a/typescript/vscode-ext/packages/web-panel/src/App.tsx b/typescript/vscode-ext/packages/web-panel/src/App.tsx
@@ -29,6 +29,7 @@ function App() {
               <Separator className='bg-vscode-textSeparator-foreground' />
               <FunctionPanel />
             </div>
+            <SettingsDialog />
           </AppStateProvider>{' '}
         </EventListener>
       </Suspense>