kbot flowers | commons | registry ref

packages/osr-code-bot/client.js

@@ -14,6 +14,7 @@ const ROUTER_BASE_URLS = {
     huggingface: 'https://api-inference.huggingface.co',
     ollama: 'http://localhost:11434', // Ollama's default local API endpoint
     fireworks: 'https://api.fireworks.ai/v1', // Fireworks API endpoint
+    gemini: 'https://generativelanguage.googleapis.com/v1beta', // Gemini API base URL
 };
 /**
  * Default models for different routers
@@ -25,6 +26,7 @@ const DEFAULT_MODELS = {
     huggingface: 'meta-llama/2',
     ollama: 'leonard', // Default Ollama model
     fireworks: 'llama-v2-70b-chat', // Default Fireworks model
+    gemini: 'gemini-1.5-pro', // Default Gemini model
 };
 /**
  * Creates an OpenAI client instance based on the provided options.
@@ -36,12 +38,12 @@ const createClient = (options) => {
     const config = (0, config_1.loadConfig)(options);
     if (!config) {
         index_1.logger.error("Config not found in $HOME/.osr/config.json. " +
-            "Optionally, export OSR_CONFIG with the path to the configuration file, ");
+            "Optionally, export OSR_CONFIG with the path to the configuration file.");
         return undefined;
     }
-    // Determine router to use (defaults to 'openzxWEOpenrouter')
-    const router = (options.router ?? 'openzxWEOpenrouter');
-    // Initialize AC<EFBFBD> EI key and baseURL
+    // Determine router to use (defaults to 'openrouter')
+    const router = (options.router ?? 'openrouter');
+    // Initialize API key
     let apiKey = options.api_key;
     // Set API key based on router if not provided in options
     if (!apiKey) {
@@ -65,10 +67,13 @@ const createClient = (options) => {
             case 'fireworks':
                 apiKey = config?.fireworks?.key;
                 break;
+            case 'gemini':
+                apiKey = config?.gemini?.key;
+                break;
         }
     }
-    // Validate API key (escept for Ollama)
-    if (!apiKey && router !== 'ollama') {
+    // Validate API key
+    if (!apiKey) {
         index_1.logger.error(`No ${router} key found. Please provide an "api_key", set it in the config, or pass it via JSON config.`);
         return undefined;
     }
@@ -86,4 +91,4 @@ const createClient = (options) => {
     });
 };
 exports.createClient = createClient;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xpZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsic3JjL2NsaWVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSxtQ0FBK0I7QUFDL0IsbUNBQWdDO0FBQ2hDLHFDQUFxQztBQVFyQzs7R0FFRztBQUNILE1BQU0sZ0JBQWdCLEdBQStCO0lBQ2pELFVBQVUsRUFBRSw4QkFBOEI7SUFDMUMsTUFBTSxFQUFFLEVBQUUsRUFBRSwwQkFBMEI7SUFDdEMsUUFBUSxFQUFFLDBCQUEwQjtJQUNwQyxXQUFXLEVBQUUsc0NBQXNDO0lBQ25ELE1BQU0sRUFBRSx3QkFBd0IsRUFBRSxzQ0FBc0M7SUFDeEUsU0FBUyxFQUFFLDZCQUE2QixFQUFFLHlCQUF5QjtDQUN0RSxDQUFDO0FBRUY7O0dBRUc7QUFDSCxNQUFNLGNBQWMsR0FBK0I7SUFDL0MsVUFBVSxFQUFFLDZCQUE2QjtJQUN6QyxNQUFNLEVBQUUsUUFBUTtJQUNoQixRQUFRLEVBQUUsZUFBZTtJQUN6QixXQUFXLEVBQUUsY0FBYztJQUMzQixNQUFNLEVBQUUsU0FBUyxFQUFFLHVCQUF1QjtJQUMxQyxTQUFTLEVBQUUsbUJBQW1CLEVBQUUsMEJBQTBCO0NBQzdELENBQUM7QUFFRjs7OztHQUlHO0FBQ0ksTUFBTSxZQUFZLEdBQUcsQ0FBQyxPQUFxQixFQUFFLEVBQUU7SUFDbEQsK0JBQStCO0lBQy9CLE1BQU0sTUFBTSxHQUFHLElBQUEsbUJBQVUsRUFBQyxPQUFPLENBQUMsQ0FBQTtJQUNsQyxJQUFJLENBQUMsTUFBTSxFQUFFLENBQUM7UUFDVixjQUFNLENBQUMsS0FBSyxDQUNSLDhDQUE4QztZQUM5Qyx5RUFBeUUsQ0FDNUUsQ0FBQztRQUNGLE9BQU8sU0FBUyxDQUFDO0lBQ3JCLENBQUM7SUFFRCw2REFBNkQ7SUFDN0QsTUFBTSxNQUFNLEdBQWUsQ0FBQyxPQUFPLENBQUMsTUFBTSxJQUFJLG9CQUFvQixDQUFlLENBQUM7SUFFbEYsb0NBQW9DO0lBQ3BDLElBQUksTUFBTSxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUM7SUFFN0IseURBQXlEO0lBQ3pELElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQztRQUNWLFFBQVEsTUFBTSxFQUFFLENBQUM7WUFDYixLQUFLLFlBQVk7Z0JBQ2IsTUFBTSxHQUFHLE1BQU0sRUFBRSxVQUFVLEVBQUUsR0FBRyxDQUFDO2dCQUNqQyxNQUFNO1lBQ1YsS0FBSyxRQUFRO2dCQUNULE1BQU0sR0FBRyxNQUFNLEVBQUUsTUFBTSxFQUFFLEdBQUcsQ0FBQztnQkFDN0IsTUFBTTtZQUNWLEtBQUssVUFBVTtnQkFDWCxNQUFNLEdBQUcsTUFBTSxFQUFFLFFBQVEsRUFBRSxHQUFHLENBQUM7Z0JBQy9CLE1BQU07WUFDVixLQUFLLGFBQWE7Z0JBQ2QsTUFBTSxHQUFHLE1BQU0sRUFBRSxXQUFXLEVBQUUsR0FBRyxDQUFDO2dCQUNsQyxNQUFNO1lBQ1YsS0FBSyxRQUFRO2dCQUNULHlEQUF5RDtnQkFDekQsTUFBTSxHQUFHLFFBQVEsQ0FBQyxDQUFDLHVCQUF1QjtnQkFDMUMsTUFBTTtZQUNWLEtBQUssV0FBVztnQkFDWixNQUFNLEdBQUcsTUFBTSxFQUFFLFNBQVMsRUFBRSxHQUFHLENBQUM7Z0JBQ2hDLE1BQU07UUFDZCxDQUFDO0lBQ0wsQ0FBQztJQUVELHVDQUF1QztJQUN2QyxJQUFJLENBQUMsTUFBTSxJQUFJLE1BQU0sS0FBSyxRQUFRLEVBQUUsQ0FBQztRQUNqQyxjQUFNLENBQUMsS0FBSyxDQUFDLE1BQU0sTUFBTSw0RkFBNEYsQ0FBQyxDQUFDO1FBQ3ZILE9BQU8sU0FBUyxDQUFDO0lBQ3JCLENBQUM7SUFFRCxzQ0FBc0M7SUFDdEMsTUFBTSxPQUFPLEdBQUcsT0FBTyxDQUFDLE9BQU8sSUFBSSxnQkFBZ0IsQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUU1RCxvQ0FBb0M7SUFDcEMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUNqQixPQUFPLENBQUMsS0FBSyxHQUFHLGNBQWMsQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUMzQyxDQUFDO0lBRUQsY0FBTSxDQUFDLElBQUksQ0FBQyx3QkFBd0IsTUFBTSxrQkFBa0IsT0FBTyxDQUFDLEtBQUssaUJBQWlCLE1BQU0sT0FBTyxPQUFPLEVBQUUsQ0FBQyxDQUFDO0lBRWxILCtDQUErQztJQUMvQyxPQUFPLElBQUksZUFBTSxDQUFDO1FBQ2QsTUFBTTtRQUNOLE9BQU87S0FDVixDQUFDLENBQUM7QUFDUCxDQUFDLENBQUE7QUEvRFksUUFBQSxZQUFZLGdCQStEeEIifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xpZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsic3JjL2NsaWVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSxtQ0FBZ0M7QUFDaEMsbUNBQWlDO0FBQ2pDLHFDQUFzQztBQVl0Qzs7R0FFRztBQUNILE1BQU0sZ0JBQWdCLEdBQStCO0lBQ2pELFVBQVUsRUFBRSw4QkFBOEI7SUFDMUMsTUFBTSxFQUFFLEVBQUUsRUFBRSwwQkFBMEI7SUFDdEMsUUFBUSxFQUFFLDBCQUEwQjtJQUNwQyxXQUFXLEVBQUUsc0NBQXNDO0lBQ25ELE1BQU0sRUFBRSx3QkFBd0IsRUFBRSxzQ0FBc0M7SUFDeEUsU0FBUyxFQUFFLDZCQUE2QixFQUFFLHlCQUF5QjtJQUNuRSxNQUFNLEVBQUUsa0RBQWtELEVBQUUsc0JBQXNCO0NBQ3JGLENBQUM7QUFFRjs7R0FFRztBQUNILE1BQU0sY0FBYyxHQUErQjtJQUMvQyxVQUFVLEVBQUUsNkJBQTZCO0lBQ3pDLE1BQU0sRUFBRSxRQUFRO0lBQ2hCLFFBQVEsRUFBRSxlQUFlO0lBQ3pCLFdBQVcsRUFBRSxjQUFjO0lBQzNCLE1BQU0sRUFBRSxTQUFTLEVBQUUsdUJBQXVCO0lBQzFDLFNBQVMsRUFBRSxtQkFBbUIsRUFBRSwwQkFBMEI7SUFDMUQsTUFBTSxFQUFFLGdCQUFnQixFQUFFLHVCQUF1QjtDQUNwRCxDQUFDO0FBRUY7Ozs7R0FJRztBQUNJLE1BQU0sWUFBWSxHQUFHLENBQUMsT0FBcUIsRUFBRSxFQUFFO0lBQ2xELCtCQUErQjtJQUMvQixNQUFNLE1BQU0sR0FBRyxJQUFBLG1CQUFVLEVBQUMsT0FBTyxDQUFDLENBQUM7SUFDbkMsSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFDO1FBQ1YsY0FBTSxDQUFDLEtBQUssQ0FDUiw4Q0FBOEM7WUFDOUMsd0VBQXdFLENBQzNFLENBQUM7UUFDRixPQUFPLFNBQVMsQ0FBQztJQUNyQixDQUFDO0lBRUQscURBQXFEO0lBQ3JELE1BQU0sTUFBTSxHQUFlLENBQUMsT0FBTyxDQUFDLE1BQU0sSUFBSSxZQUFZLENBQWUsQ0FBQztJQUUxRSxxQkFBcUI7SUFDckIsSUFBSSxNQUFNLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQztJQUU3Qix5REFBeUQ7SUFDekQsSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFDO1FBQ1YsUUFBUSxNQUFNLEVBQUUsQ0FBQztZQUNiLEtBQUssWUFBWTtnQkFDYixNQUFNLEdBQUcsTUFBTSxFQUFFLFVBQVUsRUFBRSxHQUFHLENBQUM7Z0JBQ2pDLE1BQU07WUFDVixLQUFLLFFBQVE7Z0JBQ1QsTUFBTSxHQUFHLE1BQU0sRUFBRSxNQUFNLEVBQUUsR0FBRyxDQUFDO2dCQUM3QixNQUFNO1lBQ1YsS0FBSyxVQUFVO2dCQUNYLE1BQU0sR0FBRyxNQUFNLEVBQUUsUUFBUSxFQUFFLEdBQUcsQ0FBQztnQkFDL0IsTUFBTTtZQUNWLEtBQUssYUFBYTtnQkFDZCxNQUFNLEdBQUcsTUFBTSxFQUFFLFdBQVcsRUFBRSxHQUFHLENBQUM7Z0JBQ2xDLE1BQU07WUFDVixLQUFLLFFBQVE7Z0JBQ1QseURBQXlEO2dCQUN6RCxNQUFNLEdBQUcsUUFBUSxDQUFDLENBQUMsdUJBQXVCO2dCQUMxQyxNQUFNO1lBQ1YsS0FBSyxXQUFXO2dCQUNaLE1BQU0sR0FBRyxNQUFNLEVBQUUsU0FBUyxFQUFFLEdBQUcsQ0FBQztnQkFDaEMsTUFBTTtZQUNWLEtBQUssUUFBUTtnQkFDVCxNQUFNLEdBQUcsTUFBTSxFQUFFLE1BQU0sRUFBRSxHQUFHLENBQUM7Z0JBQzdCLE1BQU07UUFDZCxDQUFDO0lBQ0wsQ0FBQztJQUVELG1CQUFtQjtJQUNuQixJQUFJLENBQUMsTUFBTSxFQUFHLENBQUM7UUFDWCxjQUFNLENBQUMsS0FBSyxDQUFDLE1BQU0sTUFBTSw0RkFBNEYsQ0FBQyxDQUFDO1FBQ3ZILE9BQU8sU0FBUyxDQUFDO0lBQ3JCLENBQUM7SUFFRCxzQ0FBc0M7SUFDdEMsTUFBTSxPQUFPLEdBQUcsT0FBTyxDQUFDLE9BQU8sSUFBSSxnQkFBZ0IsQ0FBQyxNQUFNLENBQUMsQ0FBQTtJQUUzRCxvQ0FBb0M7SUFDcEMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUNqQixPQUFPLENBQUMsS0FBSyxHQUFHLGNBQWMsQ0FBQyxNQUFNLENBQUMsQ0FBQTtJQUMxQyxDQUFDO0lBRUQsY0FBTSxDQUFDLElBQUksQ0FBQyx3QkFBd0IsTUFBTSxrQkFBa0IsT0FBTyxDQUFDLEtBQUssaUJBQWlCLE1BQU0sT0FBTyxPQUFPLEVBQUUsQ0FBQyxDQUFBO0lBRWpILCtDQUErQztJQUMvQyxPQUFPLElBQUksZUFBTSxDQUFDO1FBQ2QsTUFBTTtRQUNOLE9BQU87S0FDVixDQUFDLENBQUM7QUFDUCxDQUFDLENBQUM7QUFsRVcsUUFBQSxZQUFZLGdCQWtFdkIifQ==

packages/osr-code-bot/scripts/update-todos.sh

@@ -1,10 +1,10 @@
 kbotd modify \
     --path=. \
     --prompt="./.kbot/todos.md" \
-    --mode=completion \
     --router2=openai \
-    --model=openai/gpt-4-32k \
-    --include2="src/commands/run.ts" \
-    --include2="src/commands/run-tools.ts" \
+    --model2=gpt-4o \
+    --include="src/commands/run.ts" \
+    --include="src/zod_schema.ts" \
+    --include="src/client.ts" \
     --disable="npm,terminal,git,user,search,email" \
     --dst="./.kbot/todos-log.md"

packages/osr-code-bot/src/client.ts

@@ -1,12 +1,16 @@
-import { OpenAI } from 'openai'
-import { logger } from './index'
-import { loadConfig } from './config'
-import { IKBotOptions } from './zod_types'
+import { OpenAI } from 'openai';
+import { logger } from './index';
+import { loadConfig } from './config';
+import { IKBotOptions } from './zod_types';
+
+/**
+ * gemini : https://ai.google.dev/gemini-api/docs/openai
+ */
 
 /**
  * Router types supported by the client
  */
