@gnar-engine/cli 1.0.2 → 1.0.4

package/templates/service/{app.js.hbs → src/app.js.hbs}

@@ -1,7 +1,7 @@
 import { message, http, logger, db } from '@gnar-engine/core';
 import { config } from './config.js';
 import { messageHandlers } from './controllers/message.controller.js';
-import { httpController as {{pascalCase serviceName}}PlatformHttpController } from './controllers/http.controller.js';
+import { httpController as {{lowerCase serviceName}}PlatformHttpController } from './controllers/http.controller.js';
 
 /**
  * Initialise service
@@ -9,11 +9,15 @@ import { httpController as {{pascalCase serviceName}}PlatformHttpController } fr
 export const initService = async () => {
 
 	// Run migrations
-	db.migrations.runMigrations({config});
+    if (config.db.type == 'mysql') {
+	    db.migrations.runMigrations({config});
+    }
+
+    // Run seeders
 	db.seeders.runSeeders({config});
 
 	// Import command handlers after the command bus is initialised
-	await import('./commands/{{lowerCasePlural serviceName}}.handler.js');
+	await import('./commands/{{lowerCase serviceName}}.handler.js');
 	// Add more handlers as needed
 
 	// Initialise and register message handlers
@@ -25,7 +29,7 @@ export const initService = async () => {
 	// Register http routes
 	await http.registerRoutes({
 		controllers: [
-			{{pascalCase serviceName}}PlatformHttpController,
+			{{lowerCase serviceName}}PlatformHttpController,
 		]
 	});
 

package/templates/service/{commands → src/commands}/{{serviceName}}.handler.js.hbs

@@ -1,8 +1,7 @@
 import { commands, logger, error } from '@gnar-engine/core';
-import { auth } from '../services/authentication.service.js';
 import { {{serviceName}} } from '../services/{{serviceName}}.service.js';
 import { config } from '../config.js';
-import { validate{{pascalCase serviceName}}, validateServiceAdmin{{pascalCase serviceName}}, validate{{pascalCase serviceName}}Update, validateServiceAdmin{{pascalCase serviceName}}Update } from '../schema/{{serviceName}}.schema.js';
+import { validate{{pascalCase serviceName}} } from '../schema/{{serviceName}}.schema.js';
 
 
 /**

package/{bootstrap/services/agent/src/config.js → templates/service/src/mongodb.config.js.hbs}

@@ -3,7 +3,7 @@
  */
 export const config = {
     // service name
-    serviceName: 'agentService',
+    serviceName: '{{serviceName}}Service',
 
     // microservice | modular-monolith
     architecture: process.env.GLOBAL_ARCHITECTURE || 'microservice',
@@ -14,39 +14,32 @@ export const config = {
         allowedMethods: ['GET', 'POST', 'PUT', 'DELETE'],
         allowedHeaders: ['Content-Type', 'Authorization'],
         rateLimiting: {
-			max: 3,
-			timeWindow: '1 second',
+			max: 5,
+			timeWindow: '1 minute',
 		}
     },
 
     // database
     db: {
         // type: mongodb | mysql
-        type: 'mysql',
+        type: 'mongodb',
 
         // MongoDB
-        connectionUrl: process.env.AGENT_MONGO_URL,
+        connectionUrl: process.env.{{upperCase serviceName}}_MONGO_URL,
         connectionArgs: {},
-
-        // MySQL
-        host: process.env.AGENT_MYSQL_HOST,
-        user: process.env.AGENT_MYSQL_USER,
-        password: process.env.AGENT_MYSQL_PASSWORD,
-        database: process.env.AGENT_MYSQL_DATABASE,
-        connectionLimit: 10,
-        queueLimit: 20,
-        maxRetries: 5
     },
 
     // message broker
     message: {
         url: process.env.RABBITMQ_URL,
-        queueName: 'agentServiceQueue',
+        queueName: '{{serviceName}}ServiceQueue',
         prefetch: 20
     },
 
-    hashNameSpace: '',
+    webSockets: {
+        reconnectInterval: 5000,
+        maxInitialConnectionAttempts: 5
+    },
 
-    // Default agent type
-    agent: 'chatgpt'
+    hashNameSpace: '{{uuid}}',
 }

package/templates/service/{config.js.hbs → src/mysql.config.js.hbs}

