PyPI - MindsDB - Versions diffs - 23.3.3.1__tar.gz → 23.3.3.3__tar.gz - Mend

MindsDB 23.3.3.1tar.gz → 23.3.3.3tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of MindsDB might be problematic. Click here for more details.

Files changed (787) hide show

{MindsDB-23.3.3.1 → MindsDB-23.3.3.3/MindsDB.egg-info}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MindsDB
-Version: 23.3.3.1
+Version: 23.3.3.3
 Summary: MindsDB server, provides server capabilities to mindsdb native python library
 Home-page: https://github.com/mindsdb/mindsdb
 Author: MindsDB Inc
@@ -143,7 +143,7 @@ Description: <h1 align="center">
         | <a href="https://docs.mindsdb.com/"><img src="https://img.shields.io/badge/PostgreSQL-316192?style=for-the-badge&logo=postgresql&logoColor=white" alt="Connect PostgreSQL"></a> | <a href="https://docs.mindsdb.com/"><img src="https://img.shields.io/badge/IBMDB2-008000?logo=IBMDB2&logoColor=fff&style=for-the-badge" alt="IBMDB2 Badge"></a> | <a href="https://docs.mindsdb.com/"><img src="https://img.shields.io/badge/openGauss-02458D?logo=opengauss&logoColor=fff&style=for-the-badge" alt="openGauss Badge"></a> |
         | <a href="https://docs.mindsdb.com/data-integrations/all-data-integrations#questdb"><img src="https://img.shields.io/badge/QuestDB-d14671?style=for-the-badge&logo=questdb&logoColor=white" alt="Connect QuestDB"></a> | <a href="https://docs.mindsdb.com/"><img src="https://img.shields.io/badge/Apache%20Druid-29F1FB?logo=apachedruid&logoColor=000&style=for-the-badge" alt="Apache Druid Badge"></a> | <a href="https://docs.mindsdb.com/"><img src="https://img.shields.io/badge/starrocks-000000?style=for-the-badge&logo=starrocks&logoColor=white" alt="StarRocks Badge"></a> |
         | <a href="https://docs.mindsdb.com/"><img src="https://img.shields.io/badge/redis-%23DD0031.svg?&style=for-the-badge&logo=redis&logoColor=white" alt="Connect Redis"></a> | <a href="https://docs.mindsdb.com/"><img src="https://img.shields.io/badge/Vertica-000?logo=vertica&logoColor=fff&style=for-the-badge" alt="Vertica Badge"></a> | <a href="https://docs.mindsdb.com/"><img src="https://img.shields.io/badge/duckdb-fff?logo=duckdb&logoColor=000&style=for-the-badge" alt="DuckDB Badge"></a> |
-        | <a href=" https://docs.mindsdb.com/data-integrations/all-data-integrations#sap-hana"><img src="https://img.shields.io/badge/SAP%20HANA-1661BE?style=for-the-badge&logo=sap&logoColor=white" alt="Connect SAP HANA"></a> | <a href="https://docs.mindsdb.com/"><img src="https://img.shields.io/badge/Elastic-005571?logo=elastic&logoColor=fff&style=for-the-badge" alt="Elastic Badge"></a> | <a href="https://docs.mindsdb.com/"><img src="https://img.shields.io/badge/Cloud%20Spanner-4285F4?style=for-the-badge" alt="Cloud Spanner Badge"></a> |
+        | <a href=" https://docs.mindsdb.com/data-integrations/all-data-integrations#sap-hana"><img src="https://img.shields.io/badge/SAP%20HANA-1661BE?style=for-the-badge&logo=sap&logoColor=white" alt="Connect SAP HANA"></a> | <a href=" https://docs.mindsdb.com/data-integrations/all-data-integrations#elastic-search"><img src="https://img.shields.io/badge/Elastic-005571?logo=elastic&logoColor=fff&style=for-the-badge" alt="Elastic Badge"></a> | <a href="https://docs.mindsdb.com/"><img src="https://img.shields.io/badge/Cloud%20Spanner-4285F4?style=for-the-badge" alt="Cloud Spanner Badge"></a> |
         | <a href="https://docs.mindsdb.com/data-integrations/all-data-integrations#scylla"><img src="https://img.shields.io/badge/ScyllaDB-53CADD?style=for-the-badge&logo=scylladbb&logoColor=white" alt="Connect ScyllaDB"></a> | <a href="https://docs.mindsdb.com/"><img src="https://img.shields.io/badge/Firebird-F40D12?logo=Firebird&logoColor=fff&style=for-the-badge" alt="Firebird Badge"></a> |
         | <a href="https://docs.mindsdb.com/data-integrations/all-data-integrations#singlestore"><img src="https://img.shields.io/badge/Singlestore-5f07b4?style=for-the-badge&logo=singlestore&logoColor=white" alt="Connect Singlestore"></a> | <a href="https://docs.mindsdb.com/"><img src="https://img.shields.io/badge/Apache%20Hive-FDEE21?logo=apachehive&logoColor=000&style=for-the-badge" alt="Apache Hive Badge"></a> |
         | <a href="https://docs.mindsdb.com/"><img src="https://img.shields.io/badge/Snowflake-35aedd?style=for-the-badge&logo=snowflake&logoColor=blue" alt="Connect Snowflake"></a> | <a href="https://docs.mindsdb.com/"><img src="https://img.shields.io/badge/Informix-191A1B?logo=informix&logoColor=fff&style=for-the-badge" alt="Informix Badge"></a> |

{MindsDB-23.3.3.1 → MindsDB-23.3.3.3}/MindsDB.egg-info/SOURCES.txt RENAMED Viewed

@@ -86,6 +86,8 @@ mindsdb/api/mongo/responders/whatsmyuri.py
 mindsdb/api/mongo/utilities/__init__.py
 mindsdb/api/mongo/utilities/log.py
 mindsdb/api/mongo/utilities/mongodb_ast.py
+mindsdb/api/mongo/utilities/mongodb_parser.py
+mindsdb/api/mongo/utilities/mongodb_query.py
 mindsdb/api/mysql/__init__.py
 mindsdb/api/mysql/start.py
 mindsdb/api/mysql/mysql_proxy/__init__.py
@@ -150,20 +152,6 @@ mindsdb/api/mysql/mysql_proxy/utilities/log.py
 mindsdb/api/mysql/mysql_proxy/utilities/sql.py
 mindsdb/api/nlp/__init__.py
 mindsdb/api/nlp/nlp.py
-mindsdb/grpc/__init__.py
-mindsdb/grpc/db/__init__.py
-mindsdb/grpc/db/common_pb2.py
-mindsdb/grpc/db/common_pb2_grpc.py
-mindsdb/grpc/db/db_pb2.py
-mindsdb/grpc/db/db_pb2_grpc.py
-mindsdb/grpc/executor/__init__.py
-mindsdb/grpc/executor/executor_pb2.py
-mindsdb/grpc/executor/executor_pb2_grpc.py
-mindsdb/grpc/ml/__init__.py
-mindsdb/grpc/ml/common_pb2.py
-mindsdb/grpc/ml/common_pb2_grpc.py
-mindsdb/grpc/ml/ml_pb2.py
-mindsdb/grpc/ml/ml_pb2_grpc.py
 mindsdb/integrations/__init__.py
 mindsdb/integrations/handlers/__init__.py
 mindsdb/integrations/handlers/access_handler/__about__.py
@@ -456,8 +444,6 @@ mindsdb/integrations/handlers/mongodb_handler/icon.svg
 mindsdb/integrations/handlers/mongodb_handler/mongodb_handler.py
 mindsdb/integrations/handlers/mongodb_handler/requirements.txt
 mindsdb/integrations/handlers/mongodb_handler/utils/__init__.py
-mindsdb/integrations/handlers/mongodb_handler/utils/mongodb_parser.py
-mindsdb/integrations/handlers/mongodb_handler/utils/mongodb_query.py
 mindsdb/integrations/handlers/mongodb_handler/utils/mongodb_render.py
 mindsdb/integrations/handlers/mssql_handler/__about__.py
 mindsdb/integrations/handlers/mssql_handler/__init__.py
