baseapp-core: wip

Author: nossila

baseapp-core/baseapp_core/graphql/fields.py

@@ -1,4 +1,5 @@
 import graphene
+from django.apps import apps
 from django.conf import settings
 from django.core.cache import InvalidCacheBackendError, caches
 from easy_thumbnails.files import get_thumbnailer
@@ -8,15 +9,24 @@
 except InvalidCacheBackendError:
     cache = None
 
+def get_file_object_type():
+    if apps.is_installed("baseapp_files"):
+        from baseapp_files.graphql.object_types import FileObjectType
+    else:
+        class FileObjectType(graphene.ObjectType):
+            url = graphene.String(required=True)
+            # contentType = graphene.String()
+            # bytes = graphene.Int()
+
+            class Meta:
+                name = "File"
+
+    return FileObjectType
 
-class File(graphene.ObjectType):
-    url = graphene.String(required=True)
-    # contentType = graphene.String()
-    # bytes = graphene.Int()
 
 
 class ThumbnailField(graphene.Field):
-    def __init__(self, type=File, **kwargs):
+    def __init__(self, type=get_file_object_type, **kwargs):
         kwargs.update(
             {
                 "args": {
@@ -29,6 +39,7 @@ def __init__(self, type=File, **kwargs):
 
     def get_resolver(self, parent_resolver):
         resolver = self.resolver or parent_resolver
+        FileObjectType = get_file_object_type()
 
         def built_thumbnail(instance, info, width, height, **kwargs):
             instance = resolver(instance, info, **kwargs)
@@ -40,7 +51,7 @@ def built_thumbnail(instance, info, width, height, **kwargs):
                 cache_key = self._get_cache_key(instance, width, height)
                 value_from_cache = cache.get(cache_key)
                 if value_from_cache:
-                    return File(url=value_from_cache)
+                    return FileObjectType(url=value_from_cache)
 
             thumbnailer = get_thumbnailer(instance)
             url = thumbnailer.get_thumbnail({"size": (width, height)}).url
@@ -49,7 +60,7 @@ def built_thumbnail(instance, info, width, height, **kwargs):
             if cache:
                 cache.set(cache_key, absolute_url, timeout=None)
 
-            return File(url=absolute_url)
+            return FileObjectType(url=absolute_url)
 
         return built_thumbnail
 

baseapp-core/baseapp_core/graphql/views.py

@@ -5,7 +5,7 @@
 from graphene_django.views import HttpError
 from graphql import get_operation_ast, parse
 from graphql.execution import ExecutionResult
-from graphene_file_upload.utils import place_files_in_operations
+# from graphene_file_upload.utils import place_files_in_operations
 
 try:
     import sentry_sdk

baseapp-core/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = baseapp-core
-version = 0.2.11
+version = 0.2.12
 description = BaseApp Core
 long_description = file: README.md
 url = https://github.com/silverlogic/baseapp-backend
@@ -24,6 +24,7 @@ install_requires =
     djangorestframework >= 3.14
     drf-nested-routers >= 0.93.5
     djangorestframework-expander >= 0.2
+    djangorestframework-simplejwt >= 5.3
     drf-extra-fields >= 3.5
     psycopg2-binary >= 2.9
     django-phonenumber-field >= 7.0