chore: cleanups and OpenWrt One as default

remove some unecessary conditions, use OpenWrt One as default example,
run isort, bettern patterns for fields

Signed-off-by: Paul Spooren <[email protected]>

asu/build.py

@@ -245,7 +245,7 @@ def build(build_request: BuildRequest, job=None):
         "image",
         f"PROFILE={build_request.profile}",
         f"PACKAGES={' '.join(build_cmd_packages)}",
-        f"EXTRA_IMAGE_NAME={packages_hash}",
+        f"EXTRA_IMAGE_NAME={packages_hash[:12]}",
         f"BIN_DIR=/builder/{request_hash}",
     ]
 

asu/build_request.py

@@ -1,8 +1,12 @@
 from typing import Annotated
+
 from pydantic import BaseModel, Field
 
 from asu.config import settings
 
+STRING_PATTERN = r"^[\w.,-]*$"
+TARGET_PATTERN = r"^[\w]*/[\w]*$"
+
 
 class BuildRequest(BaseModel):
     distro: Annotated[
@@ -12,16 +16,18 @@ class BuildRequest(BaseModel):
                 This parameter is currently optional since no other
                 distributions are supported.
             """.strip(),
+            pattern=STRING_PATTERN,
         ),
     ] = "openwrt"
     version: Annotated[
         str,
         Field(
-            examples=["23.05.2"],
+            examples=["24.10.0-rc2"],
             description="""
                 It is recommended to always upgrade to the latest version,
                 however it is possible to request older images for testing.
             """.strip(),
+            pattern=STRING_PATTERN,
         ),
     ]
     version_code: Annotated[
@@ -34,30 +40,33 @@ class BuildRequest(BaseModel):
                 resulting firmware is a different revision, the build results
                 in an error.
             """.strip(),
+            pattern=STRING_PATTERN,
         ),
     ] = ""
     target: Annotated[
         str,
         Field(
-            examples=["ath79/generic"],
+            examples=["mediatek/filogic"],
             description="""
             It is recommended to always upgrade to the latest version, however
             it is possible to request older images for testing.
             """.strip(),
+            pattern=TARGET_PATTERN,
         ),
     ]
     profile: Annotated[
         str,
         Field(
-            examples=["8dev_carambola2"],
+            examples=["openwrt_one"],
             description="""
                 The ImageBuilder `PROFILE`.  Can be found with `ubus call
                 system board` as the `board_name` value.
                 """.strip(),
+            pattern=STRING_PATTERN,
         ),
     ]
     packages: Annotated[
-        list[str],
+        list[Annotated[str, Field(pattern=STRING_PATTERN)]],
         Field(
             examples=[["vim", "tmux"]],
             description="""
@@ -69,7 +78,10 @@ class BuildRequest(BaseModel):
         ),
     ] = []
     packages_versions: Annotated[
-        dict,
+        dict[
+            Annotated[str, Field(pattern=STRING_PATTERN)],
+            Annotated[str, Field(pattern=STRING_PATTERN)],
+        ],
         Field(
             examples=[{"vim": "1.2.3", "tmux": "2.3.4"}],
             description="""

asu/main.py

@@ -16,10 +16,10 @@
 from asu.routers import api
 from asu.util import (
     get_redis_client,
+    is_post_kmod_split_build,
     parse_feeds_conf,
-    parse_packages_file,
     parse_kernel_version,
-    is_post_kmod_split_build,
+    parse_packages_file,
 )
 
 logging.basicConfig(encoding="utf-8", level=settings.log_level)

asu/util.py

@@ -4,7 +4,7 @@
 import json
 import logging
 import struct
-from os import getuid, getgid
+from os import getgid, getuid
 from pathlib import Path
 from re import match
 from tarfile import TarFile
@@ -22,9 +22,6 @@
 from asu.build_request import BuildRequest
 from asu.config import settings
 
-
-REQUEST_HASH_LENGTH: int = 32
-
 log: logging.Logger = logging.getLogger("rq.worker")
 log.propagate = False  # Suppress duplicate log messages.
 
@@ -66,18 +63,16 @@ def get_branch(version_or_branch: str) -> dict[str, str]:
     return {**settings.branches.get(branch_name, {}), "name": branch_name}
 
 
-def get_str_hash(string: str, length: int = REQUEST_HASH_LENGTH) -> str:
+def get_str_hash(string: str) -> str:
     """Return sha256sum of str with optional length
 
     Args:
         string (str): input string
-        length (int): hash length
 
     Returns:
         str: hash of string with specified length
     """
-    h = hashlib.sha256(bytes(string or "", "utf-8"))
-    return h.hexdigest()[:length]
+    return hashlib.sha256(bytes(string or "", "utf-8")).hexdigest()
 
 
 def get_file_hash(path: str) -> str:
@@ -145,7 +140,6 @@ def get_request_hash(build_request: BuildRequest) -> str:
                 str(build_request.repositories),
             ]
         ),
