Core/clean codebase (#225)

Author: 0xhijo

packages/agent/src/agents/operators/supervisor/tools/schemas/common.schemas.ts

@@ -36,7 +36,7 @@ const modelGuardsValues: GuardsConfig['agents']['graph']['model'] =
   graphGuardsValues.model;
 // Schema for ModelConfig
 export const ModelConfigSchema = z.object({
-  provider: z
+  model_provider: z
     .string()
     .refine(
       (val) =>

packages/agent/src/agents/operators/supervisor/utils/normalizeAgentValues.ts

@@ -110,19 +110,19 @@ function normalizeModelConfig(
 
   if (model && isPlainObject(model)) {
     const config: AgentConfig.Input['graph']['model'] = {
-      provider: DEFAULT_AGENT_CONFIG.graph.model.provider,
+      model_provider: DEFAULT_AGENT_CONFIG.graph.model.model_provider,
       model_name: DEFAULT_AGENT_CONFIG.graph.model.model_name,
       temperature: DEFAULT_AGENT_CONFIG.graph.model.temperature,
       max_tokens: DEFAULT_AGENT_CONFIG.graph.model.max_tokens,
     };
 
     // Normalize provider
     const providerResult = normalizeStringValue(
-      model.provider,
-      DEFAULT_AGENT_CONFIG.graph.model.provider,
-      'model.provider'
+      model.model_provider,
+      DEFAULT_AGENT_CONFIG.graph.model.model_provider,
+      'model.model_provider'
     );
-    config.provider = providerResult.value;
+    config.model_provider = providerResult.value;
     if (providerResult.appliedDefault) {
       appliedDefaults.push(providerResult.appliedDefault);
     }

packages/core/src/common/agent/interfaces/agent.interface.ts

@@ -3,7 +3,7 @@ import { BaseChatModel } from '@langchain/core/language_models/chat_models';
 export type Modify<T, R> = Omit<T, keyof R> & R;
 
 export interface ModelConfig {
-  provider: string;
+  model_provider: string;
   model_name: string;
   description?: string;
   temperature: number;

packages/core/src/common/constant/agents.constants.ts

@@ -28,7 +28,7 @@ export const agentSelectorConfig: AgentConfig.Input = {
     execution_timeout_ms: 30000,
     max_token_usage: 4000,
     model: {
-      provider: 'gemini',
+      model_provider: 'gemini',
       model_name: 'gemini-2.5-flash',
       temperature: 0.7,
       max_tokens: 8192,
@@ -90,7 +90,7 @@ export const supervisorAgentConfig: AgentConfig.Input = {
     execution_timeout_ms: 120000,
     max_token_usage: 16000,
     model: {
-      provider: 'gemini',
+      model_provider: 'gemini',
       model_name: 'gemini-2.5-flash',
       temperature: 0.7,
       max_tokens: 8192,
@@ -135,7 +135,7 @@ export namespace AgentConfigDefaults {
     execution_timeout_ms: 120000,
     max_token_usage: 16000,
     model: {
-      provider: 'gemini',
+      model_provider: 'gemini',
       model_name: 'gemini-2.5-flash',
       temperature: 0.7,
       max_tokens: 8192,

packages/core/src/common/constant/default-agent.constant.ts

@@ -5,7 +5,7 @@ import {
 } from '@common/agent/interfaces/agent.interface.js';
 
 export const DEFAULT_AGENT_MODEL: ModelConfig = {
-  provider: 'gemini',
+  model_provider: 'gemini',
   model_name: 'gemini-2.5-flash',
   temperature: 0.7,
   max_tokens: 4096,

packages/core/src/services/agent-validation.service.ts

@@ -275,10 +275,10 @@ export class AgentValidationService {
     const maxTokens = getGuardValue('agents.graph.model.max_tokens');
 
     // Validate provider - REQUIRED
-    if (!model.provider) {
+    if (!model.model_provider) {
       throw new Error('Model provider is required');
     }
-    if (model.provider.toLowerCase() !== allowedProvider.toLowerCase()) {
+    if (model.model_provider.toLowerCase() !== allowedProvider.toLowerCase()) {
       throw new Error(
         `Invalid model provider. Only '${allowedProvider}' is supported.`
       );

packages/database/__test__/database.spec.ts

@@ -532,21 +532,22 @@ describe('Custom Types Operations', () => {
 
   it('should work with model composite type', async () => {
     const q = new Postgres.Query(
-      `SELECT ROW('openai', 'gpt-4', 'Advanced AI model')::model as model_config,
-       (ROW('openai', 'gpt-4', 'Advanced AI model')::model).provider as provider_name`
+      `SELECT ROW('gemini', 'gemini-2.5-flash', 0.7, 4096)::model_config as model_config,
+       (ROW('gemini', 'gemini-2.5-flash', 0.7, 4096)::model_config).model_provider as provider_name`
     );
 
     interface ModelTest {
       model_config: {
-        provider: string;
-        modelName: string;
-        description: string;
+        model_provider: string;
+        model_name: string;
+        temperature: number;
+        max_tokens: number;
       };
       provider_name: string;
     }
 
     const [result] = await Postgres.query<ModelTest>(q);
-    expect(result.provider_name).toBe('openai');
+    expect(result.provider_name).toBe('gemini');
   });
 });
 

packages/database/initdb/03-agents.sql

@@ -478,7 +478,7 @@ BEGIN
           COALESCE((p_config->'graph'->>'execution_timeout_ms')::bigint, (graph).execution_timeout_ms),
           COALESCE((p_config->'graph'->>'max_token_usage')::integer, (graph).max_token_usage),
           ROW(
-            COALESCE(p_config->'graph'->'model'->>'provider', ((graph).model).model_provider),
+            COALESCE(p_config->'graph'->'model'->>'model_provider', p_config->'graph'->'model'->>'provider', ((graph).model).model_provider),
             COALESCE(p_config->'graph'->'model'->>'model_name', ((graph).model).model_name),
             COALESCE((p_config->'graph'->'model'->>'temperature')::numeric(3,2), ((graph).model).temperature),
             COALESCE((p_config->'graph'->'model'->>'max_tokens')::integer, ((graph).model).max_tokens)
@@ -700,7 +700,7 @@ BEGIN
       (p_config->'graph'->>'execution_timeout_ms')::bigint,
       (p_config->'graph'->>'max_token_usage')::integer,
       ROW(
-        p_config->'graph'->'model'->>'provider',
+        COALESCE(p_config->'graph'->'model'->>'model_provider', p_config->'graph'->'model'->>'provider'),
         p_config->'graph'->'model'->>'model_name',
         (p_config->'graph'->'model'->>'temperature')::numeric(3,2),
         (p_config->'graph'->'model'->>'max_tokens')::integer

packages/database/src/queries/agents/queries.ts

@@ -777,7 +777,7 @@ export namespace agents {
   ): Promise<ModelConfig | null> {
     const query = new Postgres.Query(
       `SELECT
-        (model).model_provider as "provider",
+        (model).model_provider as "model_provider",
         (model).model_name as "model_name",
         (model).temperature as "temperature",
         (model).max_tokens as "max_tokens"

packages/server/src/agents.storage.ts

@@ -366,7 +366,7 @@ export class AgentStorage implements OnModuleInit {
 
       // const model = await this.getModelFromUser(userId); // Need to be used when user_id table will be created
       const model: ModelConfig = {
-        provider: process.env.DEFAULT_MODEL_PROVIDER as string,
+        model_provider: process.env.DEFAULT_MODEL_PROVIDER as string,
         model_name: process.env.DEFAULT_MODEL_NAME as string,
         temperature: parseFloat(process.env.DEFAULT_TEMPERATURE ?? '0.7'),
         max_tokens: parseInt(process.env.DEFAULT_MAX_TOKENS ?? '4096'),