Fixed bugs in the dataload process with referencing the new json folder and then looking up the available databases.

data/sqlite/products_dataset.db

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:904bf5e44391fc113ca57481c6518e427699862bb6939fbdf778fbd3efd18131
-size 36864
+oid sha256:a5ece96e2b662df011c9896e4c276053296e6ea28a8d207bdf19c5219734585d
+size 17260544

src/data_synthesis/generate_data.py

@@ -109,12 +109,12 @@ def generate_products(category: str, features: List[str], k: int = 20):
 
 def category_product_file(category: str) -> str:
     output_file_name = f"products_{category.lower().replace(' ', '_')}.json"
-    return os.path.join(data_dir, output_file_name)
+    return os.path.join(data_dir, 'json', output_file_name)
 
 
 def category_review_file(category: str) -> str:
     output_file_name = f"reviews_{category.lower().replace(' ', '_')}.json"
-    return os.path.join(data_dir, output_file_name)
+    return os.path.join(data_dir, 'json', output_file_name)
 
 
 def products_for_category(category: str) -> List[Product]:

src/datatypes.py

@@ -6,7 +6,8 @@ from src.common import *
 
 class DataLoader:
     active_db = "all_products"
-    db_file = os.path.join(data_dir, 'sqlite', f"{active_db}.db")
+    db_dir = os.path.join(data_dir, 'sqlite')
+    db_file = os.path.join(db_dir, f"{active_db}.db")
     loaded = False
 
     @classmethod
@@ -14,17 +15,17 @@ class DataLoader:
         if name != cls.active_db:
             new_file = os.path.join(data_dir, 'sqlite', f"{name}.db")
             print(f"Switching database file from {cls.db_file} to {new_file}")
-            cls.db_file = os.path.join(data_dir, f"{name}.db")
+            cls.db_file = os.path.join(DataLoader.db_dir, f"{name}.db")
             DataLoader.load_data(reload=True)
             cls.active_db = name
 
     @staticmethod
     def current_db() -> str:
-        return [f[:-3] for f in os.listdir(data_dir) if f.startswith('products') and f.endswith('.db')]
+        return DataLoader.active_db[:-3]
 
     @staticmethod
     def available_dbs() -> List[str]:
-        return [f[:-3] for f in os.listdir(data_dir) if f.startswith('products') and f.endswith('.db')]
+        return [f[:-3] for f in os.listdir(DataLoader.db_dir) if ('products' in f) and f.endswith('.db')]
 
     @staticmethod
     def load_data(reload=False):