MindsDB 25.6.2.0__py3-none-any.whl → 25.6.3.0__py3-none-any.whl

mindsdb/interfaces/skills/skills_controller.py

@@ -6,8 +6,6 @@ from sqlalchemy.orm.attributes import flag_modified
 
 from mindsdb.interfaces.storage import db
 from mindsdb.interfaces.database.projects import ProjectController
-from mindsdb.interfaces.data_catalog.data_catalog_loader import DataCatalogLoader
-from mindsdb.interfaces.skills.skill_tool import SkillType
 from mindsdb.utilities.config import config
 from mindsdb.utilities import log
 
@@ -99,27 +97,6 @@ class SkillsController:
         if skill is not None:
             raise ValueError(f"Skill with name already exists: {name}")
 
-        # Load metadata to data catalog (if enabled) if the skill is Text-to-SQL.
-        if config.get("data_catalog", {}).get("enabled", False):
-            if type == SkillType.TEXT2SQL.value and "include_tables" in params:
-                # TODO: Is it possible to create a skill with complete access to the database with the new agent syntax?
-                # TODO: Handle the case where `ignore_tables` is provided. Is this a valid parameter?
-                # TODO: Knowledge Bases?
-                database_table_map = {}
-                for table in params["include_tables"]:
-                    parts = table.split(".", 1)
-                    database_table_map[parts[0]] = database_table_map.get(parts[0], []) + [parts[1]]
-
-                for database_name, table_names in database_table_map.items():
-                    data_catalog_loader = DataCatalogLoader(database_name=database_name, table_names=table_names)
-                    data_catalog_loader.load_metadata()
-
-            elif type in [SkillType.TEXT2SQL.value, SkillType.TEXT2SQL_LEGACY.value] and "database" in params:
-                data_catalog_loader = DataCatalogLoader(
-                    database_name=params["database"], table_names=params["tables"] if "tables" in params else None
-                )
-                data_catalog_loader.load_metadata()
-
         new_skill = db.Skills(
             name=name,
             project_id=project.id,

mindsdb/interfaces/skills/sql_agent.py

@@ -402,11 +402,15 @@ class SQLAgent:
         """
         if config.get("data_catalog", {}).get("enabled", False):
             database_table_map = {}
-            for name in self.get_usable_table_names():
+            for name in table_names or self.get_usable_table_names():
                 name = name.replace("`", "")
 
-                # TODO: Can there be situations where the database name is returned from the above method?
                 parts = name.split(".", 1)
+                # TODO: Will there be situations where parts has more than 2 elements? Like a schema?
+                # This is unlikely given that we default to a single schema per database.
+                if len(parts) == 1:
+                    raise ValueError(f"Invalid table name: {name}. Expected format is 'database.table'.")
+
                 database_table_map[parts[0]] = database_table_map.get(parts[0], []) + [parts[1]]
 
             data_catalog_str = ""
@@ -430,8 +434,8 @@ class SQLAgent:
                 else:
                     all_tables.append(Identifier(name))
 
-            # if table_names is not None:
-            #     all_tables = self._resolve_table_names(table_names, all_tables)
+            if table_names is not None:
+                all_tables = self._resolve_table_names(table_names, all_tables)
 
             tables_info = []
             for table in all_tables:

mindsdb/interfaces/storage/db.py

@@ -1,6 +1,6 @@
 import json
 import datetime
-from typing import Dict, List
+from typing import Dict, List, Optional
 
 import numpy as np
 from sqlalchemy import (
@@ -494,17 +494,33 @@ class KnowledgeBase(Base):
 
     __table_args__ = (UniqueConstraint("name", "project_id", name="unique_knowledge_base_name_project_id"),)
 
-    def as_dict(self) -> Dict:
+    def as_dict(self, with_secrets: Optional[bool] = True) -> Dict:
+        params = self.params.copy()
+        embedding_model = params.pop("embedding_model", None)
+        reranking_model = params.pop("reranking_model", None)
+
+        if not with_secrets:
+            if embedding_model and "api_key" in embedding_model:
+                embedding_model["api_key"] = "******"
+
+            if reranking_model and "api_key" in reranking_model:
+                reranking_model["api_key"] = "******"
+
         return {
             "id": self.id,
             "name": self.name,
             "project_id": self.project_id,
-            "embedding_model": None if self.embedding_model is None else self.embedding_model.name,
             "vector_database": None if self.vector_database is None else self.vector_database.name,
             "vector_database_table": self.vector_database_table,
             "updated_at": self.updated_at,
             "created_at": self.created_at,
-            "params": self.params,
+            "query_id": self.query_id,
+            "embedding_model": embedding_model,
+            "reranking_model": reranking_model,
+            "metadata_columns": params.pop("metadata_columns", None),
+            "content_columns": params.pop("content_columns", None),
+            "id_column": params.pop("id_column", None),
+            "params": params,
         }
 
 

mindsdb/utilities/config.py

@@ -400,7 +400,11 @@ class Config:
             bool: True if config was loaded or updated
         """
 
-        if self.auto_config_path.is_file() and self.auto_config_mtime != self.auto_config_path.stat().st_mtime:
+        if (
+            self.auto_config_path.is_file()
+            and self.auto_config_path.read_text() != ""
+            and self.auto_config_mtime != self.auto_config_path.stat().st_mtime
+        ):
             try:
                 self._auto_config = json.loads(self.auto_config_path.read_text())
             except json.JSONDecodeError as e: