Merge branch 'mindsdb:main' into skills

src/index.ts

@@ -48,6 +48,7 @@ const SQL = new SQLModule.SqlRestApiClient(
 const Databases = new DatabasesModule.DatabasesRestApiClient(SQL);
 const Models = new ModelsModule.ModelsRestApiClient(SQL);
 const Projects = new ProjectsModule.ProjectsRestApiClient(
+  SQL,
   defaultAxiosInstance,
   httpAuthenticator
 );

src/projects/project.ts

@@ -1,5 +1,22 @@
-/** Structure of a MindsDB Project. */
-export default interface Project {
-  /** Name of the project. */
+import ProjectsApiClient from './projectsApiClient';
+
+/**
+ * Represents a MindsDB project and all supported operations.
+ */
+export default class Project {
+  /** API client to use for executing mlEngine operations. */
+  projectApiClient: ProjectsApiClient;
+
+  /** Name of the mlEngine. */
   name: string;
+
+  /**
+   *
+   * @param {ProjectsApiClient} projectApiClient - API client to use for executing project operations.
+   * @param {string} name - Name of the project.
+   */
+  constructor(projectApiClient: ProjectsApiClient, name: string) {
+    this.projectApiClient = projectApiClient;
+    this.name = name;
+  }
 }

src/projects/projectsApiClient.ts

@@ -7,4 +7,17 @@ export default abstract class ProjectsApiClient {
    * @returns {Promise<Array<Project>>} - All projects.
    */
   abstract getAllProjects(): Promise<Array<Project>>;
+
+  /**
+   * Creates a new MindsDB project.
+   * @param {string} name - Name of the project.
+   * @returns {Promise<Project>} - The created project.
+   */
+  abstract createProject(name: string): Promise<Project>;
+
+  /**
+   *
+   * @param {string} name - Name of the project to delete.
+   */
+  abstract deleteProject(name: string): Promise<void>;
 }

src/projects/projectsRestApiClient.ts

@@ -5,21 +5,30 @@ import Constants from '../constants';
 import Project from './project';
 import HttpAuthenticator from '../httpAuthenticator';
 import { MindsDbError } from '../errors';
+import SqlApiClient from '../sql/sqlApiClient';
 
 /** Implementation of ProjectsApiClient that goes through the REST API. */
 export default class ProjectsRestApiClient extends ProjectsApiClient {
+  /** SQL API client to send all SQL query requests. */
+  sqlClient: SqlApiClient;
+
   /** Axios client to send all HTTP requests. */
   client: Axios;
 
-  /** Authenticator to use for reauthenticating if needed. */
+  /** Authenticator to use for reauthenticate if needed. */
   authenticator: HttpAuthenticator;
 
   /**
    * Constructor for Projects API client.
    * @param {Axios} client - Axios instance to send all HTTP requests.
    */
-  constructor(client: Axios, authenticator: HttpAuthenticator) {
+  constructor(
+    sqlClient: SqlApiClient,
+    client: Axios,
+    authenticator: HttpAuthenticator
+  ) {
     super();
+    this.sqlClient = sqlClient;
     this.client = client;
     this.authenticator = authenticator;
   }
@@ -52,4 +61,33 @@ export default class ProjectsRestApiClient extends ProjectsApiClient {
       throw MindsDbError.fromHttpError(error, projectsUrl);
     }
   }
+
+  /**
+   *
+   * @param name - Name of the project to create.
+   * @returns {Promise<Project>} - The created project.
+   */
+  override async createProject(name: string): Promise<Project> {
+    const sqlQuery = `CREATE PROJECT ${name}`;
+
+    const sqlQueryResult = await this.sqlClient.runQuery(sqlQuery);
+    if (sqlQueryResult.error_message) {
+      throw new MindsDbError(sqlQueryResult.error_message);
+    }
+
+    return new Project(this, name);
+  }
+
+  /**
+   *
+   * @param {string} name - Name of the project to delete.
+   */
+  override async deleteProject(name: string): Promise<void> {
+    const sqlQuery = `DROP PROJECT ${name}`;
+
+    const sqlQueryResult = await this.sqlClient.runQuery(sqlQuery);
+    if (sqlQueryResult.error_message) {
+      throw new MindsDbError(sqlQueryResult.error_message);
+    }
+  }
 }

src/tables/table.ts

@@ -29,7 +29,13 @@ export default class Table {
     this.name = name;
     this.integration = integration;
   }
-
+  /**
+   * Removes this table from its integration.
+   * @throws {MindsDbError} - Something went wrong removing this table.
+   */
+  async removeTable(): Promise<void> {
+    await this.tablesApiClient.removeTable(this.name, this.integration);
+  }
   /**
    * Creates a table in an integration from a given SELECT statement.
    * @param {string} select - SELECT statement to use for populating the new table with data.
@@ -47,4 +53,13 @@ export default class Table {
   async delete(): Promise<void> {
     await this.tablesApiClient.deleteTable(this.name, this.integration);
   }
+
+   /**
+   * Insert data into this table.
+   * @param {string} select - SELECT query to insert data from.
+   * @throws {MindsDbError} - Something went wrong inserting data into the table.
+   */
+   async insert(select: string): Promise<void> {
+    await this.tablesApiClient.insertTable(this.name, this.integration, select);
+  }
 }

src/tables/tablesApiClient.ts

@@ -41,10 +41,28 @@ export default abstract class TablesApiClient {
    */
   abstract deleteTable(name: string, integration: string): Promise<void>;
 
+  /**
+  * Insert data into this table.
+  * @param {string} name - Name of the table to be deleted.
+  * @param {string} integration - Name of the integration the table to be deleted is a part of.
+  * @param {string} select -  SELECT query to insert data from.
+  * @throws {MindsDbError} - Something went wrong inserting data into the table.
+  */
+  abstract insertTable(name: string, integration: string, select: string): Promise<void>;
   /**
    * Deletes a file from the files integration.
    * @param {string} name - Name of the file to be deleted.
    * @throws {MindsDbError} - Something went wrong deleting the file.
    */
   abstract deleteFile(name: string): Promise<void>;
 }
+
+/**
+ * Removes a table from its integration.
+ * @param {string} name - Name of the table to be removed.
+ * @param {string} integration - Name of the integration the table belongs to.
+ * @returns {Promise<void>} - Resolves when the table is successfully removed.
+ * @throws {MindsDbError} - Something went wrong removing the table.
+ */
+abstract removeTable(name: string, integration: string): Promise<void>;
+

src/tables/tablesRestApiClient.ts

@@ -88,6 +88,23 @@ export default class TablesRestApiClient extends TablesApiClient {
     }
   }
 