@@ -739,6 +725,20 @@ mindsdb/interfaces/stream/kafka/__init__.py
 mindsdb/interfaces/stream/kafka/kafkadb.py
 mindsdb/interfaces/stream/redis/__init__.py
 mindsdb/interfaces/stream/redis/redisdb.py
+mindsdb/microservices_grpc/__init__.py
+mindsdb/microservices_grpc/db/__init__.py
+mindsdb/microservices_grpc/db/common_pb2.py
+mindsdb/microservices_grpc/db/common_pb2_grpc.py
+mindsdb/microservices_grpc/db/db_pb2.py
+mindsdb/microservices_grpc/db/db_pb2_grpc.py
+mindsdb/microservices_grpc/executor/__init__.py
+mindsdb/microservices_grpc/executor/executor_pb2.py
+mindsdb/microservices_grpc/executor/executor_pb2_grpc.py
+mindsdb/microservices_grpc/ml/__init__.py
+mindsdb/microservices_grpc/ml/common_pb2.py
+mindsdb/microservices_grpc/ml/common_pb2_grpc.py
+mindsdb/microservices_grpc/ml/ml_pb2.py
+mindsdb/microservices_grpc/ml/ml_pb2_grpc.py
 mindsdb/migrations/__init__.py
 mindsdb/migrations/alembic.ini
 mindsdb/migrations/env.py

{MindsDB-23.3.3.1 → MindsDB-23.3.3.3}/MindsDB.egg-info/requires.txt RENAMED Viewed

@@ -1,4 +1,4 @@
-lightwood<23.2.2.0,>=23.2.1.0
+lightwood<23.3.3.0,>=23.3.2.0
 markupsafe==2.0.1
 flask-restx<2.0.0,>=1.0.1
 flask<2.0,>=1.0

{MindsDB-23.3.3.1/MindsDB.egg-info → MindsDB-23.3.3.3}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MindsDB
-Version: 23.3.3.1
+Version: 23.3.3.3
 Summary: MindsDB server, provides server capabilities to mindsdb native python library
 Home-page: https://github.com/mindsdb/mindsdb
 Author: MindsDB Inc
@@ -143,7 +143,7 @@ Description: <h1 align="center">
         | <a href="https://docs.mindsdb.com/"><img src="https://img.shields.io/badge/PostgreSQL-316192?style=for-the-badge&logo=postgresql&logoColor=white" alt="Connect PostgreSQL"></a> | <a href="https://docs.mindsdb.com/"><img src="https://img.shields.io/badge/IBMDB2-008000?logo=IBMDB2&logoColor=fff&style=for-the-badge" alt="IBMDB2 Badge"></a> | <a href="https://docs.mindsdb.com/"><img src="https://img.shields.io/badge/openGauss-02458D?logo=opengauss&logoColor=fff&style=for-the-badge" alt="openGauss Badge"></a> |
         | <a href="https://docs.mindsdb.com/data-integrations/all-data-integrations#questdb"><img src="https://img.shields.io/badge/QuestDB-d14671?style=for-the-badge&logo=questdb&logoColor=white" alt="Connect QuestDB"></a> | <a href="https://docs.mindsdb.com/"><img src="https://img.shields.io/badge/Apache%20Druid-29F1FB?logo=apachedruid&logoColor=000&style=for-the-badge" alt="Apache Druid Badge"></a> | <a href="https://docs.mindsdb.com/"><img src="https://img.shields.io/badge/starrocks-000000?style=for-the-badge&logo=starrocks&logoColor=white" alt="StarRocks Badge"></a> |
         | <a href="https://docs.mindsdb.com/"><img src="https://img.shields.io/badge/redis-%23DD0031.svg?&style=for-the-badge&logo=redis&logoColor=white" alt="Connect Redis"></a> | <a href="https://docs.mindsdb.com/"><img src="https://img.shields.io/badge/Vertica-000?logo=vertica&logoColor=fff&style=for-the-badge" alt="Vertica Badge"></a> | <a href="https://docs.mindsdb.com/"><img src="https://img.shields.io/badge/duckdb-fff?logo=duckdb&logoColor=000&style=for-the-badge" alt="DuckDB Badge"></a> |
