Merge pull request #23 from Ivareh/21-add-option-to-deactivate-a-query-for-execution

#21 dol: Added active button and state to query

Author: Ivareh

db-optimize-logger/app/execute/query_handler.py

@@ -36,6 +36,7 @@ class Query(BaseModel):
     sql: str = Field(min_length=1)
     repeat: int | None
     query_count: bool
+    active: bool = True  # Whether to execute query or not
 
     @property
     def statement(self) -> TextClause:
@@ -84,6 +85,7 @@ def read_queries_saves_df() -> pd.DataFrame:
                 "sql": "string",
                 "repeat": "Int64",
                 "query_count": "boolean",
+                "active": "boolean",
             },
         )
         saves_df["repeat"] = saves_df["repeat"].fillna(0).astype("int64")
@@ -124,6 +126,7 @@ def find_query(id: str) -> Query:
         sql=id_existing_index["sql"].values[0],
         repeat=id_existing_index["repeat"].values[0],
         query_count=id_existing_index["query_count"].values[0],
+        active=id_existing_index["active"].values[0],
     )
 
 
@@ -150,7 +153,9 @@ def save_query(query: Query) -> None:
     try:
         saves_df = read_queries_saves_df()
     except NoQueriesFoundError:
-        cols = pd.Index(["id", "database_ids", "name", "sql", "repeat", "query_count"])
+        cols = pd.Index(
+            ["id", "database_ids", "name", "sql", "repeat", "query_count", "active"]
+        )
         saves_df = pd.DataFrame(columns=cols)
         saves_df.to_csv(QUERIES_SAVES_CSV, index=False)
     query_dump = query.model_dump()
@@ -205,6 +210,9 @@ def process_queries(queries: pd.DataFrame) -> None:
     "This function is crap and needs to be refactored and more tidy"
 
     for index, (_, query_row) in enumerate(queries.iterrows(), start=1):
+        if not query_row.active:
+            continue
+
         database_ids = parse_database_ids(query_row.database_ids)
         db_instances: list[DatabaseInstance] = []
         for db_id in database_ids:

db-optimize-logger/app/ui/components/query.py

@@ -38,6 +38,9 @@ def _saved_queries_ui(queries: QueryList, databases: list[str]):
     for query in queries.items:
         with ui.column().classes("w-full items-stretch border rounded p-4 mb-4 gap-4"):
             with ui.row().classes("w-full items-center gap-2"):
+                ui.checkbox("Active", value=query.active).classes(
+                    "flex-grow w-[160px]"
+                ).bind_value(query, "active")
                 ui.input("Query name", value=query.name).classes(
                     "flex-grow w-full"
                 ).bind_value(query, "name")
@@ -100,6 +103,7 @@ def _add_query_handler(
             sql=add_sql.value,
             repeat=add_repeat.value,
             query_count=add_query_count.value,
+            active=True,
         )
 
         # Save in csv and add to UI
@@ -175,6 +179,7 @@ def process_query(query_row):
             "sql": query_row["sql"],
             "repeat": query_row["repeat"],
             "query_count": bool(query_row["query_count"]),
+            "active": bool(query_row["active"]),
         }
         db_query = Query(**db_query_dict)
         queries.add(db_query)