Skip to content

Commit 2dea66a

Browse files
BrentOzarBrentOzar
authored
Merge pull request #3838 from BrentOzarULTD/copilot/move-payload-template-to-aiconfig
Move Payload_Template from AIPromptConfig to AIConfig table
2 parents f26e460 + 65a4f3d commit 2dea66a

3 files changed

Lines changed: 19 additions & 19 deletions

File tree

‎Documentation/Using_AI.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ CREATE TABLE dbo.Blitz_AI_Prompts
4747
(Id INT IDENTITY(1,1) PRIMARY KEY CLUSTERED,
4848
PromptNickname NVARCHAR(200),
4949
AI_System_Prompt NVARCHAR(4000),
50-
Payload_Template NVARCHAR(4000),
5150
DefaultPrompt BIT DEFAULT 0);
5251

5352
INSERT INTO dbo.Blitz_AI_Prompts (PromptNickname, DefaultPrompt, AI_System_Prompt)
@@ -189,6 +188,7 @@ CREATE TABLE dbo.Blitz_AI_Providers
189188
AI_URL NVARCHAR(500),
190189
AI_Database_Scoped_Credential_Name NVARCHAR(500),
191190
AI_Parameters NVARCHAR(4000),
191+
Payload_Template NVARCHAR(4000),
192192
Timeout_Seconds TINYINT,
193193
Context INT,
194194
DefaultModel BIT DEFAULT 0);

‎sp_BlitzCache.sql‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -878,6 +878,7 @@ CREATE TABLE #ai_providers
878878
AI_URL NVARCHAR(500),
879879
AI_Database_Scoped_Credential_Name NVARCHAR(500),
880880
AI_Parameters NVARCHAR(4000),
881+
Payload_Template NVARCHAR(4000),
881882
Timeout_Seconds TINYINT,
882883
Context INT,
883884
DefaultModel BIT DEFAULT 0);
@@ -886,7 +887,6 @@ CREATE TABLE #ai_prompts
886887
(Id INT PRIMARY KEY CLUSTERED,
887888
PromptNickname NVARCHAR(200) INDEX IX_PromptNickname,
888889
AI_System_Prompt NVARCHAR(4000),
889-
Payload_Template NVARCHAR(4000),
890890
DefaultPrompt BIT DEFAULT 0);
891891

892892
DECLARE
@@ -913,8 +913,8 @@ END;
913913
IF @AIConfigTable IS NOT NULL
914914
BEGIN
915915
RAISERROR(N'Reading values from AI Provider Configuration Table', 0, 1) WITH NOWAIT;
916-
SET @config_sql = N'INSERT INTO #ai_providers (Id, AI_Model, AI_URL, AI_Database_Scoped_Credential_Name, AI_Parameters, Timeout_Seconds, Context, DefaultModel)
917-
SELECT Id, AI_Model, AI_URL, AI_Database_Scoped_Credential_Name, AI_Parameters, Timeout_Seconds, Context, DefaultModel FROM '
916+
SET @config_sql = N'INSERT INTO #ai_providers (Id, AI_Model, AI_URL, AI_Database_Scoped_Credential_Name, AI_Parameters, Payload_Template, Timeout_Seconds, Context, DefaultModel)
917+
SELECT Id, AI_Model, AI_URL, AI_Database_Scoped_Credential_Name, AI_Parameters, Payload_Template, Timeout_Seconds, Context, DefaultModel FROM '
918918
+ CASE WHEN @AIConfigDatabaseName IS NOT NULL THEN (QUOTENAME(@AIConfigDatabaseName) + N'.') ELSE N'' END
919919
+ CASE WHEN @AIConfigSchemaName IS NOT NULL THEN (QUOTENAME(@AIConfigSchemaName) + N'.') ELSE N'' END
920920
+ QUOTENAME(@AIConfigTableName) + N' WHERE (@AIModel IS NULL AND DefaultModel = 1) OR @AIModel = AI_Model ; ';
@@ -924,8 +924,8 @@ END;
924924
IF @AIPromptConfigTable IS NOT NULL
925925
BEGIN
926926
RAISERROR(N'Reading values from AI Prompts Table', 0, 1) WITH NOWAIT;
927-
SET @config_sql = N'INSERT INTO #ai_prompts (Id, PromptNickname, Payload_Template, AI_System_Prompt, DefaultPrompt)
928-
SELECT Id, PromptNickname, Payload_Template, AI_System_Prompt, DefaultPrompt FROM '
927+
SET @config_sql = N'INSERT INTO #ai_prompts (Id, PromptNickname, AI_System_Prompt, DefaultPrompt)
928+
SELECT Id, PromptNickname, AI_System_Prompt, DefaultPrompt FROM '
929929
+ CASE WHEN @AIPromptDatabaseName IS NOT NULL THEN (QUOTENAME(@AIPromptDatabaseName) + N'.') ELSE N'' END
930930
+ CASE WHEN @AIPromptSchemaName IS NOT NULL THEN (QUOTENAME(@AIPromptSchemaName) + N'.') ELSE N'' END
931931
+ QUOTENAME(@AIPromptTableName) + N' WHERE (@AIPrompt IS NULL AND DefaultPrompt = 1) OR @AIPrompt = PromptNickname ; ';
@@ -959,6 +959,7 @@ IF @AI > 0
959959
SELECT TOP 1 @AIModel = AI_Model, @AIURL = AI_URL,
960960
@AICredential = AI_Database_Scoped_Credential_Name,
961961
@AIParameters = AI_Parameters,
962+
@AIPayloadTemplate = Payload_Template,
962963
@AITimeoutSeconds = COALESCE(Timeout_Seconds, 230),
963964
@AIContext = Context
964965
FROM #ai_providers
@@ -969,21 +970,20 @@ IF @AI > 0
969970
@AIURL = COALESCE(@AIURL, AI_URL),
970971
@AICredential = COALESCE(@AICredential, AI_Database_Scoped_Credential_Name),
971972
@AIParameters = AI_Parameters,
973+
@AIPayloadTemplate = Payload_Template,
972974
@AITimeoutSeconds = COALESCE(Timeout_Seconds, 230),
973975
@AIContext = Context
974976
FROM #ai_providers
975977
ORDER BY Id;
976978

