MindsDB 25.2.3.0__py3-none-any.whl → 25.3.1.0__py3-none-any.whl

mindsdb/integrations/utilities/sql_utils.py

@@ -7,6 +7,7 @@ from mindsdb_sql_parser import ast
 from mindsdb_sql_parser.ast.base import ASTNode
 
 from mindsdb.integrations.utilities.query_traversal import query_traversal
+from mindsdb.utilities.config import config
 
 
 class FilterOperator(Enum):
@@ -74,7 +75,7 @@ def make_sql_session():
     from mindsdb.api.executor.controllers.session_controller import SessionController
 
     sql_session = SessionController()
-    sql_session.database = 'mindsdb'
+    sql_session.database = config.get('default_project')
     return sql_session
 
 

mindsdb/interfaces/agents/agents_controller.py

@@ -13,12 +13,16 @@ from mindsdb.interfaces.database.projects import ProjectController
 from mindsdb.interfaces.model.functions import PredictorRecordNotFound
 from mindsdb.interfaces.model.model_controller import ModelController
 from mindsdb.interfaces.skills.skills_controller import SkillsController
+from mindsdb.utilities.config import config
 from mindsdb.utilities.exception import EntityExistsError, EntityNotExistsError
 
 from .constants import ASSISTANT_COLUMN, SUPPORTED_PROVIDERS, PROVIDER_TO_MODELS
 from .langchain_agent import get_llm_provider
 
 
+default_project = config.get('default_project')
+
+
 class AgentsController:
     '''Handles CRUD operations at the database level for Agents'''
 
@@ -70,7 +74,7 @@ class AgentsController:
 
         return model, provider
 
-    def get_agent(self, agent_name: str, project_name: str = 'mindsdb') -> Optional[db.Agents]:
+    def get_agent(self, agent_name: str, project_name: str = default_project) -> Optional[db.Agents]:
         '''
         Gets an agent by name.
 
@@ -91,7 +95,7 @@ class AgentsController:
         ).first()
         return agent
 
-    def get_agent_by_id(self, id: int, project_name: str = 'mindsdb') -> db.Agents:
+    def get_agent_by_id(self, id: int, project_name: str = default_project) -> db.Agents:
         '''
         Gets an agent by id.
 
@@ -162,7 +166,7 @@ class AgentsController:
             ValueError: Agent with given name already exists, or skill/model with given name does not exist.
         '''
         if project_name is None:
-            project_name = 'mindsdb'
+            project_name = default_project
         project = self.project_controller.get(name=project_name)
 
         agent = self.get_agent(name, project_name)
@@ -208,7 +212,7 @@ class AgentsController:
     def update_agent(
             self,
             agent_name: str,
-            project_name: str = 'mindsdb',
+            project_name: str = default_project,
             name: str = None,
             model_name: str = None,
             skills_to_add: List[Union[str, dict]] = None,
@@ -256,9 +260,9 @@ class AgentsController:
         if (
             is_demo and (
                 (name is not None and name != agent_name)
-                or (model_name or provider)
-                or (len(skills_to_add) > 0 or len(skills_to_remove) > 0 or len(skills_to_rewrite) > 0)
-                or (isinstance(params, dict) and len(params) > 1 and 'prompt_template' not in params)
+                or (model_name is not None and existing_agent.model_name != model_name)
+                or (provider is not None and existing_agent.provider != provider)
+                or (isinstance(params, dict) and len(params) > 0 and 'prompt_template' not in params)
             )
         ):
             raise ValueError("It is forbidden to change properties of the demo object")
@@ -347,7 +351,7 @@ class AgentsController:
 
         return existing_agent
 
-    def delete_agent(self, agent_name: str, project_name: str = 'mindsdb'):
+    def delete_agent(self, agent_name: str, project_name: str = default_project):
         '''
         Deletes an agent by name.
 
@@ -371,7 +375,7 @@ class AgentsController:
             self,
             agent: db.Agents,
             messages: List[Dict[str, str]],
