Merge branch 'dev' into feature/auto-project-covers

Author: VeryBigSad

.github/workflows/dev-ci.yml

@@ -0,0 +1,48 @@
+name: 'Deploy dev server'
+
+on:
+  push:
+    branches: 
+      - dev
+
+jobs:
+  deploy:
+      runs-on: ubuntu-latest
+      steps:
+        - name: run on server
+          uses: garygrossgarten/github-action-ssh@release
+          with:
+            host: ${{ secrets.DEV_SERVER_HOST }}
+            username: ${{ secrets.DEV_SERVER_USER }}
+            password: ${{ secrets.DEV_SERVER_PASSWORD }}
+            command: |
+              cd /root/api &&
+              git checkout dev &&
+              git pull &&
+              
+              rm -f .env &&
+              touch .env &&
+              
+              echo "DJANGO_SECRET_KEY=${{ secrets.DEV_DJANGO_SECRET_KEY }}" >> .env &&
+              
+              echo "DATABASE_NAME=${{ secrets.DEV_DATABASE_NAME }}" >> .env &&
+              echo "DATABASE_PASSWORD=${{ secrets.DEV_DATABASE_PASSWORD }}" >> .env &&
+              echo "DATABASE_USER=${{ secrets.DEV_DATABASE_USER }}" >> .env &&
+              echo "DATABASE_HOST=${{ secrets.DEV_DATABASE_HOST }}" >> .env &&
+              echo "DATABASE_PORT=${{ secrets.DEV_DATABASE_PORT }}" >> .env &&
+              
+              echo "EMAIL_USER=${{ secrets.EMAIL_USER }}" >> .env &&
+              echo "EMAIL_PASSWORD=${{ secrets.EMAIL_PASSWORD }}" >> .env &&
+              echo "EMAIL_HOST=${{ secrets.EMAIL_HOST }}" >> .env &&
+              echo "EMAIL_PORT=${{ secrets.EMAIL_PORT }}" >> .env &&
+              echo "SELECTEL_ACCOUNT_ID=${{ secrets.SELECTEL_ACCOUNT_ID }}" >> .env &&
+              echo "SELECTEL_CONTAINER_NAME=${{ secrets.SELECTEL_CONTAINER_NAME }}" >> .env &&
+              echo "SELECTEL_CONTAINER_PASSWORD=${{ secrets.SELECTEL_CONTAINER_PASSWORD }}" >> .env &&
+              echo "SELECTEL_CONTAINER_USERNAME=${{ secrets.SELECTEL_CONTAINER_USERNAME }}" >> .env &&
+              
+              echo "CLICKUP_API_TOKEN=${{ secrets.CLICKUP_API_TOKEN }}" >> .env &&
+              echo "CLICKUP_SPACE_ID=${{ secrets.CLICKUP_SPACE_ID }}" >> .env &&
+              
+              echo "SENTRY_DSN=${{ secrets.SENTRY_DSN }}" >> .env &&
+              
+              docker-compose -f docker-compose.dev-ci.yml up -d --build --force-recreate

docker-compose.dev-ci.yml

@@ -0,0 +1,19 @@
+version: "3.4"
+services:
+  server:
+    ports:
+      - "8000:8000"
+    build:
+      context: .
+      dockerfile: Dockerfile
+    env_file:
+      - .env
+    restart: always
+    networks:
+      template-network:
+
+networks:
+  template-network:
+
+volumes:
+  db-volume:

events/signals.py

@@ -16,11 +16,9 @@ def autoposting_receiver(sender, instance, created, *args, **kwargs):
             if response["ok"]:
                 instance.tg_message_id = response["result"]["message_id"]
                 instance.save()
-            # print(response) -
         else:
             link = f"{APP_URL}/{instance.pk}"
             text = f"***{instance.title}***\n{instance.short_text}\n\n{link}"
             response = edit_message(
                 text, instance.tg_message_id, settings.TELEGRAM_CHANNEL
             )
-            # print(response) -

files/admin.py

@@ -3,7 +3,7 @@
 from django.contrib import admin
 from django.forms import ModelForm, FileField
 
-from files.helpers import FileAPI
+from files.service import CDN, SelectelSwiftStorage
 from files.models import UserFile
 
 
@@ -40,6 +40,9 @@ class UserFileAdmin(admin.ModelAdmin):
     )
 
     date_hierarchy = "datetime_uploaded"
+    ordering = ("-datetime_uploaded",)
+
+    cdn = CDN(storage=SelectelSwiftStorage())
 
     @admin.display(empty_value="Empty filename")
     def filename(self, obj):
@@ -61,9 +64,8 @@ def get_fieldsets(self, request, obj=None):
         return fieldsets
 
     def save_model(self, request, obj, form, change):
-        file_api = FileAPI(request.FILES["file"], request.user)
-        url, info = file_api.upload()
-        obj.link = url
+        info = self.cdn.upload(request.FILES["file"], request.user)
+        obj.link = info.url
         obj.user = request.user
         obj.name = info.name
         obj.size = info.size
@@ -72,5 +74,10 @@ def save_model(self, request, obj, form, change):
         super().save_model(request, obj, form, change)
 
     def delete_model(self, request, obj):
-        FileAPI.delete(obj.link)
+        self.cdn.delete(obj.link)
         obj.delete()
