Move configuration out of context gathering and into handlers

Signed-off-by: worksofliam <[email protected]>

Author: worksofliam

src/aiProviders/context.ts

@@ -4,7 +4,6 @@ import { JobManager } from "../config";
 import Schemas, { AllSQLTypes, SQLType } from "../database/schemas";
 import Statement from "../database/statement";
 import { DB2_SYSTEM_PROMPT } from "./continue/prompts";
-import Configuration from "../configuration";
 
 export function canTalkToDb() {
   return JobManager.getSelection() !== undefined;
@@ -109,14 +108,8 @@ export async function buildSchemaDefinition(schema: string): Promise<Partial<Bas
     return data.map(filterBasicSQLObject);
   }
 
-  const useSchemaDef: boolean = Configuration.get<boolean>(`ai.useSchemaDefinition`);
-  if (useSchemaDef) {
-    const compressedData = filterBasicSQLObjects(allInfo);
-    return compressedData;
-  }
-
-  return undefined;
-
+  const compressedData = filterBasicSQLObjects(allInfo);
+  return compressedData;
 }
 
 /**

src/aiProviders/continue/continueContextProvider.ts

@@ -16,6 +16,7 @@ import {
   generateTableDefinition
 } from "../context";
 import { DB2_SELF_PROMPT, DB2_SYSTEM_PROMPT } from "./prompts";
+import Configuration from "../../configuration";
 
 export let isContinueActive = false;
 
@@ -142,14 +143,19 @@ export class db2ContextProvider implements IContextProvider {
       const fullInput = extras.fullInput;
 
       // 1. SCHEMA Definiton (semantic)
-      const schemaSemantic = await buildSchemaDefinition(schema);
-      if (schemaSemantic) {
-        contextItems.push({
-          name: `SCHEMA Definition`,
-          description: `${schema} definition`,
-          content: JSON.stringify(schemaSemantic),
-        });
+      const useSchemaDef: boolean = Configuration.get<boolean>(`ai.useSchemaDefinition`);
+
+      if (useSchemaDef) {
+        const schemaSemantic = await buildSchemaDefinition(schema);
+        if (schemaSemantic) {
+          contextItems.push({
+            name: `SCHEMA Definition`,
+            description: `${schema} definition`,
+            content: JSON.stringify(schemaSemantic),
+          });
+        }
       }
+      
       try {
         switch (true) {
           case fullInput.includes(`*SELF`) || query?.includes(`*SELF`):

src/aiProviders/continue/listTablesContextProvider.ts

@@ -13,6 +13,7 @@ import {
   buildSchemaDefinition,
   generateTableDefinition
 } from "../context";
+import Configuration from "../../configuration";
 
 const listDb2Table: ContextProviderDescription = {
   title: "list Db2i Tables",
@@ -69,14 +70,19 @@ class ListDb2iTables implements IContextProvider {
   ): Promise<ContextItem[]> {
     let contextItems: ContextItem[] = [];
     if (query.toUpperCase() === this.schema.toUpperCase()) {
-      const schemaSemantic = await buildSchemaDefinition(this.schema);
-      if (schemaSemantic) {
-        contextItems.push({
-          name: `SCHEMA Definition`,
-          description: `${this.schema} definition`,
-          content: JSON.stringify(schemaSemantic),
-        });
+
+      const useSchemaDef: boolean = Configuration.get<boolean>(`ai.useSchemaDefinition`);
+        if (useSchemaDef) {
+        const schemaSemantic = await buildSchemaDefinition(this.schema);
+        if (schemaSemantic) {
+          contextItems.push({
+            name: `SCHEMA Definition`,
+            description: `${this.schema} definition`,
+            content: JSON.stringify(schemaSemantic),
+          });
+        }
       }
+      
     } else {
       const tablesRefs = await generateTableDefinition(
         this.schema,

src/aiProviders/copilot/index.ts

@@ -11,6 +11,7 @@ import {
 } from "../context";
 import { JobManager } from "../../config";
 import { DB2_SYSTEM_PROMPT } from "../continue/prompts";
+import Configuration from "../../configuration";
 
 const CHAT_ID = `vscode-db2i.chat`;
 
@@ -62,13 +63,17 @@ export function activateChat(context: vscode.ExtensionContext) {
     if (canTalkToDb()) {
       // 1. SCHEMA Definiton (semantic)
       let usingSchema = getCurrentSchema();
-      const schemaSemantic = await buildSchemaDefinition(usingSchema);
-      if (schemaSemantic) {
-        messages.push(
-          vscode.LanguageModelChatMessage.Assistant(
-            JSON.stringify(schemaSemantic)
-          )
-        );
+      
+      const useSchemaDef: boolean = Configuration.get<boolean>(`ai.useSchemaDefinition`);
+      if (useSchemaDef) {
+        const schemaSemantic = await buildSchemaDefinition(usingSchema);
+        if (schemaSemantic) {
+          messages.push(
+            vscode.LanguageModelChatMessage.Assistant(
+              JSON.stringify(schemaSemantic)
+            )
+          );
+        }
       }
 
       switch (request.command) {