-            project_name: str = 'mindsdb',
+            project_name: str = default_project,
             tools: List[BaseTool] = None,
             stream: bool = False) -> Union[Iterator[object], pd.DataFrame]:
         """
@@ -412,7 +416,7 @@ class AgentsController:
             self,
             agent: db.Agents,
             messages: List[Dict[str, str]],
-            project_name: str = 'mindsdb',
+            project_name: str = default_project,
             tools: List[BaseTool] = None) -> Iterator[object]:
         '''
         Queries an agent to get a stream of completion chunks.

mindsdb/interfaces/agents/callback_handlers.py

@@ -1,9 +1,13 @@
-from typing import Any, Dict, List, Union
+import io
 import logging
+import contextlib
+from typing import Any, Dict, List, Union, Callable
+
 from langchain_core.agents import AgentAction, AgentFinish
 from langchain_core.callbacks.base import BaseCallbackHandler
 from langchain_core.messages.base import BaseMessage
 from langchain_core.outputs import LLMResult
+from langchain_core.callbacks import StdOutCallbackHandler
 
 
 class ContextCaptureCallback(BaseCallbackHandler):
@@ -20,14 +24,49 @@ class ContextCaptureCallback(BaseCallbackHandler):
         return self.context
 
 
+class VerboseLogCallbackHandler(StdOutCallbackHandler):
+    def __init__(self, logger: logging.Logger, verbose: bool):
+        self.logger = logger
+        self.verbose = verbose
+        super().__init__()
+
+    def __call(self, method: Callable, *args: List[Any], **kwargs: Any) -> Any:
+        if self.verbose is False:
+            return
+        f = io.StringIO()
+        with contextlib.redirect_stdout(f):
+            method(*args, **kwargs)
+        output = f.getvalue()
+        self.logger.info(output)
+
+    def on_chain_start(self, *args: List[Any], **kwargs: Any) -> None:
+        self.__call(super().on_chain_start, *args, **kwargs)
+
+    def on_chain_end(self, *args: List[Any], **kwargs: Any) -> None:
+        self.__call(super().on_chain_end, *args, **kwargs)
+
+    def on_agent_action(self, *args: List[Any], **kwargs: Any) -> None:
+        self.__call(super().on_agent_action, *args, **kwargs)
+
+    def on_tool_end(self, *args: List[Any], **kwargs: Any) -> None:
+        self.__call(super().on_tool_end, *args, **kwargs)
+
+    def on_text(self, *args: List[Any], **kwargs: Any) -> None:
+        self.__call(super().on_text, *args, **kwargs)
+
+    def on_agent_finish(self, *args: List[Any], **kwargs: Any) -> None:
+        self.__call(super().on_agent_finish, *args, **kwargs)
+
+
 class LogCallbackHandler(BaseCallbackHandler):
     '''Langchain callback handler that logs agent and chain executions.'''
 
-    def __init__(self, logger: logging.Logger):
+    def __init__(self, logger: logging.Logger, verbose: bool = True):
         logger.setLevel('DEBUG')
         self.logger = logger
         self._num_running_chains = 0
         self.generated_sql = None
+        self.verbose_log_handler = VerboseLogCallbackHandler(logger, verbose)
 
     def on_llm_start(
         self, serialized: Dict[str, Any], prompts: List[str], **kwargs: Any
@@ -36,6 +75,7 @@ class LogCallbackHandler(BaseCallbackHandler):
         self.logger.debug('LLM started with prompts:')
         for prompt in prompts:
             self.logger.debug(prompt[:50])
+        self.verbose_log_handler.on_llm_start(serialized, prompts, **kwargs)
 
     def on_chat_model_start(
             self,
@@ -46,7 +86,7 @@ class LogCallbackHandler(BaseCallbackHandler):
         self.logger.debug('Chat model started with messages:')
         for message_list in messages:
             for message in message_list:
-                self.logger.debug(message.pretty_print())
+                self.logger.debug(message.pretty_repr())
 
     def on_llm_new_token(self, token: str, **kwargs: Any) -> Any:
         '''Run on new LLM token. Only available when streaming is enabled.'''
@@ -72,6 +112,8 @@ class LogCallbackHandler(BaseCallbackHandler):
             self._num_running_chains))
         self.logger.debug('Inputs: {}'.format(inputs))
 
+        self.verbose_log_handler.on_chain_start(serialized=serialized, inputs=inputs, **kwargs)
+
     def on_chain_end(self, outputs: Dict[str, Any], **kwargs: Any) -> Any:
         '''Run when chain ends running.'''
         self._num_running_chains -= 1
@@ -79,6 +121,8 @@ class LogCallbackHandler(BaseCallbackHandler):
             self._num_running_chains))
         self.logger.debug('Outputs: {}'.format(outputs))
 
+        self.verbose_log_handler.on_chain_end(outputs=outputs, **kwargs)
+
     def on_chain_error(
         self, error: Union[Exception, KeyboardInterrupt], **kwargs: Any
     ) -> Any:
@@ -96,7 +140,7 @@ class LogCallbackHandler(BaseCallbackHandler):
 
     def on_tool_end(self, output: str, **kwargs: Any) -> Any:
         '''Run when tool ends running.'''
-        pass
+        self.verbose_log_handler.on_tool_end(output=output, **kwargs)
 
     def on_tool_error(
         self, error: Union[Exception, KeyboardInterrupt], **kwargs: Any
@@ -106,7 +150,7 @@ class LogCallbackHandler(BaseCallbackHandler):
 
     def on_text(self, text: str, **kwargs: Any) -> Any:
         '''Run on arbitrary text.'''
-        pass
+        self.verbose_log_handler.on_text(text=text, **kwargs)
 
     def on_agent_action(self, action: AgentAction, **kwargs: Any) -> Any:
         '''Run on agent action.'''
@@ -124,7 +168,10 @@ class LogCallbackHandler(BaseCallbackHandler):
         # fix for mistral
         action.tool = action.tool.replace('\\', '')
 
+        self.verbose_log_handler.on_agent_action(action=action, **kwargs)
+
     def on_agent_finish(self, finish: AgentFinish, **kwargs: Any) -> Any:
         '''Run on agent end.'''
         self.logger.debug('Agent finished with return values:')
         self.logger.debug(str(finish.return_values))
+        self.verbose_log_handler.on_agent_finish(finish=finish, **kwargs)

mindsdb/interfaces/agents/langchain_agent.py

@@ -400,7 +400,7 @@ class LangchainAgent:
                 "max_iterations", args.get("max_iterations", DEFAULT_MAX_ITERATIONS)
             ),
             memory=memory,
-            verbose=args.get("verbose", args.get("verbose", True)),
+            verbose=args.get("verbose", args.get("verbose", False))
         )
         return agent_executor
 
@@ -435,7 +435,7 @@ class LangchainAgent:
         all_callbacks = []
 
         if self.log_callback_handler is None:
-            self.log_callback_handler = LogCallbackHandler(logger)
+            self.log_callback_handler = LogCallbackHandler(logger, verbose=args.get("verbose", True))
 
         all_callbacks.append(self.log_callback_handler)
 
@@ -599,7 +599,9 @@ AI: {response}"""
                 agent_executor_finished_event.set()
 
         # Enqueue Langchain agent streaming chunks in a separate thread to not block event chunks.
