Add Export in ocr integration

apps/entry/models.py

@@ -1,8 +1,13 @@
+from base64 import urlsafe_b64encode
 import os
 from django.contrib.contenttypes.fields import GenericRelation
 from django.contrib.postgres.aggregates.general import ArrayAgg
 from django.contrib.postgres.fields import ArrayField
 from django.db import models
+from django.conf import settings
+from django.urls import reverse
+from django.utils.encoding import force_bytes
+from django.utils.http import urlsafe_base64_encode
 
 from deep.middleware import get_current_user
 from unified_connector.models import ConnectorLeadPreviewAttachment
@@ -21,6 +26,7 @@
     Exportable,
 )
 from assisted_tagging.models import DraftEntry
+from gallery.enums import ModuleTypeEnum
 
 
 class EntryAttachment(models.Model):
@@ -66,6 +72,19 @@ def clone_from_lead_attachment(cls, lead_attachment: LeadPreviewAttachment) -> '
         entry_attachment.save()
         return entry_attachment
 
+    def get_file_url(self):
+        return '{protocol}://{domain}{url}'.format(
+            protocol=settings.HTTP_PROTOCOL,
+            domain=settings.DJANGO_API_HOST,
+            url=reverse(
+                'external_private_url',
+                kwargs={
+                    'module': ModuleTypeEnum.ENTRY_ATTACHMENT.value,
+                    'identifier': urlsafe_base64_encode(force_bytes(self.id))
+                }
+            )
+        )
+
 
 class Entry(UserResource, ProjectEntityMixin):
     """

apps/export/entries/excel_exporter.py

@@ -272,6 +272,8 @@ def add_entries_from_excel_data_for_static_column(
             if self.modified_excerpt_exists:
                 return [entry_excerpt, entry.dropped_excerpt]
             return entry_excerpt
+        elif exportable == Export.StaticColumn.LEAD_ENTRY_ENTRY_ATTACHMENT_FILE_PREVIEW:
+            return f'{entry.entry_attachment.get_file_url()}'
 
     def add_entries_from_excel_data(self, rows, data, export_data):
         export_type = data.get('type')

apps/export/entries/report_exporter.py

@@ -592,6 +592,8 @@ def _generate_for_entry(self, entry):
                 if h_stats.get(key):
                     image_text += f', {key.title()} values: {h_stats.get(key)}' if h_stats.get(key) else ''
 
+        if entry.entry_type == Entry.TagType.ATTACHMENT:
+            image = entry.entry_attachment.file_preview
         if image:
             self.doc.add_image(image)
             if image_text:

apps/export/models.py

@@ -146,6 +146,7 @@ class StaticColumn(models.TextChoices):
         ENTRY_ID = 'entry_id', 'Entry Id'
         LEAD_ENTRY_ID = 'lead_entry_id', 'Source-Entry Id'
         ENTRY_EXCERPT = 'entry_excerpt', 'Modified Excerpt, Original Excerpt'
+        LEAD_ENTRY_ENTRY_ATTACHMENT_FILE_PREVIEW = 'lead_entry_entry_attachment_file_preview', 'EntryAttachment Url'
 
     # Used by extra options for Report
     class CitationStyle(models.IntegerChoices):

apps/gallery/enums.py

@@ -0,0 +1,6 @@
+import graphene
+
+
+class ModuleTypeEnum(graphene.Enum):
+    ENTRY_ATTACHMENT = 'entry-attachment'
+    LEAD_PREVIEW_ATTACHMENT = 'lead-preview-attachment'

apps/gallery/views.py

@@ -7,6 +7,7 @@
 from django.utils.http import urlsafe_base64_decode
 from django.shortcuts import redirect, get_object_or_404
 
+from gallery.enums import ModuleTypeEnum
 from rest_framework import (
     views,
     viewsets,
@@ -24,7 +25,7 @@
 from deep.permalinks import Permalink
 from project.models import Project
 from lead.models import Lead
-from entry.models import Entry
+from entry.models import Entry, EntryAttachment
 from user_resource.filters import UserResourceFilterSet
 
 from utils.extractor.formats import (
@@ -82,6 +83,24 @@ def get(self, request, uuid=None, filename=None):
         )
 
 
+class AttachmentFileView(views.APIView):
+    permission_classes = [permissions.IsAuthenticated]
+
+    def get(self, request, module=None, identifier=None):
+
+        if module == ModuleTypeEnum.ENTRY_ATTACHMENT.value:
+            id = force_text(urlsafe_base64_decode(identifier))
+            qs = get_object_or_404(EntryAttachment, id=id)
+            if qs:
+                return redirect(request.build_absolute_uri(qs.file.url))
+            return response.Response({
+                'error': 'File doesn\'t exists',
+            }, status=status.HTTP_404_NOT_FOUND)
+        return response.Response({
+            'error': 'Access Forbidden, Contact Admin',
+        }, status=status.HTTP_403_FORBIDDEN)
+
+
 class DeprecatedPrivateFileView(views.APIView):
     permission_classes = [permissions.IsAuthenticated]
 

deep/urls.py

@@ -26,6 +26,7 @@
     unsubscribe_email,
 )
 from gallery.views import (
+    AttachmentFileView,
     FileView,
     FileViewSet,
     GoogleDriveFileViewSet,
@@ -435,6 +436,11 @@ def get_api_path(path):
         DeprecatedPrivateFileView.as_view(),
         name='deprecated_gallery_private_url',
     ),
+    path(
+        'external/private-file/<str:module>/<str:identifier>',
+        AttachmentFileView.as_view(),
+        name='external_private_url',
+    ),
     re_path(
         r'^public-file/(?P<fidb64>[0-9A-Za-z]+)/(?P<token>.+)/(?P<filename>.*)$',
         PublicFileView.as_view(),

schema.graphql

@@ -4263,6 +4263,7 @@ enum ExportExcelSelectedStaticColumnEnum {
   ENTRY_ID
   LEAD_ENTRY_ID
   ENTRY_EXCERPT
+  LEAD_ENTRY_ENTRY_ATTACHMENT_FILE_PREVIEW
 }
 
 enum ExportExportTypeEnum {