+
+    def delete_queryset(self, request, queryset):
+        for obj in queryset:
+            self.cdn.delete(obj.link)
+        queryset.delete()

files/constants.py

@@ -0,0 +1,6 @@
+import mimetypes
+
+SUPPORTED_IMAGES_TYPES = (
+    mimetypes.types_map[".jpg"],
+    mimetypes.types_map[".png"],
+)

files/helpers.py

@@ -1,115 +1,9 @@
-from typing import Union
+import webp
+from PIL import Image
 
-import requests
-import time
-import magic
-from django.core.files.uploadedfile import TemporaryUploadedFile, InMemoryUploadedFile
 
-from files.exceptions import SelectelUploadError
-from files.typings import UserFileInfo
-
-from procollab.settings import (
-    DEBUG,
-    SELECTEL_ACCOUNT_ID,
-    SELECTEL_CONTAINER_NAME,
-    SELECTEL_CONTAINER_PASSWORD,
-    SELECTEL_CONTAINER_USERNAME,
-)
-
-
-class FileAPI:
-    # fixme: looks terrible
-    def __init__(
-        self, file: Union[TemporaryUploadedFile, InMemoryUploadedFile], user
-    ) -> None:
-        self.file = file  # it's TemporaryUploadedFile, and it will be
-        # removed after first .close() call, so we must read this file only once
-        self.user = user
-        self.file_object = self.file.open(mode="rb")
-
-    @staticmethod
-    def delete(url: str) -> int:
-        """Deletes file from selcdn"""
-        token = FileAPI._get_selectel_swift_token()
-        response = requests.delete(url, headers={"X-Auth-Token": token})
-        return response.status_code
-
-    def upload(self) -> tuple[str, UserFileInfo]:
-        url = self._upload_via_selectel_swift()
-        info = self.get_file_info(self.file)
-        self.file_object.close()
-        return url, info
-
-    def get_file_info(
-        self, file: Union[TemporaryUploadedFile, InMemoryUploadedFile]
-    ) -> UserFileInfo:
-        name, ext = file.name.split(".")
-        return UserFileInfo(
-            size=file.size, name=name, extension=ext, mime_type=self.get_file_mime_type()
-        )
-
-    def get_file_mime_type(self):
-        if isinstance(self.file, InMemoryUploadedFile):
-            return magic.from_buffer(self.file_object.read(), mime=True)
-        else:
-            return magic.from_file(self.file.temporary_file_path(), mime=True)
-
-    def _upload_via_selectel_swift(self) -> str:
-        token = self._get_selectel_swift_token()
-        url = self._generate_selectel_swift_file_url()
-
-        requests.put(
-            url,
-            headers={
-                "X-Auth-Token": token,
-                "Content-Type": self.file_object.content_type,
-            },
-            data=self.file_object.read(),
-        )
-
-        return url
-
-    def _generate_selectel_swift_link(sefl):
-        link = f"https://api.selcdn.ru/v1/SEL_{SELECTEL_ACCOUNT_ID}/{SELECTEL_CONTAINER_NAME}/"
-        if DEBUG:
-            link += "debug/"
-        return link
-
-    @staticmethod
-    def _get_selectel_swift_token():
-        """Returns auth token for selcdn"""
-        data = {
-            "auth": {
-                "identity": {
-                    "methods": ["password"],
-                    "password": {
-                        "user": {
-                            "id": SELECTEL_CONTAINER_USERNAME,
-                            "password": SELECTEL_CONTAINER_PASSWORD,
-                        }
-                    },
-                }
-            }
-        }
-        response = requests.post("https://api.selcdn.ru/v3/auth/tokens", json=data)
-        if response.status_code not in [200, 201]:
-            raise SelectelUploadError("Couldn't generate a token for selcdn")
-        return response.headers["x-subject-token"]
-
-    def _get_file_extension(self) -> str:
-        if len(self.file.name.split(".")) > 1:
-            return "." + self.file.name.split(".")[1]
-        return ""
-
-    def _generate_selectel_swift_file_url(self) -> str:
-        """
-        Generates url for selcdn
-        Returns:
-            url: str looks like /hashedEmail/hashedFilename_hashedTime.extension
-        """
-        link = self._generate_selectel_swift_link()
-        extension = self._get_file_extension()
-        return (
-            link
-            + f"{abs(hash(self.user.email))}/{abs(hash(self.file.name))}_{abs(hash(time.time()))}{extension}"
-        )
+def convert_image_to_webp(image, quality: int = 70):
+    config = webp.WebPConfig.new(preset=webp.WebPPreset.PHOTO, quality=quality)
+    pil_image = Image.open(image.file)
+    webp_image = webp.WebPPicture.from_pil(pil_image)
+    return webp_image.encode(config)

files/models.py

@@ -1,3 +1,5 @@
+import reprlib
+
 from django.contrib.auth import get_user_model
 from django.db import models
 
@@ -26,7 +28,8 @@ class UserFile(models.Model):
     size = models.PositiveBigIntegerField(null=False, blank=True, default=1)
 
     def __str__(self):
-        return f"UserFile by {self.user}, {self.link}"
+        filename_with_extension = f"{self.name}.{self.extension}"
+        return f"UserFile<{reprlib.repr(filename_with_extension)}>"
 
     class Meta:
         verbose_name = "Файл"