changes

Author: afraa-n

Makefile

@@ -9,9 +9,6 @@ format:
 	black *.py 
 
 lint:
-	#disable comment to test speed
-	#pylint --disable=R,C --ignore-patterns=test_.*?py *.py mylib/*.py
-	#ruff linting is 10-100X faster than pylint
 	ruff check *.py mylib/*.py
 
 container-lint:
@@ -46,4 +43,4 @@ transform_load:
 	python main.py transform_load
 
 query:
-	python main.py run_query "SELECT * FROM baskin_icecream WHERE Flavour='Green Tea';"
+	python main.py run_query "SELECT Flavour, Sugars_g, Size FROM BaskinRobbinsDB WHERE Size = 'Reg114g' ORDER BY Sugars_g DESC LIMIT 5;"

main.py

@@ -1,16 +1,9 @@
-"""
-ETL-Query script
-"""
-
+"""CLI Commands"""
 import sys
 import argparse
 from mylib.extract import extract
 from mylib.transform_load import load
 from mylib.query import (
-    create,
-    read,
-    update,
-    delete,
     run_query,
 )
 
@@ -23,50 +16,25 @@ def handle_arguments(args):
         choices=[
             "extract",
             "transform_load",
-            "create",
-            "read",
-            "update",
-            "delete",
-            "run_query",
+            "update_record",
+            "delete_record",
+            "create_record",
+            "general_query",
+            "read_data",
         ],
     )
     args = parser.parse_args(args[:1])
     print(args.action)
-    if args.action == "update":
-
-        parser.add_argument("record_id", type=int)
-        parser.add_argument("Flavour")
-        parser.add_argument("Calories", type=int)
-        parser.add_argument("Total_Fat_g", type=float)
-        parser.add_argument("Trans_Fat_g", type=float)
-        parser.add_argument("Carbohydrates_g", type=int)
-        parser.add_argument("Sugars_g", type=int)
-        parser.add_argument("Protein_g", type=float)
-        parser.add_argument("Size")
-
-    if args.action == "create":
-
-        parser.add_argument("Flavour")
-        parser.add_argument("Calories", type=int)
-        parser.add_argument("Total_Fat_g", type=float)
-        parser.add_argument("Trans_Fat_g", type=float)
-        parser.add_argument("Carbohydrates_g", type=int)
-        parser.add_argument("Sugars_g", type=int)
-        parser.add_argument("Protein_g", type=float)
-        parser.add_argument("Size")
 
     if args.action == "run_query":
         parser.add_argument("query")
 
-    if args.action == "delete":
-        parser.add_argument("record_id", type=int)
-
     # parse again with ever
     return parser.parse_args(sys.argv[1:])
 
 
 def main():
-    """handles all the cli commands"""
+    """handles all the CLI commands"""
     args = handle_arguments(sys.argv[1:])
 
     if args.action == "extract":
@@ -75,39 +43,11 @@ def main():
     elif args.action == "transform_load":
         print("Transforming data...")
         load()
-    elif args.action == "update_record":
-        update(
-            args.record_id,
-            args.Flavour,
-            args.Calories,
-            args.Total_Fat_g,
-            args.Trans_Fat_g,
-            args.Carbohydrates_g,
-            args.Sugars_g,
-            args.Protein_g,
-            args.Size,
-        )
-    elif args.action == "delete":
-        delete(args.record_id)
-    elif args.action == "create":
-        create(
-            args.Flavour,
-            args.Calories,
-            args.Total_Fat_g,
-            args.Trans_Fat_g,
-            args.Carbohydrates_g,
-            args.Sugars_g,
-            args.Protein_g,
-            args.Size,
-        )
-    elif args.action == "run_query":
+    elif args.action == "general_query":
         run_query(args.query)
-    elif args.action == "read":
-        data = read()
-        print(data)
     else:
         print(f"Unknown action: {args.action}")
 
 
 if __name__ == "__main__":
-    main()
+    main()