-type RouterType = 'openrouter' | 'openai' | 'deepseek' | 'huggingface' | 'ollama' | 'fireworks';
+type RouterType = 'openrouter' | 'openai' | 'deepseek' | 'huggingface' | 'ollama' | 'fireworks' | 'gemini'
 
 /**
  * Default base URLs for different routers
@@ -18,6 +22,7 @@ const ROUTER_BASE_URLS: Record<RouterType, string> = {
     huggingface: 'https://api-inference.huggingface.co',
     ollama: 'http://localhost:11434', // Ollama's default local API endpoint
     fireworks: 'https://api.fireworks.ai/v1', // Fireworks API endpoint
+    gemini: 'https://generativelanguage.googleapis.com/v1beta', // Gemini API base URL
 };
 
 /**
@@ -30,6 +35,7 @@ const DEFAULT_MODELS: Record<RouterType, string> = {
     huggingface: 'meta-llama/2',
     ollama: 'leonard', // Default Ollama model
     fireworks: 'llama-v2-70b-chat', // Default Fireworks model
+    gemini: 'gemini-1.5-pro', // Default Gemini model
 };
 
 /**
@@ -39,19 +45,19 @@ const DEFAULT_MODELS: Record<RouterType, string> = {
  */
 export const createClient = (options: IKBotOptions) => {
     // Load configuration from file
-    const config = loadConfig(options)
+    const config = loadConfig(options);
     if (!config) {
         logger.error(
             "Config not found in $HOME/.osr/config.json. " +
-            "Optionally, export OSR_CONFIG with the path to the configuration file, "
+            "Optionally, export OSR_CONFIG with the path to the configuration file."
         );
         return undefined;
     }
 
-    // Determine router to use (defaults to 'openzxWEOpenrouter')
-    const router: RouterType = (options.router ?? 'openzxWEOpenrouter') as RouterType;
+    // Determine router to use (defaults to 'openrouter')
+    const router: RouterType = (options.router ?? 'openrouter') as RouterType;
 
-    // Initialize AC<EFBFBD> EI key and baseURL
+    // Initialize API key
     let apiKey = options.api_key;
 
     // Set API key based on router if not provided in options
@@ -76,28 +82,31 @@ export const createClient = (options: IKBotOptions) => {
             case 'fireworks':
                 apiKey = config?.fireworks?.key;
                 break;
+            case 'gemini':
+                apiKey = config?.gemini?.key;
+                break;
         }
     }
 
