MindsDB 25.7.3.0__py3-none-any.whl → 25.7.4.0__py3-none-any.whl

mindsdb/interfaces/database/projects.py

@@ -94,14 +94,26 @@ class Project:
     def drop_model(self, name: str):
         ModelController().delete_model(name, project_name=self.name)
 
-    def drop_view(self, name: str):
-        ViewController().delete(name, project_name=self.name)
+    def drop_view(self, name: str, strict_case: bool = False) -> None:
+        """Remove a view with the specified name from the current project.
+
+        Args:
+            name (str): The name of the view to remove.
+            strict_case (bool, optional): If True, the view name is case-sensitive. Defaults to False.
+
+        Raises:
+            EntityNotExistsError: If the view does not exist.
+
+        Returns:
+            None
+        """
+        ViewController().delete(name, project_name=self.name, strict_case=strict_case)
 
     def create_view(self, name: str, query: str):
         ViewController().add(name, query=query, project_name=self.name)
 
-    def update_view(self, name: str, query: str):
-        ViewController().update(name, query=query, project_name=self.name)
+    def update_view(self, name: str, query: str, strict_case: bool = False):
+        ViewController().update(name, query=query, project_name=self.name, strict_case=strict_case)
 
     def delete_view(self, name: str):
         ViewController().delete(name, project_name=self.name)
@@ -279,18 +291,29 @@ class Project:
         ]
         return data
 
-    def get_view(self, name):
-        view_record = (
-            db.session.query(db.View)
-            .filter(
-                db.View.project_id == self.id,
-                db.View.company_id == ctx.company_id,
-                sa.func.lower(db.View.name) == name.lower(),
-            )
-            .one_or_none()
+    def get_view(self, name: str, strict_case: bool = False) -> dict | None:
+        """Get a view by name from the current project.
+
+        Args:
+            name (str): The name of the view to retrieve.
+            strict_case (bool, optional): If True, the view name is case-sensitive. Defaults to False.
+
+        Returns:
+            dict | None: A dictionary with view information if found, otherwise None.
+        """
+        query = db.session.query(db.View).filter(
+            db.View.project_id == self.id,
+            db.View.company_id == ctx.company_id,
         )
+        if strict_case:
+            query = query.filter(db.View.name == name)
+        else:
+            query = query.filter(sa.func.lower(db.View.name) == name.lower())
+
+        view_record = query.one_or_none()
+
         if view_record is None:
-            return view_record
+            return None
         return {
             "name": view_record.name,
             "query": view_record.query,
@@ -385,8 +408,29 @@ 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, is_default: bool = False
+        self,
+        id: int | None = None,
+        name: str | None = None,
+        deleted: bool = False,
+        is_default: bool = False,
+        strict_case: bool = False,
     ) -> Project:
+        """Get a project by id or name.
+
+        Args:
+            id (int | None, optional): The id of the project to retrieve. Cannot be used with 'name'.
+            name (str | None, optional): The name of the project to retrieve. Cannot be used with 'id'.
+            deleted (bool, optional): If True, include deleted projects. Defaults to False.
+            is_default (bool, optional): If True, only return the default project. Defaults to False.
+            strict_case (bool, optional): If True, the project name is case-sensitive. Defaults to False.
+
+        Raises:
+            ValueError: If both 'id' and 'name' are provided.
+            EntityNotExistsError: If the project is not found.
+
+        Returns:
+            Project: The project instance matching the given criteria.
+        """
         if id is not None and name is not None:
             raise ValueError("Both 'id' and 'name' can't be provided at the same time")
 
@@ -396,7 +440,10 @@ class ProjectController:
         if id is not None:
             q = q.filter_by(id=id)
         elif name is not None:
-            q = q.filter((sa.func.lower(db.Project.name) == sa.func.lower(name)))
+            if strict_case:
+                q = q.filter((db.Project.name == name))
+            else:
+                q = q.filter((sa.func.lower(db.Project.name) == sa.func.lower(name)))
 
         if deleted is True:
             q = q.filter((db.Project.deleted_at != sa.null()))

mindsdb/interfaces/database/views.py

@@ -12,64 +12,90 @@ class ViewController:
         from mindsdb.interfaces.database.database import DatabaseController
 
         database_controller = DatabaseController()
-        project_databases_dict = database_controller.get_dict(filter_type='project')
+        project_databases_dict = database_controller.get_dict(filter_type="project")
 
         if project_name not in project_databases_dict:
-            raise EntityNotExistsError('Can not find project', project_name)
+            raise EntityNotExistsError("Can not find project", project_name)
 
-        project_id = project_databases_dict[project_name]['id']
+        project_id = project_databases_dict[project_name]["id"]
         view_record = (
             db.session.query(db.View.id)
             .filter(
-                func.lower(db.View.name) == name,
-                db.View.company_id == ctx.company_id,
-                db.View.project_id == project_id
-            ).first()
+                func.lower(db.View.name) == name, db.View.company_id == ctx.company_id, db.View.project_id == project_id
+            )
+            .first()
         )
         if view_record is not None:
-            raise EntityExistsError('View already exists', name)
+            raise EntityExistsError("View already exists", name)
 
