Merge pull request #47 from rwxd/pyreadwise

fix: changed to pyreadwise

Author: rwxd

.pre-commit-config.yaml

@@ -1,7 +1,63 @@
+---
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.3.0
+    rev: "v4.4.0"
     hooks:
       - id: check-yaml
+      - id: check-json
       - id: end-of-file-fixer
       - id: trailing-whitespace
+      - id: check-added-large-files
+      - id: check-symlinks
+      - id: no-commit-to-branch
+      - id: trailing-whitespace
+      - id: debug-statements
+      - id: double-quote-string-fixer
+      - id: requirements-txt-fixer
+
+  - repo: https://github.com/psf/black
+    rev: "23.1.0"
+    hooks:
+      - id: black
+        args:
+          - "--skip-string-normalization"
+
+  - repo: https://github.com/asottile/pyupgrade
+    rev: "v3.3.1"
+    hooks:
+      - id: pyupgrade
+
+  - repo: https://github.com/pre-commit/mirrors-mypy
+    rev: "v1.1.1"
+    hooks:
+      - id: mypy
+        args:
+          - "--ignore-missing-imports"
+        additional_dependencies:
+          - types-requests
+          - types-pyyaml
+
+  - repo: https://github.com/PyCQA/flake8
+    rev: 6.0.0
+    hooks:
+      - id: flake8
+        args:
+          - "--max-line-length=100"
+
+  - repo: https://github.com/pycqa/isort
+    rev: 5.12.0
+    hooks:
+      - id: isort
+        name: isort (python)
+        args:
+          - "--profile"
+          - "black"
+          - "--filter-files"
+
+  - repo: https://github.com/PyCQA/autoflake
+    rev: v2.0.2
+    hooks:
+      - id: autoflake
+        args:
+          - "--remove-all-unused-imports"
+          - "--ignore-init-module-imports"

requirements.txt

@@ -1,5 +1,4 @@
-typer==0.7.0
-rich==12.6.0
+readwise==1.0.13
 requests==2.28.1
-ratelimit==2.2.1
-backoff==2.2.1
+rich==12.6.0
+typer==0.7.0

setup.py

@@ -1,8 +1,9 @@
-from setuptools import setup
 from os import path
 from subprocess import check_output
 
-with open("./requirements.txt") as f:
+from setuptools import setup
+
+with open('./requirements.txt') as f:
     required = f.read().splitlines()
 
 this_directory = path.abspath(path.dirname(__file__))
@@ -15,7 +16,7 @@
     version = (
         check_output(['git', 'describe', '--tags']).strip().decode().replace('v', '')
     )