977979
/* Check the prompts table */
978980
IF @AIPrompt IS NULL
979-
SELECT TOP 1 @AISystemPrompt = AI_System_Prompt,
980-
@AIPayloadTemplate = Payload_Template
981+
SELECT TOP 1 @AISystemPrompt = AI_System_Prompt
981982
FROM #ai_prompts
982983
WHERE DefaultPrompt = 1
983984
ORDER BY Id;
984985
ELSE
985-
SELECT TOP 1 @AISystemPrompt = AI_System_Prompt,
986-
@AIPayloadTemplate = Payload_Template
986+
SELECT TOP 1 @AISystemPrompt = AI_System_Prompt
987987
FROM #ai_prompts
988988
WHERE PromptNickname = @AIPrompt
989989
ORDER BY Id;

‎sp_BlitzIndex.sql‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -999,6 +999,7 @@ CREATE TABLE #ai_providers
999999
AI_URL NVARCHAR(500),
10001000
AI_Database_Scoped_Credential_Name NVARCHAR(500),
10011001
AI_Parameters NVARCHAR(4000),
1002+
Payload_Template NVARCHAR(4000),
10021003
Timeout_Seconds TINYINT,
10031004
Context INT,
10041005
DefaultModel BIT DEFAULT 0);
@@ -1007,7 +1008,6 @@ CREATE TABLE #ai_prompts
10071008
(Id INT PRIMARY KEY CLUSTERED,
10081009
PromptNickname NVARCHAR(200) INDEX IX_PromptNickname,
10091010
AI_System_Prompt NVARCHAR(4000),
1010-
Payload_Template NVARCHAR(4000),
10111011
DefaultPrompt BIT DEFAULT 0);
10121012