-        REQUEST_HASH_LENGTH,
     )
 
 
@@ -161,7 +155,7 @@ def get_packages_hash(packages: list[str]) -> str:
     Returns:
         str: hash of `req`
     """
-    return get_str_hash(" ".join(sorted(list(set(packages)))), 12)
+    return get_str_hash(" ".join(sorted(list(set(packages)))))
 
 
 def fingerprint_pubkey_usign(pubkey: str) -> str:

tests/test_api.py

@@ -178,8 +178,8 @@ def test_api_build_request_hash(client):
         profile="testprofile",
     )
 
-    case12hash = "8731372f84b0022c070e6127bad24eb2"
-    case34hash = "0dab3b60bd8174da250e2ea2942a3744"
+    case12hash = "8d8e0aa2fd95bb75dba4aff4279dd6f976a40ad17300927d54b8a9a9b0576306"
+    case34hash = "6b1645013216da39ee09deae75b87b0636f3c50648b037750b0a80448ce5c7ca"
 
     # Case 1 - diff_packages=True, first package ordering
     json["diff_packages"] = True
@@ -702,7 +702,10 @@ def test_api_build_defaults_filled_allowed(app):
 
     assert response.status_code == 200
     data = response.json()
-    assert data["request_hash"] == "c9836b2259eec0c3a31868fe77a19983"
+    assert (
+        data["request_hash"]
+        == "9c8d0cd7d9ec208a233b954edb20c3c20b5c11103bb7f5f1ebface565f8c6720"
+    )
 
 
 def test_api_build_defaults_filled_too_big(app):

tests/test_util.py

@@ -16,46 +16,57 @@
     get_podman,
     get_request_hash,
     get_str_hash,
+    is_post_kmod_split_build,
     parse_feeds_conf,
+    parse_kernel_version,
     parse_manifest,
     parse_packages_file,
-    parse_kernel_version,
-    is_post_kmod_split_build,
     run_cmd,
     verify_usign,
 )
 
 
 def test_get_str_hash():
-    assert get_str_hash("test", 12) == "9f86d081884c"
+    assert (
+        get_str_hash("test")
+        == "9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08"
+    )
 
 
 def test_get_file_hash():
     file_fd, file_path = tempfile.mkstemp()
     os.write(file_fd, b"test")
 
-    assert get_file_hash(file_path).startswith("9f86d081884c")
+    assert get_file_hash(file_path).startswith(
+        "9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08"
+    )
 
     os.close(file_fd)
     os.unlink(file_path)
 
 
 def test_get_packages_hash():
-    assert get_packages_hash(["test1", "test2"]) == "57aab5949a36"
+    assert (
+        get_packages_hash(["test1", "test2"])
+        == "57aab5949a36e66b535a8cb13e39e9e093181c9000c016990d7be9eb86a9b9e8"
+    )
 
 
 def test_get_request_hash():
     request = BuildRequest(
         **{
             "distro": "test",
             "version": "test",
-            "target": "test",
+            "target": "testtarget/testsubtarget",
             "profile": "test",
             "packages": ["test"],
         }
     )
 
-    assert get_request_hash(request) == "3944eba49da93e2c605a7e9980e52765"
+    assert (
+        get_request_hash(request)
+        == "99ff721439cd696f7da259541a07d7bfc7eb6c45a844db532e0384b464e23f46"
+    )
 
 
 def test_diff_packages():