Updated

README.md

@@ -1,11 +1,2 @@
----
-title: Voice Clone
-emoji: 🦀
-colorFrom: green
-colorTo: purple
-sdk: docker
-pinned: false
-license: mit
----
 
-Check out the configuration reference at https://huggingface.co/docs/hub/spaces-config-reference
+title: Voice Clone

accounts/admin.py

@@ -1,3 +1,50 @@
 from django.contrib import admin
+from django.contrib.auth.admin import UserAdmin
 
-# Register your models here.
+from .models import User
+
+
+class AdminUser(UserAdmin):
+    list_display = ["email", "first_name", "last_name", "role", "is_active", "created"]
+
+    fieldsets = (
+        (
+            None,
+            {
+                "fields": (
+                    "first_name",
+                    "last_name",
+                    "mobile",
+                    "email",
+                    "password",
+                )
+            },
+        ),
+        (
+            "Permissions",
+            {
+                "fields": (
+                    "role",
+                    "is_active",
+                    "is_staff",
+                    "is_superuser",
+                    "user_permissions",
+                )
+            },
+        ),
+    )
+    add_fieldsets = (
+        (None, {"classes": ("wide",), "fields": ("email", "password1", "password2")}),
+    )
+
+    list_filter = ("role", "is_active")
+    search_fields = ("email", "first_name", "last_name")
+    ordering = ("email",)
+    filter_horizontal = (
+        "groups",
+        "user_permissions",
+    )
+
+
+admin.site.register(User, AdminUser)
+# admin.site.unregister(Group)

accounts/migrations/0001_initial.py

@@ -0,0 +1,44 @@
+# Generated by Django 5.0.1 on 2024-04-02 09:30
+
+import django.contrib.auth.models
+import django.contrib.auth.validators
+import django.utils.timezone
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('auth', '0012_alter_user_first_name_max_length'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='User',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('password', models.CharField(max_length=128, verbose_name='password')),
+                ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')),
+                ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')),
+                ('username', models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username')),
+                ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')),
+                ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')),
+                ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')),
+                ('email', models.EmailField(max_length=254, unique=True)),
+                ('first_name', models.CharField(max_length=150)),
+                ('last_name', models.CharField(max_length=150)),
+                ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.group', verbose_name='groups')),
+                ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.permission', verbose_name='user permissions')),
+            ],
+            options={
+                'verbose_name': 'user',
+                'verbose_name_plural': 'users',
+                'abstract': False,
+            },
+            managers=[
+                ('objects', django.contrib.auth.models.UserManager()),
+            ],
+        ),
+    ]

accounts/migrations/0002_alter_user_options_alter_user_managers_and_more.py

@@ -0,0 +1,104 @@
+# Generated by Django 5.0.1 on 2024-04-02 09:44
+
+import django.core.validators
+import django.utils.timezone
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='user',
+            options={'verbose_name': 'User', 'verbose_name_plural': 'Users'},
+        ),
+        migrations.AlterModelManagers(
+            name='user',
+            managers=[
+            ],
+        ),
+        migrations.RemoveField(
+            model_name='user',
+            name='username',
+        ),
+        migrations.AddField(
+            model_name='user',
+            name='address',
+            field=models.TextField(blank=True, null=True, verbose_name='Address'),
+        ),
+        migrations.AddField(
+            model_name='user',
+            name='city',
+            field=models.CharField(blank=True, max_length=50, null=True, verbose_name='City/Town'),
+        ),
+        migrations.AddField(
+            model_name='user',
+            name='country',
+            field=models.CharField(blank=True, max_length=50, null=True, verbose_name='Country'),
+        ),
+        migrations.AddField(
+            model_name='user',
+            name='created',
+            field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='user',
+            name='mobile',
+            field=models.CharField(blank=True, max_length=17, null=True, validators=[django.core.validators.RegexValidator(message="Phone number must be entered in the format: '+999999999'. Up to 15 digits allowed.", regex='^\\+?1?\\d{9,15}$')], verbose_name='mobile'),
+        ),
+        migrations.AddField(
+            model_name='user',
+            name='modified',
+            field=models.DateTimeField(auto_now=True),
+        ),
+        migrations.AddField(
+            model_name='user',
+            name='role',
+            field=models.PositiveSmallIntegerField(choices=[(1, 'Admin'), (2, 'User')], default=2, verbose_name='role'),
+        ),
+        migrations.AddField(
+            model_name='user',
+            name='state',
+            field=models.CharField(blank=True, max_length=50, null=True, verbose_name='State/Province'),
+        ),
+        migrations.AddField(
+            model_name='user',
+            name='zip_code',
+            field=models.CharField(blank=True, max_length=50, null=True),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='date_joined',
+            field=models.DateTimeField(auto_now_add=True, verbose_name='date joined'),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='email',
+            field=models.EmailField(max_length=254, unique=True, verbose_name='email address'),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='first_name',
+            field=models.CharField(blank=True, max_length=50, null=True, verbose_name='First Name'),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='is_active',
+            field=models.BooleanField(default=True),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='is_staff',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='last_name',
+            field=models.CharField(blank=True, max_length=50, null=True, verbose_name='Last Name'),
+        ),
+    ]