-    // Validate API key (escept for Ollama)
-    if (!apiKey && router !== 'ollama') {
+    // Validate API key
+    if (!apiKey ) {
         logger.error(`No ${router} key found. Please provide an "api_key", set it in the config, or pass it via JSON config.`);
         return undefined;
     }
 
     // Set default baseURL if not provided
-    const baseURL = options.baseURL ?? ROUTER_BASE_URLS[router];
+    const baseURL = options.baseURL ?? ROUTER_BASE_URLS[router]
 
     // Set default model if not provided
     if (!options.model) {
-        options.model = DEFAULT_MODELS[router];
+        options.model = DEFAULT_MODELS[router]
     }
 
-    logger.info(`Creating client with ${router} router, model ${options.model}, and API key ${apiKey} at ${baseURL}`);
+    logger.info(`Creating client with ${router} router, model ${options.model}, and API key ${apiKey} at ${baseURL}`)
 
     // Create and return the OpenAI client instance
     return new OpenAI({
         apiKey,
         baseURL,
     });
-}
+};

packages/osr-code-bot/src/zod_schema.ts

@@ -13,6 +13,9 @@ import { isString } from '@plastichub/core/primitives'
 
 export const E_Filters = z.enum(Object.keys(Filters) as any)
 
+export const RouterTypeSchema = z.enum(['openrouter', 'openai', 'deepseek', 'huggingface', 'ollama', 'fireworks', 'gemini'])
+export type RouterType = z.infer<typeof RouterTypeSchema>
+
 export const EMode = {
   COMPLETION: 'completion',
   TOOLS: 'tools',

packages/osr-commons/package-lock.json

@@ -12,7 +12,7 @@
         "@plastichub/core": "^0.2.6",
         "@plastichub/fs": "^0.13.41",
         "cryptr": "^6.0.3",
-        "env-var": "^7.1.1",
+        "env-var": "^7.5.0",
         "fast-glob": "^3.3.2",
         "filenamify": "^4.3.0",
         "glob": "^11.0.0",
@@ -424,9 +424,10 @@
       "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
     },
     "node_modules/env-var": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/env-var/-/env-var-7.3.0.tgz",
