adding separate blobs view

Signed-off-by: vsoch <vsochat@stanford.edu>

django_oci/models.py

@@ -51,14 +51,14 @@ def get_upload_folder(instance, filename):
 
 def get_image_by_tag(name, reference):
     """given the name of a repository and a reference, look up the image
-       based on the reference. By default we use the reference to look for
-       a tag or digest. A return of None indicates that the image is not found, 
-       and the view should raise Http404
-
-       Parameters
-       ==========
-       name (str): the name of the repository to lookup
-       reference (str): an image tag or version
+    based on the reference. By default we use the reference to look for
+    a tag or digest. A return of None indicates that the image is not found,
+    and the view should raise Http404
+
+    Parameters
+    ==========
+    name (str): the name of the repository to lookup
+    reference (str): an image tag or version
     """
     if not name or not reference:
         return None
@@ -157,7 +157,8 @@ def get_download_url(self, name):
         if self.remotefile is not None:
             return self.remotefile
         return settings.DOMAIN_URL.strip("/") + reverse(
-            "django_oci:blob_download", kwargs={"digest": self.digest, "name": name},
+            "django_oci:blob_download",
+            kwargs={"digest": self.digest, "name": name},
         )
 
     def write_chunk(self, content_start, content_end, body):
@@ -172,12 +173,16 @@ def write_chunk(self, content_start, content_end, body):
                 raise ValueError(
                     "The first request for a chunked upload must start at 0."
                 )
-            datafile = ChunkedFile(name=self.digest, content=body, content_type=self.content_type)
+            datafile = ChunkedFile(
+                name=self.digest, content=body, content_type=self.content_type
+            )
 
         # Uploading another chunk for existing file
         else:
             datafile = ChunkedFile(
-                name=self.digest, file=self.datafile.file, content_type=self.content_type
+                name=self.digest,
+                file=self.datafile.file,
+                content_type=self.content_type,
             )
 
         # Update the chunk, get back the status code
@@ -186,7 +191,6 @@ def write_chunk(self, content_start, content_end, body):
         self.save()
         return status_code
 
-
     def create_upload_session(self):
         """A function to create an upload session for a particular blob.
         The version variable will be set with a session id.
@@ -197,9 +201,7 @@ def create_upload_session(self):
 
         # Expires in default 10 seconds
         filecache.set(session_id, 1, timeout=settings.SESSION_EXPIRES_SECONDS)
-        return reverse(
-            "django_oci:blob_upload", kwargs={"session_id": session_id}
-        )
+        return reverse("django_oci:blob_upload", kwargs={"session_id": session_id})
 
     def get_abspath(self):
         return os.path.join(settings.MEDIA_ROOT, self.datafile.name)
@@ -210,9 +212,10 @@ class Meta:
 
 class Image(models.Model):
     """An image (manifest) holds a set of layers (blobs) for a repository.
-       Blobs can be shared between manifests, and are deleted if they are
-       no longer referenced.
+    Blobs can be shared between manifests, and are deleted if they are
+    no longer referenced.
     """
+
     add_date = models.DateTimeField("date manifest added", auto_now=True)
 
     # When a repository is deleted, so are the manifests
@@ -224,7 +227,7 @@ class Image(models.Model):
     )
 
     # Blobs are added at the creation of the manifest (can be shared based on hash)
-    blobs = models.ManyToManyField(Blob, blank=True, null=True)
+    blobs = models.ManyToManyField(Blob)
 
     # The text of the manifest (added at the end)
     manifest = models.TextField(null=False, blank=False, default="{}")
@@ -275,26 +278,26 @@ class Meta:
         unique_together = (
             (
                 "repository",
-                "tag",
+                "version",
             ),
         )
 
 
 class Tag(models.Model):
-    """A tag is a reference for one or more manifests
-    """
+    """A tag is a reference for one or more manifests"""
+
     name = models.CharField(max_length=250, null=False, blank=False)
     image = models.ForeignKey(
         Image,
         null=False,
         blank=False,
-
         # When a manifest is deleted, any associated tags are too
         on_delete=models.CASCADE,
     )
 
+
 class Annotation(models.Model):
-    """An annotation is a key/value pair to describe an image. 
+    """An annotation is a key/value pair to describe an image.
     We will want to parse these from an image manifest (eventually)
     """
 
