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

mindsdb/migrations/versions/2025-02-10_6ab9903fc59a_del_log_table.py

@@ -0,0 +1,33 @@
+"""del_log_table
+
+Revision ID: 6ab9903fc59a
+Revises: 4943359e354a
+Create Date: 2025-02-10 16:50:27.186697
+
+"""
+from alembic import op
+import sqlalchemy as sa
+import mindsdb.interfaces.storage.db  # noqa
+
+# revision identifiers, used by Alembic.
+revision = '6ab9903fc59a'
+down_revision = '4943359e354a'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.drop_table('log')
+
+
+def downgrade():
+    op.create_table(
+        'log',
+        sa.Column('id', sa.INTEGER(), nullable=False),
+        sa.Column('created_at', sa.DATETIME(), nullable=True),
+        sa.Column('log_type', sa.VARCHAR(), nullable=True),
+        sa.Column('source', sa.VARCHAR(), nullable=True),
+        sa.Column('company_id', sa.INTEGER(), nullable=True),
+        sa.Column('payload', sa.VARCHAR(), nullable=True),
+        sa.PrimaryKeyConstraint('id')
+    )

mindsdb/migrations/versions/2025-02-14_4521dafe89ab_added_encrypted_content_to_json_storage.py

@@ -0,0 +1,29 @@
+"""added_encrypted_content_to_json_storage
+
+Revision ID: 4521dafe89ab
+Revises: 6ab9903fc59a
+Create Date: 2025-02-14 12:05:13.102594
+
+"""
+from alembic import op
+import sqlalchemy as sa
+import mindsdb.interfaces.storage.db  # noqa
+
+
+# revision identifiers, used by Alembic.
+revision = '4521dafe89ab'
+down_revision = '6ab9903fc59a'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    with op.batch_alter_table('json_storage', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('encrypted_content', sa.LargeBinary(), nullable=True))
+        batch_op.alter_column('resource_id', existing_type=sa.Integer(), type_=sa.BigInteger())
+
+
+def downgrade():
+    with op.batch_alter_table('json_storage', schema=None) as batch_op:
+        batch_op.drop_column('encrypted_content')
+        batch_op.alter_column('resource_id', existing_type=sa.BigInteger(), type_=sa.Integer())

mindsdb/migrations/versions/2025-02-19_11347c213b36_added_metadata_to_projects.py

@@ -0,0 +1,41 @@
+"""added_metadata_to_projects
+
+Revision ID: 11347c213b36
+Revises: 4521dafe89ab
+Create Date: 2025-02-19 18:46:24.014843
+
+"""
+from alembic import op
+from sqlalchemy.orm.attributes import flag_modified
+import sqlalchemy as sa
+
+import mindsdb.interfaces.storage.db as db
+from mindsdb.utilities.config import config
+
+
+# revision identifiers, used by Alembic.
+revision = '11347c213b36'
+down_revision = '4521dafe89ab'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    with op.batch_alter_table('project', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('metadata', sa.JSON(), nullable=True))
+
+    conn = op.get_bind()
+    session = sa.orm.Session(bind=conn)
+    session.commit()
+
+    project = session.query(db.Project).filter_by(name='mindsdb').first()
+    if project:
+        project.name = config.get('default_project')
+        project.metadata_ = {"is_default": True}
+        flag_modified(project, 'metadata_')
+        session.commit()
+
+
+def downgrade():
+    with op.batch_alter_table('project', schema=None) as batch_op:
+        batch_op.drop_column('metadata')

mindsdb/utilities/config.py

@@ -149,6 +149,7 @@ class Config:
                 "handlers": {
                     "console": {
                         "enabled": True,
+                        "formatter": "default",
                         "level": "INFO"     # MINDSDB_CONSOLE_LOG_LEVEL or MINDSDB_LOG_LEVEL (obsolete)
                     },
                     "file": {
@@ -216,7 +217,8 @@ class Config:
             },
             "tasks": {
                 "disable": False
-            }
+            },
+            "default_project": "mindsdb"
         }
         # endregion
 