-        | <a href=" https://docs.mindsdb.com/data-integrations/all-data-integrations#sap-hana"><img src="https://img.shields.io/badge/SAP%20HANA-1661BE?style=for-the-badge&logo=sap&logoColor=white" alt="Connect SAP HANA"></a> | <a href="https://docs.mindsdb.com/"><img src="https://img.shields.io/badge/Elastic-005571?logo=elastic&logoColor=fff&style=for-the-badge" alt="Elastic Badge"></a> | <a href="https://docs.mindsdb.com/"><img src="https://img.shields.io/badge/Cloud%20Spanner-4285F4?style=for-the-badge" alt="Cloud Spanner Badge"></a> |
+        | <a href=" https://docs.mindsdb.com/data-integrations/all-data-integrations#sap-hana"><img src="https://img.shields.io/badge/SAP%20HANA-1661BE?style=for-the-badge&logo=sap&logoColor=white" alt="Connect SAP HANA"></a> | <a href=" https://docs.mindsdb.com/data-integrations/all-data-integrations#elastic-search"><img src="https://img.shields.io/badge/Elastic-005571?logo=elastic&logoColor=fff&style=for-the-badge" alt="Elastic Badge"></a> | <a href="https://docs.mindsdb.com/"><img src="https://img.shields.io/badge/Cloud%20Spanner-4285F4?style=for-the-badge" alt="Cloud Spanner Badge"></a> |
         | <a href="https://docs.mindsdb.com/data-integrations/all-data-integrations#scylla"><img src="https://img.shields.io/badge/ScyllaDB-53CADD?style=for-the-badge&logo=scylladbb&logoColor=white" alt="Connect ScyllaDB"></a> | <a href="https://docs.mindsdb.com/"><img src="https://img.shields.io/badge/Firebird-F40D12?logo=Firebird&logoColor=fff&style=for-the-badge" alt="Firebird Badge"></a> |
         | <a href="https://docs.mindsdb.com/data-integrations/all-data-integrations#singlestore"><img src="https://img.shields.io/badge/Singlestore-5f07b4?style=for-the-badge&logo=singlestore&logoColor=white" alt="Connect Singlestore"></a> | <a href="https://docs.mindsdb.com/"><img src="https://img.shields.io/badge/Apache%20Hive-FDEE21?logo=apachehive&logoColor=000&style=for-the-badge" alt="Apache Hive Badge"></a> |
         | <a href="https://docs.mindsdb.com/"><img src="https://img.shields.io/badge/Snowflake-35aedd?style=for-the-badge&logo=snowflake&logoColor=blue" alt="Connect Snowflake"></a> | <a href="https://docs.mindsdb.com/"><img src="https://img.shields.io/badge/Informix-191A1B?logo=informix&logoColor=fff&style=for-the-badge" alt="Informix Badge"></a> |

{MindsDB-23.3.3.1 → MindsDB-23.3.3.3}/README.md RENAMED Viewed

@@ -134,7 +134,7 @@ MindsDB works with most of the SQL and NoSQL databases, data lakes, data Streams
 | <a href="https://docs.mindsdb.com/"><img src="https://img.shields.io/badge/PostgreSQL-316192?style=for-the-badge&logo=postgresql&logoColor=white" alt="Connect PostgreSQL"></a> | <a href="https://docs.mindsdb.com/"><img src="https://img.shields.io/badge/IBMDB2-008000?logo=IBMDB2&logoColor=fff&style=for-the-badge" alt="IBMDB2 Badge"></a> | <a href="https://docs.mindsdb.com/"><img src="https://img.shields.io/badge/openGauss-02458D?logo=opengauss&logoColor=fff&style=for-the-badge" alt="openGauss Badge"></a> |
 | <a href="https://docs.mindsdb.com/data-integrations/all-data-integrations#questdb"><img src="https://img.shields.io/badge/QuestDB-d14671?style=for-the-badge&logo=questdb&logoColor=white" alt="Connect QuestDB"></a> | <a href="https://docs.mindsdb.com/"><img src="https://img.shields.io/badge/Apache%20Druid-29F1FB?logo=apachedruid&logoColor=000&style=for-the-badge" alt="Apache Druid Badge"></a> | <a href="https://docs.mindsdb.com/"><img src="https://img.shields.io/badge/starrocks-000000?style=for-the-badge&logo=starrocks&logoColor=white" alt="StarRocks Badge"></a> |
 | <a href="https://docs.mindsdb.com/"><img src="https://img.shields.io/badge/redis-%23DD0031.svg?&style=for-the-badge&logo=redis&logoColor=white" alt="Connect Redis"></a> | <a href="https://docs.mindsdb.com/"><img src="https://img.shields.io/badge/Vertica-000?logo=vertica&logoColor=fff&style=for-the-badge" alt="Vertica Badge"></a> | <a href="https://docs.mindsdb.com/"><img src="https://img.shields.io/badge/duckdb-fff?logo=duckdb&logoColor=000&style=for-the-badge" alt="DuckDB Badge"></a> |