-        executor_stream_thread = threading.Thread(target=stream_worker, daemon=True, args=(ctx.dump(),))
+        executor_stream_thread = threading.Thread(
+            target=stream_worker, daemon=True, args=(ctx.dump(),), name='LangchainAgent.stream_worker'
+        )
         executor_stream_thread.start()
 
         while not agent_executor_finished_event.is_set():

mindsdb/interfaces/agents/mindsdb_chat_model.py

@@ -31,8 +31,10 @@ from langchain_core.outputs import (
 from pydantic import model_validator
 
 from mindsdb.interfaces.agents.constants import USER_COLUMN
+from mindsdb.utilities.config import config
 
 logger = logging.getLogger(__name__)
+default_project = config.get('default_project')
 
 
 def _convert_message_to_dict(message: BaseMessage) -> dict:
@@ -63,7 +65,7 @@ class ChatMindsdb(BaseChatModel):
     """A chat model that uses the Mindsdb"""
 
     model_name: str
-    project_name: Optional[str] = 'mindsdb'
+    project_name: Optional[str] = default_project
     model_info: Optional[dict] = None
     project_datanode: Optional[Any] = None
 
@@ -139,7 +141,7 @@ class ChatMindsdb(BaseChatModel):
         from mindsdb.api.executor.controllers import SessionController
 
         session = SessionController()
-        session.database = 'mindsdb'
+        session.database = default_project
 
         values['model_info'] = session.model_controller.get_model(model_name, project_name=project_name)
 

mindsdb/interfaces/chatbot/chatbot_controller.py

@@ -9,7 +9,10 @@ from mindsdb.interfaces.model.functions import get_project_records
 from mindsdb.utilities.context import context as ctx
 
 from mindsdb.api.executor.controllers.session_controller import SessionController
-from mindsdb.utilities.config import Config
+from mindsdb.utilities.config import config
+
+
+default_project = config.get('default_project')
 
 
 class ChatBotController:
@@ -25,7 +28,7 @@ class ChatBotController:
         self.project_controller = project_controller
         self.agents_controller = agents_controller
 
-    def get_chatbot(self, chatbot_name: str, project_name: str = 'mindsdb') -> dict:
+    def get_chatbot(self, chatbot_name: str, project_name: str = default_project) -> dict:
         '''
         Gets a chatbot by name.
 
@@ -118,7 +121,7 @@ class ChatBotController:
 
         return bot_obj
 
-    def get_chatbots(self, project_name: str = 'mindsdb') -> List[dict]:
+    def get_chatbots(self, project_name: str = default_project) -> List[dict]:
         '''
         Gets all chatbots in a project.
 
@@ -199,14 +202,12 @@ class ChatBotController:
             bot (db.ChatBots): The created chatbot
         '''
 
-        config = Config()
-
         is_cloud = config.get('cloud', False)
         if is_cloud and ctx.user_class == 0:
             raise Exception("You can't create chatbot")
 
         if project_name is None:
-            project_name = 'mindsdb'
+            project_name = default_project
         project = self.project_controller.get(name=project_name)
 
         bot = self.get_chatbot(name, project_name)
@@ -260,7 +261,7 @@ class ChatBotController:
     def update_chatbot(
             self,
             chatbot_name: str,
-            project_name: str = 'mindsdb',
+            project_name: str = default_project,
             name: str = None,
             model_name: str = None,
             agent_name: str = None,
@@ -338,7 +339,7 @@ class ChatBotController:
 
         return existing_chatbot_rec
 
-    def delete_chatbot(self, chatbot_name: str, project_name: str = 'mindsdb'):
+    def delete_chatbot(self, chatbot_name: str, project_name: str = default_project):
         '''
         Deletes a chatbot by name.
 

mindsdb/interfaces/database/database.py

@@ -3,6 +3,7 @@ from collections import OrderedDict
 
 from mindsdb.interfaces.database.projects import ProjectController
 import mindsdb.utilities.profiler as profiler
+from mindsdb.utilities.config import config
 from mindsdb.utilities.exception import EntityNotExistsError
 from mindsdb.interfaces.database.log import LogDBController
 
@@ -58,7 +59,7 @@ class DatabaseController:
                 'id': x.id,
                 'engine': None,
                 'visible': True,
-                'deletable': x.name.lower() != 'mindsdb'
+                'deletable': x.name.lower() != config.get('default_project')
             })
         for key, value in integrations.items():
             db_type = value.get('type', 'data')
