Merge pull request steam-bell-92#817 from mrdeyroy/fix/utilities-projects-guidelines

refactor: convert utilities projects to follow procedural guidelines

Author: steam-bell-92

.github/workflows/python-ci.yml

@@ -25,7 +25,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install -r requirements-dev.txt
+        pip install -r requirements.txt
 
     - name: Syntax check with py_compile
       run: |

tests/test_number_system_converter.py

@@ -1,62 +1,60 @@
-import importlib.util
-import io
-import os
-from contextlib import redirect_stdout
-from unittest.mock import patch
-
-
-def _load_converter_module():
-    file_path = os.path.join(
-        os.path.dirname(__file__), "..",
-        "utilities", "Number-System-Converter", "Number-System-Converter.py"
-    )
-    file_path = os.path.abspath(file_path)
-
-    spec = importlib.util.spec_from_file_location("number_system_converter", file_path)
-    module = importlib.util.module_from_spec(spec)
-
-    with patch("builtins.input", side_effect=["5"]):
-        with patch("builtins.print"):
-            spec.loader.exec_module(module)
-
-    return module
-
-
-_mod = _load_converter_module()
-
-
-def _capture_output(func, *args):
-    buffer = io.StringIO()
-    with redirect_stdout(buffer):
-        func(*args)
-    return buffer.getvalue()
-
-
-class TestNumberSystemConverter:
-    def test_decimal_to_others(self):
-        output = _capture_output(_mod.decimal_to_others, "10")
-        assert "Binary (Base 2) : 1010" in output
-        assert "Octal (Base 8)" in output
-        assert "Hex (Base 16)" in output
-
-    def test_binary_to_others(self):
-        output = _capture_output(_mod.binary_to_others, "1010")
-        assert "Decimal (Base 10) : 10" in output
-        assert "Octal (Base 8)" in output
-        assert "Hex (Base 16)" in output
-
-    def test_octal_to_others(self):
-        output = _capture_output(_mod.octal_to_others, "17")
-        assert "Decimal (Base 10) : 15" in output
-        assert "Binary (Base 2)" in output
-        assert "Hex (Base 16)" in output
-
-    def test_hex_to_others(self):
-        output = _capture_output(_mod.hex_to_others, "1a")
-        assert "Conversions for Hexadecimal: 1A" in output
-        assert "Decimal (Base 10) : 26" in output
-        assert "Binary (Base 2)" in output
-
-    def test_invalid_input_is_handled(self):
-        output = _capture_output(_mod.decimal_to_others, "not-a-number")
-        assert "Invalid input! Please enter a valid decimal integer." in output
+import os
+import subprocess
+import sys
+import unittest
+
+class TestNumberSystemConverter(unittest.TestCase):
+    def setUp(self):
+        self.script_path = os.path.abspath(os.path.join(
+            os.path.dirname(__file__), "..",
+            "utilities", "Number-System-Converter", "Number-System-Converter.py"
+        ))
+
+    def run_script_with_inputs(self, inputs):
+        # Join inputs with newlines
+        input_data = "\n".join(inputs) + "\n"
+        env = os.environ.copy()
+        env["PYTHONIOENCODING"] = "utf-8"
+        process = subprocess.Popen(
+            [sys.executable, self.script_path],
+            stdin=subprocess.PIPE,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            env=env,
+            encoding="utf-8"
+        )
+        stdout, stderr = process.communicate(input=input_data, timeout=5)
+        return stdout, stderr
+
+    def test_decimal_to_others(self):
+        # Input choice 1 (Decimal), then value 10, then choice 5 (Exit)
+        stdout, stderr = self.run_script_with_inputs(["1", "10", "5"])
+        self.assertIn("Binary (Base 2) : 1010", stdout)
+        self.assertIn("Octal (Base 8)", stdout)
+        self.assertIn("Hex (Base 16)", stdout)
+
+    def test_binary_to_others(self):
+        # Input choice 2 (Binary), then value 1010, then choice 5 (Exit)
+        stdout, stderr = self.run_script_with_inputs(["2", "1010", "5"])
+        self.assertIn("Decimal (Base 10) : 10", stdout)
+        self.assertIn("Octal (Base 8)", stdout)
+        self.assertIn("Hex (Base 16)", stdout)
+
+    def test_octal_to_others(self):
+        # Input choice 3 (Octal), then value 17, then choice 5 (Exit)
+        stdout, stderr = self.run_script_with_inputs(["3", "17", "5"])
+        self.assertIn("Decimal (Base 10) : 15", stdout)
+        self.assertIn("Binary (Base 2)", stdout)
+        self.assertIn("Hex (Base 16)", stdout)
+
+    def test_hex_to_others(self):
+        # Input choice 4 (Hex), then value 1a, then choice 5 (Exit)
+        stdout, stderr = self.run_script_with_inputs(["4", "1a", "5"])
+        self.assertIn("Conversions for Hexadecimal: 1A", stdout)
+        self.assertIn("Decimal (Base 10) : 26", stdout)
+        self.assertIn("Binary (Base 2)", stdout)
+
+    def test_invalid_input_is_handled(self):
+        # Input choice 1 (Decimal), then value "not-a-number", then choice 5 (Exit)
+        stdout, stderr = self.run_script_with_inputs(["1", "not-a-number", "5"])
+        self.assertIn("Invalid input! Please enter a valid decimal integer.", stdout)

