Merge remote-tracking branch 'origin/master'

app_users/models.py

@@ -184,8 +184,10 @@ def copy_from_firebase_user(self, user: auth.UserRecord) -> "AppUser":
         self.uid = user.uid
         self.is_disabled = user.disabled
         self.display_name = user.display_name or ""
-        self.email = str(user.email)
-        self.phone_number = str(user.phone_number)
+        if user.email:
+            self.email = str(user.email)
+        if user.phone_number:
+            self.phone_number = str(user.phone_number)
         self.created_at = timezone.datetime.fromtimestamp(
             user.user_metadata.creation_timestamp / 1000
         )

daras_ai_v2/upscaler_models.py

@@ -120,7 +120,7 @@ def gfpgan(img: str, scale: int = 1) -> bytes:
     elif scale != 2:
         scale *= 2
 
-    # https://replicate.com/nightmareai/real-esrgan/versions/42fed1c4974146d4d2414e2be2c5277c7fcf05fcc3a73abf41610695738c1d7b#output-schema
+    # https://replicate.com/tencentarc/gfpgan/versions/9283608cc6b7be6b65a8e44983db012355fde4132009bf99d976b2f0896856a3
     model = replicate.models.get(UpscalerModels.gfpgan.model_id)
     version = model.versions.get(
         "9283608cc6b7be6b65a8e44983db012355fde4132009bf99d976b2f0896856a3"

scripts/fix_email_or_phone_number_is_str_None.py

@@ -0,0 +1,17 @@
+from app_users.models import AppUser
+from .migrate_workspaces import update_in_batches
+
+
+def run():
+    fix_email_is_str_None()
+    fix_phone_number_is_str_None()
+
+
+def fix_email_is_str_None():
+    qs = AppUser.objects.filter(email="None")
+    update_in_batches(qs, email=None)
+
+
+def fix_phone_number_is_str_None():
+    qs = AppUser.objects.filter(phone_number="None")
+    update_in_batches(qs, phone_number=None)