-        view_record = db.View(
-            name=name,
-            company_id=ctx.company_id,
-            query=query,
-            project_id=project_id
-        )
+        view_record = db.View(name=name, company_id=ctx.company_id, query=query, project_id=project_id)
         db.session.add(view_record)
         db.session.commit()
 
-    def update(self, name, query, project_name):
-        name = name.lower()
+    def update(self, name: str, query: str, project_name: str, strict_case: bool = False):
+        """Update the SQL query of an existing view in the specified project.
+
+        Args:
+            name (str): The name of the view to update.
+            query (str): The new SQL query for the view.
+            project_name (str): The name of the project containing the view.
+            strict_case (bool, optional): If True, the view name is case-sensitive. If False, the name comparison is case-insensitive. Defaults to False.
+
+        Raises:
+            EntityNotExistsError: If the view with the specified name does not exist in the given project.
+
+        Returns:
+            None
+        """
         project_record = get_project_record(project_name)
 
-        rec = db.session.query(db.View).filter(
-            func.lower(db.View.name) == name,
-            db.View.company_id == ctx.company_id,
-            db.View.project_id == project_record.id
-        ).first()
+        q = db.session.query(db.View).filter(
+            db.View.company_id == ctx.company_id, db.View.project_id == project_record.id
+        )
+        if strict_case:
+            q = q.filter(db.View.name == name)
+        else:
+            q = q.filter(func.lower(db.View.name) == func.lower(name))
+
+        rec = q.first()
         if rec is None:
-            raise EntityNotExistsError('View not found', name)
+            raise EntityNotExistsError("View not found", name)
         rec.query = query
         db.session.commit()
 
-    def delete(self, name, project_name):
-        name = name.lower()
+    def delete(self, name: str, project_name: str, strict_case: bool = False) -> None:
+        """Remove a view with the specified name from the given project.
+
+        Args:
+            name (str): The name of the view to remove.
+            project_name (str): The name of the project containing the view.
+            strict_case (bool, optional): If True, the view name is case-sensitive. Defaults to False.
+
+        Raises:
+            EntityNotExistsError: If the view does not exist.
+
+        Returns:
+            None
+        """
         project_record = get_project_record(project_name)
 
-        rec = db.session.query(db.View).filter(
-            func.lower(db.View.name) == name,
-            db.View.company_id == ctx.company_id,
-            db.View.project_id == project_record.id
-        ).first()
-        if rec is None:
-            raise EntityNotExistsError('View not found', name)
-        db.session.delete(rec)
+        query = db.session.query(db.View).filter(
+            db.View.company_id == ctx.company_id, db.View.project_id == project_record.id
+        )
+        if strict_case:
+            query = query.filter(db.View.name == name)
+        else:
+            query = query.filter(func.lower(db.View.name) == func.lower(name))
+
+        record = query.first()
+        if record is None:
+            raise EntityNotExistsError("View not found", name)
+        db.session.delete(record)
         db.session.commit()
 
-        query_context_controller.drop_query_context('view', rec.id)
+        query_context_controller.drop_query_context("view", record.id)
 
     def list(self, project_name):
-
         project_names = {}
         for project in get_project_records():
             if project_name is not None and project.name != project_name:
@@ -77,49 +103,49 @@ class ViewController:
             project_names[project.id] = project.name
 
         query = db.session.query(db.View).filter(
-            db.View.company_id == ctx.company_id,
-            db.View.project_id.in_(list(project_names.keys()))
+            db.View.company_id == ctx.company_id, db.View.project_id.in_(list(project_names.keys()))
         )
 
         data = []
 
         for record in query:
-
-            data.append({
-                'id': record.id,
-                'name': record.name,
-                'project': project_names[record.project_id],
-                'query': record.query,
-            })
+            data.append(
+                {
+                    "id": record.id,
+                    "name": record.name,
+                    "project": project_names[record.project_id],
+                    "query": record.query,
+                }
+            )
 
         return data
 
     def _get_view_record_data(self, record):
-        return {
-            'id': record.id,
-            'name': record.name,
-            'query': record.query
-        }
+        return {"id": record.id, "name": record.name, "query": record.query}
 
     def get(self, id=None, name=None, project_name=None):
         project_record = get_project_record(project_name)
 
         if id is not None:
-            records = db.session.query(db.View).filter_by(
-                id=id,
-                project_id=project_record.id,
-                company_id=ctx.company_id
-            ).all()
+            records = (
+                db.session.query(db.View)
+                .filter_by(id=id, project_id=project_record.id, company_id=ctx.company_id)
+                .all()
+            )
         elif name is not None:
-            records = db.session.query(db.View).filter(
-                func.lower(db.View.name) == name.lower(),
-                db.View.project_id == project_record.id,
-                db.View.company_id == ctx.company_id,
-            ).all()
+            records = (
+                db.session.query(db.View)
+                .filter(
+                    func.lower(db.View.name) == name.lower(),
+                    db.View.project_id == project_record.id,
+                    db.View.company_id == ctx.company_id,
+                )
+                .all()
+            )
         if len(records) == 0:
             if name is None:
-                name = f'id={id}'
-            raise EntityNotExistsError("Can't find view", f'{project_name}.{name}')
+                name = f"id={id}"
+            raise EntityNotExistsError("Can't find view", f"{project_name}.{name}")
         elif len(records) > 1:
             raise Exception(f"There are multiple views with name/id: {name}/{id}")
         record = records[0]