@@ -106,7 +107,7 @@ class DatabaseController:
                 }
 
     def exists(self, db_name: str) -> bool:
-        return db_name in self.get_dict()
+        return db_name.lower() in self.get_dict()
 
     def get_project(self, name: str):
         return self.project_controller.get(name=name)

mindsdb/interfaces/database/integrations.py

@@ -64,7 +64,7 @@ class HandlersCache:
         ):
             return
         self._stop_event.clear()
-        self.cleaner_thread = threading.Thread(target=self._clean)
+        self.cleaner_thread = threading.Thread(target=self._clean, name='HandlersCache.clean')
         self.cleaner_thread.daemon = True
         self.cleaner_thread.start()
 

mindsdb/interfaces/database/projects.py

@@ -4,6 +4,7 @@ from typing import List, Optional
 from collections import OrderedDict
 
 import sqlalchemy as sa
+from sqlalchemy.orm.attributes import flag_modified
 import numpy as np
 
 from mindsdb_sql_parser.ast.base import ASTNode
@@ -30,6 +31,7 @@ class Project:
         p.name = db_record.name
         p.company_id = ctx.company_id
         p.id = db_record.id
+        p.metadata = db_record.metadata_
         return p
 
     def create(self, name: str):
@@ -405,9 +407,9 @@ class ProjectController:
 
         return [Project.from_record(x) for x in records]
 
-    def get(self, id: Optional[int] = None, name: Optional[str] = None, deleted: bool = False) -> Project:
+    def get(self, id: Optional[int] = None, name: Optional[str] = None, deleted: bool = False, is_default: bool = False) -> Project:
         if id is not None and name is not None:
-            raise ValueError("Both 'id' and 'name' is None")
+            raise ValueError("Both 'id' and 'name' can't be provided at the same time")
 
         company_id = ctx.company_id if ctx.company_id is not None else 0
         q = db.Project.query.filter_by(company_id=company_id)
@@ -424,6 +426,9 @@ class ProjectController:
         else:
             q = q.filter_by(deleted_at=sa.null())
 