utilities/F1-Performance-Analyzer/F1-Performance-Analyzer.py

@@ -1,77 +1,72 @@
-import requests
+import urllib.request
+import json
 
-def fetch_f1_data(endpoint):
-    # Utilizing a reliable API mirror for up-to-date stats
-    base_url = "https://api.jolpica.erik.mclarty.int/ergast/f1"
-    try:
-        response = requests.get(f"{base_url}/{endpoint}.json")
-        if response.status_code == 200:
-            return response.json()
-        else:
-            print(f"❌ Error fetching data: Status code {response.status_code}")
-            return None
-    except Exception as e:
-        print(f"❌ Connection error: {e}")
-        return None
+base_url = "https://api.jolpica.erik.mclarty.int/ergast/f1"
 
-def display_standings():
-    print("\n🏁 Fetching current F1 Driver Standings...")
-    data = fetch_f1_data("current/driverStandings")
-    if not data:
-        return
-
-    try:
-        standings = data['MRData']['StandingsTable']['StandingsLists'][0]['DriverStandings']
-        print(f"\n🏆 {'Pos':<4} | {'Driver':<20} | {'Constructor':<20} | {'Points':<6}")
-        print("-" * 60)
-        for item in standings[:10]:  # Displays Top 10 Drivers
-            pos = item['position']
-            driver = f"{item['Driver']['givenName']} {item['Driver']['familyName']}"
-            team = item['Constructors'][0]['name']
-            points = item['points']
-            print(f"{pos:<4} | {driver:<20} | {team:<20} | {points:<6}")
-    except (KeyError, IndexError):
-        print("❌ Could not parse standings data.")
-
-def display_constructors():
-    print("\n🏎️ Fetching current F1 Constructor Standings...")
-    data = fetch_f1_data("current/constructorStandings")
-    if not data:
-        return
-
-    try:
-        standings = data['MRData']['StandingsTable']['StandingsLists'][0]['ConstructorStandings']
-        print(f"\n🏆 {'Pos':<4} | {'Constructor':<25} | {'Nationality':<15} | {'Points':<6}")
-        print("-" * 60)
-        for item in standings:
-            pos = item['position']
-            team = item['Constructor']['name']
-            nat = item['Constructor']['nationality']
-            points = item['points']
-            print(f"{pos:<4} | {team:<25} | {nat:<15} | {points:<6}")
-    except (KeyError, IndexError):
-        print("❌ Could not parse constructor data.")
-
-def main():
-    while True:
-        print("\n=============================================")
-        print("🏎️  F1 DRIVER & TEAM PERFORMANCE ANALYZER  🏎️")
-        print("=============================================")
-        print("1. View Current Top 10 Driver Standings")
-        print("2. View Constructor Standings")
-        print("3. Exit")
+while True:
+    print("\n=============================================")
+    print("🏎️  F1 DRIVER & TEAM PERFORMANCE ANALYZER  🏎️")
+    print("=============================================")
+    print("1️⃣  View Current Top 10 Driver Standings")
+    print("2️⃣  View Constructor Standings")
+    print("3️⃣  Exit")
+    
+    choice = input("\n🎯 Enter your choice (1-3): ").strip()
+    
+    if choice == "3":
+        print("\n👋 Thank you for using F1 Analyzer! Circuit out. 🏁\n")
+        break
 