@@ -40,9 +40,15 @@ export const config = {
 
     // message broker
     message: {
+        url: process.env.RABBITMQ_URL,
         queueName: '{{serviceName}}ServiceQueue',
         prefetch: 20
     },
 
+    webSockets: {
+        reconnectInterval: 5000,
+        maxInitialConnectionAttempts: 5
+    },
+
     hashNameSpace: '{{uuid}}',
 }

package/{bootstrap/services/agent/src/schema/Agent.schema.js → templates/service/src/schema/{{serviceName}}.schema.js.hbs}

@@ -1,8 +1,8 @@
 import { schema } from '@gnar-engine/core';
 import { config } from '../config.js';
 
-export const AgentSchema = {
-    schemaName: 'agentService.AgentSchema',
+export const {{serviceName}}Schema = {
+    schemaName: '{{serviceName}}Service.{{serviceName}}Schema',
     schema: {
         type: 'object',
         properties: {
@@ -14,4 +14,4 @@ export const AgentSchema = {
     }
 };
 
-export const validateAgent = schema.compile(AgentSchema);
+export const validate{{pascalCase serviceName}} = schema.compile({{serviceName}}Schema);

package/templates/service/src/services/mongodb.{{serviceName}}.service.js.hbs

@@ -0,0 +1,70 @@
+import { db, logger } from '@gnar-engine/core';
+import { ObjectId } from 'mongodb';
+
+export const {{serviceName}} = {
+
+    // Get all {{lowerCasePlural serviceName}}
+    getAll: async () => {
+        try {
+            const items = await db.collection('{{lowerCasePlural serviceName}}').find().toArray();
+            return items;
+        } catch (error) {
+            logger.error("Error fetching {{lowerCasePlural serviceName}}:", error);
+            throw error;
+        }
+    },
+
+    // Create a {{lowerCase serviceName}}
+    create: async (data) => {
+        try {
+            const collection = db.collection('{{lowerCasePlural serviceName}}');
+            const result = await collection.insertOne(data);
+            return await collection.findOne({ _id: result.insertedId });
+        } catch (error) {
+            logger.error("Error creating {{lowerCase serviceName}}:", error);
+            throw error;
+        }
+    },
+
+    // Get a {{lowerCase serviceName}} by ID
+    getById: async ({ id }) => {
+        try {
+            const collection = db.collection('{{lowerCasePlural serviceName}}');
+            const objectId = new ObjectId(id);
+            const item = await collection.findOne({ _id: objectId });
+            return item;
+        } catch (error) {
+            logger.error("Error fetching {{lowerCase serviceName}}:", error);
+            throw error;
+        }
+    },
+
+    // Update a {{lowerCase serviceName}}
+    update: async ({ id, updatedData }) => {
+        try {
+            const collection = db.collection('{{lowerCasePlural serviceName}}');
+            const objectId = new ObjectId(id);
+            const result = await collection.updateOne(
+                { _id: objectId },
+                { $set: updatedData }
+            );
+            return result.modifiedCount > 0;
+        } catch (error) {
+            logger.error("Error updating {{lowerCase serviceName}}:", error);
+            throw error;
+        }
+    },
+
+    // Delete a {{lowerCase serviceName}}
+    delete: async ({ id }) => {
+        try {
+            const collection = db.collection('{{lowerCasePlural serviceName}}');
+            const objectId = new ObjectId(id);
+            const result = await collection.deleteOne({ _id: objectId });
+            return result.deletedCount > 0;
+        } catch (error) {
+            logger.error("Error deleting {{lowerCase serviceName}}:", error);
+            throw error;
+        }
+    }
+};

package/bootstrap/services/agent/Dockerfile

@@ -1,23 +0,0 @@
-# Dockerfile for Agent Service
-FROM node:20-alpine
-
-# Set the working directory
-WORKDIR /usr/gnar_engine/app
-
-# Define a global env var
-ENV GLOBAL_SERVICE_BASE_DIR=/usr/gnar_engine/app/src/
-
-# Copy package.json and package-lock.json
-COPY ./services/agent/package*.json ./
-
-# Install nodemon
-RUN npm install -g nodemon
-
-# Install app dependencies
-RUN npm install
-
-# Expose the port the service will run on
-EXPOSE 3000
-
-# Start the application
-CMD ["nodemon", "--watch", "./gnar_engine", "./gnar_engine/app.js"]

package/bootstrap/services/agent/notes.md

@@ -1,28 +0,0 @@
-# Gnar MCP Notes
-
-### Aims
-
-- We don't want to provide all command implementations (with payload information) until we know what commands are required.
-
-Step 1: Gather Facts
-
-- All first prompts (no chatId provided) are 'gather facts'.
-- This prompt will be augmented with the all service/model schemas and a list of all available commands e.g. userService.create, userService.update.
-- From the client input the model should generate an action plan with an ordered list of the commands required, and also request the exact data required from the user to carry out the plan (based on the schemas provided in the augmented prompt).
-
-Step 2: Confirm plan
-
-- All further prompts (chatId provided) that do not have a 'confirmed plan' are 'confirm plan'.
-- This prompt will be augmented with the all service/model schemas, a list of all available commands, a manifest containing the command implementations (including payload information) for each command in the most recently proposed action plan, the most recently proposed action plan itself, and a list of all previous user inputs and response texts.
-- The model should determine from the resources provided if the action plan is accurate and if we have enough information, request conmfirmation from the user to action the request. If not we should request further information from the user until all information is provided. Should reassess the proposed plan based on user input and the command implementations provided in the prompt augmentation. If the plan is suitable, we have all the required information, and the user has confirmed that we can action the request, the model should include - actionPlanGoAhead = true in the response, and also the first command execution payload in the actionPlan.
-
-
-// should we postback before actioning?
-Step 3: Action plan loop
-- Before returning back to the client - if the agent response has 'actionPlanGoAhead' = true, we should initalise the action plan execution loop
-- Action Plan Execution Loop (foreach action plan command):
-    - The command will be triggered with the included payload.
-    - The result of the first command will be passed back to the agent with the system prompt, action plan, all messages, schemas, relevant command implementations.
-    - This prompt should confirm the payload for the next command in the action Plan.
-    
-- Upon the last command being executed, the model will be prompted to provide a text output to confirm the result of the action plan.

package/bootstrap/services/agent/package.json

@@ -1,16 +0,0 @@
-{
-    "name": "agent-service",
-    "version": "1.0.0",
-    "description": "LLM Agent microservice for Gnar Engine",
-    "type": "module",
-    "scripts": {
-        "start": "node ./src/app.js",
-        "start:dev": "nodemon --watch ./src ./src/app.js"
-    },
-    "dependencies": {
-        "@gnar-engine/core": "^1.0.1",
-        "openai": "5.13.1"
-    },
-    "author": "Gnar Software",
-    "license": "MIT"
-}

package/bootstrap/services/agent/src/app.js

@@ -1,52 +0,0 @@
-import { message, http, logger, db, registerService } from '@gnar-engine/core';
-import { config } from './config.js';
-import { messageHandlers } from './controllers/message.controller.js';
-import { httpController as AgentPlatformHttpController } from './controllers/http.controller.js';
-import { manifestService } from './services/manifest.service.js';
-import { Agent } from './services/agent.service.js';
-
-/**
- * Initialise service
- */
-export const initService = async () => {
-
-	// Run migrations
-	db.migrations.runMigrations({config});
-	db.seeders.runSeeders({config});
-
-	// Import command handlers after the command bus is initialised
-	await import('./commands/agent.handler.js');
-	// Add more handlers as needed
-
-	// Initialise and register message handlers
-	await message.init({
-		config: config.message,
-		handlers: messageHandlers
-	});
-
-	// Register http routes
-	await http.registerRoutes({
-		controllers: [
-			AgentPlatformHttpController,
-		]
-	});
-
-    // Initialise agent client
-    await Agent.init();
-
-	// Start the HTTP server
-	await http.start();
-
-	// Register service with control service
-    await registerService();
-
-	// Start manifest generation poll
-	//setInterval(() => {
-		manifestService.generateServiceManifests();
-	//}, 3600);
-
-	logger.info('G n a r  E n g i n e | Agent Service initialised successfully.');
-}
-
-initService();
-

package/bootstrap/services/agent/src/commands/agent.handler.js

@@ -1,104 +0,0 @@
-import { commands, logger } from '@gnar-engine/core';
-import { Agent } from '../services/agent.service.js';
-import { config } from '../config.js';
-
-
-/**
- * Prompt the LLM agent
- */
-commands.register('agentService.prompt', async ({input, chatId, authUser}) => {
-    try {
-        logger.info('recieved input' + JSON.stringify(input));
-        let chatContextToStore = {};
-
-        const [manifests, resolvedChatId, chat] = await Promise.all([
-            // Get the manifests
-            commands.execute('controlService.getManifests'),
-
-            // Create a new chat if chatId is not provided
-            (async () => {
-                if (!chatId) {
-                    return await Agent.createChat({
-                        userId: '',
-                        title: input.substring(0, 50),
-                        sessionKey: input.sessionKey
-                    });
-                }
-
-                return chatId
-            })(),
-
-            // Retrieve existing chat if chatId is provided
-            (async () => {
-                if (chatId) {
-                    return await Agent.getChat({chatId});
-                }
-
-                return null;
-            })()
-        ]);
-
-        let preparedInput;
-
-        // Gather facts
-        if (!chatId) {
-            preparedInput = await Agent.prepareGatherFactsPrompt({inputText: input, manifests: manifests});
-        }
-
-        // Prepare Plan
-        else if (chat) {
-            await logger.info('GOT HERE WITH CHAT: ' + JSON.stringify(chat));
-            preparedInput = await Agent.preparePlanPrompt({inputText: input, manifests: manifests, chat: chat});
-        }
-
-        // Infer
-        let agentResponse = await Agent.infer({preparedInput});
-        logger.info('Agent response: ' + agentResponse);
-        agentResponse = JSON.parse(agentResponse);
-
-        // Collect context from response
-        chatContextToStore.actionPlan = agentResponse.actionPlan || null;
-        chatContextToStore.input = input;
-        chatContextToStore.responseText = agentResponse.responseText || null;
-
-        // Collect required command implementations from manifests to store for next time
-        if (agentResponse.commandsRequired) {
-            chatContextToStore.commandsManifest = [];
-
-            agentResponse.commandsRequired.forEach((commandRequired) => {
-                manifests.manifests.forEach((manifest) => {
-                    //logger.info('got here ' + commandRequired + ' ' + JSON.stringify(manifest.manifest) );
-                    if (manifest.manifest?.commandImplementations?.[commandRequired]) {
-                        chatContextToStore.commandsManifest.push(manifest.manifest.commandImplementations[commandRequired]);
-                    }
-                })
-            });
-        }
-
-        logger.info('Chat context to store: ' + JSON.stringify(chatContextToStore));
-
-        // Store chat messages
-        chatId = resolvedChatId;
-        Agent.createChatMessage({
-            chatId: chatId,
-            userName: authUser.username,
-            context: chatContextToStore
-        });
-
-        // Plan execution loop
-        if (agentResponse.actionPlan) {
-            logger.info('Executing plan: ' + agentResponse.actionPlan);
-    
-        }
-
-        let response = {
-            structuredResponse: agentResponse,
-            chatId: chatId
-        };
-
-        return response;
-    } catch (err) {
-        logger.error("Error handling LLM agent prompt: " + err);
-        throw err;
-    }
-});

package/bootstrap/services/agent/src/controllers/http.controller.js

@@ -1,44 +0,0 @@
-import { commands, logger } from '@gnar-engine/core';
-import { authorise } from '../policies/agent.policy.js';
-
-/**
- * HTTP controller
- */
-export const httpController = {
-
-	/**
-	 * Prompt the agent
-	 */
-	agentPrompt: {
-		method: 'POST',
-		url: '/agent/prompt',
-		preHandler: async (request, reply) => authorise.agentPrompt(request, reply),
-		handler: async (request, reply) => {
-			logger.info('Received agent prompt request' + JSON.stringify(request.body));
-			const params = {
-				input: request.body.textInput,
-                chatId: request.body.chatId || '',
-                authUser: request.user
-			};
-
-			// Sanitize input (remove all JSON delimiters)
-			params.input = params.input.replace(/[\{\}\[\]\"\'\:\,]/g, '');
-
-			// execute
-			let response;
-            logger.info('params' + JSON.stringify(params));
-			try {
-				response = await commands.execute('prompt', params);
-			} catch (error) {
-				logger.error(error.message);
-				return reply.code(500).send({ error: error.message});
-			}
-
-            logger.info('response is: ' + JSON.stringify(response));
-
-			// handle response
-			reply.code(200).send(response);
-		}
-	},
-
-}

package/bootstrap/services/agent/src/controllers/message.controller.js

@@ -1,51 +0,0 @@
-import { commands } from '@gnar-engine/core';
-
-export const messageHandlers = {
-
-    getAgent: async (payload) => {
-        let result;
-        if (payload.data?.id) {
-            result = await commands.execute('getSingleAgent', {
-                id: payload.data.id
-            });
-        } else if (payload.data?.email) {
-            result = await commands.execute('getSingleAgent', {
-                email: payload.data.email
-            });
-        } else {
-            throw new Error('No Agent ID or email provided');
-        }
-        if (!result) {
-            throw new Error('Agent not found');
-        }
-        return { Agent: result };
-    },
-
-    getManyAgents: async (payload) => {
-        const results = await commands.execute('getManyAgents', {});
-        return { agents: results };
-    },
-
-    createAgent: async (payload) => {
-        const results = await commands.execute('createAgents', {
-            agents: [payload.data.Agent]
-        });
-        return { agents: results };
-    },
-
-    updateAgent: async (payload) => {
-        const result = await commands.execute('updateAgent', {
-            id: payload.data.id,
-            newAgentData: payload.data
-        });
-        return { Agent: result };
-    },
-
-    deleteAgent: async (payload) => {
-        await commands.execute('deleteAgent', {
-            id: payload.data.id
-        });
-        return { message: 'Agent deleted' };
-    },
-
-};

package/bootstrap/services/agent/src/db/migrations/01-init.js

@@ -1,50 +0,0 @@
-import { logger, db } from '@gnar-engine/core';
-
-/**
- * Up
- */
-export const up = async () => {
-    await initDatabaseTables();
-}
-
-/**
- * Down
- */
-export const down = async () => {
-    await dropDatabaseTables();
-}
-
-/**
- * Create all tables
- */
-export const initDatabaseTables = async () => {
-
-    // Migrations table
-    logger.info("Creating migrations table");
-    const createMigrationsTableQuery = `
-        CREATE TABLE migrations (
-            id INT AUTO_INCREMENT PRIMARY KEY,
-            name VARCHAR(255) NOT NULL UNIQUE,
-            created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
-        )`;
-    await db.query(createMigrationsTableQuery);
-
-    // Seeders table
-    logger.info("Creating seeders table");
-    const createSeedersTableQuery = `
-        CREATE TABLE seeders (
-            id INT AUTO_INCREMENT PRIMARY KEY,
-            name VARCHAR(255) NOT NULL UNIQUE,
-            created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
-        )`;
-    await db.query(createSeedersTableQuery);
-}
-
-/**
- * Drop all tables
- */
-export const dropDatabaseTables = async () => {
-    logger.info('Dropping tables');
-    await db.query('DROP TABLE IF EXISTS migrations');
-    await db.query('DROP TABLE IF EXISTS seeders');
-}

package/bootstrap/services/agent/src/db/migrations/02-agent-service-init.js

@@ -1,36 +0,0 @@
-import { logger, db } from '@gnar-engine/core';
-
-/**
- * Up
- */
-export const up = async () => {
-    logger.info('Creating table: agent-chats');
-    await db.query(`
-        CREATE TABLE agent_chats (
-            id CHAR(36) PRIMARY KEY,
-            user_id CHAR(36) NOT NULL,
-            title VARCHAR(255) NOT NULL,
-            created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-            updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
-        )
-    `);
-
-    logger.info('Creating table: agent-chat-messages');
-    await db.query(`
-        CREATE TABLE agent_chat_messages (
-            id CHAR(36) PRIMARY KEY,
-            chat_id CHAR(36) NOT NULL,
-            user_name VARCHAR(255) NOT NULL,
-            context MEDIUMTEXT NOT NULL,
-            created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
-        )
-    `);
-}
-
-/**
- * Down
- */
-export const down = async () => {
-    logger.info('Dropping table: agents');
-    await db.query('DROP TABLE IF EXISTS agents');
-}

package/bootstrap/services/agent/src/policies/agent.policy.js

@@ -1,13 +0,0 @@
-import { config } from '../config.js';
-
-export const authorise = {
-
-    /**
-     * Authorise agent prompt
-     */
-    agentPrompt: async (request, reply) => {
-        if (!request.user || request.user.role !== 'service_admin') {
-            reply.code(403).send({error: 'not authorised'});
-        }
-    }
-}