accounts/models.py

@@ -1,3 +1,111 @@
+# Create your models here.
+from django.contrib.auth.base_user import BaseUserManager
+from django.contrib.auth.models import AbstractBaseUser, PermissionsMixin
 from django.db import models
+from django.utils.translation import gettext_lazy as _
+from django.core.validators import RegexValidator
 
-# Create your models here.
+from .task import send_email_to_user
+
+
+class BaseModel(models.Model):
+    created = models.DateTimeField(auto_now_add=True, editable=False)
+    modified = models.DateTimeField(auto_now=True, editable=False)
+
+    class Meta:
+        abstract = True
+
+
+class UserManager(BaseUserManager):
+    """
+    Custom user model manager where email is the unique identifiers
+    for authentication instead of usernames.
+    """
+
+    def create_user(self, email, password, **extra_fields):
+        """
+        Create and save a User with the given email and password.
+        """
+        if not email:
+            raise ValueError(_("The Email must be set"))
+        email = self.normalize_email(email)
+        user = self.model(email=email, **extra_fields)
+        user.set_password(password)
+        user.save()
+        return user
+
+    def create_superuser(self, email, password, **extra_fields):
+        """
+        Create and save a SuperUser with the given email and password.
+        """
+        extra_fields.setdefault("is_staff", True)
+        extra_fields.setdefault("is_superuser", True)
+        extra_fields.setdefault("is_active", True)
+
+        if extra_fields.get("is_staff") is not True:
+            raise ValueError(_("Superuser must have is_staff=True."))
+        if extra_fields.get("is_superuser") is not True:
+            raise ValueError(_("Superuser must have is_superuser=True."))
+        return self.create_user(email, password, **extra_fields)
+
+
+phone_regex = RegexValidator(
+    regex=r"^\+?1?\d{9,15}$",
+    message="Phone number must be entered in the format: '+999999999'. Up to 15 digits allowed.",
+)
+
+
+class User(AbstractBaseUser, PermissionsMixin):
+    """Custom user model to add more fields"""
+
+    # User roles
+    class Roles(models.IntegerChoices):
+        """Roles for user model"""
+
+        ADMIN = 1
+        USER = 2
+
+    email = models.EmailField(_("email address"), unique=True)
+    first_name = models.CharField(_("First Name"), max_length=50, blank=True, null=True)
+    last_name = models.CharField(_("Last Name"), max_length=50, blank=True, null=True)
+
+    mobile = models.CharField(
+        _("mobile"),
+        max_length=17,
+        validators=[phone_regex],
+        null=True,
+        blank=True,
+    )
+
+    address = models.TextField(_("Address"), blank=True, null=True)
+    city = models.CharField(_("City/Town"), max_length=50, blank=True, null=True)
+    state = models.CharField(_("State/Province"), max_length=50, blank=True, null=True)
+    country = models.CharField(_("Country"), max_length=50, blank=True, null=True)
+    zip_code = models.CharField(max_length=50, blank=True, null=True)
+
+    is_staff = models.BooleanField(default=False)
+    is_active = models.BooleanField(default=True)
+    date_joined = models.DateTimeField(_("date joined"), auto_now_add=True)
+    role = models.PositiveSmallIntegerField(
+        _("role"), choices=Roles.choices, default=Roles.USER
+    )
+    created = models.DateTimeField(auto_now_add=True, editable=False)
+    modified = models.DateTimeField(auto_now=True, editable=False)
+
+    USERNAME_FIELD = "email"
+    REQUIRED_FIELDS = []
+
+    objects = UserManager()
+
+    class Meta:
+        verbose_name = _("User")
+        verbose_name_plural = _("Users")
+
+    def __str__(self):
+        return self.get_full_name()
+
+    def get_full_name(self):
+        return "{} {}".format(self.first_name, self.last_name)
+    
+    def send_forgot_password_email(self,host,email):
+        return send_email_to_user(self.pk, host,email,email_type="forgot_password")

