Rename function and favor verbose usage

This makes it more clear where the data is actually coming from.

Author: PGijsbers

src/database/flows.py

@@ -3,7 +3,7 @@
 from sqlalchemy import Connection, Row, text
 
 
-def get_flow_subflows(flow_id: int, expdb: Connection) -> Sequence[Row]:
+def get_subflows(for_flow: int, expdb: Connection) -> Sequence[Row]:
     return cast(
         Sequence[Row],
         expdb.execute(
@@ -14,12 +14,12 @@ def get_flow_subflows(flow_id: int, expdb: Connection) -> Sequence[Row]:
             WHERE parent = :flow_id
             """,
             ),
-            parameters={"flow_id": flow_id},
+            parameters={"flow_id": for_flow},
         ),
     )
 
 
-def get_flow_tags(flow_id: int, expdb: Connection) -> list[str]:
+def get_tags(flow_id: int, expdb: Connection) -> list[str]:
     tag_rows = expdb.execute(
         text(
             """
@@ -33,7 +33,7 @@ def get_flow_tags(flow_id: int, expdb: Connection) -> list[str]:
     return [tag.tag for tag in tag_rows]
 
 
-def get_flow_parameters(flow_id: int, expdb: Connection) -> Sequence[Row]:
+def get_parameters(flow_id: int, expdb: Connection) -> Sequence[Row]:
     return cast(
         Sequence[Row],
         expdb.execute(
@@ -49,7 +49,7 @@ def get_flow_parameters(flow_id: int, expdb: Connection) -> Sequence[Row]:
     )
 
 
-def get_flow_by_name(name: str, external_version: str, expdb: Connection) -> Row | None:
+def get_by_name(name: str, external_version: str, expdb: Connection) -> Row | None:
     """Gets flow by name and external version."""
     return expdb.execute(
         text(
@@ -63,7 +63,7 @@ def get_flow_by_name(name: str, external_version: str, expdb: Connection) -> Row
     ).one_or_none()
 
 
-def get_flow(flow_id: int, expdb: Connection) -> Row | None:
+def get_by_id(flow_id: int, expdb: Connection) -> Row | None:
     return expdb.execute(
         text(
             """

src/routers/openml/flows.py

@@ -1,9 +1,8 @@
 import http.client
 from typing import Annotated, Literal
 
+import database.flows
 from core.conversions import _str_to_num
-from database.flows import get_flow as db_get_flow
-from database.flows import get_flow_by_name, get_flow_parameters, get_flow_subflows, get_flow_tags
 from fastapi import APIRouter, Depends, HTTPException
 from schemas.flows import Flow, Parameter
 from sqlalchemy import Connection
@@ -20,7 +19,7 @@ def flow_exists(
     expdb: Annotated[Connection, Depends(expdb_connection)],
 ) -> dict[Literal["flow_id"], int]:
     """Check if a Flow with the name and version exists, if so, return the flow id."""
-    flow = get_flow_by_name(name, version, expdb)
+    flow = database.flows.get_by_name(name, version, expdb)
     if flow is None:
         raise HTTPException(
             status_code=http.client.NOT_FOUND,
@@ -31,11 +30,11 @@ def flow_exists(
 
 @router.get("/{flow_id}")
 def get_flow(flow_id: int, expdb: Annotated[Connection, Depends(expdb_connection)] = None) -> Flow:
-    flow = db_get_flow(flow_id, expdb)
+    flow = database.flows.get_by_id(flow_id, expdb)
     if not flow:
         raise HTTPException(status_code=http.client.NOT_FOUND, detail="Flow not found")
 
-    parameter_rows = get_flow_parameters(flow_id, expdb)
+    parameter_rows = database.flows.get_parameters(flow_id, expdb)
     parameters = [
         Parameter(
             name=parameter.name,
@@ -49,9 +48,8 @@ def get_flow(flow_id: int, expdb: Annotated[Connection, Depends(expdb_connection
         for parameter in parameter_rows
     ]
 
-    tags = get_flow_tags(flow_id, expdb)
-
-    flow_rows = get_flow_subflows(flow_id, expdb)
+    tags = database.flows.get_tags(flow_id, expdb)
+    flow_rows = database.flows.get_subflows(for_flow=flow_id, expdb=expdb)
     subflows = [
         {
             "identifier": flow.identifier,