-| <a href=" https://docs.mindsdb.com/data-integrations/all-data-integrations#sap-hana"><img src="https://img.shields.io/badge/SAP%20HANA-1661BE?style=for-the-badge&logo=sap&logoColor=white" alt="Connect SAP HANA"></a> | <a href="https://docs.mindsdb.com/"><img src="https://img.shields.io/badge/Elastic-005571?logo=elastic&logoColor=fff&style=for-the-badge" alt="Elastic Badge"></a> | <a href="https://docs.mindsdb.com/"><img src="https://img.shields.io/badge/Cloud%20Spanner-4285F4?style=for-the-badge" alt="Cloud Spanner Badge"></a> |
+| <a href=" https://docs.mindsdb.com/data-integrations/all-data-integrations#sap-hana"><img src="https://img.shields.io/badge/SAP%20HANA-1661BE?style=for-the-badge&logo=sap&logoColor=white" alt="Connect SAP HANA"></a> | <a href=" https://docs.mindsdb.com/data-integrations/all-data-integrations#elastic-search"><img src="https://img.shields.io/badge/Elastic-005571?logo=elastic&logoColor=fff&style=for-the-badge" alt="Elastic Badge"></a> | <a href="https://docs.mindsdb.com/"><img src="https://img.shields.io/badge/Cloud%20Spanner-4285F4?style=for-the-badge" alt="Cloud Spanner Badge"></a> |
 | <a href="https://docs.mindsdb.com/data-integrations/all-data-integrations#scylla"><img src="https://img.shields.io/badge/ScyllaDB-53CADD?style=for-the-badge&logo=scylladbb&logoColor=white" alt="Connect ScyllaDB"></a> | <a href="https://docs.mindsdb.com/"><img src="https://img.shields.io/badge/Firebird-F40D12?logo=Firebird&logoColor=fff&style=for-the-badge" alt="Firebird Badge"></a> |
 | <a href="https://docs.mindsdb.com/data-integrations/all-data-integrations#singlestore"><img src="https://img.shields.io/badge/Singlestore-5f07b4?style=for-the-badge&logo=singlestore&logoColor=white" alt="Connect Singlestore"></a> | <a href="https://docs.mindsdb.com/"><img src="https://img.shields.io/badge/Apache%20Hive-FDEE21?logo=apachehive&logoColor=000&style=for-the-badge" alt="Apache Hive Badge"></a> |
 | <a href="https://docs.mindsdb.com/"><img src="https://img.shields.io/badge/Snowflake-35aedd?style=for-the-badge&logo=snowflake&logoColor=blue" alt="Connect Snowflake"></a> | <a href="https://docs.mindsdb.com/"><img src="https://img.shields.io/badge/Informix-191A1B?logo=informix&logoColor=fff&style=for-the-badge" alt="Informix Badge"></a> |

{MindsDB-23.3.3.1 → MindsDB-23.3.3.3}/mindsdb/__about__.py RENAMED Viewed

@@ -1,6 +1,6 @@
 __title__ = 'MindsDB'
 __package_name__ = 'mindsdb'
