diff --git a/.woodpecker/static_analysis.yml b/.woodpecker/static_analysis.yml index b817624..5244d3a 100644 --- a/.woodpecker/static_analysis.yml +++ b/.woodpecker/static_analysis.yml @@ -3,7 +3,7 @@ steps: image: nikolaik/python-nodejs commands: - npm install --global pyright - - poetry install - - python --version && poetry --version && pyright --version + - uv sync + - python --version && uv version && pyright --version - echo "------------- running pyright typecheck -------------" - - poetry run pyright + - uv run pyright diff --git a/.woodpecker/test.yml b/.woodpecker/test.yml index 0dc8073..5ae9b1d 100644 --- a/.woodpecker/test.yml +++ b/.woodpecker/test.yml @@ -3,9 +3,9 @@ when: steps: pytest: - image: ghcr.io/withlogicco/poetry:1.5.1 + image: nikolaik/python-nodejs commands: - - poetry install - - python --version && poetry --version + - uv sync + - python --version && uv version - echo "------------- running pytest -------------" - - poetry run pytest + - uv run pytest diff --git a/papis_extract/annotation.py b/papis_extract/annotation.py index 2111f1b..8fd63ac 100644 --- a/papis_extract/annotation.py +++ b/papis_extract/annotation.py @@ -37,12 +37,17 @@ class Annotation: page: int = 0, tag: str = "", type: str = "Highlight", + minimum_similarity_color: float | None = None, ) -> None: self.file = file self._color = color self.content = content self.note = note self.page = page + self.minimum_similarity_color = minimum_similarity_color or ( + papis.config.getfloat("minimum_similarity_color", "plugins.extract") + or COLOR_SIMILARITY_MINIMUM_FALLBACK + ) self.tag = tag or self._tag_from_colorname(self.colorname or "") self.type = type @@ -82,10 +87,7 @@ class Annotation: """ annot_colors = self.color or (0.0, 0.0, 0.0) nearest = None - minimum_similarity = ( - papis.config.getfloat("minimum_similarity_color", "plugins.extract") - or COLOR_SIMILARITY_MINIMUM_FALLBACK - ) + minimum_similarity = self.minimum_similarity_color for name, values in COLORS.items(): similarity_ratio = self._color_similarity_ratio(values, annot_colors) if similarity_ratio >= minimum_similarity: diff --git a/papis_extract/extractors/pdf.py b/papis_extract/extractors/pdf.py index 906fdec..8caaf5c 100644 --- a/papis_extract/extractors/pdf.py +++ b/papis_extract/extractors/pdf.py @@ -35,7 +35,6 @@ class PdfExtractor: for ( page ) in doc: # pyright: ignore [reportUnknownVariableType] - missing stub - page = cast(mu.Page, page) annot: mu.Annot for annot in page.annots(): quote, note = self._retrieve_annotation_content(page, annot)