Update query

Author: danlooo

pathtraits/access.py

@@ -70,40 +70,6 @@ def get_dict(db, path):
     return res
 
 
-def get_paths(db, query_str):
-    """
-    Docstring for get_paths
-
-    :param db: Description
-    :param query_str: Description
-    """
-    query_str = f"SELECT DISTINCT path FROM data where {query_str};"
-    res = db.execute(query_str, ignore_error=False).fetchall()
-    res = [x["path"] for x in res]
-    return res
-
-
-def get_paths_values(db, query_str):
-    """
-    Docstring for get_paths_values
-
-    :param db: Description
-    :param query_str: Description
-    """
-    query_str = f"SELECT * FROM data where {query_str};"
-    response = db.execute(query_str, ignore_error=False).fetchall()
-    res = {}
-    for r in response:
-        path = r["path"]
-        # ensure distinct paths
-        # pylint: disable=C0201
-        if path not in res.keys():
-            r = nest_dict(r)
-            r.pop("path")
-            res[path] = r
-    return res
-
-
 def get(path, db_path, verbose):
     """
     Docstring for get
@@ -124,33 +90,16 @@ def get(path, db_path, verbose):
         sys.exit(1)
 
 
-def query(query_str, db_path, show_values):
+def query(query_str, db_path):
     """
     Docstring for query
 
     :param query_str: Description
     :param db_path: Description
     """
     db = TraitsDB(db_path)
-    if show_values:
-        res = get_paths_values(db, query_str)
-        if len(res) > 0:
-            print(yaml.safe_dump(res))
-        else:
-            logger.error(
-                "No paths found for traits matching %s in database %s",
-                query_str,
-                db_path,
-            )
-        sys.exit(1)
-    else:
-        res = get_paths(db, query_str)
-        if len(res) > 0:
-            for r in res:
-                print(r)
-        else:
-            logger.error(
-                "No paths found for traits matching %s in database %s",
-                query_str,
-                db_path,
-            )
+    paths = db.get_paths(query_str)
+    if paths == []:
+        sys.exit(f"No paths matching query '{query_str}'")
+    for path in paths:
+        print(path)

pathtraits/cli.py

@@ -75,17 +75,14 @@ def get(path, db_path, verbose):
     default=DB_PATH,
     type=click.Path(file_okay=True, dir_okay=False),
 )
-@click.option(
-    "--show-values", flag_value=True, default=False, help="Also show their trait values"
-)
-def query(query_str, db_path, show_values):
+def query(query_str, db_path):
     """
     Get paths of given traits
 
     Enter QUERY_STR in SQLite3 where statement format,
-    e.g. "[score/REAL]>1" to get all paths having a score >1.
+    e.g. "score_REAL>1" to get all paths having a numerical score >1.
     """
-    access.query(query_str, db_path, show_values)
+    access.query(query_str, db_path)
 
 
 if __name__ == "__main__":

pathtraits/db.py

@@ -21,6 +21,17 @@ class TraitsDB:
     cursor = None
     traits = []
 
+    @staticmethod
+    def remove_type_suffixes(s: str):
+        """
+        Docstring for remove_type_suffixes
+
+        :param s: Description
+        :type s: str
+        """
+        s = s.removesuffix("_TEXT").removesuffix("_REAL").removesuffix("_BOOL")
+        return s
+
     @staticmethod
     def row_factory(cursor, row):
         """
@@ -40,7 +51,7 @@ def row_factory(cursor, row):
             if isinstance(v, float):
                 v_int = int(v)
                 v = v_int if v_int == v else v
-            k = k.removesuffix("_TEXT").removesuffix("_REAL").removesuffix("_BOOL")
+            k = TraitsDB.remove_type_suffixes(k)
             res[k] = v
         return res
 
@@ -224,6 +235,27 @@ def get_pathtraits(self, path: str):
                     res[k] = v
         return res
 
+    def get_paths(self, query_str):
+        """
+        Get paths matching pathtraits
+
+        :param self: Description
+        :param kwargs: pathtraits to match
+        """
+        traits = filter(lambda x: x in query_str, self.traits)
+        query = "SELECT DISTINCT path FROM _path"
+        for trait in traits:
+            query += f" NATURAL JOIN {trait}"
+        query += f" WHERE {query_str};"
+
+        response = self.execute(query)
+        if response is None:
+            return None
+        else:
+            res = response.fetchall()
+            res = [x["path"] for x in res]
+            return res
+
     def put_path_id(self, path):
         """
         Docstring for put_path_id

test/test.py

@@ -70,6 +70,15 @@ def test_missing_north_america(self):
         for k, v in target.items():
             self.assertEqual(source[k], v)
 
+    def test_query(self):
+        q1 = self.db.get_paths("score_REAL > 3")
+        self.assertEqual(len(q1), 2)
+
+        q2 = self.db.get_paths(
+            "score_TEXT = 'zero' AND description_TEXT LIKE '%Germany%'"
+        )
+        self.assertEqual(len(q2), 1)
+
 
 if __name__ == "__main__":
     unittest.main()