✨ Added functionality for taking screenshot of original/raw page prior to tagging. Added functionality for combining the OCR annotations of the original/raw page and the tagged page. #95
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…r to tagging. Added functionality for combining the OCR annotations of the original/raw page and the tagged page.
…to be compatible with supertype ITarsier.
tarsier/core.py
Outdated
| @@ -77,3 +98,15 @@ async def _remove_tags(adapter: BrowserAdapter) -> None: | |||
| script = "return window.removeTags();" | |||
|
|
|||
| await adapter.run_js(script) | |||
|
|
|||
| @staticmethod | |||
| async def _hide_non_tag_elem(adapter: BrowserAdapter) -> None: | |||
There was a problem hiding this comment.
Should maybe just use the same name as TS (Should be done for all similar methods)
Suggested change
| async def _hide_non_tag_elem(adapter: BrowserAdapter) -> None: | |
| async def _hide_non_tag_elements(adapter: BrowserAdapter) -> None: |
tarsier/core.py
Outdated
Comment on lines
32
to
47
| ) -> Tuple[bytes, bytes, Dict[int, str]]: | ||
| adapter = adapter_factory(driver) | ||
| initial_screenshot = await self._take_screenshot(adapter) | ||
| tag_to_xpath = ( | ||
| await self._tag_page(adapter, tag_text_elements) if not tagless else {} | ||
| ) | ||
| screenshot = await self._take_screenshot(adapter) | ||
| await self._hide_non_tag_elem(adapter) | ||
| tagged_screenshot = await self._take_screenshot(adapter) | ||
| await self._revert_visibilities(adapter) | ||
| if not tagless: | ||
| await self._remove_tags(adapter) | ||
| return screenshot, tag_to_xpath if not tagless else {} | ||
| return ( | ||
| initial_screenshot, | ||
| tagged_screenshot, | ||
| tag_to_xpath if not tagless else {}, | ||
| ) |
There was a problem hiding this comment.
Let's maybe keep this method the same and just move over logic to page_to_text.
This is because anyone using page_to_image currently expects a single image with all of the tagged elements (Alongside the page text). We also avoid changing the function signature this way
tarsier/core.py
Outdated
Comment on lines
58
to
69
| combined_annotations: ImageAnnotatorResponse = { | ||
| "words": untagged_ocr_annotations["words"] + tagged_ocr_annotations["words"] | ||
| } | ||
| combined_annotations["words"] = list( | ||
| sorted( | ||
| combined_annotations["words"], | ||
| key=lambda x: ( | ||
| x["midpoint_normalized"][1], | ||
| x["midpoint_normalized"][0], | ||
| ), | ||
| ) | ||
| ) |
There was a problem hiding this comment.
Should maybe make a combine_annotations() method that handles this resorting (To decouple this function having to care that its sorted)
…ase tagging from page_to_image() to page_to_text(), added method combine_annotations() to decouple the sorting logic from page_to_text().
asim-shrestha
approved these changes
Jun 26, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.