Merge pull request #90 from schemacrawler/mcp

Create new main for use from a Docker image

Author: sualeh

schemacrawler-ai-mcpserver/src/main/bin/schemacrawler-ai.sh

@@ -3,4 +3,4 @@
 # SPDX-License-Identifier: CC-BY-NC-4.0
 
 SC_DIR=/opt/schemacrawler
-java -cp "$SC_DIR"/lib/*:"$SC_DIR"/config schemacrawler.tools.ai.mcpserver.DockerMcpServer "$@"
+java -cp "$SC_DIR"/lib/*:"$SC_DIR"/config schemacrawler.tools.ai.mcpserver.McpServerMain "$@"

schemacrawler-ai-mcpserver/src/main/java/schemacrawler/tools/ai/mcpserver/DockerMcpServer.java

@@ -5,19 +5,27 @@
 import static us.fatehi.utility.Utility.trimToEmpty;
 
 import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.logging.Level;
 import schemacrawler.schemacrawler.InfoLevel;
+import schemacrawler.schemacrawler.LimitOptions;
+import schemacrawler.schemacrawler.LimitOptionsBuilder;
+import schemacrawler.schemacrawler.LoadOptions;
+import schemacrawler.schemacrawler.LoadOptionsBuilder;
+import schemacrawler.schemacrawler.SchemaCrawlerOptions;
+import schemacrawler.schemacrawler.SchemaCrawlerOptionsBuilder;
 import schemacrawler.tools.command.mcpserver.McpServerTransportType;
 import schemacrawler.tools.databaseconnector.EnvironmentalDatabaseConnectionSourceBuilder;
-import us.fatehi.utility.datasource.DatabaseConnectionSourceBuilder;
+import schemacrawler.tools.offline.jdbc.OfflineConnectionUtility;
+import us.fatehi.utility.LoggingConfig;
+import us.fatehi.utility.datasource.DatabaseConnectionSource;
 import us.fatehi.utility.ioresource.EnvironmentVariableAccessor;
 
 /** Inner class that handles the MCP server setup. */
 public final class McpServerContext {
 
   private final EnvironmentVariableAccessor envAccessor;
+  private final McpServerTransportType transport;
+  private final SchemaCrawlerOptions schemaCrawlerOptions;
 
   /** Default constructor that uses System.getenv */
   public McpServerContext() {
@@ -31,60 +39,70 @@ public McpServerContext() {
    */
   protected McpServerContext(final EnvironmentVariableAccessor envAccessor) {
     this.envAccessor = requireNonNull(envAccessor, "No environment accessor provided");
+
+    final Level logLevel = readLogLevel();
+    new LoggingConfig(logLevel);
+
+    transport = readTransport();
+    schemaCrawlerOptions = buildSchemaCrawlerOptions();
   }
 
-  /**
-   * Builds the complete argument list from environment variables.
-   *
-   * @return List of command line arguments
-   */
-  public String[] buildArguments() {
+  public SchemaCrawlerOptions getSchemaCrawlerOptions() {
+    return schemaCrawlerOptions;
+  }
 
-    final List<String> arguments = new ArrayList<>();
+  public McpServerTransportType mcpTransport() {
+    return transport;
+  }
 
-    final List<String> offlineDatabaseArgs = buildOfflineDatabaseArguments();
-    if (offlineDatabaseArgs.size() > 0) {
-      arguments.addAll(offlineDatabaseArgs);
-    } else {
-      final DatabaseConnectionSourceBuilder databaseConnectionSourceBuilder =
-          EnvironmentalDatabaseConnectionSourceBuilder.builder(envAccessor);
-      final List<String> connectionArguments = databaseConnectionSourceBuilder.toArguments();
+  protected DatabaseConnectionSource buildCatalogDatabaseConnectionSource() {
 
-      arguments.addAll(connectionArguments);
+    final String offlineDatabasePathString =
+        trimToEmpty(envAccessor.getenv("SCHCRWLR_OFFLINE_DATABASE"));
+    if (isBlank(offlineDatabasePathString)) {
+      return buildOperationsDatabaseConnectionSource();
     }
 
-    addSchemaCrawlerArguments(arguments);
+    final Path offlineDatabasePath = Path.of(offlineDatabasePathString);
+    final DatabaseConnectionSource dbConnectionSource =
+        OfflineConnectionUtility.newOfflineDatabaseConnectionSource(offlineDatabasePath);
+    return dbConnectionSource;
+  }
+
+  /**
+   * Builds the complete argument list from environment variables.
+   *
+   * @return List of command line arguments
+   */
+  protected DatabaseConnectionSource buildOperationsDatabaseConnectionSource() {
 
-    return arguments.toArray(new String[0]);
+    final DatabaseConnectionSource databaseConnectionSource =
+        EnvironmentalDatabaseConnectionSourceBuilder.builder(envAccessor).build();
+    return databaseConnectionSource;
   }
 
   /**
    * Adds SchemaCrawler specific arguments to the arguments list.
    *
    * @param arguments The list of arguments to add to
    */
-  protected void addSchemaCrawlerArguments(final List<String> arguments) {
-    final String infoLevel = envAccessor.getenv("SCHCRWLR_INFO_LEVEL");
-    arguments.add("--info-level");
-    arguments.add(validInfoLevel(infoLevel).name());
-
-    final String logLevel = envAccessor.getenv("SCHCRWLR_LOG_LEVEL");
-    arguments.add("--log-level");
-    arguments.add(validLogLevel(logLevel).getName());
-
-    arguments.add("--routines");
-    arguments.add(".*");
-    arguments.add("--sequences");
-    arguments.add(".*");
-    arguments.add("--synonyms");
-    arguments.add(".*");
-
-    arguments.add("--command");
-    arguments.add("mcpserver");
-
-    final String transport = envAccessor.getenv("SCHCRWLR_MCP_SERVER_TRANSPORT");
-    arguments.add("--transport");
-    arguments.add(validTransport(transport).name());
+  protected SchemaCrawlerOptions buildSchemaCrawlerOptions() {
+    final InfoLevel infoLevel = readInfoLevel();
+
+    final LoadOptions loadOptions = LoadOptionsBuilder.builder().withInfoLevel(infoLevel).build();
+    final LimitOptions limitOptions =
+        LimitOptionsBuilder.builder()
+            .includeAllRoutines()
+            .includeAllSequences()
+            .includeAllSynonyms()
+            .includeAllTables()
+            .build();
+
+    final SchemaCrawlerOptions schemaCrawlerOptions =
+        SchemaCrawlerOptionsBuilder.newSchemaCrawlerOptions()
+            .withLoadOptions(loadOptions)
+            .withLimitOptions(limitOptions);
+    return schemaCrawlerOptions;
   }
 
   /**
@@ -93,13 +111,11 @@ protected void addSchemaCrawlerArguments(final List<String> arguments) {
    * @param value The info level string to check
    * @return InfoLevel Non-null value
    */
-  protected InfoLevel validInfoLevel(final String value) {
-    final InfoLevel defaultValue = InfoLevel.standard;
+  protected InfoLevel readInfoLevel() {
 
-    if (isBlank(value)) {
-      return defaultValue;
-    }
+    final InfoLevel defaultValue = InfoLevel.standard;
     try {
+      final String value = envAccessor.getenv("SCHCRWLR_INFO_LEVEL");
       InfoLevel infoLevel = InfoLevel.valueOfFromString(value);
       if (infoLevel == InfoLevel.unknown) {
         infoLevel = defaultValue;
@@ -116,9 +132,11 @@ protected InfoLevel validInfoLevel(final String value) {
    * @param value The log level string to check
    * @return Level Non-null value
    */
-  protected Level validLogLevel(final String value) {
+  protected Level readLogLevel() {
+
     final Level defaultValue = Level.INFO;
 
+    final String value = envAccessor.getenv("SCHCRWLR_LOG_LEVEL");
     if (isBlank(value)) {
       return defaultValue;
     }
@@ -135,9 +153,12 @@ protected Level validLogLevel(final String value) {
    * @param value The transport string to check
    * @return McpServerTransportType Non-null value
    */
-  protected McpServerTransportType validTransport(final String value) {
+  protected McpServerTransportType readTransport() {
+    requireNonNull(envAccessor, "No environmental accessor provided");
+
     final McpServerTransportType defaultValue = McpServerTransportType.stdio;
 
+    final String value = envAccessor.getenv("SCHCRWLR_MCP_SERVER_TRANSPORT");
     if (isBlank(value)) {
       return defaultValue;
     }
@@ -151,27 +172,4 @@ protected McpServerTransportType validTransport(final String value) {
       return defaultValue;
     }
   }
-
-  private List<String> buildOfflineDatabaseArguments() {
-
-    final List<String> arguments = new ArrayList<>();
-
-    final String offlineDatabasePathString =
-        trimToEmpty(envAccessor.getenv("SCHCRWLR_OFFLINE_DATABASE"));
-    if (isBlank(offlineDatabasePathString)) {
-      return arguments;
-    }
-
-    final Path offlineDatabasePath = Path.of(offlineDatabasePathString);
-    if (!offlineDatabasePath.toFile().exists() && !offlineDatabasePath.toFile().isFile()) {
-      return arguments;
-    }
-
-    arguments.add("--server");
-    arguments.add("offline");
-    arguments.add("--database");
-    arguments.add(offlineDatabasePath.toAbsolutePath().toString());
-
-    return arguments;
-  }
 }

schemacrawler-ai-mcpserver/src/main/java/schemacrawler/tools/ai/mcpserver/McpServerContext.java

@@ -0,0 +1,45 @@
+/*
+ * SchemaCrawler AI
+ * http://www.schemacrawler.com
+ * Copyright (c) 2000-2025, Sualeh Fatehi <sualeh@hotmail.com>.
+ * All rights reserved.
+ * SPDX-License-Identifier: CC-BY-NC-4.0
+ */
+
+package schemacrawler.tools.ai.mcpserver;
+
+import static schemacrawler.tools.ai.mcpserver.McpServerUtility.startMcpServer;
+
+import schemacrawler.schema.Catalog;
+import schemacrawler.schemacrawler.SchemaCrawlerOptions;
+import schemacrawler.tools.ai.mcpserver.server.ConfigurationManager;
+import schemacrawler.tools.ai.mcpserver.server.ConnectionService;
+import schemacrawler.tools.utility.SchemaCrawlerUtility;
+import us.fatehi.utility.datasource.DatabaseConnectionSource;
+
+/**
+ * Construct SchemaCrawler arguments from environment variables and run SchemaCrawler MCP Server.
+ */
+public class McpServerMain {
+
+  /**
+   * Main method that reads environment variables, constructs arguments, and runs SchemaCrawler MCP
+   * Server.
+   *
+   * @param args Command line arguments (will be combined with environment variable arguments)
+   * @throws Exception If an error occurs during execution
+   */
+  public static void main(final String[] args) throws Exception {
+    // Read options from environmental variable
+    final McpServerContext context = new McpServerContext();
+    final SchemaCrawlerOptions schemaCrawlerOptions = context.getSchemaCrawlerOptions();
+    final DatabaseConnectionSource connectionSource =
+        context.buildCatalogDatabaseConnectionSource();
+    // Obtain the database catalog
+    final Catalog catalog = SchemaCrawlerUtility.getCatalog(connectionSource, schemaCrawlerOptions);
+    ConnectionService.instantiate(connectionSource);
+    ConfigurationManager.instantiate(catalog);
+    // Start the MCP server
+    startMcpServer(context.mcpTransport());
+  }
+}

schemacrawler-ai-mcpserver/src/main/java/schemacrawler/tools/ai/mcpserver/McpServerMain.java

@@ -11,7 +11,6 @@
 import static java.util.Objects.requireNonNull;
 
 import schemacrawler.schema.Catalog;
-import schemacrawler.tools.command.mcpserver.McpServerCommandOptions;
 
 /**
  * Thread-safe singleton configuration manager for SchemaCrawler AI. Manages configuration settings
@@ -33,37 +32,30 @@ public static ConfigurationManager getInstance() {
    * Initializes the ConnectionService singleton. This method should be called exactly once during
    * application startup. Subsequent calls will throw an IllegalStateException.
    *
-   * @param options Command options
    * @param catalog Database schema catalog
    * @param connection SQL connection
    * @throws IllegalStateException if the service has already been initialized
    */
-  public static void instantiate(final McpServerCommandOptions options, final Catalog catalog) {
+  public static void instantiate(final Catalog catalog) {
     synchronized (lock) {
       if (instance != null) {
         throw new IllegalStateException("ConnectionService has already been initialized");
       }
-      instance = new ConfigurationManager(options, catalog);
+      instance = new ConfigurationManager(catalog);
     }
   }
 
   private boolean isDryRun = false;
   private final Catalog catalog;
-  private final McpServerCommandOptions options;
 
-  private ConfigurationManager(final McpServerCommandOptions options, final Catalog catalog) {
+  private ConfigurationManager(final Catalog catalog) {
     this.catalog = requireNonNull(catalog, "No catalog provided");
-    this.options = requireNonNull(options, "No options provided");
   }
 
   public Catalog getCatalog() {
     return catalog;
   }
 
-  public McpServerCommandOptions getOptions() {
-    return options;
-  }
-
   public boolean isDryRun() {
     return isDryRun;
   }

schemacrawler-ai-mcpserver/src/main/java/schemacrawler/tools/ai/mcpserver/server/ConfigurationManager.java

@@ -51,11 +51,22 @@ public static ConnectionService getInstance() {
    * @throws IllegalStateException if the service has already been initialized
    */
   public static void instantiate(final Connection connection) {
+    final DatabaseConnectionSource dbConnectionSource = newDatabaseConnectionSource(connection);
+    instantiate(dbConnectionSource);
+  }
+
+  /**
+   * Initializes the ConnectionService singleton. This method should be called exactly once during
+   * application startup. Subsequent calls will throw an IllegalStateException.
+   *
+   * @param dbConnectionSource Database connection sources
+   * @throws IllegalStateException if the service has already been initialized
+   */
+  public static void instantiate(final DatabaseConnectionSource dbConnectionSource) {
     synchronized (lock) {
       if (instance != null) {
         throw new IllegalStateException("ConnectionService has already been initialized");
       }
-      final DatabaseConnectionSource dbConnectionSource = newDatabaseConnectionSource(connection);
       instance = new ConnectionService(dbConnectionSource);
     }
   }

schemacrawler-ai-mcpserver/src/main/java/schemacrawler/tools/ai/mcpserver/server/ConnectionService.java

@@ -37,7 +37,7 @@ public void checkAvailability() throws RuntimeException {
   @Override
   public void execute() {
     ConnectionService.instantiate(connection);
-    ConfigurationManager.instantiate(commandOptions, catalog);
+    ConfigurationManager.instantiate(catalog);
     startMcpServer(commandOptions.mcpTransport());
   }