+        if is_default:
+            q = q.filter(db.Project.metadata_['is_default'].as_boolean() == is_default)
+
         record = q.first()
 
         if record is None:
@@ -434,3 +439,24 @@ class ProjectController:
         project = Project()
         project.create(name=name)
         return project
+
+    def update(self, id: Optional[int] = None, name: Optional[str] = None, new_name: str = None, new_metadata: dict = None) -> Project:
+        if id is not None and name is not None:
+            raise ValueError("Both 'id' and 'name' can't be provided at the same time")
+
+        if id is not None:
+            project = self.get(id=id)
+        else:
+            project = self.get(name=name)
+
+        if new_name is not None:
+            project.name = new_name
+            project.record.name = new_name
+
+        if new_metadata is not None:
+            project.metadata = new_metadata
+            project.record.metadata = new_metadata
+            flag_modified(project.record, 'metadata_')
+
+        db.session.commit()
+        return project

mindsdb/interfaces/jobs/jobs_controller.py

@@ -9,6 +9,7 @@ from mindsdb_sql_parser import parse_sql, ParsingException
 from mindsdb_sql_parser.ast.mindsdb import CreateJob
 from mindsdb_sql_parser.ast import Select, Star, Identifier, BinaryOperation, Constant
 
+from mindsdb.utilities.config import config
 from mindsdb.utilities.context import context as ctx
 from mindsdb.utilities.exception import EntityNotExistsError, EntityExistsError
 from mindsdb.interfaces.storage import db
@@ -20,6 +21,8 @@ from mindsdb.utilities import log
 
 logger = log.getLogger(__name__)
 
+default_project = config.get('default_project')
+
 
 def split_sql(sql):
     # split sql by ';' ignoring delimiter in quotes
@@ -199,7 +202,7 @@ class JobsController:
         """
 
         if project_name is None:
-            project_name = 'mindsdb'
+            project_name = default_project
 
         start_at = None
         if query.start_str is not None:

mindsdb/interfaces/jobs/scheduler.py

@@ -44,7 +44,7 @@ class Scheduler:
         self.q_in = queue.Queue()
         self.q_out = queue.Queue()
         self.work_thread = threading.Thread(
-            target=execute_async, args=(self.q_in, self.q_out)
+            target=execute_async, args=(self.q_in, self.q_out), name='Scheduler.execute_async'
         )
         self.work_thread.start()
 

mindsdb/interfaces/knowledge_base/preprocessing/constants.py

@@ -6,8 +6,8 @@ DEFAULT_MARKDOWN_HEADERS = [
 ]
 
 # Limits for web crawling
-DEFAULT_CRAWL_DEPTH = 1
-DEFAULT_WEB_CRAWL_LIMIT = 100
+DEFAULT_CRAWL_DEPTH = None
+DEFAULT_WEB_CRAWL_LIMIT = 1
 DEFAULT_WEB_FILTERS = []
 
 DEFAULT_CONTEXT_DOCUMENT_LIMIT = 50

mindsdb/interfaces/model/model_controller.py

@@ -19,6 +19,7 @@ from mindsdb.interfaces.model.functions import (
 )
 from mindsdb.interfaces.storage.json import get_json_storage
 from mindsdb.interfaces.storage.model_fs import ModelStorage
+from mindsdb.utilities.config import config
 from mindsdb.utilities.context import context as ctx
 from mindsdb.utilities.functions import resolve_model_identifier
 import mindsdb.utilities.profiler as profiler
@@ -29,6 +30,8 @@ logger = log.getLogger(__name__)
 
 IS_PY36 = sys.version_info[1] <= 6
 
+default_project = config.get('default_project')
+
 
 def delete_model_storage(model_id, ctx_dump):
     try:
@@ -149,7 +152,7 @@ class ModelController():
             models.append(model_data)
         return models
 
-    def delete_model(self, model_name: str, project_name: str = 'mindsdb', version=None):
+    def delete_model(self, model_name: str, project_name: str = default_project, version=None):
         from mindsdb.interfaces.database.database import DatabaseController
 
         project_record = get_project_record(func.lower(project_name))
@@ -344,7 +347,7 @@ class ModelController():
     def prepare_finetune_statement(self, statement, database_controller):
         project_name, model_name, model_version = resolve_model_identifier(statement.name)
         if project_name is None:
-            project_name = 'mindsdb'
+            project_name = default_project
         data_integration_ref, fetch_data_query = self._get_data_integration_ref(statement, database_controller)
 
         set_active = True