10131013
/* Sanitize our inputs */
@@ -1027,8 +1027,8 @@ END;
10271027
IF @AIConfigTable IS NOT NULL
10281028
BEGIN
10291029
RAISERROR(N'Reading values from AI Provider Configuration Table', 0, 1) WITH NOWAIT;
1030-
SET @config_sql = N'INSERT INTO #ai_providers (Id, AI_Model, AI_URL, AI_Database_Scoped_Credential_Name, AI_Parameters, Timeout_Seconds, Context, DefaultModel)
1031-
SELECT Id, AI_Model, AI_URL, AI_Database_Scoped_Credential_Name, AI_Parameters, Timeout_Seconds, Context, DefaultModel FROM '
1030+
SET @config_sql = N'INSERT INTO #ai_providers (Id, AI_Model, AI_URL, AI_Database_Scoped_Credential_Name, AI_Parameters, Payload_Template, Timeout_Seconds, Context, DefaultModel)
1031+
SELECT Id, AI_Model, AI_URL, AI_Database_Scoped_Credential_Name, AI_Parameters, Payload_Template, Timeout_Seconds, Context, DefaultModel FROM '
10321032
+ CASE WHEN @AIConfigDatabaseName IS NOT NULL THEN (QUOTENAME(@AIConfigDatabaseName) + N'.') ELSE N'' END
10331033
+ CASE WHEN @AIConfigSchemaName IS NOT NULL THEN (QUOTENAME(@AIConfigSchemaName) + N'.') ELSE N'' END
10341034
+ QUOTENAME(@AIConfigTableName) + N' WHERE (@AIModel IS NULL AND DefaultModel = 1) OR @AIModel = AI_Model ; ';
@@ -1038,8 +1038,8 @@ END;
10381038
IF @AIPromptConfigTable IS NOT NULL
10391039
BEGIN
10401040
RAISERROR(N'Reading values from AI Prompts Table', 0, 1) WITH NOWAIT;
1041-
SET @config_sql = N'INSERT INTO #ai_prompts (Id, PromptNickname, Payload_Template, AI_System_Prompt, DefaultPrompt)
1042-
SELECT Id, PromptNickname, Payload_Template, AI_System_Prompt, DefaultPrompt FROM '
1041+
SET @config_sql = N'INSERT INTO #ai_prompts (Id, PromptNickname, AI_System_Prompt, DefaultPrompt)
1042+
SELECT Id, PromptNickname, AI_System_Prompt, DefaultPrompt FROM '
10431043
+ CASE WHEN @AIPromptDatabaseName IS NOT NULL THEN (QUOTENAME(@AIPromptDatabaseName) + N'.') ELSE N'' END
10441044
+ CASE WHEN @AIPromptSchemaName IS NOT NULL THEN (QUOTENAME(@AIPromptSchemaName) + N'.') ELSE N'' END
10451045
+ QUOTENAME(@AIPromptTableName) + N' WHERE (@AIPrompt IS NULL AND DefaultPrompt = 1) OR @AIPrompt = PromptNickname ; ';
@@ -1068,6 +1068,7 @@ IF @AI > 0
10681068
SELECT TOP 1 @AIModel = AI_Model, @AIURL = AI_URL,
10691069
@AICredential = AI_Database_Scoped_Credential_Name,
10701070
@AIParameters = AI_Parameters,
1071+
@AIPayloadTemplate = Payload_Template,
10711072
@AITimeoutSeconds = COALESCE(Timeout_Seconds, 230),
10721073
@AIContext = Context
10731074
FROM #ai_providers
@@ -1078,21 +1079,20 @@ IF @AI > 0
10781079
@AIURL = COALESCE(@AIURL, AI_URL),
10791080
@AICredential = COALESCE(@AICredential, AI_Database_Scoped_Credential_Name),
10801081
@AIParameters = AI_Parameters,
1082+
@AIPayloadTemplate = Payload_Template,
10811083
@AITimeoutSeconds = COALESCE(Timeout_Seconds, 230),
10821084
@AIContext = Context
10831085
FROM #ai_providers
10841086
ORDER BY Id;
10851087

10861088
/* Check the prompts table */
10871089
IF @AIPrompt IS NULL
1088-
SELECT TOP 1 @AISystemPrompt = AI_System_Prompt,
1089-
@AIPayloadTemplate = Payload_Template
1090+
SELECT TOP 1 @AISystemPrompt = AI_System_Prompt
10901091
FROM #ai_prompts
10911092
WHERE DefaultPrompt = 1
10921093
ORDER BY Id;
10931094
ELSE
1094-
SELECT TOP 1 @AISystemPrompt = AI_System_Prompt,
1095-
@AIPayloadTemplate = Payload_Template
1095+
SELECT TOP 1 @AISystemPrompt = AI_System_Prompt
10961096
FROM #ai_prompts
10971097
WHERE PromptNickname = @AIPrompt
10981098
ORDER BY Id;

0 commit comments

Comments
 (0)