-__version__ = '23.3.3.1'
+__version__ = '23.3.3.3'
 __description__ = "MindsDB server, provides server capabilities to mindsdb native python library"
 __email__ = "jorge@mindsdb.com"
 __author__ = 'MindsDB Inc'

{MindsDB-23.3.3.1 → MindsDB-23.3.3.3}/mindsdb/api/mongo/classes/query_sql.py RENAMED Viewed

@@ -14,9 +14,9 @@ class SqlServerStub:
             setattr(self, arg, kwargs[arg])
-def run_sql_command(mindsdb_env, ast_query):
+def run_sql_command(request_env, ast_query):
     sql_session = SessionController()
-    sql_session.database = 'mindsdb'
+    sql_session.database = request_env.get('database', 'mindsdb')
     sqlserver = SqlServerStub(connection_id=-1)
     executor = Executor(sql_session, sqlserver)

MindsDB-23.3.3.3/mindsdb/api/mongo/responders/aggregate.py ADDED Viewed

@@ -0,0 +1,79 @@
+from bson.int64 import Int64
+from mindsdb_sql.parser.ast import Identifier, Insert, CreateTable
+from mindsdb.api.mongo.classes import Responder
+import mindsdb.api.mongo.functions as helpers
+from mindsdb.api.mongo.responders.find import find_to_ast
+from mindsdb.api.mongo.classes.query_sql import run_sql_command
+def aggregate_to_ast(query, database):
+    collection = query['aggregate']
+    save_table = None
+    is_append = False
+    first_step = query['pipeline'][0]
+    if '$match' in first_step:
+        # convert to find
+        find_query = {
+            'find': collection,
+            'filter': first_step['$match'],
+        }
+        for step in query['pipeline'][1:]:
+            if '$project' in step:
+                find_query['projection'] = step['$project']
+            if '$sort' in step:
+                find_query['sort'] = step['$sort']
+            if '$skip' in step:
+                find_query['skip'] = step['$skip']
+            if '$limit' in step:
+                find_query['limit'] = step['$limit']
+            if '$out' in step:
+                target = step['$out']
+                if isinstance(target, str):
+                    save_table = Identifier(target)
+                else:
+                    save_table = Identifier(parts=[target['db'], target['coll']])
+                    if target.get('append'):
+                        is_append = True
+            # TODO implement group
+        ast_query = find_to_ast(find_query, database)
+        if save_table is not None:
+            if is_append:
+                ast_query = Insert(save_table, from_select=ast_query)
+            else:
+                ast_query = CreateTable(save_table, from_select=ast_query, is_replace=True)
+    else:
+        raise NotImplementedError
+    return ast_query
+class Responce(Responder):
+    when = {'aggregate': helpers.is_true}
+    def result(self, query, request_env, mindsdb_env, session):
+        db = query['$db']
+        collection = query['aggregate']
+        ast_query = aggregate_to_ast(query, request_env.get('database', 'mindsdb'))
+        data = run_sql_command(request_env, ast_query)
+        cursor = {
+            'id': Int64(0),
+            'ns': f"{db}.$cmd.{collection}",
+            'firstBatch': data
+        }
+        return {
+            'cursor': cursor,
+            'ok': 1
+        }
+responder = Responce()

{MindsDB-23.3.3.1 → MindsDB-23.3.3.3}/mindsdb/api/mongo/responders/coll_stats.py RENAMED Viewed

@@ -49,7 +49,7 @@ class Responce(Responder):
                 parts=ident_parts
             ))
-            data = run_sql_command(mindsdb_env, ast_query)
+            data = run_sql_command(request_env, ast_query)
             res = {
                 'data': data
             }

{MindsDB-23.3.3.1 → MindsDB-23.3.3.3}/mindsdb/api/mongo/responders/delete.py RENAMED Viewed

@@ -1,7 +1,8 @@
 from mindsdb.api.mongo.classes import Responder
 import mindsdb.api.mongo.functions as helpers
 from mindsdb_sql.parser.ast import Delete, Identifier, BinaryOperation, Constant
