Skip to content

Commit

Permalink
Fix bad merge
Browse files Browse the repository at this point in the history
  • Loading branch information
sarayourfriend committed Nov 16, 2023
1 parent 69e1528 commit f9c66bf
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 10 deletions.
4 changes: 2 additions & 2 deletions api/api/views/audio_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
source_collection,
stats,
tag_collection,
thumbnail as thumbnail_docs,
waveform,
)
from api.docs.audio_docs import thumbnail as thumbnail_docs
from api.docs.audio_docs import waveform
from api.models import Audio
from api.serializers.audio_serializers import (
AudioCollectionRequestSerializer,
Expand Down
8 changes: 2 additions & 6 deletions api/api/views/image_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
source_collection,
stats,
tag_collection,
thumbnail as thumbnail_docs,
)
from api.docs.image_docs import thumbnail as thumbnail_docs
from api.docs.image_docs import watermark as watermark_doc
from api.models import Image
from api.serializers.image_serializers import (
Expand All @@ -34,11 +34,7 @@
OembedSerializer,
WatermarkRequestSerializer,
)
from api.serializers.media_serializers import (
MediaThumbnailRequestSerializer,
PaginatedRequestSerializer,
)
from api.utils.throttle import AnonThumbnailRateThrottle, OAuth2IdThumbnailRateThrottle
from api.serializers.media_serializers import PaginatedRequestSerializer
from api.utils.image_proxy import ImageProxyMediaInfo
from api.utils.watermark import watermark
from api.views.media_views import MediaViewSet
Expand Down
4 changes: 2 additions & 2 deletions api/api/views/media_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
from rest_framework.response import Response
from rest_framework.viewsets import ReadOnlyModelViewSet

from api.constants.media_types import MediaType
from api.constants.search import SearchStrategy
from adrf.views import APIView as AsyncAPIView
from adrf.viewsets import ViewSetMixin as AsyncViewSetMixin
from asgiref.sync import sync_to_async

from api.constants.media_types import MediaType
from api.constants.search import SearchStrategy
from api.controllers import search_controller
from api.controllers.elasticsearch.related import related_media
from api.models import ContentProvider
Expand Down

0 comments on commit f9c66bf

Please sign in to comment.