accounts/serializers.py

@@ -1,20 +1,33 @@
 from rest_framework import serializers
-from django.contrib.auth.models import User
+from .models import User
 
-class UserSerializer(serializers.ModelSerializer):
+class UserRegistrationSerializer(serializers.ModelSerializer):
     password = serializers.CharField(write_only=True)
 
+    class Meta:
+        model = User
+        fields = ['email', 'password', 'first_name', 'last_name', 'mobile', 'address', 'city', 'state', 'country', 'zip_code', 'role']
+        extra_kwargs = {
+            'first_name': {'required': False},
+            'last_name': {'required': False},
+            'mobile': {'required': False},
+            'address': {'required': False},
+            'city': {'required': False},
+            'state': {'required': False},
+            'country': {'required': False},
+            'zip_code': {'required': False},
+            'role': {'required': False},
+        }
+
     def create(self, validated_data):
-        # Create the user instance
-        user = User.objects.create_user(
-            username=validated_data['username'],
-            email=validated_data.get('email', ''),  # Default to empty string if email is not provided
-            password=validated_data['password'],
-            first_name=validated_data.get('first_name', ''),  # Default to empty string if first_name is not provided
-            last_name=validated_data.get('last_name', '')  # Default to empty string if last_name is not provided
-        )
+        user = User.objects.create_user(**validated_data)
         return user
 
-    class Meta:
-        model = User
-        fields = ('id', 'username', 'password', 'first_name', 'last_name', 'email')
+
+class ForgotPasswordSerializer(serializers.Serializer):
+    email = serializers.EmailField()
+
+class ResetPasswordSerializer(serializers.Serializer):
+    token = serializers.CharField()
+    uid = serializers.CharField()
+    new_password = serializers.CharField()

accounts/task.py

@@ -0,0 +1,56 @@
+from django.contrib.auth.tokens import PasswordResetTokenGenerator
+from django.core.mail import send_mail
+from django.conf import settings
+from django.contrib.auth import get_user_model
+from django.utils.encoding import force_bytes
+from django.utils.html import strip_tags
+from django.utils.http import urlsafe_base64_encode
+
+
+def send_email_to_user(
+    user_pk,
+    host,
+    email,
+    email_type,
+    new_email=None,
+    from_email=settings.EMAIL_HOST_USER,
+    **kwargs,
+):
+    user = get_user_model().objects.get(pk=user_pk)
+
+    token_generator = PasswordResetTokenGenerator()
+    token = token_generator.make_token(user)
+    uid = urlsafe_base64_encode(force_bytes(user.pk))
+    reset_link = f"{host}/verify/{uid}/{token}"
+
+    # Define your email subject
+    subject = "Reset Your Password for Text to Speech AI Voice Generator"
+    
+    # Write the HTML content directly in the function
+    html_content = f"""
+    <html>
+        <body>
+            <p>Hello {user.get_full_name() or user.username},</p>
+            <p>You requested a password reset for your account. Click the link below to reset your password:</p>
+            <p><a href="{reset_link}">Reset Password</a></p>
+            <p>If you didn't request this, you can ignore this email.</p>
+            <p>Your link will expire in 48 hours.</p>
+            <p>Thank you!</p>
+        </body>
+    </html>
+    """
+
+    # Create a text-only version of the email
+    text_content = strip_tags(html_content)
+
+    try:
+        send_mail(
+            subject,
+            text_content,
+            from_email,
+            [email],
+            html_message=html_content,  # This is the key part for HTML
+            fail_silently=False,
+        )
+    except Exception as e:
+        print(e)

accounts/urls.py

@@ -1,9 +1,11 @@
 from django.urls import path
-from . import views
-from rest_framework.authtoken.views import obtain_auth_token
+from .views import *
 
 urlpatterns = [
-    path('register/', views.RegisterView.as_view(), name='register'),
-    path('login', obtain_auth_token, name="Get Token"),
+    path('register/', UserRegistrationAPIView.as_view(), name='user-registration'),
+    path('login/', LoginView.as_view(), name='login'),
+    path('forgot-password/', ResetPasswordView.as_view(), name='forgot_password'),
+    path('reset-password/', ChangePasswordView.as_view(), name='reset_password'),
+
 ]
 

accounts/views.py

@@ -1,16 +1,100 @@
-from .serializers import  UserSerializer
+from .models import User
 from rest_framework import status
 from rest_framework.response import Response
-from rest_framework.generics import CreateAPIView
+from rest_framework.generics import CreateAPIView,UpdateAPIView
 from rest_framework.authtoken.models import Token
