Kinesin/skeleton-api
1
0 Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Making objective_lens a thing

Browse Source
This commit is contained in:
Ian Roddis committed 2026-08-04 16:48:00 -03:00
1 parent fcb4dbaa62
commit 12e6984c63
17 files changed
+115 -119
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/services/fit_matching.py
+4 -4
View File
@@ -142,9 +142,7 @@ async def _reconcile(
for own_ap in own_points:
for other_ap in points_by_part.get(other_id, []):
if attachment_points_match(own_ap, other_ap):
candidate_pairs.add(
_canonical_pair(own_ap.id, other_ap.id)
)
candidate_pairs.add(_canonical_pair(own_ap.id, other_ap.id))
result = RecomputeResult()
@@ -171,7 +169,9 @@ async def _reconcile(
return result
async def recompute_for_part(db: AsyncSession, augmented_part_id: int) -> RecomputeResult:
async def recompute_for_part(
db: AsyncSession, augmented_part_id: int
) -> RecomputeResult:
"""Reconcile Possible fits involving this part against the current algorithm.
Creates Possible fits for newly-matching attachment point pairs, and removes
app/services/scope_guide.py
+12 -23
View File
@@ -7,7 +7,6 @@ the parts of that type that fit the row's scope.
from sqlalchemy.ext.asyncio import AsyncSession
from app.crud import attachment_point as attachment_point_crud
from app.crud import augmented_part as augmented_part_crud
from app.crud import fit as fit_crud
from app.crud import part_type as part_type_crud
@@ -15,7 +14,6 @@ from app.crud import scope_info as scope_info_crud
from app.models.fit import FitLabel
SCOPE_TYPE_NAME = "Scope"
OBJECTIVE_ATTACHMENT_POINT_NAME = "Objective"
# "exact" outranks "possible" when the same part fits a scope via several fits.
_LABEL_RANK = {FitLabel.EXACT.value: 2, FitLabel.POSSIBLE.value: 1}
@@ -45,7 +43,6 @@ async def build(
{
"scope": AugmentedPart,
"info": ScopeInfo | None,
"objective_diameter_mm": float | None,
"cells": {part_type_id: [{"part": AugmentedPart, "label": str}]},
},
...,
@@ -54,7 +51,9 @@ async def build(
"""
part_types = await part_type_crud.list_all(db, limit=1000)
scope_type = next((pt for pt in part_types if pt.name == SCOPE_TYPE_NAME), None)
column_types = [pt for pt in part_types if scope_type is None or pt.id != scope_type.id]
column_types = [
pt for pt in part_types if scope_type is None or pt.id != scope_type.id
]
if scope_type is None:
return {"column_types": column_types, "rows": []}
@@ -72,7 +71,9 @@ async def build(
if not scope_ids:
return {"column_types": column_types, "rows": []}
fits = await fit_crud.list_for_parts(db, list(scope_ids), exclude_label=FitLabel.NONE)
fits = await fit_crud.list_for_parts(
db, list(scope_ids), exclude_label=FitLabel.NONE
)
# Resolve the "other" (non-scope) part on each fit in a single batched query.
other_ids: set[int] = set()
@@ -80,28 +81,15 @@ async def build(
scope_id, other_id = _scope_and_other(fit, scope_ids)
if scope_id is not None and other_id not in scope_ids:
other_ids.add(other_id)
other_parts = {p.id: p for p in await augmented_part_crud.get_many(db, list(other_ids))}
other_parts = {
p.id: p for p in await augmented_part_crud.get_many(db, list(other_ids))
}
infos = {
info.augmented_part_id: info
for info in await scope_info_crud.list_by_augmented_parts(db, list(scope_ids))
}
# The lens outside diameter lives on the "Objective" attachment point's
# StaticConnection, not on ScopeInfo (which only carries the objective
# *thread* spec) — see app/services/scope_import.py's column-mapping doc.
objective_diameters: dict[int, float] = {}
objective_aps = await attachment_point_crud.list_by_augmented_parts_and_name(
db, list(scope_ids), OBJECTIVE_ATTACHMENT_POINT_NAME
)
for ap in objective_aps:
if ap.static_connection is not None:
objective_diameters[ap.augmented_part_id] = ap.static_connection.od_mm
elif ap.iso_thread is not None:
objective_diameters[ap.augmented_part_id] = ap.iso_thread.diameter_mm
elif ap.unc_thread is not None:
objective_diameters[ap.augmented_part_id] = float(ap.unc_thread.diameter_fraction)
# cell_map[scope_id][type_id][other_part_id] -> {"part", "label"}, dedup'd so a
# part appears once per cell, keeping its strongest fit label.
cell_map: dict[int, dict[int, dict[int, dict]]] = {sid: {} for sid in scope_ids}
@@ -121,7 +109,9 @@ async def build(
rows = []
for scope in scopes:
cells = {
type_id: sorted(entries.values(), key=lambda e: e["part"].description.lower())
type_id: sorted(
entries.values(), key=lambda e: e["part"].description.lower()
)
for type_id, entries in cell_map[scope.id].items()
}
if fits_part_type_id is not None and fits_part_type_id not in cells:
@@ -130,7 +120,6 @@ async def build(
{
"scope": scope,
"info": infos.get(scope.id),
"objective_diameter_mm": objective_diameters.get(scope.id),
"cells": cells,
}
)
app/services/scope_import.py
+9 -19
View File
@@ -2,7 +2,7 @@
The spreadsheet describes parts of PartType "Scope". Each row maps onto an
AugmentedPart (keyed on ``product_number`` → ``sku``, so re-importing upserts),
a ScopeModel, a ScopeInfo record for the scope-specific fields, up to three
a ScopeModel, a ScopeInfo record for the scope-specific fields, up to two
attachment points, and up to two Fits against other parts.
Column → destination
@@ -14,9 +14,9 @@ model_suffix → ScopeInfo.model_suffix (+ description)
sub_part_type → SubPartType (get-or-create under "Scope")
product_number → AugmentedPart.sku (also the upsert / fit-lookup key)
magnification_min / _max → ScopeInfo
objective_lens_diameter_mm → ScopeInfo (descriptive only, no attachment point)
objective_thread_pitch → ScopeInfo
ocular_outer_diameter_mm → StaticConnection + AttachmentPoint "Ocular"
objective_lens_outside_diameter_mm → StaticConnection + AttachmentPoint "Objective"
objective_thread → ISO/UNC thread + AttachmentPoint "Objective"
ocular_fit → Fit: scope's Ocular AP ↔ referenced part's first AP
objective_fit → Fit: scope's Objective AP ↔ referenced part's first AP
@@ -68,7 +68,7 @@ EXPECTED_COLUMNS = [
"model",
"magnification_min",
"magnification_max",
"objective_lens_outside_diameter_mm",
"objective_lens_diameter_mm",
"model_suffix",
"sub_part_type",
"product_number",
@@ -330,6 +330,7 @@ async def import_scopes(db: AsyncSession, rows: list[dict]) -> ScopeImportResult
magnification_min=_num(row.get("magnification_min")),
magnification_max=_num(row.get("magnification_max")),
model_suffix=model_suffix,
objective_lens_diameter_mm=_num(row.get("objective_lens_diameter_mm")),
objective_thread_pitch=_text(row.get("objective_thread_pitch")),
)
@@ -350,34 +351,23 @@ async def import_scopes(db: AsyncSession, rows: list[dict]) -> ScopeImportResult
od_mm=ocular_od,
)
objective_static_ap = None
objective_od = _num(row.get("objective_lens_outside_diameter_mm"))
if objective_od is not None:
objective_static_ap = await _static_ap(
db,
augmented_part_id=part.id,
label=OBJECTIVE_LABEL,
od_mm=objective_od,
)
# The objective attachment point comes from the thread alone — the
# lens diameter is a descriptive attribute, not a connection.
objective_thread_spec = _text(row.get("objective_thread"))
objective_thread_ap = None
objective_ap = None
if objective_thread_spec:
objective_thread_ap = await _thread_ap(
objective_ap = await _thread_ap(
db,
augmented_part_id=part.id,
label=OBJECTIVE_LABEL,
spec=objective_thread_spec,
)
if objective_thread_ap is None:
if objective_ap is None:
result.messages.append(
f"could not parse objective_thread "
f"'{objective_thread_spec}'"
)
# For objective_fit prefer the lens-OD point, falling back to the thread.
objective_ap = objective_static_ap or objective_thread_ap
staged.append((row, ocular_ap, objective_ap, part.id, result))
row_results.append(result)
except Exception as exc: # noqa: BLE001 - report, don't abort the batch