系统变量

Fixes #211

Author: chenxizhang

code365scripts.openai/Private/Get-PromptContent.ps1

@@ -1,8 +1,11 @@
-function Get-PromptContent($prompt) {
+function Get-PromptContent {
+    param(
+        [string]$prompt,
+        [hashtable]$context
+    )
 
     # ignore error and continue
     $ErrorActionPreference = "SilentlyContinue"
-
     $type = "userinput"
     $content = $prompt
     $lib = ""
@@ -39,9 +42,34 @@ function Get-PromptContent($prompt) {
         }
     }
 
+
+
+    # system variable
+    $systemVariables = @{
+        "username"       = $env:USERNAME
+        "computername"   = $env:COMPUTERNAME
+        "os"             = $env:OS
+        "osarch"         = $env:PROCESSOR_ARCHITECTURE
+        "currentTimeutc" = [System.DateTime]::UtcNow
+        "currentTime"    = [System.DateTime]::Now
+    }
+
+    if (!$context) {
+        $context = @{}
+    }
+
+    #merge system variables with context
+    Merge-Hashtable -table1 $systemVariables -table2 $context
+    $context = $systemVariables
+    # if user provide the context, inject the data into the prompt by replace the context key with the context value
+    if ($context) {
+        foreach ($key in $context.keys) {
+            $content = $content -replace "{{$key}}", $context[$key]
+        }
+    }
     # restore error action preference
     $ErrorActionPreference = "Continue"
-    
+
     Write-Output @{
         type    = $type
         content = $content

code365scripts.openai/Public/New-ChatGPTConversation.ps1

@@ -159,34 +159,15 @@ function New-ChatGPTConversation {
         }
 
         # if prompt is not empty and it is a file, then read the file as the prompt
-        $parsedprompt = Get-PromptContent($prompt)
+        $parsedprompt = Get-PromptContent -prompt $prompt -context $context
         $prompt = $parsedprompt.content
-
-        # if user provide the context, inject the data into the prompt by replace the context key with the context value
-        if ($context) {
-            Write-Verbose ($resources.verbose_context_received -f ($context | ConvertTo-Json -Depth 10))
-            foreach ($key in $context.keys) {
-                $prompt = $prompt -replace "{{$key}}", $context[$key]
-            }
-            Write-Verbose ($resources.verbose_prompt_context_injected -f $prompt)
-        }
-
         $telemetries.Add("promptType", $parsedprompt.type)
         $telemetries.Add("promptLib", $parsedprompt.lib)
 
         # if system is not empty and it is a file, then read the file as the system prompt
-        $parsedsystem = Get-PromptContent($system)
+        $parsedsystem = Get-PromptContent -prompt $system -context $context
         $system = $parsedsystem.content
 
-        # if user provide the context, inject the data into the system prompt by replace the context key with the context value
-        if ($context) {
-            Write-Verbose ($resources.verbose_context_received -f ($context | ConvertTo-Json -Depth 10))
-            foreach ($key in $context.keys) {
-                $system = $system -replace "{{$key}}", $context[$key]
-            }
-            Write-Verbose ($resources.verbose_prompt_context_injected -f $system)
-        }
-
         $telemetries.Add("systemPromptType", $parsedsystem.type)
         $telemetries.Add("systemPromptLib", $parsedsystem.lib)
 
@@ -245,9 +226,9 @@ function New-ChatGPTConversation {
             $body = @{model = "$model"; messages = $messages }
 
             $params = @{
-                Uri         = $endpoint
-                Method      = "POST"
-                Headers     = $header
+                Uri     = $endpoint
+                Method  = "POST"
+                Headers = $header
             }
 
             if ($json) {
@@ -402,9 +383,9 @@ function New-ChatGPTConversation {
                 # TODO #174 保留消息的个数是不是可以放宽
                 $body = @{model = "$model"; messages = ($systemPrompt + $messages[-5..-1]); stream = $stream } 
                 $params = @{
-                    Uri         = $endpoint
-                    Method      = "POST"
-                    Headers     = $header
+                    Uri     = $endpoint
+                    Method  = "POST"
+                    Headers = $header
                 }
 
                 if ($json) {