modernize type hinting

app/models/corpus.py

@@ -3,7 +3,6 @@ from enum import IntEnum
 from flask import current_app, url_for
 from flask_hashids import HashidMixin
 from sqlalchemy.ext.associationproxy import association_proxy
-from typing import Union
 from pathlib import Path
 import shutil
 import xml.etree.ElementTree as ET
@@ -25,7 +24,7 @@ class CorpusStatus(IntEnum):
     CANCELING_ANALYSIS_SESSION = 9
 
     @staticmethod
-    def get(corpus_status: Union['CorpusStatus', int, str]) -> 'CorpusStatus':
+    def get(corpus_status: 'CorpusStatus | int | str') -> 'CorpusStatus':
         if isinstance(corpus_status, CorpusStatus):
             return corpus_status
         if isinstance(corpus_status, int):

app/models/corpus_follower_role.py

@@ -1,6 +1,5 @@
 from flask_hashids import HashidMixin
 from enum import IntEnum
-from typing import Union
 from app import db
 
 
@@ -11,7 +10,7 @@ class CorpusFollowerPermission(IntEnum):
     MANAGE_CORPUS = 8
 
     @staticmethod
-    def get(corpus_follower_permission: Union['CorpusFollowerPermission', int, str]) -> 'CorpusFollowerPermission':
+    def get(corpus_follower_permission: 'CorpusFollowerPermission | int | str') -> 'CorpusFollowerPermission':
         if isinstance(corpus_follower_permission, CorpusFollowerPermission):
             return corpus_follower_permission
         if isinstance(corpus_follower_permission, int):
@@ -38,16 +37,16 @@ class CorpusFollowerRole(HashidMixin, db.Model):
     def __repr__(self):
         return f'<CorpusFollowerRole {self.name}>'
 
-    def has_permission(self, permission: Union[CorpusFollowerPermission, int, str]):
+    def has_permission(self, permission: CorpusFollowerPermission | int | str):
         perm = CorpusFollowerPermission.get(permission)
         return self.permissions & perm.value == perm.value
-    
-    def add_permission(self, permission: Union[CorpusFollowerPermission, int, str]):
+
+    def add_permission(self, permission: CorpusFollowerPermission | int | str):
         perm = CorpusFollowerPermission.get(permission)
         if not self.has_permission(perm):
             self.permissions += perm.value
-    
-    def remove_permission(self, permission: Union[CorpusFollowerPermission, int, str]):
+
+    def remove_permission(self, permission: CorpusFollowerPermission | int | str):
         perm = CorpusFollowerPermission.get(permission)
         if self.has_permission(perm):
             self.permissions -= perm.value

app/models/job.py

@@ -3,7 +3,6 @@ from enum import IntEnum
 from flask import current_app, url_for
 from flask_hashids import HashidMixin
 from time import sleep
-from typing import Union
 from pathlib import Path
 import shutil
 from app import db
@@ -21,7 +20,7 @@ class JobStatus(IntEnum):
     FAILED = 8
 
     @staticmethod
-    def get(job_status: Union['JobStatus', int, str]) -> 'JobStatus':
+    def get(job_status: 'JobStatus | int | str') -> 'JobStatus':
         if isinstance(job_status, JobStatus):
             return job_status
         if isinstance(job_status, int):

app/models/role.py

@@ -1,6 +1,5 @@
 from enum import IntEnum
 from flask_hashids import HashidMixin
-from typing import Union
 from app import db
 
 
@@ -14,7 +13,7 @@ class Permission(IntEnum):
     USE_API = 4
 
     @staticmethod
-    def get(permission: Union['Permission', int, str]) -> 'Permission':
+    def get(permission: 'Permission | int | str') -> 'Permission':
         if isinstance(permission, Permission):
             return permission
         if isinstance(permission, int):
@@ -38,16 +37,16 @@ class Role(HashidMixin, db.Model):
     def __repr__(self):
         return f'<Role {self.name}>'
 
-    def has_permission(self, permission: Union[Permission, int, str]):
+    def has_permission(self, permission: Permission | int | str):
         p = Permission.get(permission)
         return self.permissions & p.value == p.value
-    
-    def add_permission(self, permission: Union[Permission, int, str]):
+
+    def add_permission(self, permission: Permission | int | str):
         p = Permission.get(permission)
         if not self.has_permission(p):
             self.permissions += p.value
-    
-    def remove_permission(self, permission: Union[Permission, int, str]):
+
+    def remove_permission(self, permission: Permission | int | str):
         p = Permission.get(permission)
         if self.has_permission(p):
             self.permissions -= p.value

app/models/user.py

@@ -5,7 +5,6 @@ from flask_hashids import HashidMixin
 from flask_login import UserMixin
 from sqlalchemy.ext.associationproxy import association_proxy
 from pathlib import Path
-from typing import Union
 from werkzeug.security import generate_password_hash, check_password_hash
 import jwt
 import re
@@ -26,7 +25,7 @@ class ProfilePrivacySettings(IntEnum):
     SHOW_MEMBER_SINCE = 4
 
     @staticmethod
-    def get(profile_privacy_setting: Union['ProfilePrivacySettings', int, str]) -> 'ProfilePrivacySettings':
+    def get(profile_privacy_setting: 'ProfilePrivacySettings | int | str') -> 'ProfilePrivacySettings':
         if isinstance(profile_privacy_setting, ProfilePrivacySettings):
             return profile_privacy_setting
         if isinstance(profile_privacy_setting, int):
@@ -315,7 +314,7 @@ class User(HashidMixin, UserMixin, db.Model):
     def has_profile_privacy_setting(self, setting):
         s = ProfilePrivacySettings.get(setting)
         return self.profile_privacy_settings & s.value == s.value
-    
+
     def add_profile_privacy_setting(self, setting):
         s = ProfilePrivacySettings.get(setting)
         if not self.has_profile_privacy_setting(s):
@@ -350,7 +349,7 @@ class User(HashidMixin, UserMixin, db.Model):
 
     def is_following_corpus(self, corpus):
         return corpus in self.followed_corpora
-    
+
     def generate_follow_corpus_token(self, corpus_hashid, role_name, expiration=7):
         now = datetime.utcnow()
         payload = {
@@ -366,7 +365,7 @@ class User(HashidMixin, UserMixin, db.Model):
             current_app.config['SECRET_KEY'],
             algorithm='HS256'
         )
-    
+
     def follow_corpus_by_token(self, token):
         try:
             payload = jwt.decode(