@@ -316,7 +319,7 @@ class Meta:
         unique_together = (("key", "value"),)
 
 
-#def delete_blobs(sender, instance, **kwargs):
+# def delete_blobs(sender, instance, **kwargs):
 #    for image in instance.image_set.all():
 #        if hasattr(image, "datafile"):
 #            count = Image.objects.filter(image__datafile=image.datafile).count()
@@ -332,4 +335,4 @@ class Meta:
 # by inheriting "chunked_upload.models.AbstractChunkedUpload" class
 MyChunkedUpload = ChunkedUpload
 
-#post_delete.connect(delete_blobs, sender=Image)
+# post_delete.connect(delete_blobs, sender=Image)

django_oci/settings.py

@@ -60,7 +60,9 @@
 DOMAIN_URL = oci.get("DOMAIN_URL", DEFAULTS["DOMAIN_URL"])
 MEDIA_ROOT = oci.get("MEDIA_ROOT", DEFAULTS["MEDIA_ROOT"])
 CACHE_DIR = oci.get("CACHE_DIR", DEFAULTS["CACHE_DIR"])
-DISABLE_TAG_MANIFEST_DELETE = oci.get("DISABLE_TAG_MANIFEST_DELETE", DEFAULTS["DISABLE_TAG_MANIFEST_DELETE"])
+DISABLE_TAG_MANIFEST_DELETE = oci.get(
+    "DISABLE_TAG_MANIFEST_DELETE", DEFAULTS["DISABLE_TAG_MANIFEST_DELETE"]
+)
 
 SESSION_EXPIRES_SECONDS = oci.get(
     "SESSION_EXPIRES_SECONDS", DEFAULTS["SESSION_EXPIRES_SECONDS"]

django_oci/signals.py

@@ -19,6 +19,7 @@
 from django.dispatch import receiver
 from .models import Image
 
+
 @receiver(post_delete, sender=Image)
 def delete_blobs(sender, instance, **kwargs):
     print("Delete image signal running.")

django_oci/storage.py

@@ -76,7 +76,6 @@ def create_blob_request(self, name):
         # Upon success, the response MUST have a code of 202 Accepted with a location header
         return Response(status=202, headers={"Location": blob.create_upload_session()})
 
-
     def finish_blob(
         self,
         blob,
@@ -86,7 +85,7 @@ def finish_blob(
         """Finish a blob, meaning finalizing the digest and returning a download
         url relative to the name provided.
         """
-        #TODO: in the case of a blob created from upload session, need to rename to be digest
+        # TODO: in the case of a blob created from upload session, need to rename to be digest
         blob.digest = digest
         blob.save()
 
@@ -157,7 +156,9 @@ def upload_blob_chunk(
         content_end (int): the content ending index
         content_length (int): the content length
         """
-        status_code = blob.write_chunk(content_start=content_start, content_end=content_end, body=body)
+        status_code = blob.write_chunk(
+            content_start=content_start, content_end=content_end, body=body
+        )
 
         # If it's already existing, return Accepted header, otherwise alert created
         if status_code not in [201, 202]:
@@ -168,7 +169,6 @@ def upload_blob_chunk(
             status=status_code, headers={"Location": blob.get_download_url(name)}
         )
 
-
     def download_blob(self, name, digest):
         """Given a blob repository name and digest, return response to stream download.
         The repository name is associated to the blob via the image.
@@ -187,3 +187,7 @@ def download_blob(self, name, digest):
                     "Content-Disposition"
                 ] = "inline; filename=" + os.path.basename(file_path)
                 return response
+
+
+# Load storage on application init
+storage = get_storage()

django_oci/views/__init__.py

@@ -1,3 +1,9 @@
 from .base import APIVersionCheck
-from .image import ImageManifest, ImageBlobUpload, ImageBlobDownload
+from .blobs import BlobUpload, BlobDownload
+from .image import ImageManifest, ImageTags
 from .chunked import ChunkedUploadDemo, MyChunkedUploadView, MyChunkedUploadCompleteView
+
+# Load storage on application init
+from django_oci.storage import get_storage
+
+storage = get_storage()