-from mindsdb_sql.parser.dialects.mindsdb import DropPredictor
+from mindsdb_sql.parser.dialects.mindsdb import DropPredictor, DropJob
+from mindsdb.interfaces.jobs.jobs_controller import JobsController
 from mindsdb.api.mongo.classes.query_sql import run_sql_command
@@ -28,14 +29,16 @@ class Responce(Responder):
         table = query['delete']
         if table == 'predictors':
             table = 'models'
-        if table not in ('models_versions', 'models'):
-            raise Exception("Only REMOVE from 'models' collection is supported at this time")
+        project_name = request_env['database']
+        if table not in ('models_versions', 'models', 'jobs'):
+            raise Exception("Only REMOVE from 'models' or 'jobs' collection is supported at this time")
         if len(query['deletes']) != 1:
             raise Exception("Should be only one argument in REMOVE operation")
         obj_name, obj_id = None, None
-        project_name = request_env['database']
         delete_filter = query['deletes'][0]['q']
         if '_id' in delete_filter:
@@ -52,24 +55,31 @@ class Responce(Responder):
         if obj_name is None and obj_id is None:
             raise Exception("Can't find object to delete, use filter by name or _id")
-        if obj_name is None and (table == 'models' or table == 'models_versions'):
-            model_id = obj_id >> 20
-            if obj_name is None:
-                models = mindsdb_env['model_controller'].get_models(
-                    ml_handler_name=None,
-                    project_name=project_name
-                )
-                for model in models:
-                    if model['id'] == model_id:
-                        obj_name = model['name']
-                        break
+        if obj_name is None:
+            if table == 'models' or table == 'models_versions':
+                model_id = obj_id >> 20
                 if obj_name is None:
-                    raise Exception("Can't find model by _id")
+                    models = mindsdb_env['model_controller'].get_models(
+                        ml_handler_name=None,
+                        project_name=project_name
+                    )
+                    for model in models:
+                        if model['id'] == model_id:
+                            obj_name = model['name']
+                            break
+                    if obj_name is None:
+                        raise Exception("Can't find model by _id")
+            elif table == 'jobs':
+                jobs_controller = JobsController()
+                for job in jobs_controller.get_list(project_name):
+                    if job['id'] == obj_id:
+                        obj_name = job['name']
+                        break
         # delete model
         if table == 'models':
             ast_query = DropPredictor(Identifier(parts=[project_name, obj_name]))
-            run_sql_command(mindsdb_env, ast_query)
+            run_sql_command(request_env, ast_query)
         # delete model version
         elif table == 'models_versions':
@@ -84,7 +94,11 @@ class Responce(Responder):
                                    BinaryOperation(op='=', args=[Identifier('name'), Constant(obj_name)]),
                                    BinaryOperation(op='=', args=[Identifier('version'), Constant(version)])
                                ]))
