Update/python base (#13)

* updating python base and pinning django version

pip, when upgraded, will install a version that is no longer supporting
python 3.5 because of a specific kind of format string. So here we want to upgrade
the python in the container to 3.8. I am also pinning the Django version because
the latest needs a bit of work to upgrade (and this can be done when needed in another PR)

Signed-off-by: vsoch <[email protected]>

* black formatting

Signed-off-by: vsoch <[email protected]>

Co-authored-by: vsoch <[email protected]>

Author: vsoch

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.5.1
+FROM python:3.8
 ENV PYTHONUNBUFFERED 1
 
 ################################################################################

VERSION

@@ -1 +1 @@
-0.0.12
+0.0.13

push.py

@@ -1,10 +1,10 @@
 #!/usr/bin/env python
 
-'''
+"""
 
 push.py: example of how to push image to nginx upload server!
 
-Copyright (C) 2018 Vanessa Sochat.
+Copyright (C) 2018-2021 Vanessa Sochat.
 
 This program is free software: you can redistribute it and/or modify it
 under the terms of the GNU Affero General Public License as published by
@@ -19,50 +19,55 @@
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-'''
+"""
 
 from __future__ import print_function
-from requests_toolbelt.streaming_iterator import StreamingIterator
-from requests_toolbelt import (
-    MultipartEncoder,
-    MultipartEncoderMonitor
-)
+from requests_toolbelt import MultipartEncoder, MultipartEncoderMonitor
 
 import requests
 import argparse
-import hashlib
 import sys
 import os
 
 
 def get_parser():
     parser = argparse.ArgumentParser(description="Dinosaur Nginx Upload Example")
 
-    description = 'example push client to upload files to nginx upload endpoint'
-
-    parser.add_argument("--host", dest='host', 
-                        help="the host where the server is running", 
-                        type=str, default='127.0.0.1')
-
-    parser.add_argument("--port", "-p", dest='port', 
-                        help="the port where the server is running", 
-                        type=str, default='')
-
-    parser.add_argument("--schema", "-s", dest='schema', 
-                        help="http:// or https://", 
-                        type=str, default='http://')
-
-    parser.add_argument("file", nargs=1,
-                        help="full path to file to push", 
-                        type=str)
+    description = "example push client to upload files to nginx upload endpoint"
+
+    parser.add_argument(
+        "--host",
+        dest="host",
+        help="the host where the server is running",
+        type=str,
+        default="127.0.0.1",
+    )
+
+    parser.add_argument(
+        "--port",
+        "-p",
+        dest="port",
+        help="the port where the server is running",
+        type=str,
+        default="",
+    )
+
+    parser.add_argument(
+        "--schema",
+        "-s",
+        dest="schema",
+        help="http:// or https://",
+        type=str,
+        default="http://",
+    )
+
+    parser.add_argument("file", nargs=1, help="full path to file to push", type=str)
 
     return parser
 
 
-
 def main():
-    '''the main entrypoint for pushing!
-    '''
+    """the main entrypoint for pushing!"""
 
     parser = get_parser()
 
@@ -88,62 +93,68 @@ def main():
 
 def assemble_url(schema, host, port):
     if port:
-        port = ':%s' % port
-    return '%s%s%s/upload' %(schema, host, port)
+        port = ":%s" % port
+    return "%s%s%s/upload" % (schema, host, port)
 
 
 def push(path, url):
-    '''push an image to the dinosaur nginx upload server!
-
-       Parameters
-       ==========
-       path: the full path to the image.
+    """
+    Push an image to the dinosaur nginx upload server!
 
-    '''
+    Parameters
+    ==========
+    path: the full path to the image.
+    """
 
     path = os.path.abspath(path)
     image = os.path.basename(path)
-    print("PUSH %s" % path)
 
     if not os.path.exists(path):
-        print('ERROR: %s does not exist.' %path)
+        print("ERROR: %s does not exist." % path)
         sys.exit(1)
 
     image_size = os.path.getsize(path) >> 20
+    print("PUSH %s of size %s" % (image, image_size))
 
     upload_to = os.path.basename(path)
 
-    encoder = MultipartEncoder(fields={'name': upload_to,
-                                       'terminal': "yes",
-                                       'file1': (upload_to, open(path, 'rb'), 'text/plain')})
+    encoder = MultipartEncoder(
+        fields={
+            "name": upload_to,
+            "terminal": "yes",
+            "file1": (upload_to, open(path, "rb"), "text/plain"),
+        }
+    )
 
     progress_callback = create_callback(encoder)
     monitor = MultipartEncoderMonitor(encoder, progress_callback)
-    headers = {'Content-Type': monitor.content_type }
+    headers = {"Content-Type": monitor.content_type}
 
     try:
         r = requests.post(url, data=monitor, headers=headers)
-        message = r.json()['message']
-        print('\n[Return status {0} {1}]'.format(r.status_code, message))
+        message = r.json()["message"]
+        print("\n[Return status {0} {1}]".format(r.status_code, message))
     except KeyboardInterrupt:
-        print('\nUpload cancelled.')
+        print("\nUpload cancelled.")
     except Exception as e:
         print(e)
 
     sys.stdout.write("\n")
 
 
 def create_callback(encoder):
-    encoder_len = int(encoder.len / (1024*1024.0))
+    encoder_len = int(encoder.len / (1024 * 1024.0))
     sys.stdout.write("[0 of %s MB]" % (encoder_len))
     sys.stdout.flush()
+
     def callback(monitor):
-        sys.stdout.write('\r')
-        bytes_read = int(monitor.bytes_read / (1024*1024.0))
+        sys.stdout.write("\r")
+        bytes_read = int(monitor.bytes_read / (1024 * 1024.0))
         sys.stdout.write("[%s of %s MB]" % (bytes_read, encoder_len))
         sys.stdout.flush()
+
     return callback
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     main()

requirements.txt

@@ -1,3 +1,3 @@
 uwsgi
-Django>=2.0.8
+Django==2.0.8
 psycopg2-binary

upload/main/apps.py

@@ -2,4 +2,4 @@
 
 
 class MainConfig(AppConfig):
-    name = 'main'
+    name = "main"

upload/main/models.py

@@ -1,6 +1,6 @@
-'''
+"""
 
-Copyright (C) 2018 Vanessa Sochat.
+Copyright (C) 2018-2021 Vanessa Sochat.
 
 This program is free software: you can redistribute it and/or modify it
 under the terms of the GNU Affero General Public License as published by
@@ -15,44 +15,40 @@
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-'''
+"""
 
 from django.core.files.storage import FileSystemStorage
 from django.conf import settings
 from django.db import models
-import uuid
 import time
 import hashlib
 import os
 
 
-
 ################################################################################
 # Storage
 
+
 def get_upload_to(instance, filename):
-    filename = os.path.join(settings.UPLOAD_PATH, instance.upload_id + '.simg')
+    filename = os.path.join(settings.UPLOAD_PATH, instance.upload_id + ".simg")
     return time.strftime(filename)
 
 
 class OverwriteStorage(FileSystemStorage):
-
     def get_available_name(self, name, max_length=None):
         if self.exists(name):
             os.remove(os.path.join(settings.MEDIA_ROOT, name))
         return name
 
 
-
 ################################################################################
-# Models 
-
+# Models
 
 
 class ImageFile(models.Model):
-    ''' a base image upload to hold a file temporarily during upload
-        based off of django-chunked-uploads BaseChunkedUpload model
-    '''
+    """a base image upload to hold a file temporarily during upload
+    based off of django-chunked-uploads BaseChunkedUpload model
+    """
 
     file = models.FileField(upload_to=get_upload_to, storage=OverwriteStorage())
     filename = models.CharField(max_length=255)
@@ -68,22 +64,21 @@ def get_abspath(self):
 
     @property
     def md5(self):
-        '''calculate the md5 sum of the file'''
-        if getattr(self, '_md5', None) is None:
+        """calculate the md5 sum of the file"""
+        if getattr(self, "_md5", None) is None:
             md5 = hashlib.md5()
             for chunk in self.file.chunks():
                 md5.update(chunk)
             self._md5 = md5.hexdigest()
         return self._md5
 
-
     def delete(self, delete_file=True, *args, **kwargs):
-        '''delete the file and make sure to also delete from storage'''
+        """delete the file and make sure to also delete from storage"""
         if self.file:
             storage, path = self.file.storage, self.file.path
         super(ImageFile, self).delete(*args, **kwargs)
         if self.file and delete_file:
             storage.delete(path)
 
     class Meta:
-        app_label = 'main'
+        app_label = "main"

upload/main/utils.py

@@ -1,6 +1,6 @@
-'''
+"""
 
-Copyright (C) 2018 Vanessa Sochat.
+Copyright (C) 2018-2021 Vanessa Sochat.
 
 This program is free software: you can redistribute it and/or modify it
 under the terms of the GNU Affero General Public License as published by
@@ -15,50 +15,50 @@
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-'''
+"""
 
 from upload.main.models import ImageFile
 from upload.settings import MEDIA_ROOT
 import shutil
-import uuid
-import json
 import os
 
 
 def move_upload_to_storage(source, name):
-    '''moving an uploaded file (from nginx module) to storage means.
-         1. create a folder for the collection, if doesn't exist
-         2. an image in storage pointing to the moved file
+    """moving an uploaded file (from nginx module) to storage means.
+    1. create a folder for the collection, if doesn't exist
+    2. an image in storage pointing to the moved file
 
-         Parameters
-         ==========
-         collection: the collection the image will belong to
-         source: the source file (under /var/www/images/_upload/{0-9}
-         dest: the destination filename
-    '''
+    Parameters
+    ==========
+    collection: the collection the image will belong to
+    source: the source file (under /var/www/images/_upload/{0-9}
+    dest: the destination filename
+    """
     new_path = os.path.join(MEDIA_ROOT, os.path.basename(name))
     shutil.move(source, new_path)
     return new_path
 
 
 def upload_file(name, version, path, size=None):
-    '''save an uploaded container, usually coming from an ImageUpload
+    """save an uploaded container, usually coming from an ImageUpload
 
-       Parameters
-       ==========
-       path: the path to the file uploaded
-       name: the requested name for the container
-       version: the md5 sum of the file
-       size: the file size. if not provided, is calculated
+    Parameters
+    ==========
+    path: the path to the file uploaded
+    name: the requested name for the container
+    version: the md5 sum of the file
+    size: the file size. if not provided, is calculated
 
-    '''
+    """
 
     if os.path.exists(path):
         new_path = move_upload_to_storage(path, name)
-        image = ImageFile.objects.create(file=new_path,
-                                         size=size,
-                                         version=version,
-                                         filename=os.path.basename(new_path))
+        image = ImageFile.objects.create(
+            file=new_path,
+            size=size,
+            version=version,
+            filename=os.path.basename(new_path),
+        )
 
         image.save()
         return image