-except:
+except Exception:
     pass
 
 setup(
@@ -26,12 +27,12 @@
     long_description_content_type='text/markdown',
     author='rwxd',
     author_email='[email protected]',
-    url="https://github.com/rwxd/wallabag2readwise",
+    url='https://github.com/rwxd/wallabag2readwise',
     license='MIT',
     packages=['wallabag2readwise'],
     install_requires=required,
     entry_points={
-        "console_scripts": ["wallabag2readwise = wallabag2readwise.__main__:main"]
+        'console_scripts': ['wallabag2readwise = wallabag2readwise.__main__:main']
     },
     classifiers=[
         'Programming Language :: Python :: 3.6',

wallabag2readwise/cli.py

@@ -1,12 +1,12 @@
+import importlib.metadata
+from time import sleep
+
 import typer
-from wallabag2readwise.misc import push_annotations
-from wallabag2readwise.readwise import ReadwiseConnector, ReadwiseReaderConnector
+from readwise import Readwise, ReadwiseReader
 
-from wallabag2readwise.wallabag import WallabagConnector
-from time import sleep
+from wallabag2readwise.misc import push_annotations
 from wallabag2readwise.output import console
-import importlib.metadata
-
+from wallabag2readwise.wallabag import WallabagConnector
 
 app = typer.Typer()
 
@@ -29,7 +29,7 @@ def push(
         wallabag_client_id,
         wallabag_client_secret,
     )
-    readwise = ReadwiseConnector(readwise_token)
+    readwise = Readwise(readwise_token)
     push_annotations(wallabag, readwise)
 
 
@@ -47,7 +47,6 @@ def daemon(
         60, help='time to wait between runs in minutes', envvar='WAIT_TIME'
     ),
 ) -> None:
-
     console.print(f'> Starting daemon with {wait_time} minutes wait time')
     while True:
         wallabag = WallabagConnector(
@@ -57,7 +56,7 @@ def daemon(
             wallabag_client_id,
             wallabag_client_secret,
         )
-        readwise = ReadwiseConnector(readwise_token)
+        readwise = Readwise(readwise_token)
         push_annotations(wallabag, readwise)
 
         console.print(f'=> Waiting {wait_time} minutes')
@@ -75,21 +74,21 @@ def reader(
     wallabag_client_secret: str = typer.Option(..., envvar='WALLABAG_CLIENT_SECRET'),
     readwise_token: str = typer.Option(..., envvar='READWISE_TOKEN', prompt=True),
 ):
-    console.print(f'> Starting readwise reader import')
+    console.print('> Starting readwise reader import')
     wallabag = WallabagConnector(
         wallabag_url,
         wallabag_user,
         wallabag_password,
         wallabag_client_id,
         wallabag_client_secret,
     )
-    readwise = ReadwiseReaderConnector(readwise_token)
+    readwise = ReadwiseReader(readwise_token)
     wallabag_entries = wallabag.get_entries()
     for entry in wallabag_entries:
         console.print(f'=> Importing {entry.title}')
         location = 'archive' if entry.archived else 'new'
         try:
-            readwise.create(
+            readwise.create_document(
                 entry.url, tags=[t.label for t in entry.tags], location=location
             )
         except Exception as e:

wallabag2readwise/misc.py

@@ -1,15 +1,18 @@
-from requests import JSONDecodeError
-from wallabag2readwise.models import ReadwiseBook, WallabagAnnotation
-from wallabag2readwise.readwise import ReadwiseConnector, new_highlights
-from wallabag2readwise.wallabag import WallabagConnector
 from datetime import datetime
+from time import sleep
+
+from readwise import Readwise
+from readwise.models import ReadwiseBook
+from requests import JSONDecodeError
+
 from wallabag2readwise.logging import logger
+from wallabag2readwise.models import WallabagAnnotation, WallabagEntry
 from wallabag2readwise.output import console
-from time import sleep
+from wallabag2readwise.wallabag import WallabagConnector
 
 
 def get_readwise_articles_with_retries(
-    readwise: ReadwiseConnector, retries: int = 15, timeout: int = 5
+    readwise: Readwise, retries: int = 15, timeout: int = 5
 ) -> list[ReadwiseBook]:
     """We try to circumvent readwise JSONDecodeError with retries."""
     maximum = retries
@@ -31,7 +34,7 @@ def get_readwise_articles_with_retries(
             sleep(timeout)
 
 
-def push_annotations(wallabag: WallabagConnector, readwise: ReadwiseConnector):
+def push_annotations(wallabag: WallabagConnector, readwise: Readwise):
     readwise_articles = get_readwise_articles_with_retries(readwise)
     for wallabag_entry in wallabag.get_entries():
         if len(wallabag_entry.annotations) > 0:
@@ -52,7 +55,8 @@ def push_annotations(wallabag: WallabagConnector, readwise: ReadwiseConnector):
                 if readwise_article.title == wallabag_entry.title:
                     highlights = list(readwise.get_book_highlights(readwise_article.id))
                     console.print(
-                        f'=> Found {len(highlights)} wallabag highlights for "{wallabag_entry.title}"'
+                        f'=> Found {len(highlights)} wallabag highlights '
+                        f'for "{wallabag_entry.title}"'
                     )
                     for annotation in annotations:
                         if annotation.quote not in [i.text for i in highlights]:
@@ -63,19 +67,23 @@ def push_annotations(wallabag: WallabagConnector, readwise: ReadwiseConnector):
                     readwise_article_tags = list(
                         readwise.get_book_tags(readwise_article.id)
                     )
-                    for tag in wallabag_entry.tags:
-                        if tag.label not in [i.name for i in readwise_article_tags]:
+                    for wallabag_tag in wallabag_entry.tags:
+                        if wallabag_tag.label not in [
+                            i.name for i in readwise_article_tags
+                        ]:
                             console.print(
-                                f'==> Adding tag "{tag.label}" to Readwise article'
+                                f'==> Adding tag "{wallabag_tag.label}" to Readwise article'
                             )
-                            readwise.add_tag(readwise_article.id, tag.label)
+                            readwise.add_tag(readwise_article.id, wallabag_tag.label)
 
-                    for tag in readwise_article_tags:
-                        if tag.name not in [i.label for i in wallabag_entry.tags]:
+                    for readwise_tag in readwise_article_tags:
+                        if readwise_tag.name not in [
+                            i.label for i in wallabag_entry.tags
+                        ]:
                             console.print(
-                                f'==> Deleting tag "{tag.name}" from Readwise article'
+                                f'==> Deleting tag "{readwise_tag.name}" from Readwise article'
                             )
-                            readwise.delete_tag(readwise_article.id, tag.id)
+                            readwise.delete_tag(readwise_article.id, readwise_tag.id)
 
                     break
             else:
@@ -86,9 +94,26 @@ def push_annotations(wallabag: WallabagConnector, readwise: ReadwiseConnector):
                 new_highlights(readwise, wallabag_entry, annotations)
                 for new_articles in get_readwise_articles_with_retries(readwise):
                     if new_articles.title == wallabag_entry.title:
-                        for tag in wallabag_entry.tags:
+                        for wallabag_tag in wallabag_entry.tags:
                             console.print(
-                                f'==> Adding tag "{tag.label}" to Readwise article'
+                                f'==> Adding tag "{wallabag_tag.label}" to Readwise article'
                             )
-                            readwise.add_tag(new_articles.id, tag.label)
+                            readwise.add_tag(new_articles.id, wallabag_tag.label)
                         break
+
+
+def new_highlights(
+    readwise: Readwise,
+    entry: WallabagEntry,
+    annotations: list[WallabagAnnotation],
+):
+    for item in annotations:
+        console.print('==> Adding highlight to Readwise')
+        readwise.create_highlight(
+            item.quote,
+            entry.title,
+            highlighted_at=item.created_at,
+            source_url=entry.url,
+            note=item.text,
+            category='articles',
+        )