-from django.contrib.auth.models import User
+from rest_framework.views import APIView
+from django.contrib.auth import authenticate
+from drf_yasg.utils import swagger_auto_schema
+from drf_yasg import openapi
+from django.utils.http import urlsafe_base64_decode
+from django.utils.encoding import force_str
 
-class RegisterView(CreateAPIView):
-    queryset = User.objects.all()
-    serializer_class = UserSerializer  # Create a UserSerializer to handle user registration.
+from .serializers import ForgotPasswordSerializer, ResetPasswordSerializer, UserRegistrationSerializer
+from django.contrib.auth.tokens import default_token_generator
+
+
+class UserRegistrationAPIView(CreateAPIView):
+    serializer_class = UserRegistrationSerializer
+    def post(self, request, format=None):
+        serializer = UserRegistrationSerializer(data=request.data)
+        if serializer.is_valid():
+            serializer.save()
+            return Response(serializer.data, status=status.HTTP_201_CREATED)
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+
+
+
+class LoginView(APIView):
+    @swagger_auto_schema(
+        request_body=openapi.Schema(
+            type=openapi.TYPE_OBJECT,
+            required=['email', 'password'],
+            properties={
+                'email': openapi.Schema(type=openapi.TYPE_STRING),
+                'password': openapi.Schema(type=openapi.TYPE_STRING),
+            },
+        ),
+        responses={
+            status.HTTP_200_OK: openapi.Schema(
+                type=openapi.TYPE_OBJECT,
+                properties={
+                    'token': openapi.Schema(type=openapi.TYPE_STRING),
+                },
+            ),
+        },
+    )
+    def post(self, request):
+        email = request.data.get('email')
+        password = request.data.get('password')
+
+        if email is None or password is None:
+            return Response({'error': 'Please provide both email and password'}, status=status.HTTP_400_BAD_REQUEST)
+
+        user = authenticate(email=email, password=password)
+
+        if not user:
+            return Response({'error': 'Invalid credentials'}, status=status.HTTP_401_UNAUTHORIZED)
 
-    def perform_create(self, serializer):
-        user = serializer.save()
         token, _ = Token.objects.get_or_create(user=user)
-        return Response({'token': token.key}, status=status.HTTP_201_CREATED)
 
+        return Response({'token': token.key})
+
+
+class ResetPasswordView(CreateAPIView):
+    serializer_class = ForgotPasswordSerializer
+
+    def post(self, request):
+        serializer = self.serializer_class(data=request.data)
+        if serializer.is_valid():
+            email = serializer.validated_data.get("email")
+            if User.objects.filter(email=email).exists():
+                user = User.objects.get(email=email)
+                scheme = "https" if request.is_secure() else "http"
+                full_host = request.get_host()
+                base_url = f"{scheme}://{full_host}"
+                user.send_forgot_password_email(base_url, email)
+                return Response({"message": "Password reset email sent"})
+            else:
+                return Response({"error": "Email does not exist"}, status=status.HTTP_400_BAD_REQUEST)
+        else:
+            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+        
+
+class ChangePasswordView(UpdateAPIView):
+    serializer_class = ResetPasswordSerializer
+    http_method_names = ['patch', 'head', 'options', 'trace'] 
+
+    def partial_update(self, request, *args, **kwargs):
+        serializer = self.get_serializer(data=request.data)
+        serializer.is_valid(raise_exception=True)
+
+        uid = force_str(urlsafe_base64_decode(serializer.validated_data['uid']))
+        user = User.objects.get(pk=uid)
+
+        if user is not None and default_token_generator.check_token(user, serializer.validated_data['token']):
+            user.set_password(serializer.validated_data['new_password'])
+            user.save()
+            return Response({"message": "Password updated successfully"}, status=status.HTTP_200_OK)
+        else:
+            return Response({"error": "Invalid token or user does not exist"}, status=status.HTTP_400_BAD_REQUEST)

config/schemaprotocol.py

@@ -0,0 +1,6 @@
+from drf_yasg.generators import OpenAPISchemaGenerator
+class BothHttpAndHttpsSchemaGenerator(OpenAPISchemaGenerator):
+    def get_schema(self, request=None, public=False):
+        schema = super().get_schema(request, public)
+        schema.schemes = ["http", "https"]
+        return schema

config/settings.py

