fix: unified search param for filament modal + Ruff violations

- Use single debounced ?search= call, consistent with spool modal and PR846
- Remove 4-field parallel fetch loop, getAPIURL import, allSearchResults state
- Fix Ruff violations in vendor.py and vendor_logos.py

Author: akira69

client/src/pages/printing/filamentSelectModal.tsx

@@ -24,17 +24,6 @@ function collapseFilament(element: IFilament): IFilamentCollapsed {
   return { ...element, "vendor.name": element.vendor?.name ?? null };
 }
 
-// Keep the quick search local to the currently loaded page instead of changing the server-side query contract.
-function matchesSearch(filament: IFilamentCollapsed, searchTerm: string): boolean {
-  const needle = searchTerm.trim().toLowerCase();
-  if (needle.length === 0) {
-    return true;
-  }
-
-  const haystacks = [String(filament.id), filament["vendor.name"] ?? "", filament.name ?? "", filament.material ?? ""];
-  return haystacks.some((value) => value.toLowerCase().includes(needle));
-}
-
 const MIN_TABLE_SCROLL_Y = 180;
 const TABLE_BOTTOM_GAP = 16;
 
@@ -43,9 +32,9 @@ const FilamentSelectModal = ({ description, onPrint, searchPlaceholder }: Props)
   const [selectedItems, setSelectedItems] = useState<number[]>([]);
   const [messageApi, contextHolder] = message.useMessage();
   const navigate = useNavigate();
-  const [searchValue, setSearchValue] = useState("");
-  const [serverSearchValue, setServerSearchValue] = useState("");
   const [tableScrollY, setTableScrollY] = useState<number>(300);
+  const [searchTerm, setSearchTerm] = useState("");
+  const [debouncedSearch, setDebouncedSearch] = useState("");
   const rootRef = useRef<HTMLDivElement | null>(null);
   const tableContainerRef = useRef<HTMLDivElement | null>(null);
 
@@ -54,7 +43,7 @@ const FilamentSelectModal = ({ description, onPrint, searchPlaceholder }: Props)
       resource: "filament",
       meta: {
         queryParams: {
-          ...(serverSearchValue.trim().length > 0 ? { search: serverSearchValue.trim() } : {}),
+          ...(debouncedSearch.length > 0 ? { search: debouncedSearch } : {}),
         },
       },
       syncWithLocation: false,
@@ -85,16 +74,9 @@ const FilamentSelectModal = ({ description, onPrint, searchPlaceholder }: Props)
     pagination: { currentPage, pageSize },
   };
 
-  const dataSource: IFilamentCollapsed[] = useMemo(
-    () => (tableProps.dataSource || []).map((record) => ({ ...record })),
-    [tableProps.dataSource],
-  );
-  // Keep typing responsive by narrowing the current page immediately even while the backend query is in flight.
-  const visibleDataSource = useMemo(
-    () => dataSource.filter((filament) => matchesSearch(filament, searchValue)),
-    [dataSource, searchValue],
-  );
+  const dataSource = [...(tableProps.dataSource ?? [])];
   const selectedSet = useMemo(() => new Set(selectedItems), [selectedItems]);
+  const paginationTotal = tableProps.pagination ? (tableProps.pagination.total ?? 0) : 0;
 
   useEffect(() => {
     const computeScrollHeight = () => {
@@ -130,8 +112,6 @@ const FilamentSelectModal = ({ description, onPrint, searchPlaceholder }: Props)
       resizeObserver?.disconnect();
     };
   }, []);
