Merge pull request #168 from PROCOLLAB-github/feature/files

Feature/files

Author: yakser

.github/workflows/django-test.yml

@@ -13,10 +13,10 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Set up Python 3.9
+      - name: Set up Python 3.11
         uses: actions/setup-python@v2
         with:
-          python-version: 3.9
+          python-version: 3.11
 
       - name: cache poetry install
         uses: actions/cache@v2

.github/workflows/lints.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.9]
+        python-version: [3.11]
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}

.github/workflows/release-ci.yml

@@ -11,10 +11,10 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Set up Python 3.9
+      - name: Set up Python 3.11
         uses: actions/setup-python@v2
         with:
-          python-version: 3.9
+          python-version: 3.11
 
       - name: cache poetry install
         uses: actions/cache@v2

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.9
+FROM python:3.11
 
 RUN apt update --no-install-recommends -y
 

files/admin.py

@@ -65,8 +65,12 @@ def save_model(self, request, obj, form, change):
         url, info = file_api.upload()
         obj.link = url
         obj.user = request.user
-        obj.name = info["name"]
-        obj.size = info["size"]
-        obj.extension = info["extension"]
-        obj.mime_type = info["mime_type"]
+        obj.name = info.name
+        obj.size = info.size
+        obj.extension = info.extension
+        obj.mime_type = info.mime_type
         super().save_model(request, obj, form, change)
+
+    def delete_model(self, request, obj):
+        FileAPI.delete(obj.link)
+        obj.delete()

files/helpers.py

@@ -6,6 +6,7 @@
 from django.core.files.uploadedfile import TemporaryUploadedFile, InMemoryUploadedFile
 
 from files.exceptions import SelectelUploadError
+from files.typings import UserFileInfo
 
 from procollab.settings import (
     DEBUG,
@@ -33,25 +34,19 @@ def delete(url: str) -> int:
         response = requests.delete(url, headers={"X-Auth-Token": token})
         return response.status_code
 
-    def upload(self) -> tuple[str, dict]:
+    def upload(self) -> tuple[str, UserFileInfo]:
         url = self._upload_via_selectel_swift()
-        # todo: type hints for this dummy dict
         info = self.get_file_info(self.file)
         self.file_object.close()
         return url, info
 
     def get_file_info(
         self, file: Union[TemporaryUploadedFile, InMemoryUploadedFile]
-    ) -> dict:
+    ) -> UserFileInfo:
         name, ext = file.name.split(".")
-
-        # fixme:
-        return {
-            "size": file.size,
-            "name": name,
-            "extension": ext,
-            "mime_type": self.get_file_mime_type(),
-        }
+        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):

files/typings.py

@@ -0,0 +1,12 @@
+from dataclasses import dataclass
+from typing import TypeAlias
+
+Bytes: TypeAlias = int
+
+
+@dataclass(slots=True, frozen=True)
+class UserFileInfo:
+    size: Bytes
+    name: str
+    extension: str
+    mime_type: str