-            run_sql_command(mindsdb_env, ast_query)
+            run_sql_command(request_env, ast_query)
+        elif table == 'jobs':
+            ast_query = DropJob(Identifier(parts=[project_name, obj_name]))
+            run_sql_command(request_env, ast_query)
         return {
             'n': 1,

MindsDB-23.3.3.3/mindsdb/api/mongo/responders/find.py ADDED Viewed

@@ -0,0 +1,168 @@
+from bson.int64 import Int64
+from mindsdb_sql.parser.ast import Join, Select, Identifier, Describe
+import mindsdb.api.mongo.functions as helpers
+from mindsdb.api.mongo.classes import Responder
+from mindsdb.api.mongo.utilities.mongodb_ast import MongoToAst
+from mindsdb.interfaces.jobs.jobs_controller import JobsController
+from mindsdb.api.mongo.classes.query_sql import run_sql_command
+def find_to_ast(query, database):
+    mongoToAst = MongoToAst()
+    collection = [database, query['find']]
+    if not query.get('singleBatch') and 'collection' in query.get('filter'):
+        # JOIN mode
+        # upper query
+        ast_query = mongoToAst.find(
+            collection=collection,
+            projection=query.get('projection'),
+            sort=query.get('sort'),
+            limit=query.get('limit'),
+            skip=query.get('skip'),
+        )
+        # table_query
+        collection = query['filter']['collection']
+        filter = query['filter'].get('query', {})
+        table_select = mongoToAst.find(
+            collection=collection,
+            filter=filter,
+        )
+        table_select.parentheses = True
+        modifiers = query['filter'].get('modifiers')
+        if modifiers is not None and hasattr(ast_query, 'modifiers'):
+            for modifier in modifiers:
+                table_select.modifiers.append(modifier)
+        # convert to join
+        right_table = ast_query.from_table
+        ast_join = Join(
+            left=table_select,
+            right=right_table,
+            join_type='join'
+        )
+        ast_query.from_table = ast_join
+    else:
+        # is single table
+        ast_query = mongoToAst.find(
+            collection=collection,
+            filter=query.get('filter'),
+            projection=query.get('projection'),
+            sort=query.get('sort'),
+            limit=query.get('limit'),
+            skip=query.get('skip'),
+        )
+        modifiers = query['filter'].get('modifiers')
+        if modifiers is not None and hasattr(ast_query, 'modifiers'):
+            for modifier in modifiers:
+                ast_query.modifiers.append(modifier)
+    return ast_query
+class Responce(Responder):
+    when = {'find': helpers.is_true}
+    def result(self, query, request_env, mindsdb_env, session):
+        database = request_env['database']
+        project_name = request_env['database']
+        if database == 'config':
+            # return nothing
+            return {
+                'cursor': {
+                    'id': Int64(0),
+                    'ns': f"{database}.$cmd.{query['find']}",
+                    'firstBatch': []
+                },
+                'ok': 1
+            }
+        # system queries
+        if query['find'] == 'system.version':
+            # For studio3t
+            data = [{
+                "_id": "featureCompatibilityVersion",
+                "version": "3.6"
+            }]
+            cursor = {
+                'id': Int64(0),
+                'ns': f"system.version.$cmd.{query['find']}",
+                'firstBatch': data
+            }
+            return {
+                'cursor': cursor,
+                'ok': 1
+            }
+        ast_query = find_to_ast(query, database)
+        # add _id for objects
+        table_name = None
+        obj_idx = {}
+        if isinstance(ast_query, Select) and ast_query.from_table is not None:
+            if isinstance(ast_query.from_table, Identifier):
+                table_name = ast_query.from_table.parts[-1].lower()
+                if table_name == 'models' or table_name == 'models_versions':
+                    models = mindsdb_env['model_controller'].get_models(
+                        ml_handler_name=None,
+                        project_name=project_name
+                    )
+                    for model in models:
+                        obj_idx[model['name']] = model['id']
+                    # is select from model without where
+                    if table_name in obj_idx and ast_query.where is None:
+                        # replace query to describe model
+                        ast_query = Describe(ast_query.from_table)
+                elif table_name == 'jobs':
+                    jobs_controller = JobsController()
+                    for job in jobs_controller.get_list(project_name):
+                        obj_idx[job['name']] = job['id']
+        data = run_sql_command(request_env, ast_query)
+        if table_name == 'models' or table_name == 'models_versions':
+            # for models and models_versions _id is:
+            #   - first 20 bytes is version
+            #   - next bytes is model id
+            for row in data:
+                model_id = obj_idx.get(row.get('NAME'))
+                if model_id is not None:
+                    obj_id = model_id << 20
+                    if table_name == 'models_versions':
+                        obj_id += row.get('VERSION', 0)
+                    row['_id'] = helpers.int_to_objectid(obj_id)
+        elif table_name == 'jobs':
+            for row in data:
+                obj_id = obj_idx.get(row.get('NAME'))
+                if obj_id is not None:
+                    row['_id'] = helpers.int_to_objectid(obj_id)
+        db = mindsdb_env['config']['api']['mongodb']['database']
+        cursor = {
+            'id': Int64(0),
+            'ns': f"{db}.$cmd.{query['find']}",
+            'firstBatch': data
+        }
+        return {
+            'cursor': cursor,
+            'ok': 1
+        }
+responder = Responce()

MindsDB 23.3.3.1__tar.gz → 23.3.3.3__tar.gz

Potentially problematic release.

MindsDB 23.3.3.1tar.gz → 23.3.3.3tar.gz