-        choice = input("\nEnter your choice (1-3): ").strip()
+    if choice not in ("1", "2"):
+        print("❌ Invalid choice. Please enter 1, 2, or 3.")
+        continue
 
-        if choice == "1":
-            display_standings()
-        elif choice == "2":
-            display_constructors()
-        elif choice == "3":
-            print("\n👋 Thank you for using F1 Analyzer! Circuit out. 🏁")
-            break
-        else:
-            print("❌ Invalid choice. Please enter 1, 2, or 3.")
-
-if __name__ == "__main__":
-    main()
+    if choice == "1":
+        print("\n🏁 Fetching current F1 Driver Standings...")
+        endpoint = "current/driverStandings"
+        url = f"{base_url}/{endpoint}.json"
+        
+        # Fetch using urllib
+        try:
+            req = urllib.request.Request(url, headers={'User-Agent': 'Mozilla/5.0'})
+            with urllib.request.urlopen(req, timeout=10) as response:
+                if response.status == 200:
+                    data = json.loads(response.read().decode('utf-8'))
+                    standings = data['MRData']['StandingsTable']['StandingsLists'][0]['DriverStandings']
+                    print(f"\n🏆 {'Pos':<4} | {'Driver':<20} | {'Constructor':<20} | {'Points':<6}")
+                    print("-" * 60)
+                    for item in standings[:10]:  # Top 10 Drivers
+                        rank_val = item.get(next(k for k in item.keys() if k.startswith("pos") and not k.endswith("Text")))
+                        driver_name = f"{item['Driver']['givenName']} {item['Driver']['familyName']}"
+                        team_name = item['Constructors'][0]['name']
+                        score_points = item.get(next(k for k in item.keys() if k.startswith("point")))
+                        print(f"{rank_val:<4} | {driver_name:<20} | {team_name:<20} | {score_points:<6}")
+                else:
+                    print(f"❌ Error fetching data: Status code {response.status}")
+        except Exception as e:
+            print(f"❌ Connection or parsing error: {e}")
+            
+    elif choice == "2":
+        print("\n🏎️  Fetching current F1 Constructor Standings...")
+        endpoint = "current/constructorStandings"
+        url = f"{base_url}/{endpoint}.json"
+        
+        try:
+            req = urllib.request.Request(url, headers={'User-Agent': 'Mozilla/5.0'})
+            with urllib.request.urlopen(req, timeout=10) as response:
+                if response.status == 200:
+                    data = json.loads(response.read().decode('utf-8'))
+                    standings = data['MRData']['StandingsTable']['StandingsLists'][0]['ConstructorStandings']
+                    print(f"\n🏆 {'Pos':<4} | {'Constructor':<25} | {'Nationality':<15} | {'Points':<6}")
+                    print("-" * 60)
+                    for item in standings:
+                        rank_val = item.get(next(k for k in item.keys() if k.startswith("pos") and not k.endswith("Text")))
+                        c_info = item['Constructor']
+                        team_name = c_info['name']
+                        team_country = c_info.get(next(k for k in c_info.keys() if k.startswith("nation")))
+                        score_points = item.get(next(k for k in item.keys() if k.startswith("point")))
+                        print(f"{rank_val:<4} | {team_name:<25} | {team_country:<15} | {score_points:<6}")
+                else:
+                    print(f"❌ Error fetching data: Status code {response.status}")
+        except Exception as e:
+            print(f"❌ Connection or parsing error: {e}")