gaard-api 0.1.1__tar.gz → 0.1.2__tar.gz

{gaard_api-0.1.1/src/gaard_api.egg-info → gaard_api-0.1.2}/PKG-INFO

@@ -1,12 +1,13 @@
 Metadata-Version: 2.4
 Name: gaard-api
-Version: 0.1.1
+Version: 0.1.2
 Summary: GAARD backend web services providing admin interface
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 Requires-Dist: gaard-core==0.1.0
-Requires-Dist: gaard-connectors==0.1.0
+Requires-Dist: gaard-connectors==0.1.1
 Requires-Dist: gaard-llm==0.1.0
+Requires-Dist: gaard-plugin-api<0.2.0,>=0.1.0
 Requires-Dist: fastapi>=0.111.0
 Requires-Dist: uvicorn[standard]>=0.30.0
 Requires-Dist: pydantic>=2.7.0

{gaard_api-0.1.1 → gaard_api-0.1.2}/pyproject.toml

@@ -4,15 +4,16 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "gaard-api"
-version = "0.1.1"
+version = "0.1.2"
 description = "GAARD backend web services providing admin interface"
 readme = "README.md"
 requires-python = ">=3.11"
 
 dependencies = [
     "gaard-core==0.1.0",
-    "gaard-connectors==0.1.0",
+    "gaard-connectors==0.1.1",
     "gaard-llm==0.1.0",
+    "gaard-plugin-api>=0.1.0,<0.2.0",
     "fastapi>=0.111.0",
     "uvicorn[standard]>=0.30.0",
     "pydantic>=2.7.0",

{gaard_api-0.1.1 → gaard_api-0.1.2}/src/gaard_api/admin/services.py

@@ -5,12 +5,10 @@ from dataclasses import dataclass
 from datetime import UTC, datetime, timedelta
 from typing import Any
 
-from sqlalchemy import create_engine, text
 from sqlalchemy import delete, desc, select
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm import Session
 
-from gaard_connectors.sqlalchemy.introspector import SQLAlchemySchemaIntrospector
 from gaard_core.errors import LlmProviderError
 from gaard_core.llm_output import remove_thinking_blocks
 from gaard_core.query_pipeline.models import OutputClassification, QueryRequest, QueryResponse
@@ -33,6 +31,7 @@ from gaard_api.admin.models import (
     PromptTemplate,
 )
 from gaard_api.core.settings import settings
+from gaard_api.extensions import get_connector_registry
 
 
 def json_dumps(value: Any) -> str:
@@ -43,24 +42,16 @@ def json_loads(value: str) -> Any:
     return json.loads(value or "{}")
 
 
-SUPPORTED_DATABASE_TYPES = {
-    "sqlite": ("sqlite://", "sqlite"),
-    "postgresql": ("postgresql://", "postgresql+psycopg://"),
-    "mysql": ("mysql://", "mysql+pymysql://"),
-}
-
-
 def validate_datasource_url(database_type: str, database_url: str) -> None:
-    prefixes = SUPPORTED_DATABASE_TYPES.get(database_type)
+    get_connector_registry().get(database_type).validate_database_url(database_url)
 
-    if prefixes is None:
-        raise ValueError("Unsupported datasource type.")
 
-    if not database_url.startswith(prefixes):
-        raise ValueError(
-            f"Datasource URL for {database_type} must start with one of: "
-            f"{', '.join(prefixes)}"
-        )
+def validate_datasource_configuration(
+    database_type: str,
+    database_url: str,
+    sql_dialect: str,
+) -> None:
+    get_connector_registry().validate(database_type, database_url, sql_dialect)
 
 
 def mask_database_url(database_url: str) -> str:
@@ -1896,18 +1887,7 @@ def set_active_datasource_connector(
 
 
 def test_datasource_connection(connector: DatasourceConnector) -> None:
-    connect_args = (
-        {"check_same_thread": False}
-        if connector.database_url.startswith("sqlite")
-        else {}
-    )
-    engine = create_engine(connector.database_url, connect_args=connect_args)
-
-    try:
-        with engine.connect() as connection:
-            connection.execute(text("SELECT 1"))
-    finally:
-        engine.dispose()
+    get_connector_registry().get(connector.database_type).connection_tester(connector.database_url)
 
 
 def get_datasource_schema_cache(
@@ -1935,7 +1915,12 @@ def introspect_datasource_connector(
     connector: DatasourceConnector,
     actor: str,
 ) -> DatasourceSchemaCache:
-    schema = SQLAlchemySchemaIntrospector(connector.database_url).introspect()
+    schema = (
+        get_connector_registry()
+        .get(connector.database_type)
+        .introspector_factory(connector.database_url)
+        .introspect()
+    )
     existing = get_datasource_schema_cache(session, connector.id)
     existing_settings = (
         json_loads(existing.table_settings_json) if existing is not None else {}

{gaard_api-0.1.1 → gaard_api-0.1.2}/src/gaard_api/admin-web/assets/main.js

@@ -81,6 +81,7 @@ const state = {
     llmConfig: null,
     governancePolicy: null,
     datasources: [],
+    datasourceTypes: [],
     selectedDatasourceId: null,
     datasourceSchema: null,
     datasourceSchemaLoading: false,
@@ -946,7 +947,14 @@ function getSelectedDatasource() {
 }
 function renderDatasourceForm(connector) {
     const systemManaged = connector?.system_managed === true;
-    const disabled = systemManaged ? "disabled" : "";
+    const selectedTypeKey = connector?.database_type || state.datasourceTypes[0]?.type_key || "";
+    const selectedType = getDatasourceType(selectedTypeKey);
+    const databaseUrlSchema = selectedType?.config_schema?.properties?.database_url;
+    const selectedSqlDialect = connector?.sql_dialect || selectedType?.default_sql_dialect || "";
+    const databaseUrl = connector?.database_url || String(databaseUrlSchema?.default || "");
+    const unavailableType = Boolean(selectedTypeKey && !selectedType);
+    const disabled = systemManaged || unavailableType || !selectedType ? "disabled" : "";
+    const connectorDescription = selectedType?.description || (unavailableType ? `Connector type '${selectedTypeKey}' is unavailable. Install or enable its plugin before editing this datasource.` : "No connector types are available. Install or enable a connector plugin.");
     return `
     <form id="datasource-form" class="form-grid">
       <input type="hidden" name="id" value="${escapeHtml(connector?.id || "")}" />
@@ -954,32 +962,74 @@ function renderDatasourceForm(connector) {
       <label>Connector key<input name="connector_key" ${connector || systemManaged ? "readonly" : ""} ${disabled} value="${escapeHtml(connector?.connector_key || "")}" /></label>
       <label>Name<input name="name" ${disabled} value="${escapeHtml(connector?.name || "")}" /></label>
       <div class="subgrid">
-        <label>Database type<select name="database_type" ${disabled}>${renderDatabaseTypeOptions(connector?.database_type || "sqlite")}</select></label>
-        <label>SQL dialect<select name="sql_dialect" ${disabled}>${renderSqlDialectOptions(connector?.sql_dialect || "sqlite")}</select></label>
+        <label>Connector type<select id="datasource-type" name="database_type" ${disabled}>${renderDatasourceTypeOptions(selectedTypeKey)}</select></label>
+        <label>SQL dialect<select id="datasource-sql-dialect" name="sql_dialect" ${disabled}>${renderSqlDialectOptions(selectedType, selectedSqlDialect)}</select></label>
       </div>
-      <label>Database URL<input name="database_url" ${disabled} value="${escapeHtml(connector?.database_url || "sqlite:///./examples/medical-poc/demo.db")}" /></label>
+      <p id="datasource-type-description" class="muted">${escapeHtml(connectorDescription)}</p>
+      <label><span id="datasource-url-label">${escapeHtml(databaseUrlSchema?.title || "Database URL")}</span><input id="datasource-url" name="database_url" ${disabled} placeholder="${escapeHtml(databaseUrlSchema?.description || "")}" value="${escapeHtml(databaseUrl)}" /></label>
       <label class="inline-check"><input name="active" type="checkbox" ${connector?.active ? "checked" : ""} ${disabled} /> Active datasource</label>
       <div class="button-row">
-        <button type="button" id="test-datasource">Test</button>
+        <button type="button" id="test-datasource" ${disabled}>Test</button>
         <button type="button" id="introspect-datasource" ${connector ? "" : "disabled"}>Schema introspection</button>
         <button type="button" id="activate-datasource" ${connector && !connector.active && !systemManaged ? "" : "disabled"}>Activate</button>
         <button class="primary" type="submit" ${systemManaged ? "disabled" : ""}>${connector ? "Save" : "Create"}</button>
       </div>
     </form>`;
 }
-function renderDatabaseTypeOptions(selected) {
-    return [
-        "sqlite",
-        "postgresql",
-        "mysql"
-    ].map((value)=>`<option value="${value}" ${selected === value ? "selected" : ""}>${value}</option>`).join("");
+function getDatasourceType(typeKey) {
+    return state.datasourceTypes.find((item)=>item.type_key === typeKey) || null;
 }
-function renderSqlDialectOptions(selected) {
-    return [
-        "sqlite",
-        "postgres",
-        "mysql"
-    ].map((value)=>`<option value="${value}" ${selected === value ? "selected" : ""}>${value}</option>`).join("");
+function renderDatasourceTypeOptions(selected) {
+    const datasourceTypes = [
+        ...state.datasourceTypes
+    ];
+    if (selected && !getDatasourceType(selected)) {
+        datasourceTypes.unshift({
+            type_key: selected,
+            label: `${selected} (plugin unavailable)`,
+            description: "",
+            sql_dialects: [],
+            default_sql_dialect: "",
+            config_schema: {}
+        });
+    }
+    if (!datasourceTypes.length) {
+        return `<option value="" selected>No connector types available</option>`;
+    }
+    return datasourceTypes.map((item)=>`<option value="${escapeHtml(item.type_key)}" ${item.type_key === selected ? "selected" : ""}>${escapeHtml(item.label)}</option>`).join("");
+}
+function renderSqlDialectOptions(datasourceType, selected) {
+    const dialects = [
+        ...datasourceType?.sql_dialects || []
+    ];
+    if (selected && !dialects.includes(selected)) {
+        dialects.unshift(selected);
+    }
+    if (!dialects.length) {
+        return `<option value="" selected>No SQL dialect available</option>`;
+    }
+    return dialects.map((value)=>`<option value="${escapeHtml(value)}" ${selected === value ? "selected" : ""}>${escapeHtml(value)}</option>`).join("");
+}
+function syncDatasourceTypeFields(event) {
+    const typeKey = event.currentTarget.value;
+    const datasourceType = getDatasourceType(typeKey);
+    const sqlDialect = document.querySelector("#datasource-sql-dialect");
+    const description = document.querySelector("#datasource-type-description");
+    const urlLabel = document.querySelector("#datasource-url-label");
+    const urlInput = document.querySelector("#datasource-url");
+    const databaseUrlSchema = datasourceType?.config_schema?.properties?.database_url;
+    if (sqlDialect) {
+        sqlDialect.innerHTML = renderSqlDialectOptions(datasourceType, datasourceType?.default_sql_dialect || "");
+    }
+    if (description) {
+        description.textContent = datasourceType?.description || "Connector type is unavailable.";
+    }
+    if (urlLabel) {
+        urlLabel.textContent = databaseUrlSchema?.title || "Database URL";
+    }
+    if (urlInput) {
+        urlInput.placeholder = databaseUrlSchema?.description || "";
+    }
 }
 function renderModeOptions(selected, values) {
     return values.map((value)=>`<option value="${value}" ${selected === value ? "selected" : ""}>${value}</option>`).join("");
@@ -1315,6 +1365,7 @@ function attachSectionHandlers() {
     document.querySelector("#llm-config-form")?.addEventListener("submit", saveLlmConfig);
     document.querySelector("#governance-policy-form")?.addEventListener("submit", saveGovernancePolicy);
     document.querySelector("#datasource-form")?.addEventListener("submit", saveDatasource);
+    document.querySelector("#datasource-type")?.addEventListener("change", syncDatasourceTypeFields);
     document.querySelector("#datasource-schema-form")?.addEventListener("submit", saveDatasourceSchema);
     document.querySelector("#schema-show-enabled-only")?.addEventListener("change", (event)=>{
         syncDatasourceSchemaDraftFromForm();
@@ -1974,8 +2025,12 @@ async function loadPrompts() {
     render();
 }
 async function loadDatasources() {
-    const result = await api("/api/v1/admin/datasources");
-    state.datasources = result.items || [];
+    const [datasources, datasourceTypes] = await Promise.all([
+        api("/api/v1/admin/datasources"),
+        api("/api/v1/admin/datasource-types")
+    ]);
+    state.datasources = datasources.items || [];
+    state.datasourceTypes = datasourceTypes.items || [];
     if (!state.selectedDatasourceId || state.selectedDatasourceId === "new") {
         state.selectedDatasourceId = state.datasources[0]?.id || null;
     }

gaard_api-0.1.2/src/gaard_api/admin-web/package.json

@@ -0,0 +1,10 @@
+{
+  "name": "gaard-admin-web",
+  "private": true,
+  "scripts": {
+    "build": "esbuild src/main.ts --bundle --format=esm --target=es2020 --outfile=assets/main.js"
+  },
+  "devDependencies": {
+    "esbuild": "^0.25.0"
+  }
+}

{gaard_api-0.1.1 → gaard_api-0.1.2}/src/gaard_api/admin-web/src/main.ts

@@ -26,14 +26,31 @@ type DatasourceConnector = {
   id: number;
   connector_key: string;
   name: string;
-  database_type: "sqlite" | "postgresql" | "mysql";
+  database_type: string;
   database_url: string;
   masked_database_url: string;
-  sql_dialect: "sqlite" | "postgres" | "mysql";
+  sql_dialect: string;
   active: boolean;
   system_managed: boolean;
 };
 
+type DatasourceTypeConfigSchema = {
+  properties?: Record<string, {
+    title?: string;
+    description?: string;
+    default?: unknown;
+  }>;
+};
+
+type DatasourceType = {
+  type_key: string;
+  label: string;
+  description: string;
+  sql_dialects: string[];
+  default_sql_dialect: string;
+  config_schema: DatasourceTypeConfigSchema;
+};
+
 type OverviewDatasource = {
   connector_key: string;
   name: string;
@@ -108,6 +125,7 @@ type State = {
   llmConfig: any | null;
   governancePolicy: any | null;
   datasources: DatasourceConnector[];
+  datasourceTypes: DatasourceType[];
   selectedDatasourceId: number | "new" | null;
   datasourceSchema: any | null;
   datasourceSchemaLoading: boolean;
@@ -167,6 +185,7 @@ const state: State = {
   llmConfig: null,
   governancePolicy: null,
   datasources: [],
+  datasourceTypes: [],
   selectedDatasourceId: null,
   datasourceSchema: null,
   datasourceSchemaLoading: false,
@@ -1143,7 +1162,17 @@ function getSelectedDatasource(): DatasourceConnector | null {
 
 function renderDatasourceForm(connector: DatasourceConnector | null): string {
   const systemManaged = connector?.system_managed === true;
-  const disabled = systemManaged ? "disabled" : "";
+  const selectedTypeKey = connector?.database_type || state.datasourceTypes[0]?.type_key || "";
+  const selectedType = getDatasourceType(selectedTypeKey);
+  const databaseUrlSchema = selectedType?.config_schema?.properties?.database_url;
+  const selectedSqlDialect = connector?.sql_dialect || selectedType?.default_sql_dialect || "";
+  const databaseUrl = connector?.database_url || String(databaseUrlSchema?.default || "");
+  const unavailableType = Boolean(selectedTypeKey && !selectedType);
+  const disabled = systemManaged || unavailableType || !selectedType ? "disabled" : "";
+  const connectorDescription = selectedType?.description
+    || (unavailableType
+      ? `Connector type '${selectedTypeKey}' is unavailable. Install or enable its plugin before editing this datasource.`
+      : "No connector types are available. Install or enable a connector plugin.");
   return `
     <form id="datasource-form" class="form-grid">
       <input type="hidden" name="id" value="${escapeHtml(connector?.id || "")}" />
@@ -1151,13 +1180,14 @@ function renderDatasourceForm(connector: DatasourceConnector | null): string {
       <label>Connector key<input name="connector_key" ${connector || systemManaged ? "readonly" : ""} ${disabled} value="${escapeHtml(connector?.connector_key || "")}" /></label>
       <label>Name<input name="name" ${disabled} value="${escapeHtml(connector?.name || "")}" /></label>
       <div class="subgrid">
-        <label>Database type<select name="database_type" ${disabled}>${renderDatabaseTypeOptions(connector?.database_type || "sqlite")}</select></label>
-        <label>SQL dialect<select name="sql_dialect" ${disabled}>${renderSqlDialectOptions(connector?.sql_dialect || "sqlite")}</select></label>
+        <label>Connector type<select id="datasource-type" name="database_type" ${disabled}>${renderDatasourceTypeOptions(selectedTypeKey)}</select></label>
+        <label>SQL dialect<select id="datasource-sql-dialect" name="sql_dialect" ${disabled}>${renderSqlDialectOptions(selectedType, selectedSqlDialect)}</select></label>
       </div>
-      <label>Database URL<input name="database_url" ${disabled} value="${escapeHtml(connector?.database_url || "sqlite:///./examples/medical-poc/demo.db")}" /></label>
+      <p id="datasource-type-description" class="muted">${escapeHtml(connectorDescription)}</p>
+      <label><span id="datasource-url-label">${escapeHtml(databaseUrlSchema?.title || "Database URL")}</span><input id="datasource-url" name="database_url" ${disabled} placeholder="${escapeHtml(databaseUrlSchema?.description || "")}" value="${escapeHtml(databaseUrl)}" /></label>
       <label class="inline-check"><input name="active" type="checkbox" ${connector?.active ? "checked" : ""} ${disabled} /> Active datasource</label>
       <div class="button-row">
-        <button type="button" id="test-datasource">Test</button>
+        <button type="button" id="test-datasource" ${disabled}>Test</button>
         <button type="button" id="introspect-datasource" ${connector ? "" : "disabled"}>Schema introspection</button>
         <button type="button" id="activate-datasource" ${connector && !connector.active && !systemManaged ? "" : "disabled"}>Activate</button>
         <button class="primary" type="submit" ${systemManaged ? "disabled" : ""}>${connector ? "Save" : "Create"}</button>
@@ -1165,18 +1195,78 @@ function renderDatasourceForm(connector: DatasourceConnector | null): string {
     </form>`;
 }
 
-function renderDatabaseTypeOptions(selected: string): string {
-  return ["sqlite", "postgresql", "mysql"]
-    .map(value => `<option value="${value}" ${selected === value ? "selected" : ""}>${value}</option>`)
+function getDatasourceType(typeKey: string): DatasourceType | null {
+  return state.datasourceTypes.find(item => item.type_key === typeKey) || null;
+}
+
+function renderDatasourceTypeOptions(selected: string): string {
+  const datasourceTypes = [...state.datasourceTypes];
+
+  if (selected && !getDatasourceType(selected)) {
+    datasourceTypes.unshift({
+      type_key: selected,
+      label: `${selected} (plugin unavailable)`,
+      description: "",
+      sql_dialects: [],
+      default_sql_dialect: "",
+      config_schema: {},
+    });
+  }
+
+  if (!datasourceTypes.length) {
+    return `<option value="" selected>No connector types available</option>`;
+  }
+
+  return datasourceTypes
+    .map(item => `<option value="${escapeHtml(item.type_key)}" ${item.type_key === selected ? "selected" : ""}>${escapeHtml(item.label)}</option>`)
     .join("");
 }
 
-function renderSqlDialectOptions(selected: string): string {
-  return ["sqlite", "postgres", "mysql"]
-    .map(value => `<option value="${value}" ${selected === value ? "selected" : ""}>${value}</option>`)
+function renderSqlDialectOptions(datasourceType: DatasourceType | null, selected: string): string {
+  const dialects = [...(datasourceType?.sql_dialects || [])];
+
+  if (selected && !dialects.includes(selected)) {
+    dialects.unshift(selected);
+  }
+
+  if (!dialects.length) {
+    return `<option value="" selected>No SQL dialect available</option>`;
+  }
+
+  return dialects
+    .map(value => `<option value="${escapeHtml(value)}" ${selected === value ? "selected" : ""}>${escapeHtml(value)}</option>`)
     .join("");
 }
 
+function syncDatasourceTypeFields(event: Event): void {
+  const typeKey = (event.currentTarget as HTMLSelectElement).value;
+  const datasourceType = getDatasourceType(typeKey);
+  const sqlDialect = document.querySelector<HTMLSelectElement>("#datasource-sql-dialect");
+  const description = document.querySelector<HTMLElement>("#datasource-type-description");
+  const urlLabel = document.querySelector<HTMLElement>("#datasource-url-label");
+  const urlInput = document.querySelector<HTMLInputElement>("#datasource-url");
+  const databaseUrlSchema = datasourceType?.config_schema?.properties?.database_url;
+
+  if (sqlDialect) {
+    sqlDialect.innerHTML = renderSqlDialectOptions(
+      datasourceType,
+      datasourceType?.default_sql_dialect || "",
+    );
+  }
+
+  if (description) {
+    description.textContent = datasourceType?.description || "Connector type is unavailable.";
+  }
+
+  if (urlLabel) {
+    urlLabel.textContent = databaseUrlSchema?.title || "Database URL";
+  }
+
+  if (urlInput) {
+    urlInput.placeholder = databaseUrlSchema?.description || "";
+  }
+}
+
 function renderModeOptions(selected: string, values: string[]): string {
   return values
     .map(value => `<option value="${value}" ${selected === value ? "selected" : ""}>${value}</option>`)
@@ -1533,6 +1623,7 @@ function attachSectionHandlers(): void {
   document.querySelector<HTMLFormElement>("#llm-config-form")?.addEventListener("submit", saveLlmConfig);
   document.querySelector<HTMLFormElement>("#governance-policy-form")?.addEventListener("submit", saveGovernancePolicy);
   document.querySelector<HTMLFormElement>("#datasource-form")?.addEventListener("submit", saveDatasource);
+  document.querySelector<HTMLSelectElement>("#datasource-type")?.addEventListener("change", syncDatasourceTypeFields);
   document.querySelector<HTMLFormElement>("#datasource-schema-form")?.addEventListener("submit", saveDatasourceSchema);
   document.querySelector<HTMLInputElement>("#schema-show-enabled-only")?.addEventListener("change", event => {
     syncDatasourceSchemaDraftFromForm();
@@ -2252,8 +2343,12 @@ async function loadPrompts(): Promise<void> {
 }
 
 async function loadDatasources(): Promise<void> {
-  const result = await api<any>("/api/v1/admin/datasources");
-  state.datasources = result.items || [];
+  const [datasources, datasourceTypes] = await Promise.all([
+    api<{ items: DatasourceConnector[] }>("/api/v1/admin/datasources"),
+    api<{ items: DatasourceType[] }>("/api/v1/admin/datasource-types"),
+  ]);
+  state.datasources = datasources.items || [];
+  state.datasourceTypes = datasourceTypes.items || [];
   if (!state.selectedDatasourceId || state.selectedDatasourceId === "new") {
     state.selectedDatasourceId = state.datasources[0]?.id || null;
   }

{gaard_api-0.1.1 → gaard_api-0.1.2}/src/gaard_api/api/v1/admin.py

@@ -4,7 +4,6 @@ from datetime import datetime
 from typing import Any, Annotated
 
 from fastapi import APIRouter, Depends, Header, HTTPException, status
-from gaard_connectors.sqlalchemy.executor import SQLAlchemyQueryExecutor
 from gaard_core.errors import (
     ConfigurationError,
     LlmProviderError,
@@ -92,10 +91,12 @@ from gaard_api.admin.services import (
     update_business_logic_suggestion_content,
     update_schema_table_settings,
     validate_datasource_url,
+    validate_datasource_configuration,
 )
 from gaard_api.api.v1.schema import get_schema_cache_key
 from gaard_api.core.schema_cache import schema_context_cache
 from gaard_api.core.settings import settings
+from gaard_api.extensions import get_connector_registry
 
 router = APIRouter()
 
@@ -220,22 +221,22 @@ class OverviewWidgetFromQueryRequest(BaseModel):
 class DatasourceConnectorRequest(BaseModel):
     connector_key: str = Field(min_length=1, pattern=r"^[a-zA-Z0-9_-]+$")
     name: str = Field(min_length=1)
-    database_type: str = Field(pattern=r"^(sqlite|postgresql|mysql)$")
+    database_type: str = Field(pattern=r"^[a-z][a-z0-9_-]{0,63}$")
     database_url: str = Field(min_length=1)
-    sql_dialect: str = Field(pattern=r"^(sqlite|postgres|mysql)$")
+    sql_dialect: str = Field(pattern=r"^[a-z][a-z0-9_-]{0,63}$")
     active: bool = False
 
 
 class DatasourceConnectorUpdateRequest(BaseModel):
     name: str = Field(min_length=1)
-    database_type: str = Field(pattern=r"^(sqlite|postgresql|mysql)$")
+    database_type: str = Field(pattern=r"^[a-z][a-z0-9_-]{0,63}$")
     database_url: str = Field(min_length=1)
-    sql_dialect: str = Field(pattern=r"^(sqlite|postgres|mysql)$")
+    sql_dialect: str = Field(pattern=r"^[a-z][a-z0-9_-]{0,63}$")
     active: bool = False
 
 
 class DatasourceConnectionTestRequest(BaseModel):
-    database_type: str = Field(pattern=r"^(sqlite|postgresql|mysql)$")
+    database_type: str = Field(pattern=r"^[a-z][a-z0-9_-]{0,63}$")
     database_url: str = Field(min_length=1)
 
 
@@ -472,10 +473,15 @@ def execute_overview_sql(
 ) -> QueryResult:
     SelectOnlySqlValidator(dialect=connector.sql_dialect).validate(sql)
 
-    return SQLAlchemyQueryExecutor(
-        database_url=connector.database_url,
-        max_rows=get_query_runtime_config(session).query_max_rows,
-    ).execute(sql)
+    return (
+        get_connector_registry()
+        .get(connector.database_type)
+        .executor_factory(
+            connector.database_url,
+            get_query_runtime_config(session).query_max_rows,
+        )
+        .execute(sql)
+    )
 
 
 def generate_overview_widget_sql(
@@ -1502,6 +1508,16 @@ def get_datasources(
     }
 
 
+@router.get("/datasource-types")
+def get_datasource_types(
+    user: AdminUser = Depends(get_current_admin),
+) -> dict[str, Any]:
+    return {
+        "items": [definition.serialize() for definition in get_connector_registry().list()],
+        "viewer": user.username,
+    }
+
+
 @router.post("/datasources")
 def create_datasource(
     request: DatasourceConnectorRequest,
@@ -1515,7 +1531,11 @@ def create_datasource(
         )
 
     try:
-        validate_datasource_url(request.database_type, request.database_url)
+        validate_datasource_configuration(
+            request.database_type,
+            request.database_url,
+            request.sql_dialect,
+        )
     except ValueError as exc:
         raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail=str(exc)) from exc
 
@@ -1584,7 +1604,11 @@ def update_datasource(
         )
 
     try:
-        validate_datasource_url(request.database_type, request.database_url)
+        validate_datasource_configuration(
+            request.database_type,
+            request.database_url,
+            request.sql_dialect,
+        )
     except ValueError as exc:
         raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail=str(exc)) from exc
 
@@ -1695,12 +1719,13 @@ def test_datasource_from_request(
     request: DatasourceConnectionTestRequest,
 ) -> dict[str, Any]:
     validate_datasource_url(request.database_type, request.database_url)
+    definition = get_connector_registry().get(request.database_type)
     connector = DatasourceConnector(
         connector_key="__preview__",
         name="__preview__",
         database_type=request.database_type,
         database_url=request.database_url,
-        sql_dialect=request.database_type if request.database_type != "postgresql" else "postgres",
+        sql_dialect=definition.default_sql_dialect,
         active=False,
     )
     test_datasource_connection(connector)

{gaard_api-0.1.1 → gaard_api-0.1.2}/src/gaard_api/api/v1/prompts.py

@@ -1,7 +1,6 @@
 from fastapi import APIRouter
 from pydantic import BaseModel, Field
 
-from gaard_connectors.sqlalchemy.introspector import SQLAlchemySchemaIntrospector
 from gaard_core.prompt_compiler.models import CompiledPrompt
 from gaard_core.prompt_compiler.models import SqlGenerationPromptRequest
 from gaard_core.prompt_compiler.sql_generation_prompt import SqlGenerationPromptCompiler
@@ -12,6 +11,7 @@ from gaard_api.admin.services import get_datasource_schema_context_safe, get_que
 from gaard_api.api.v1.schema import get_schema_cache_key
 from gaard_api.core.schema_cache import schema_context_cache
 from gaard_api.core.settings import settings
+from gaard_api.extensions import get_connector_registry
 
 router = APIRouter()
 
@@ -32,9 +32,9 @@ def compile_sql_generation_prompt(
         sql_dialect = connector.sql_dialect
     else:
         sql_dialect = settings.gaard_sql_dialect
-        introspector = SQLAlchemySchemaIntrospector(
-            database_url=settings.gaard_datasource_url,
-        )
+        introspector = get_connector_registry().detect_from_database_url(
+            settings.gaard_datasource_url
+        ).introspector_factory(settings.gaard_datasource_url)
         service = SchemaContextService(
             introspector=introspector,
             cache=schema_context_cache,

{gaard_api-0.1.1 → gaard_api-0.1.2}/src/gaard_api/api/v1/query.py

@@ -8,8 +8,6 @@ from typing import Any, Callable
 from fastapi import APIRouter
 from fastapi.responses import StreamingResponse
 
-from gaard_connectors.sqlalchemy.executor import SQLAlchemyQueryExecutor
-from gaard_connectors.sqlalchemy.introspector import SQLAlchemySchemaIntrospector
 from gaard_core.errors import (
     ConfigurationError,
     LlmProviderError,
@@ -75,6 +73,7 @@ from gaard_api.admin.services import (
 from gaard_api.api.v1.schema import get_schema_cache_key
 from gaard_api.core.schema_cache import schema_context_cache
 from gaard_api.core.settings import settings
+from gaard_api.extensions import get_connector_registry
 
 router = APIRouter()
 
@@ -169,9 +168,9 @@ def create_sql_generator(
                 prompt_compiler=get_sql_generation_prompt_compiler(),
             )
 
-        introspector = SQLAlchemySchemaIntrospector(
-            database_url=settings.gaard_datasource_url,
-        )
+        introspector = get_connector_registry().detect_from_database_url(
+            settings.gaard_datasource_url
+        ).introspector_factory(settings.gaard_datasource_url)
 
         schema_context_service = SchemaContextService(
             introspector=introspector,
@@ -315,9 +314,14 @@ def create_pipeline(datasource_context: DatasourceContext | None = None) -> Quer
         else settings.gaard_sql_dialect
     )
 
-    executor = SQLAlchemyQueryExecutor(
-        database_url=database_url,
-        max_rows=runtime_config.query_max_rows,
+    connector_definition = (
+        get_connector_registry().get(datasource_context[0].database_type)
+        if datasource_context is not None
+        else get_connector_registry().detect_from_database_url(database_url)
+    )
+    executor = connector_definition.executor_factory(
+        database_url,
+        runtime_config.query_max_rows,
     )
     llm_config = (
         get_llm_runtime_config_safe()
@@ -376,9 +380,9 @@ def schema_and_business_logic_for_investigation(
             get_active_business_logic_prompt_safe(connector.id),
         )
 
-    introspector = SQLAlchemySchemaIntrospector(
-        database_url=settings.gaard_datasource_url,
-    )
+    introspector = get_connector_registry().detect_from_database_url(
+        settings.gaard_datasource_url
+    ).introspector_factory(settings.gaard_datasource_url)
     schema_context_service = SchemaContextService(
         introspector=introspector,
         cache=schema_context_cache,

{gaard_api-0.1.1 → gaard_api-0.1.2}/src/gaard_api/api/v1/schema.py

@@ -1,6 +1,5 @@
 from fastapi import APIRouter
 
-from gaard_connectors.sqlalchemy.introspector import SQLAlchemySchemaIntrospector
 from gaard_core.schema.context import SchemaContextService
 from gaard_core.schema.models import DatabaseSchema
 
@@ -10,6 +9,7 @@ from gaard_api.admin.services import (
 )
 from gaard_api.core.schema_cache import schema_context_cache
 from gaard_api.core.settings import settings
+from gaard_api.extensions import get_connector_registry
 
 router = APIRouter()
 
@@ -29,9 +29,9 @@ def get_schema() -> DatabaseSchema:
         _connector, schema_cache = datasource_context
         return selected_schema_from_cache(schema_cache)
 
-    introspector = SQLAlchemySchemaIntrospector(
-        database_url=settings.gaard_datasource_url,
-    )
+    introspector = get_connector_registry().detect_from_database_url(
+        settings.gaard_datasource_url
+    ).introspector_factory(settings.gaard_datasource_url)
 
     service = SchemaContextService(
         introspector=introspector,

gaard_api-0.1.2/src/gaard_api/extensions.py

@@ -0,0 +1,18 @@
+from functools import lru_cache
+
+from gaard_connectors import ConnectorRegistry, create_builtin_connector_registry
+from gaard_plugin_api import ExtensionManager
+
+
+@lru_cache
+def get_extension_manager() -> ExtensionManager:
+    manager = ExtensionManager()
+    manager.discover()
+    return manager
+
+
+@lru_cache
+def get_connector_registry() -> ConnectorRegistry:
+    registry = create_builtin_connector_registry()
+    get_extension_manager().activate("connectors", registry)
+    return registry

{gaard_api-0.1.1 → gaard_api-0.1.2/src/gaard_api.egg-info}/PKG-INFO

@@ -1,12 +1,13 @@
 Metadata-Version: 2.4
 Name: gaard-api
-Version: 0.1.1
+Version: 0.1.2
 Summary: GAARD backend web services providing admin interface
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 Requires-Dist: gaard-core==0.1.0
-Requires-Dist: gaard-connectors==0.1.0
+Requires-Dist: gaard-connectors==0.1.1
 Requires-Dist: gaard-llm==0.1.0
+Requires-Dist: gaard-plugin-api<0.2.0,>=0.1.0
 Requires-Dist: fastapi>=0.111.0
 Requires-Dist: uvicorn[standard]>=0.30.0
 Requires-Dist: pydantic>=2.7.0

{gaard_api-0.1.1 → gaard_api-0.1.2}/src/gaard_api.egg-info/SOURCES.txt

@@ -5,6 +5,7 @@ src/gaard_api/__init__.py
 src/gaard_api/cli.py
 src/gaard_api/cli_commands.py
 src/gaard_api/example_database.py
+src/gaard_api/extensions.py
 src/gaard_api/main.py
 src/gaard_api/server_cli.py
 src/gaard_api.egg-info/PKG-INFO
@@ -21,6 +22,7 @@ src/gaard_api/admin/prompt_runtime.py
 src/gaard_api/admin/security.py
 src/gaard_api/admin/services.py
 src/gaard_api/admin-web/index.html
+src/gaard_api/admin-web/package.json
 src/gaard_api/admin-web/assets/main.js
 src/gaard_api/admin-web/assets/styles.css
 src/gaard_api/admin-web/src/main.ts
@@ -34,13 +36,10 @@ src/gaard_api/core/__init__.py
 src/gaard_api/core/error_handlers.py
 src/gaard_api/core/schema_cache.py
 src/gaard_api/core/settings.py
-src/gaard_api/dependencies/__init__.py
 src/gaard_api/example_data/__init__.py
 src/gaard_api/example_data/medical_poc/__init__.py
 src/gaard_api/example_data/medical_poc/schema.sql
 src/gaard_api/example_data/medical_poc/seed.sql
-src/gaard_api/schemas/__init__.py
-src/gaard_api/services/__init__.py
 tests/test_admin_api.py
 tests/test_error_handlers.py
 tests/test_investigation_error_messages.py

{gaard_api-0.1.1 → gaard_api-0.1.2}/src/gaard_api.egg-info/requires.txt

@@ -1,6 +1,7 @@
 gaard-core==0.1.0
-gaard-connectors==0.1.0
+gaard-connectors==0.1.1
 gaard-llm==0.1.0
+gaard-plugin-api<0.2.0,>=0.1.0
 fastapi>=0.111.0
 uvicorn[standard]>=0.30.0
 pydantic>=2.7.0

{gaard_api-0.1.1 → gaard_api-0.1.2}/tests/test_admin_api.py

@@ -91,6 +91,31 @@ def change_password(client: TestClient, token: str) -> None:
     assert response.json()["must_change_password"] is False
 
 
+def test_admin_lists_datasource_types_from_connector_registry(admin_client: TestClient) -> None:
+    token = login(admin_client)["token"]
+    change_password(admin_client, token)
+
+    response = admin_client.get(
+        "/api/v1/admin/datasource-types",
+        headers={"Authorization": f"Bearer {token}"},
+    )
+
+    assert response.status_code == 200
+    definitions = {item["type_key"]: item for item in response.json()["items"]}
+    assert definitions["sqlite"]["default_sql_dialect"] == "sqlite"
+    assert definitions["postgresql"]["default_sql_dialect"] == "postgres"
+    assert definitions["mysql"]["config_schema"]["required"] == ["database_url"]
+
+
+def test_admin_web_loads_connector_types_from_the_registry_api(admin_client: TestClient) -> None:
+    response = admin_client.get("/admin/assets/main.js")
+
+    assert response.status_code == 200
+    assert 'api("/api/v1/admin/datasource-types")' in response.text
+    assert "plugin unavailable" in response.text
+    assert "renderDatabaseTypeOptions" not in response.text
+
+
 def test_system_seeded_mock_runtime_modes_are_migrated_to_current_defaults(
     tmp_path: Path,
     monkeypatch: pytest.MonkeyPatch,