@@ -51,7 +51,8 @@ INSTALLED_APPS = [
 CORS_ALLOW_ALL_ORIGINS = True # If this is used then `CORS_ALLOWED_ORIGINS` will not have any effect
 CORS_ALLOW_CREDENTIALS = True
 CORS_ALLOWED_ORIGINS = [
-    'https://undetectable-voice-clone.hf.space', "http://94.101.98.237:7860" ,"https://voice-clone-frontend.vercel.app" ,"https://voice.undetectable.ai" ,"https://api.voice.undetectable.ai" 
+    'https://undetectable-voice-clone.hf.space', "http://94.101.98.237:7860" ,"https://voice-clone-frontend.vercel.app" ,
+    "https://voice.undetectable.ai" ,"https://api.voice.undetectable.ai" 
 ]
 
 REST_FRAMEWORK = {
@@ -122,10 +123,12 @@ DATABASES = {
     }
 }
 
-MINIO_ENDPOINT = '94.101.98.237:9000'  # Use the service name defined in Docker Compose
+MINIO_ENDPOINT = 'storage.voice.undetectable.ai'  # Use the service name defined in Docker Compose
 MINIO_ACCESS_KEY = 'voice-clone'
 MINIO_SECRET_KEY = 'voice-clone'
-MINIO_SECURE = False  # Change to True if using HTTPS
+MINIO_SECURE = True  # Change to True if using HTTPS
+
+AUTH_USER_MODEL = 'accounts.User'
 
 # Password validation
 # https://docs.djangoproject.com/en/5.0/ref/settings/#auth-password-validators
@@ -157,7 +160,11 @@ USE_I18N = True
 
 USE_TZ = True
 
-
+ACCOUNT_USER_MODEL_USERNAME_FIELD = None
+ACCOUNT_AUTHENTICATION_METHOD = "email"
+ACCOUNT_EMAIL_REQUIRED = True
+ACCOUNT_UNIQUE_EMAIL = True
+ACCOUNT_USERNAME_REQUIRED = False
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/5.0/howto/static-files/
 
@@ -169,3 +176,12 @@ MEDIA_URL = '/media/'
 # https://docs.djangoproject.com/en/5.0/ref/settings/#default-auto-field
 
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
+
+
+EMAIL_HOST = "smtp.gmail.com"
+EMAIL_PORT = 587  # For TLS
+EMAIL_USE_TLS = True
+EMAIL_USE_SSL = False
+EMAIL_HOST_USER='[email protected]'
+EMAIL_HOST_PASSWORD="fgxx yuns jagn rwak"
+DEFAULT_FROM_EMAIL="[email protected]"

config/urls.py

@@ -1,5 +1,6 @@
 from django.contrib import admin
 from django.urls import path, include
+from .schemaprotocol import BothHttpAndHttpsSchemaGenerator
 from rest_framework import permissions
 from drf_yasg.views import get_schema_view
 from drf_yasg import openapi
@@ -17,7 +18,7 @@ schema_view = get_schema_view(
         license=openapi.License(name="Your License"),
     ),
     public=True,
-    url="https://undetectable-voice-clone.hf.space/",
+    # generator_class=BothHttpAndHttpsSchemaGenerator,
     permission_classes=(permissions.AllowAny,),
 )
 

texttovoice/models.py

@@ -1,6 +1,6 @@
 
 from django.db import models
-from django.contrib.auth.models import User
+from accounts.models import User
 
 # Create your models here.
 class BaseModel(models.Model):

texttovoice/serializers.py

@@ -8,7 +8,7 @@ class TextToSpeechSerializer(serializers.Serializer):
 
 
 class TextToSpeechSerializerResponse(serializers.ModelSerializer):
-    created_by = serializers.SerializerMethodField()
+    #created_by = serializers.SerializerMethodField()
 
     class Meta:
         model = TextToSpeech
@@ -16,12 +16,12 @@ class TextToSpeechSerializerResponse(serializers.ModelSerializer):
         # Ensure that all the fields you want to include are listed here
 
     def get_created_by(self, obj):
-        return obj.created_by.username if obj.created_by else None
+         return obj.created_by.email if obj.created_by else None
 
 class TextToSpeechSerializerResponseWithURL(serializers.ModelSerializer):
     speaker_wav_url = serializers.SerializerMethodField()
     output_wav_url = serializers.SerializerMethodField()
-    created_by = serializers.SerializerMethodField()
+    #created_by = serializers.SerializerMethodField()
 
 
     class Meta:
@@ -36,4 +36,4 @@ class TextToSpeechSerializerResponseWithURL(serializers.ModelSerializer):
         return self.context['view'].generate_presigned_url(obj.output_wav)
     
     def get_created_by(self, obj):
-        return obj.created_by.username if obj.created_by else None
+        return obj.created_by.email if obj.created_by else None