-      "integrity": "sha512-qwtwYJ9d3XFxXRDudPEAMszaggpDgcfb1ZGYb9/cNyMugN2/a8EtviopnRL6c+petj2vp6/gxwYd9ExL1/iPcw==",
+      "version": "7.5.0",
+      "resolved": "https://registry.npmjs.org/env-var/-/env-var-7.5.0.tgz",
+      "integrity": "sha512-mKZOzLRN0ETzau2W2QXefbFjo5EF4yWq28OyKb9ICdeNhHJlOE/pHHnz4hdYJ9cNZXcJHo5xN4OT4pzuSHSNvA==",
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       }

packages/osr-commons/package.json

@@ -9,7 +9,7 @@
     "@plastichub/core": "^0.2.6",
     "@plastichub/fs": "^0.13.41",
     "cryptr": "^6.0.3",
-    "env-var": "^7.1.1",
+    "env-var": "^7.5.0",
     "fast-glob": "^3.3.2",
     "filenamify": "^4.3.0",
     "glob": "^11.0.0",

packages/osr-registry/README.md

@@ -8,12 +8,14 @@ https://github.com/typestack/class-transformer#readme
 ## Multistore
 
 - https://github.com/jaredwray/keyv
-  - https://github.com/zaaack/keyv-file
+- https://github.com/zaaack/keyv-file
 
 https://github.com/Level/abstract-level (?)
 
 ## Utils
+
 https://www.npmjs.com/package/filter-obj
 
 ## Graph store
+
 https://www.npmjs.com/package/gun