From 749c9e5641017b52839f423f29b002f100163cbb Mon Sep 17 00:00:00 2001
From: "Duc Nguyen (john)" <trungduc1992@gmail.com>
Date: Sat, 20 Apr 2024 18:21:32 +0700
Subject: [PATCH] Remove redundant attributes in the file index (#41)

---
 libs/ktem/ktem/index/file/index.py |  1 -
 libs/ktem/ktem/index/file/ui.py    | 14 +++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/libs/ktem/ktem/index/file/index.py b/libs/ktem/ktem/index/file/index.py
index b2403b3..5e97983 100644
--- a/libs/ktem/ktem/index/file/index.py
+++ b/libs/ktem/ktem/index/file/index.py
@@ -63,7 +63,6 @@ class FileIndex(BaseIndex):
                 "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
index 5ca4616..ca00894 100644
--- a/libs/ktem/ktem/index/file/ui.py
+++ b/libs/ktem/ktem/index/file/ui.py
@@ -199,8 +199,8 @@ class FileIndexPage(BasePage):
     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:
@@ -208,8 +208,8 @@ class FileIndexPage(BasePage):
 
             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 @@ class FileIndexPage(BasePage):
         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 @@ class FileIndexPage(BasePage):
         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 @@ class FileSelector(BasePage):
         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)