From 09c5b86a9213d0960e235174c71710ccf39e330f Mon Sep 17 00:00:00 2001 From: Kaustubh Maske Patil <37668193+nikochiko@users.noreply.github.com> Date: Fri, 19 Jan 2024 12:45:43 +0530 Subject: [PATCH] Remove slugify module - use django utils --- bots/models.py | 3 +-- daras_ai_v2/base.py | 2 +- daras_ai_v2/meta_content.py | 3 ++- daras_ai_v2/slugify.py | 14 -------------- 4 files changed, 4 insertions(+), 18 deletions(-) delete mode 100644 daras_ai_v2/slugify.py diff --git a/bots/models.py b/bots/models.py index d46c166ea..fa55f251b 100644 --- a/bots/models.py +++ b/bots/models.py @@ -8,7 +8,7 @@ from django.contrib.auth import get_user_model from django.db import models, transaction from django.db.models import Q -from django.utils.text import Truncator +from django.utils.text import Truncator, slugify from furl import furl from phonenumber_field.modelfields import PhoneNumberField @@ -17,7 +17,6 @@ from bots.custom_fields import PostgresJSONEncoder, CustomURLField from daras_ai_v2.crypto import get_random_doc_id from daras_ai_v2.language_model import format_chat_entry -from daras_ai_v2.slugify import slugify if typing.TYPE_CHECKING: from daras_ai_v2.base import BasePage diff --git a/daras_ai_v2/base.py b/daras_ai_v2/base.py index 3ed60c677..edd3d9ec8 100644 --- a/daras_ai_v2/base.py +++ b/daras_ai_v2/base.py @@ -16,6 +16,7 @@ import requests import sentry_sdk from django.utils import timezone +from django.utils.text import slugify from fastapi import HTTPException from firebase_admin import auth from furl import furl @@ -57,7 +58,6 @@ extract_query_params, ) from daras_ai_v2.send_email import send_reported_run_email -from daras_ai_v2.slugify import slugify from daras_ai_v2.tabs_widget import MenuTabs from daras_ai_v2.user_date_widgets import ( render_js_dynamic_dates, diff --git a/daras_ai_v2/meta_content.py b/daras_ai_v2/meta_content.py index 7943acae9..12076d26f 100644 --- a/daras_ai_v2/meta_content.py +++ b/daras_ai_v2/meta_content.py @@ -1,8 +1,9 @@ +from django.utils.text import slugify from furl import furl from bots.models import PublishedRun, SavedRun, WorkflowMetadata from daras_ai_v2 import settings -from daras_ai_v2.base import BasePage, slugify +from daras_ai_v2.base import BasePage from daras_ai_v2.breadcrumbs import get_title_breadcrumbs from daras_ai_v2.meta_preview_url import meta_preview_url from daras_ai_v2.tabs_widget import MenuTabs diff --git a/daras_ai_v2/slugify.py b/daras_ai_v2/slugify.py deleted file mode 100644 index 3fbc1910b..000000000 --- a/daras_ai_v2/slugify.py +++ /dev/null @@ -1,14 +0,0 @@ -import re - - -def slugify(s: str) -> str: - # remove leading/trailing space, and make lowercase - s = s.strip() - # remove multiple space - s = re.sub(r"\s+", " ", s) - # replace non-alphanumeric chars (and space) with "-" - s = re.sub(r"[^A-Za-z0-9]+", " ", s) - # grab upto first 5 words - s = "-".join(s.split()[:5]) - - return s