@@ -352,6 +354,9 @@ class Config:
         if os.environ.get('MINDSDB_DB_CON', '') != '':
             self._env_config['storage_db'] = os.environ['MINDSDB_DB_CON']
 
+        if os.environ.get('MINDSDB_DEFAULT_PROJECT', '') != '':
+            self._env_config['default_project'] = os.environ['MINDSDB_DEFAULT_PROJECT'].lower()
+
     def parse_cmd_args(self) -> None:
         """Collect cmd args to self._cmd_args (accessable as self.cmd_args)
         """

mindsdb/utilities/functions.py

@@ -1,6 +1,7 @@
 import os
 import base64
 import hashlib
+import json
 import datetime
 import textwrap
 from functools import wraps
@@ -195,3 +196,13 @@ def decrypt(encripted: bytes, key: str) -> bytes:
 
     cipher = Fernet(fernet_key)
     return cipher.decrypt(encripted)
+
+
+def encrypt_json(data: dict, key: str) -> bytes:
+    json_str = json.dumps(data)
+    return encrypt(json_str.encode(), key)
+
+
+def decrypt_json(encrypted_data: bytes, key: str) -> dict:
+    decrypted = decrypt(encrypted_data, key)
+    return json.loads(decrypted)

mindsdb/utilities/log.py

@@ -1,3 +1,4 @@
+import json
 import logging
 from logging.config import dictConfig
 
@@ -7,6 +8,19 @@ from mindsdb.utilities.config import config as app_config
 logging_initialized = False
 
 
+class JsonFormatter(logging.Formatter):
+    def format(self, record):
+        record_message = super().format(record)
+        log_record = {
+            'process_name': record.processName,
+            'name': record.name,
+            'message': record_message,
+            'level': record.levelname,
+            'time': record.created
+        }
+        return json.dumps(log_record)
+
+
 class ColorFormatter(logging.Formatter):
     green = "\x1b[32;20m"
     default = "\x1b[39;20m"
@@ -53,7 +67,7 @@ def configure_logging():
     if console_handler_config['enabled'] is True:
         handlers_config['console'] = {
             "class": "logging.StreamHandler",
-            "formatter": "f",
+            "formatter": console_handler_config.get('formatter', 'default'),
             "level": console_handler_config_level
         }
 
@@ -74,7 +88,8 @@ def configure_logging():
     logging_config = dict(
         version=1,
         formatters={
-            "f": {"()": ColorFormatter},
+            "default": {"()": ColorFormatter},
+            "json": {"()": JsonFormatter},
             "file": {
                 "format": "%(asctime)s %(processName)15s %(levelname)-8s %(name)s: %(message)s"
             }

mindsdb/utilities/ml_task_queue/consumer.py

@@ -74,7 +74,9 @@ class MLTaskConsumer(BaseRedisQueue):
 
         # region collect cpu usage statistic
         self.cpu_stat = [0] * 10
-        self._collect_cpu_stat_thread = threading.Thread(target=self._collect_cpu_stat)
+        self._collect_cpu_stat_thread = threading.Thread(
+            target=self._collect_cpu_stat, name='MLTaskConsumer._collect_cpu_stat'
+        )
         self._collect_cpu_stat_thread.start()
         # endregion
 
@@ -221,7 +223,7 @@ class MLTaskConsumer(BaseRedisQueue):
             if self._ready_event.is_set() is False:
                 continue
             self._ready_event.clear()
-            threading.Thread(target=self._listen).start()
+            threading.Thread(target=self._listen, name='MLTaskConsumer._listen').start()
         self.stop()
 
     def stop(self) -> None:

mindsdb/utilities/render/sqlalchemy_render.py

@@ -63,6 +63,10 @@ class AttributedStr(str):
         obj.is_quoted = is_quoted
         return obj
 
+    def replace(self, *args):
+        obj = super().replace(*args)
+        return AttributedStr(obj, self.is_quoted)
+
 
 def get_is_quoted(identifier: ast.Identifier):
     quoted = getattr(identifier, 'is_quoted', [])