Remove redundant attributes in the file index

Cinnamon · Apr 19, 2024 · 587122e · 587122e
1 parent c6045bc
commit 587122e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/libs/ktem/ktem/index/file/index.py b/libs/ktem/ktem/index/file/index.py
@@ -63,7 +63,6 @@ def __init__(self, app, id: int, name: str, config: dict):
                 "relation_type": Column(Integer),
             },
         )
-        self._db_tables: dict[str, Any] = {"Source": Source, "Index": Index}
         self._vs: BaseVectorStore = get_vectorstore(f"index_{self.id}")
         self._docstore: BaseDocumentStore = get_docstore(f"index_{self.id}")
         self._fs_path = filestorage_path / f"index_{self.id}"

diff --git a/libs/ktem/ktem/index/file/ui.py b/libs/ktem/ktem/index/file/ui.py
@@ -199,17 +199,17 @@ def to_confirm_delete(self, file_id):
     def delete_yes_event(self, file_id):
         with Session(engine) as session:
             source = session.execute(
-                select(self._index._db_tables["Source"]).where(
-                    self._index._db_tables["Source"].id == file_id
+                select(self._index._resources["Source"]).where(
+                    self._index._resources["Source"].id == file_id
                 )
             ).first()
             if source:
                 session.delete(source[0])
 
             vs_ids, ds_ids = [], []
             index = session.execute(
-                select(self._index._db_tables["Index"]).where(
-                    self._index._db_tables["Index"].source_id == file_id
+                select(self._index._resources["Index"]).where(
+                    self._index._resources["Index"].source_id == file_id
                 )
             ).all()
             for each in index:
@@ -431,7 +431,7 @@ def index_files_from_dir(self, folder_path, reindex, settings):
         return self.index_fn(files, reindex, settings)
 
     def list_file(self):
-        Source = self._index._db_tables["Source"]
+        Source = self._index._resources["Source"]
         with Session(engine) as session:
             statement = select(Source)
             results = [
@@ -494,7 +494,7 @@ def validate(self, files: list[str]):
         if max_number_of_files := self._index.config.get("max_number_of_files", 0):
             with Session(engine) as session:
                 current_num_files = session.query(
-                    self._index._db_tables["Source"].id
+                    self._index._resources["Source"].id
                 ).count()
             if len(paths) + current_num_files > max_number_of_files:
                 errors.append(
@@ -566,7 +566,7 @@ def load_files(self, selected_files):
         options = []
         available_ids = []
         with Session(engine) as session:
-            statement = select(self._index._db_tables["Source"])
+            statement = select(self._index._resources["Source"])
             results = session.execute(statement).all()
             for result in results:
                 available_ids.append(result[0].id)