-
-  const paginationTotal = tableProps.pagination ? (tableProps.pagination.total ?? 0) : 0;
   const handlePageChange = useCallback(
     (page: number, nextPageSize?: number) => {
       if (typeof nextPageSize === "number" && nextPageSize !== pageSize) {
@@ -145,17 +125,22 @@ const FilamentSelectModal = ({ description, onPrint, searchPlaceholder }: Props)
     setPageSize(size);
     setCurrentPage(1);
   }, []);
-  const applySearchFilter = useCallback((nextSearch: string) => {
-    setServerSearchValue(nextSearch.trim());
-    setCurrentPage(1);
-  }, []);
 
-  // Bulk toggles only touch the rows currently visible after search and paging.
+  // Debounce search input to avoid excessive API calls while typing
+  useEffect(() => {
+    const timer = setTimeout(() => {
+      setDebouncedSearch(searchTerm.trim());
+      setCurrentPage(1);
+    }, 300);
+    return () => clearTimeout(timer);
+  }, [searchTerm, setCurrentPage]);
+
+  // Bulk toggles only touch the rows currently visible after paging and server-side filtering.
   const selectUnselectFiltered = useCallback(
     (select: boolean) => {
       setSelectedItems((prevSelected) => {
         const nextSelected = new Set(prevSelected);
-        visibleDataSource.forEach((filament) => {
+        dataSource.forEach((filament) => {
           if (select) {
             nextSelected.add(filament.id);
           } else {
@@ -165,7 +150,7 @@ const FilamentSelectModal = ({ description, onPrint, searchPlaceholder }: Props)
         return Array.from(nextSelected);
       });
     },
-    [visibleDataSource],
+    [dataSource],
   );
 
   const handleSelectItem = useCallback((item: number) => {
@@ -174,10 +159,9 @@ const FilamentSelectModal = ({ description, onPrint, searchPlaceholder }: Props)
     );
   }, []);
 
-  const isAllFilteredSelected =
-    visibleDataSource.length > 0 && visibleDataSource.every((filament) => selectedSet.has(filament.id));
+  const isAllFilteredSelected = dataSource.length > 0 && dataSource.every((filament) => selectedSet.has(filament.id));
   const isSomeButNotAllFilteredSelected =
-    visibleDataSource.some((filament) => selectedSet.has(filament.id)) && !isAllFilteredSelected;
+    dataSource.some((filament) => selectedSet.has(filament.id)) && !isAllFilteredSelected;
 
   const commonProps = {
     t,
@@ -227,17 +211,14 @@ const FilamentSelectModal = ({ description, onPrint, searchPlaceholder }: Props)
           <Col xs={24} md={12}>
             <Input.Search
               placeholder={resolvedSearchPlaceholder}
-              value={searchValue}
+              value={searchTerm}
               allowClear
               enterButton
               onChange={(event) => {
-                const value = event.target.value;
-                setSearchValue(value);
-                applySearchFilter(value);
+                setSearchTerm(event.target.value);
               }}
               onSearch={(value) => {
-                setSearchValue(value);
-                applySearchFilter(value);
+                setSearchTerm(value);
               }}
             />
           </Col>
@@ -246,8 +227,7 @@ const FilamentSelectModal = ({ description, onPrint, searchPlaceholder }: Props)
           <Col flex="none">
             <Button
               onClick={() => {
-                setSearchValue("");
-                setServerSearchValue("");
+                setSearchTerm("");
                 setFilters([], "replace");
                 setCurrentPage(1);
               }}
@@ -303,7 +283,7 @@ const FilamentSelectModal = ({ description, onPrint, searchPlaceholder }: Props)
             rowKey="id"
             tableLayout="fixed"
             pagination={false}
-            dataSource={visibleDataSource}
+            dataSource={dataSource}
             scroll={{ y: tableScrollY, x: "max-content" }}
             columns={removeUndefined([
               {

spoolman/api/v1/vendor.py

@@ -75,6 +75,7 @@ class VendorLogoConvertRequest(BaseModel):
     @field_validator("logo_url")
     @classmethod
     def validate_logo_url(cls: type["VendorLogoConvertRequest"], value: str) -> str:
+        """Validate and strip the logo URL."""
         trimmed = value.strip()
         if trimmed == "":
             raise ValueError("Logo URL is required.")

spoolman/database/filament.py

@@ -92,7 +92,7 @@ async def get_by_id(db: AsyncSession, filament_id: int) -> models.Filament:
     return filament
 
 
-async def find(
+async def find(  # noqa: C901, PLR0912
     *,
     db: AsyncSession,
     ids: list[int] | None = None,

spoolman/vendor_logos.py

@@ -18,12 +18,14 @@
 
 
 def get_runtime_vendor_logo_dir() -> Path:
+    """Return the runtime vendor logo directory, creating it if needed."""
     target_dir = env.get_data_dir() / "vendor-logos"
     target_dir.mkdir(parents=True, exist_ok=True)
     return target_dir
 
 
 def get_bundled_vendor_logo_dir() -> Path:
+    """Return the bundled vendor logo directory from the built client assets."""
     project_root = Path(__file__).resolve().parent.parent
     return project_root / "client" / "dist" / "vendor-logos"
 
@@ -95,9 +97,7 @@ def _normalize_logo_asset_path(logo_url: str) -> str:
     if base_path and path.startswith(base_path + "/"):
         path = path[len(base_path) + 1 :]
 
-    normalized = path.lstrip("/")
-    normalized = normalized.removeprefix("vendor-logos/")
-    return normalized
+    return path.lstrip("/").removeprefix("vendor-logos/")
 
 
 def _load_logo_source_bytes(logo_url: str) -> bytes:
@@ -106,7 +106,7 @@ def _load_logo_source_bytes(logo_url: str) -> bytes:
         raise ValueError("Logo URL is required.")
 
     if value.startswith(("http://", "https://")):
-        request = Request(value, headers={"User-Agent": "spoolman-vendor-logo-convert"})
+        request = Request(value, headers={"User-Agent": "spoolman-vendor-logo-convert"})  # noqa: S310
         with urlopen(request, timeout=60) as response:  # noqa: S310
             return response.read()
 
@@ -148,6 +148,9 @@ def _update_runtime_manifest_with_generated_print_logo(print_logo_url: str) -> N
         json.dump(runtime_manifest, file, indent=2)
 
 
+_MONOCHROME_THRESHOLD = 180
+
+
 def convert_web_logo_to_print_logo(logo_url: str, vendor_name: str | None = None) -> str:
     """Convert a web logo to grayscale PNG and store it in runtime print logo directory."""
     source_bytes = _load_logo_source_bytes(logo_url)
@@ -161,13 +164,13 @@ def convert_web_logo_to_print_logo(logo_url: str, vendor_name: str | None = None
     # Preserve transparency from the source asset while forcing the printable pixels to pure black or white.
     alpha = rgba.getchannel("A")
     grayscale = ImageOps.grayscale(rgba.convert("RGB"))
-    monochrome = grayscale.point(lambda value: 0 if value < 180 else 255, mode="L")
+    monochrome = grayscale.point(lambda value: 0 if value < _MONOCHROME_THRESHOLD else 255, mode="L")
     converted = Image.merge("RGBA", (monochrome, monochrome, monochrome, alpha))
 
     parsed_logo_path = urlparse(logo_url).path if logo_url.startswith(("http://", "https://")) else logo_url
     source_stem = Path(parsed_logo_path).stem.replace("-web", "")
     slug = slugify_vendor_name(vendor_name) or slugify_vendor_name(source_stem) or f"vendor-{uuid4().hex[:8]}"
-    source_hash = hashlib.sha1(source_bytes).hexdigest()[:10]
+    source_hash = hashlib.sha1(source_bytes).hexdigest()[:10]  # noqa: S324
 
     runtime_dir = get_runtime_vendor_logo_dir()
     print_dir = runtime_dir / "print"