Enhacements of JSON support. Related to issue #20

rrg92 · Oct 1, 2024 · 6c0af1d · 6c0af1d
1 parent 30a23e5
commit 6c0af1d
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/powershai/powershai.psm1 b/powershai/powershai.psm1
@@ -859,7 +859,7 @@ function Get-AiChat {
 		,#Formato da resposta 
 		 #Os formatos aceitáveis, e comportamento, devem seguir o mesmo da OpenAI: https://platform.openai.com/docs/api-reference/chat/create#chat-create-response_format
 		 #Atalhos:
-		 #	"json", equivale a {"type": "json_object"}
+		 #	"json"|"json_object", equivale a {"type": "json_object"}
 			$ResponseFormat = $null
 
 		,#Lista de tools que devem ser invocadas!
@@ -888,8 +888,8 @@ function Get-AiChat {
 	$Provider = Get-AiCurrentProvider
 	$FuncParams = $PsBoundParameters;
 
-	if($ResponseFormat -eq "json"){
-		$ResponseFormat = @{type = "json_object"}
+	if($ResponseFormat -in "json","json_object"){
+		$FuncParams.ResponseFormat = @{type = "json_object"}
 	}
 
 	if(!$model){

diff --git a/powershai/providers/google.ps1 b/powershai/providers/google.ps1
@@ -162,6 +162,12 @@ function Invoke-GoogleGenerateContent {
 	#Note que reaproveitamos o convert to openai message do provider!
 	$GoogleContent = @(ConvertTo-GoogleContentMessage $messages)
 
+	$Config = @{}
+
+	if($ResponseFormat.type -eq "json_object"){
+		$Config.responseMimeType = "application/json"
+	}
+
 	$Data = @{
 		contents = $GoogleContent.content
 		#tools = @()
@@ -170,6 +176,8 @@ function Invoke-GoogleGenerateContent {
 						@{text = $GoogleContent.SystemMessage }
 					)
 			}
+
+		generationConfig = $Config
 	}
 
 	$ReqParams = @{

diff --git a/util/TestPowershai.ps1 b/util/TestPowershai.ps1
@@ -85,6 +85,17 @@ try {
 		}
 
 		write-host "	TEMPORARY TEST PASSED";
+
+
+		# Json test!
+		$ExpectedA = Get-Random -Min 1 -Max 100;
+		$ExpectedB = [Guid]::NewGuid().Guid;
+		$prompt = @(
+			"Return an array with 5 objects"
+			"Each object must contains two props: a and b. a must contain value $ExpectedA, b must contains value $ExpectedB"
+		)
+		$JsonResult = @(iat -Json -Lines $prompt);
+		write-host "JsonOutput:`n$JsonResult";
 	}
 
 } catch {