[Req report] Fix data fetching

Author: d0rich

test2text/pages/reports/report_by_req.py

@@ -4,6 +4,7 @@
 
 from test2text.services.utils.math_utils import round_distance
 from test2text.services.repositories import requirements
+from test2text.services.repositories import test_cases
 
 SUMMARY_LENGTH = 100
 LABELS_SUMMARY_LENGTH = 15
@@ -171,7 +172,7 @@ def make_a_report():
                                                             smart_search_query=filter_embedding)
 
             requirements_dict = {
-                f"{req_external_id} {summary[:SUMMARY_LENGTH]}...": req_id
+                req_id: f"{req_external_id} {summary[:SUMMARY_LENGTH]}..."
                 for (req_id, req_external_id, summary) in data
             }
 
@@ -180,6 +181,7 @@ def make_a_report():
                 "Choose a requirement to work with",
                 requirements_dict.keys(),
                 key="filter_req_id",
+                format_func=lambda x: requirements_dict[x],
             )
 
             if selected_requirement:
@@ -206,14 +208,7 @@ def make_a_report():
                         )
                         st.info("Limit of selected test cases")
 
-                if filter_radius:
-                    where_clauses.append("distance <= ?")
-                    params.append(f"{filter_radius}")
-
-                if filter_limit:
-                    params.append(f"{filter_limit}")
-
-                rows = db.join_all_tables_by_requirements(where_clauses, params)
+                rows = test_cases.fetch_test_cases_by_requirement(db, selected_requirement, filter_radius, filter_limit)
 
                 if not rows:
                     st.error(

test2text/services/db/client.py

@@ -184,55 +184,6 @@ def get_embeddings_from_annotations_to_requirements_table(self):
             """)
         return cursor.fetchall()
 
-    def join_all_tables_by_requirements(
-        self, where_clauses="", params=None
-    ) -> list[tuple]:
-        """
-        Extract values from requirements with related annotations and their test cases based on the provided where clauses and parameters.
-        Return a list of tuples containing :
-            req_id,
-            req_external_id,
-            req_summary,
-            req_embedding,
-            anno_id,
-            anno_summary,
-            anno_embedding,
-            distance,
-            case_id,
-            test_script,
-            test_case
-        """
-        where_sql = f"WHERE {' AND '.join(where_clauses)}" if where_clauses else ""
-        sql = f"""
-                            SELECT
-                                Requirements.id as req_id,
-                                Requirements.external_id as req_external_id,
-                                Requirements.summary as req_summary,
-                                Requirements.embedding as req_embedding,
-
-                                Annotations.id as anno_id,
-                                Annotations.summary as anno_summary,
-                                Annotations.embedding as anno_embedding,
-
-                                AnnotationsToRequirements.cached_distance as distance,
-
-                                TestCases.id as case_id,
-                                TestCases.test_script as test_script,
-                                TestCases.test_case as test_case
-                            FROM
-                                Requirements
-                                    JOIN AnnotationsToRequirements ON Requirements.id = AnnotationsToRequirements.requirement_id
-                                    JOIN Annotations ON Annotations.id = AnnotationsToRequirements.annotation_id
-                                    JOIN CasesToAnnos ON Annotations.id = CasesToAnnos.annotation_id
-                                    JOIN TestCases ON TestCases.id = CasesToAnnos.case_id
-                            {where_sql}
-                            ORDER BY
-                                Requirements.id, AnnotationsToRequirements.cached_distance, TestCases.id
-                            LIMIT ?
-                """
-        data = self.conn.execute(sql, params)
-        return data.fetchall()
-
     def get_ordered_values_from_test_cases(
         self, distance_sql="", where_clauses="", distance_order_sql="", params=None
     ) -> list[tuple]:

test2text/services/repositories/requirements/fetch_filtered.py

@@ -31,7 +31,7 @@ def fetch_filtered_requirements(db: DbClient,
         if smart_search_query:
             from test2text.services.embeddings.embed import embed_requirement
             embedding = embed_requirement(smart_search_query.strip())
-            conditions.append("vec_distance(Requirements.embedding, ?) < 0.7")
+            conditions.append("vec_distance_L2(Requirements.embedding, ?) < 0.7")
             options.append(serialize_float32(embedding))
         sql += " AND ".join(conditions)
     sql += " ORDER BY Requirements.id ASC"

test2text/services/repositories/test_cases/__init__.py

@@ -0,0 +1,3 @@
+__all__=['fetch_test_cases_by_requirement']
+
+from .fetch_by_requirement import fetch_test_cases_by_requirement

test2text/services/repositories/test_cases/fetch_by_requirement.py

@@ -0,0 +1,31 @@
+from test2text.services.db import DbClient
+
+
+def fetch_test_cases_by_requirement(db: DbClient, requirement_id: int, radius: float, limit: int) -> list:
+    sql = f"""
+        SELECT
+            Requirements.id as req_id,
+            Requirements.external_id as req_external_id,
+            Requirements.summary as req_summary,
+            Requirements.embedding as req_embedding,
+
+            Annotations.id as anno_id,
+            Annotations.summary as anno_summary,
+            Annotations.embedding as anno_embedding,
+
+            vec_distance_L2(Requirements.embedding, Annotations.embedding) as distance,
+
+            TestCases.id as case_id,
+            TestCases.test_script as test_script,
+            TestCases.test_case as test_case
+        FROM
+            Requirements
+                JOIN Annotations ON vec_distance_L2(Requirements.embedding, Annotations.embedding) <= ?
+                JOIN CasesToAnnos ON Annotations.id = CasesToAnnos.annotation_id
+                JOIN TestCases ON TestCases.id = CasesToAnnos.case_id
+        WHERE Requirements.id = ?
+        ORDER BY
+            Requirements.id, distance, TestCases.id
+        LIMIT ?
+        """
+    return db.conn.execute(sql, (radius, requirement_id, limit)).fetchall()