Merge branch 'main' of github.com:nanoapi-io/napi into feature/php-manifest

Author: LeBoufty

.github/workflows/lint_test_compile.yml

@@ -14,7 +14,7 @@ jobs:
       - name: Set up Deno
         uses: denoland/setup-deno@v2
         with:
-          deno-version: "2.x"
+          deno-version: "2.4.0"
 
       - name: Install dependencies
         run: |
@@ -35,7 +35,7 @@ jobs:
       - name: Set up Node.js
         uses: denoland/setup-deno@v2
         with:
-          deno-version: "2.x"
+          deno-version: "2.4.0"
 
       - name: Install dependencies
         run: |
@@ -53,7 +53,7 @@ jobs:
       - name: Set up Node.js
         uses: denoland/setup-deno@v2
         with:
-          deno-version: "2.x"
+          deno-version: "2.4.0"
 
       - name: Install dependencies
         run: |

.github/workflows/release.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Set up Deno
         uses: denoland/setup-deno@v2
         with:
-          deno-version: "2.3.5"
+          deno-version: "2.4.0"
 
       - name: Get new version and bump deno.json
         id: get_version

deno.json

@@ -1,11 +1,17 @@
 {
-  "version": "1.0.11",
+  "version": "1.0.14",
   "name": "@napi/cli",
   "exports": "./src/index.ts",
   "nodeModulesDir": "auto",
   "lock": false,
   "imports": {
     "@inquirer/prompts": "npm:@inquirer/prompts@^7.5.3",
+    "@langchain/anthropic": "npm:@langchain/anthropic@^0.3.23",
+    "@langchain/core": "npm:@langchain/core@^0.3.61",
+    "@langchain/google-genai": "npm:@langchain/google-genai@^0.2.14",
+    "@langchain/google-vertexai": "npm:@langchain/google-vertexai@^0.2.14",
+    "@langchain/langgraph": "npm:@langchain/langgraph@^0.3.5",
+    "@langchain/openai": "npm:@langchain/openai@^0.5.15",
     "@oak/oak": "jsr:@oak/oak@^17.1.4",
     "@std/expect": "jsr:@std/expect@^1.0.16",
     "@std/path": "jsr:@std/path@^1.0.9",

examples/csharp/EndpointExample/Properties/launchSettings.json

@@ -1,4 +1,4 @@
-{
+{
   "$schema": "https://json.schemastore.org/launchsettings.json",
   "profiles": {
     "http": {

src/cli/handlers/init/index.ts

@@ -4,7 +4,7 @@ import {
   getConfigFromWorkDir,
 } from "../../middlewares/napiConfig.ts";
 import { join, normalize, relative, SEPARATOR } from "@std/path";
-import type z from "zod";
+import z from "zod";
 import type { localConfigSchema } from "../../middlewares/napiConfig.ts";
 import pythonStdlibList from "../../../scripts/generate_python_stdlib_list/output.json" with {
   type: "json",
@@ -20,6 +20,11 @@ import {
 import { ApiService } from "../../../apiService/index.ts";
 import type { globalConfigSchema } from "../../middlewares/globalConfig.ts";
 import { isAuthenticatedMiddleware } from "../../middlewares/isAuthenticated.ts";
+import {
+  ANTHROPIC_PROVIDER,
+  GOOGLE_PROVIDER,
+  OPENAI_PROVIDER,
+} from "../../../manifest/dependencyManifest/labeling/model.ts";
 
 function builder(
   yargs: Arguments & {
@@ -749,12 +754,25 @@ async function createNewProject(apiService: ApiService): Promise<number> {
     },
   });
 
+  const projectRepoUrl = await input({
+    message: "Enter the URL of your project repository:",
+    validate: (value) => {
+      if (!value.trim()) return "Project repository URL cannot be empty";
+      const result = z.string().url().safeParse(value);
+      if (!result.success) {
+        return result.error.message;
+      }
+      return true;
+    },
+  });
+
   try {
     const createProjectResponse = await apiService.performRequest(
       "POST",
       "/projects",
       {
         name: projectName,
+        repoUrl: projectRepoUrl,
         workspaceId: selectedWorkspaceId,
         maxCodeCharPerSymbol: 100,
         maxCodeCharPerFile: 1000,
@@ -1018,6 +1036,61 @@ export async function generateConfig(
   // Show final file selection to the user
   showFinalFileSelection(workDir, includePatterns, excludePatterns);
 
+  // Labeling configuration
+  console.info("\n🏷️  LABELING CONFIGURATION");
+  console.info(
+    "Labeling helps categorize and organize your code dependencies using AI models.",
+  );
+
+  const enableLabeling = await confirm({
+    message: "Would you like to enable AI-powered labeling?",
+    default: false,
+  });
+
+  let labelingConfig:
+    | z.infer<typeof localConfigSchema>["labeling"]
+    | undefined = undefined;
+
+  if (enableLabeling) {
+    console.info("\n🤖 AI MODEL SELECTION");
+    console.info(
+      "Choose an AI provider for labeling your dependencies:",
+    );
+
+    const modelProvider = await select({
+      message: "Select AI model provider:",
+      choices: [
+        { name: "OpenAI (GPT-4o-mini)", value: OPENAI_PROVIDER },
+        { name: "Google (Gemini 2.5 Flash)", value: GOOGLE_PROVIDER },
+        { name: "Anthropic (Claude 3.5 Sonnet)", value: ANTHROPIC_PROVIDER },
+      ],
+    }) as
+      | typeof OPENAI_PROVIDER
+      | typeof GOOGLE_PROVIDER
+      | typeof ANTHROPIC_PROVIDER;
+
+    const maxConcurrency = await input({
+      message: "Enter maximum concurrent requests (leave empty for unlimited):",
+      validate: (value) => {
+        if (!value.trim()) return true; // Allow empty for unlimited
+        const num = parseInt(value);
+        if (isNaN(num) || num <= 0) {
+          return "Please enter a positive number or leave empty for unlimited";
+        }
+        return true;
+      },
+    });
+
+    labelingConfig = {
+      modelProvider,
+      maxConcurrency: maxConcurrency.trim()
+        ? parseInt(maxConcurrency)
+        : undefined,
+    };
+
+    console.info("✅ Labeling configuration added");
+  }
+
   // Build the config object
   const config: z.infer<typeof localConfigSchema> = {
     language: language,
@@ -1039,5 +1112,10 @@ export async function generateConfig(
     config.c = cConfig;
   }
 
+  // Add labeling config if it exists
+  if (labelingConfig) {
+    config.labeling = labelingConfig;
+  }
+
   return config;
 }

src/cli/handlers/manifest/generate.ts

@@ -45,6 +45,9 @@ function builder(
         }
         return value;
       },
+    }).option("labelingApiKey", {
+      type: "string",
+      description: "The API key to use for the labeling",
     });
 }
 
@@ -128,6 +131,7 @@ async function handler(
     branch?: string;
     commitSha?: string;
     commitShaDate?: string;
+    labelingApiKey?: string;
   },
 ) {
   const napiConfig = argv.napiConfig as z.infer<typeof localConfigSchema>;
@@ -217,7 +221,12 @@ async function handler(
 
     console.info(`📊 Processing ${files.size} files...`);
 
-    const dependencyManifest = generateDependencyManifest(files, napiConfig);
+    const dependencyManifest = await generateDependencyManifest(
+      files,
+      napiConfig,
+      globalConfig,
+      argv.labelingApiKey,
+    );
 
     // Upload manifest to API instead of writing to disk
     const apiService = new ApiService(

src/cli/handlers/set/apiKey.ts

@@ -0,0 +1,53 @@
+import type { Arguments } from "yargs-types";
+import type { z } from "zod";
+import {
+  type globalConfigSchema,
+  setConfig,
+} from "../../middlewares/globalConfig.ts";
+import {
+  ANTHROPIC_PROVIDER,
+  GOOGLE_PROVIDER,
+  type ModelProvider,
+  OPENAI_PROVIDER,
+} from "../../../manifest/dependencyManifest/labeling/model.ts";
+import { input, select } from "@inquirer/prompts";
+
+async function handler(
+  argv: Arguments & {
+    globalConfig: z.infer<typeof globalConfigSchema>;
+  },
+) {
+  const globalConfig = argv.globalConfig as z.infer<typeof globalConfigSchema>;
+
+  const provider = await select({
+    message: "Select a provider",
+    choices: [
+      { name: "Google", value: GOOGLE_PROVIDER },
+      { name: "OpenAI", value: OPENAI_PROVIDER },
+      { name: "Anthropic", value: ANTHROPIC_PROVIDER },
+    ],
+  }) as ModelProvider;
+
+  const apiKey = await input({
+    message: "Enter the API key",
+    validate: (value) => {
+      if (value.length === 0) {
+        return "API key cannot be empty";
+      }
+      return true;
+    },
+  });
+
+  const labeling = globalConfig.labeling || { apiKeys: {} };
+  labeling.apiKeys[provider] = apiKey;
+  setConfig({ ...globalConfig, labeling });
+
+  console.info("API key set successfully");
+}
+
+export default {
+  command: "apiKey",
+  describe: "set an API key for a model provider in your global config",
+  builder: () => {},
+  handler,
+};

src/cli/handlers/set/index.ts

@@ -0,0 +1,21 @@
+import apiKeyHandler from "./apiKey.ts";
+import type { Arguments } from "yargs-types";
+import type { globalConfigSchema } from "../../middlewares/globalConfig.ts";
+import type { z } from "zod";
+
+function builder(
+  yargs: Arguments & {
+    globalConfig: z.infer<typeof globalConfigSchema>;
+  },
+) {
+  return yargs
+    .command(apiKeyHandler)
+    .demandCommand(1, "You need to specify a valid command");
+}
+
+export default {
+  command: "set",
+  describe: "set a value in the global config",
+  builder,
+  handler: () => {},
+};

src/cli/index.ts

@@ -5,6 +5,7 @@ import {
 } from "./middlewares/checkVersion.ts";
 import loginCommand from "./handlers/login/index.ts";
 import initCommand from "./handlers/init/index.ts";
+import setCommand from "./handlers/set/index.ts";
 import manifestCommand from "./handlers/manifest/index.ts";
 import extractCommand from "./handlers/extract/index.ts";
 import { globalConfigMiddleware } from "./middlewares/globalConfig.ts";
@@ -27,6 +28,7 @@ export function initCli() {
     .middleware(globalConfigMiddleware)
     .command(loginCommand)
     .command(initCommand)
+    .command(setCommand)
     .command(manifestCommand)
     .command(extractCommand)
     .demandCommand(1, "You need to specify a command")

src/cli/middlewares/globalConfig.ts

@@ -1,11 +1,18 @@
 import type { Arguments } from "yargs-types";
-import { join } from "@std/path";
+import { dirname, join } from "@std/path";
 import z from "zod";
 
 export const globalConfigSchema = z.object({
   jwt: z.string().optional(),
   token: z.string().optional(),
   apiHost: z.string(),
+  labeling: z.object({
+    apiKeys: z.object({
+      google: z.string().optional(),
+      openai: z.string().optional(),
+      anthropic: z.string().optional(),
+    }),
+  }).optional(),
 });
 
 export const defaultApiHost = "https://api.nanoapi.io";
@@ -74,28 +81,44 @@ export function globalConfigMiddleware(
       const result = globalConfigSchema.safeParse(JSON.parse(content));
       if (!result.success) {
         // wrong config, generate a new one
-        config = defaultConfig;
-        Deno.writeTextFileSync(configPath, JSON.stringify(config, null, 2));
-      }
-      if (result.data) {
-        config = result.data;
+        setConfig(config);
+        args.globalConfig = config;
+        return;
       }
+
+      // config is valid, use it
+      config = result.data;
+      args.globalConfig = config;
+      return;
     } else {
       // no config, generate a new one
-      config = defaultConfig;
-      Deno.writeTextFileSync(configPath, JSON.stringify(config, null, 2));
+      setConfig(config);
+      args.globalConfig = config;
+      return;
     }
   } catch (_error) {
     // failed to read or create config, generate a new one
     config = defaultConfig;
-    Deno.writeTextFileSync(configPath, JSON.stringify(config, null, 2));
+    setConfig(config);
+    args.globalConfig = config;
+    return;
   }
-
-  args.globalConfig = config;
 }
 
 export function setConfig(
   config: z.infer<typeof globalConfigSchema>,
 ) {
-  Deno.writeTextFileSync(getConfigPath(), JSON.stringify(config, null, 2));
+  const configPath = getConfigPath();
+  const dir = dirname(configPath);
+  let dirExists = false;
+  try {
+    Deno.statSync(dir);
+    dirExists = true;
+  } catch {
+    dirExists = false;
+  }
+  if (!dirExists) {
+    Deno.mkdirSync(dir, { recursive: true });
+  }
+  Deno.writeTextFileSync(configPath, JSON.stringify(config, null, 2));
 }