+  /**
+  * Insert data into this table.
+  * @param {Array<Array<any>> | string} data - A 2D array of values to insert, or a SELECT query to insert data from.
+  * @throws {MindsDbError} - Something went wrong inserting data into the table.
+  */
+  override async insertTable(name: string, integration: string, select: string): Promise<void> {
+    try {
+      const sqlQuery = `INSERT INTO ${mysql.escapeId(integration)}.${mysql.escapeId(name)} (${select})`;
+      const sqlQueryResult = await this.sqlClient.runQuery(sqlQuery);
+      if (sqlQueryResult.error_message) {
+        throw new MindsDbError(sqlQueryResult.error_message);
+      }
+    } catch(error) {
+      throw new MindsDbError(`Insert into a table failed: ${error}`);
+    }
+  }
+
   /**
    * Deletes a file from the files integration.
    * @param {string} name - Name of the file to be deleted.
@@ -102,3 +119,27 @@ export default class TablesRestApiClient extends TablesApiClient {
     }
   }
 }
+
+/**
+ * Removes a table from its integration.
+ * @param {string} name - Name of the table to be removed.
+ * @param {string} integration - Name of the integration the table belongs to.
+ * @returns {Promise<void>} - Resolves when the table is successfully removed.
+ * @throws {MindsDbError} - Something went wrong removing the table.
+ */
+override async removeTable(
+  name: string,
+  integration: string
+): Promise<void> {
+  // Construct the SQL query to drop the table
+  const sqlQuery = `DROP TABLE ${mysql.escapeId(integration)}.${mysql.escapeId(name)}`;
+
+  // Execute the SQL query using the sqlClient
+  const sqlQueryResult = await this.sqlClient.runQuery(sqlQuery);
+
+  // Check for errors
+  if (sqlQueryResult.error_message) {
+    throw new MindsDbError(sqlQueryResult.error_message);
+  }
+}
+