PeterSurda/inoreader2readwise
1
0
Fork 2
Code Issues Pull Requests 4 Packages Projects Releases Wiki Activity

Separate services - app, db, and job #1

Open
swapnil wants to merge 36 commits from swapnil/inoreader2readwise:main into main
pull from: swapnil/inoreader2readwise:main
merge into: PeterSurda:main
Conversation 1 Commits 36 Files Changed 14 +80 -36
1 changed files with 80 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ee9b4b10a1 - Show all commits

116
job/main.py
View File

@ -33,11 +33,11 @@ def update_last_update_time(new_time):
with open(DATA_STORE_PATH, 'w') as file: with open(DATA_STORE_PATH, 'w') as file:
file.write(str(new_time)) file.write(str(new_time))
def get_new_annotations(last_annotation_time): def get_new_annotations(last_annotation_time, inoreader_token):
inoreader = APIHandler( inoreader = APIHandler(
"https://www.inoreader.com/reader/api/0/stream/contents", "https://www.inoreader.com/reader/api/0/stream/contents",
headers = { headers = {
'Authorization': 'Bearer ' + get_inoreader_access_token() 'Authorization': 'Bearer ' + inoreader_token()
} }
) )
@ -74,11 +74,11 @@ def get_new_annotations(last_annotation_time):
return [annotation for annotation in all_annotations if annotation['added_on'] > last_annotation_time] return [annotation for annotation in all_annotations if annotation['added_on'] > last_annotation_time]
def push_annotations_to_readwise(annotations): def push_annotations_to_readwise(annotations, readwise_token):
readwise = APIHandler( readwise = APIHandler(
"https://readwise.io", "https://readwise.io",
headers = { headers = {
'Authorization': 'Token ' + os.getenv("READWISE_ACCESS_TOKEN"), 'Authorization': 'Token ' + readwise_token,
'Content-Type': 'application/json' 'Content-Type': 'application/json'
} }
) )
@ -101,29 +101,29 @@ def push_annotations_to_readwise(annotations):
} }
) )
def get_inoreader_access_token(): # def get_inoreader_access_token():
response = requests.get(f'{DATABASE_URL}/token/latest') # response = requests.get(f'{DATABASE_URL}/token/latest')
response.raise_for_status() # response.raise_for_status()
if response.status_code == 204: # if response.status_code == 204:
# throw error - not logged in. Please log in first through the web app # # throw error - not logged in. Please log in first through the web app
raise Exception("Not logged in. Please log in first through the web app") # raise Exception("Not logged in. Please log in first through the web app")
elif response.status_code == 200: # elif response.status_code == 200:
resp_json = response.json() # resp_json = response.json()
if resp_json['token']['expiration_seconds'] + resp_json['token']['timestamp'] > datetime.now().timestamp(): # if resp_json['token']['expiration_seconds'] + resp_json['token']['timestamp'] > datetime.now().timestamp():
return resp_json['token']['access_token'] # return resp_json['token']['access_token']
else: # else:
return refresh_inoreader_access_token(resp_json['token']['refresh_token']) # return refresh_inoreader_access_token(resp_json['token']['refresh_token'])
access_token = get_token_from_database() # access_token = get_token_from_database()
if not access_token: # if not access_token:
access_token = refresh_inoreader_access_token() # access_token = refresh_inoreader_access_token()
if not access_token: # if not access_token:
raise Exception("Unable to get access token. Try logging in again through the web app") # raise Exception("Unable to get access token. Try logging in again through the web app")
return access_token # return access_token
def refresh_inoreader_access_token(refresh_token): def refresh_inoreader_access_token(refresh_token, readwise_api_key):
response = requests.post( response = requests.post(
'https://www.inoreader.com/oauth2/token', 'https://www.inoreader.com/oauth2/token',
headers={ headers={
@ -139,40 +139,84 @@ def refresh_inoreader_access_token(refresh_token):
response.raise_for_status() response.raise_for_status()
tokens = response.json() token = response.json()
user_info = requests.get('https://www.inoreader.com/reader/api/0/user-info', headers={
'Authorization': f'Bearer {token.get("access_token")}'
}).json()
# Save tokens for later use # Save tokens for later use
save_tokens(tokens['access_token'], tokens['refresh_token'], tokens['expires_in']) save_token(
user_info.get('userEmail'),
token['access_token'],
token['refresh_token'],
token['expires_in'],
readwise_api_key
)
return tokens['access_token'] return token['access_token'], readwise_api_key
def save_tokens(access_token, refresh_token, expiration_seconds): def save_token(email, access_token, refresh_token, expiration_seconds, readwise_api_key):
response = requests.post( response = requests.post(
f'{DATABASE_URL}/token', f'{DATABASE_URL}/token',
headers={ headers={
'Content-Type': 'application/json' 'Content-Type': 'application/json'
}, },
json={ json={
'email': email,
'access_token': access_token, 'access_token': access_token,
'refresh_token': refresh_token, 'refresh_token': refresh_token,
'expiration_seconds': expiration_seconds 'expiration_seconds': expiration_seconds,
'readwise_api_key': readwise_api_key
} }
) )
response.raise_for_status() response.raise_for_status()
def get_all_active_tokens():
response = requests.get(f'{DATABASE_URL}/token/all?only_active=true')
response.raise_for_status()
if response.status_code == 200:
return response.json()['tokens']
else:
return []
def deactivate_token(token_id):
response = requests.post(
f'{DATABASE_URL}/token/{token_id}/deactivate',
headers={
'Content-Type': 'application/json'
}
)
response.raise_for_status()
def check_and_refresh_access_token(token):
if token['expiration_seconds'] + token['timestamp'] > datetime.now().timestamp():
return token['access_token'], token['readwise_api_key']
else:
deactivate_token(token['id'])
return refresh_inoreader_access_token(token['refresh_token'], token['readwise_api_key'])
def main(): def main():
while True: while True:
try: try:
last_annotation_time = get_last_update_time() all_tokens = get_all_active_tokens()
new_annotations = get_new_annotations(last_annotation_time) for token in all_tokens:
logging.info("Checking for new annotations for user with email: {}".format(token['email']))
if new_annotations: inoreader_token, readwise_api_key = check_and_refresh_access_token(token)
latest_added_on = max(annotation['added_on'] for annotation in new_annotations)
push_annotations_to_readwise(new_annotations) last_annotation_time = get_last_update_time()
update_last_update_time(latest_added_on) new_annotations = get_new_annotations(last_annotation_time, inoreader_token)
else:
logging.info("No new annotations found") if new_annotations:
latest_added_on = max(annotation['added_on'] for annotation in new_annotations)
push_annotations_to_readwise(new_annotations, readwise_api_key)
update_last_update_time(latest_added_on)
logging.info("Successfully pushed {} new annotations to Readwise for user with email: {}".format(len(new_annotations), token['email']))
else:
logging.info("No new annotations found for user with email: {}".format(token['email']))
time.sleep(86400) # Sleep for 24 hours time.sleep(86400) # Sleep for 24 hours