From 054770d3703cfff3d3e8eb0feee5efbfd81c38b6 Mon Sep 17 00:00:00 2001 From: Ian Roddis <31021769+iroddis@users.noreply.github.com> Date: Mon, 21 Sep 2026 14:16:17 -0300 Subject: [PATCH] formatting --- app/schemas/manufacturer.py | 8 ++------ app/services/scope_import.py | 34 ++++++++++++++++++++++++---------- 2 files changed, 26 insertions(+), 16 deletions(-) diff --git a/app/schemas/manufacturer.py b/app/schemas/manufacturer.py index e820e18..c9afb5b 100644 --- a/app/schemas/manufacturer.py +++ b/app/schemas/manufacturer.py @@ -12,9 +12,7 @@ class ManufacturerBase(BaseModel): url: HttpUrl | None = None logo_url: HttpUrl | None = None - _normalize_url = field_validator("url", "logo_url", mode="before")( - _blank_to_none - ) + _normalize_url = field_validator("url", "logo_url", mode="before")(_blank_to_none) class ManufacturerCreate(ManufacturerBase): @@ -26,9 +24,7 @@ class ManufacturerUpdate(BaseModel): url: HttpUrl | None = None logo_url: HttpUrl | None = None - _normalize_url = field_validator("url", "logo_url", mode="before")( - _blank_to_none - ) + _normalize_url = field_validator("url", "logo_url", mode="before")(_blank_to_none) class ManufacturerRead(ManufacturerBase): diff --git a/app/services/scope_import.py b/app/services/scope_import.py index 106fbcf..e24923a 100644 --- a/app/services/scope_import.py +++ b/app/services/scope_import.py @@ -145,11 +145,15 @@ def parse_workbook(data: bytes) -> list[dict]: wb.close() -async def _static_ap(db: AsyncSession, *, augmented_part_id: int, label: str, od_mm: float): +async def _static_ap( + db: AsyncSession, *, augmented_part_id: int, label: str, od_mm: float +): """Create an attachment point carrying a StaticConnection for ``od_mm``.""" sc = await static_connection_crud.get_by_od_mm(db, od_mm) if sc is None: - sc = await static_connection_crud.create(db, od_mm=od_mm, od_in=od_mm / MM_PER_INCH) + sc = await static_connection_crud.create( + db, od_mm=od_mm, od_in=od_mm / MM_PER_INCH + ) apn = await apn_crud.get_by_name(db, label) if apn is None: apn = await apn_crud.create(db, name=label) @@ -161,7 +165,9 @@ async def _static_ap(db: AsyncSession, *, augmented_part_id: int, label: str, od ) -async def _thread_ap(db: AsyncSession, *, augmented_part_id: int, label: str, spec: str): +async def _thread_ap( + db: AsyncSession, *, augmented_part_id: int, label: str, spec: str +): """Create an attachment point for a parsed ISO/UNC thread, or None.""" parsed = _parse_thread_attribute(spec) if parsed is None: @@ -268,14 +274,18 @@ async def _link_fit( if target_aps: target_ap = target_aps[0] else: - target_ap = await _mirrored_ap(db, augmented_part_id=target.id, scope_ap=scope_ap) + target_ap = await _mirrored_ap( + db, augmented_part_id=target.id, scope_ap=scope_ap + ) messages.append( f"{scope_role}_fit '{target_sku}': referenced part had no attachment points, " "created one matching the scope's attachment point" ) existing = await fit_crud.get_by_attachment_points(db, scope_ap, target_ap) if existing is None: - await fit_crud.create(db, ap_a=scope_ap, ap_b=target_ap, label=FitLabel.POSSIBLE) + await fit_crud.create( + db, ap_a=scope_ap, ap_b=target_ap, label=FitLabel.POSSIBLE + ) async def import_scopes(db: AsyncSession, rows: list[dict]) -> ScopeImportResult: @@ -300,9 +310,9 @@ async def import_scopes(db: AsyncSession, rows: list[dict]) -> ScopeImportResult model = _text(row.get("model")) magnification_min = _num(row.get("magnification_min")) magnification_max = _num(row.get("magnification_max")) - objective_lens_diameter_mm = _num(row.get("objective_lens_diameter_mm")) or _num( - row.get("objective_lens") - ) + objective_lens_diameter_mm = _num( + row.get("objective_lens_diameter_mm") + ) or _num(row.get("objective_lens")) # Construct the model number default_product_number = model @@ -333,7 +343,9 @@ async def import_scopes(db: AsyncSession, rows: list[dict]) -> ScopeImportResult manufacturer = await manufacturer_crud.get_by_name(db, manufacturer_name) if manufacturer is None: - manufacturer = await manufacturer_crud.create(db, name=manufacturer_name, url="") + manufacturer = await manufacturer_crud.create( + db, name=manufacturer_name, url="" + ) model_name = _text(row.get("model")) url = _text(row.get("url")) @@ -395,7 +407,9 @@ async def import_scopes(db: AsyncSession, rows: list[dict]) -> ScopeImportResult # Rebuild attachment points from scratch so re-imports stay idempotent # (cascades delete any fits that referenced the old points). - for old_ap in await attachment_point_crud.list_for_augmented_part(db, part.id): + for old_ap in await attachment_point_crud.list_for_augmented_part( + db, part.id + ): await attachment_point_crud.delete(db, old_ap) ocular_ap = None