π₯π₯π₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.
TypeScript boardsbug-trackerdjangodockerganttissue-trackerjirajira-alternativekanbanlinearpostgresqlproduct-managementproject-managementproject-planningpythonreactredistypesciptvitework-management
dev: move storage metadata collection to background job (#5818)
Nikhil9b85306359e4
diff --git a/apiserver/plane/app/views/asset/v2.py b/apiserver/plane/app/views/asset/v2.pyindex fba1073f8b..c307bbd4b3 100644--- a/apiserver/plane/app/views/asset/v2.py+++ b/apiserver/plane/app/views/asset/v2.py@@ -22,6 +22,7 @@ from plane.db.models import (from plane.settings.storage import S3Storagefrom plane.app.permissions import allow_permission, ROLEfrom plane.utils.cache import invalidate_cache_directly+from plane.bgtasks.storage_metadata_task import get_asset_object_metadataclass UserAssetsV2Endpoint(BaseAPIView):@@ -193,14 +194,11 @@ class UserAssetsV2Endpoint(BaseAPIView):def patch(self, request, asset_id):# get the asset idasset = FileAsset.objects.get(id=asset_id, user_id=request.user.id)- storage = S3Storage(request=request)# get the storage metadataasset.is_uploaded = True# get the storage metadata- if asset.storage_metadata is None:- asset.storage_metadata = storage.get_object_metadata(- object_name=asset.asset.name- )+ if not asset.storage_metadata:+ get_asset_object_metadata.delay(asset_id=str(asset_id))# get the entity and save the asset id for the request fieldself.entity_asset_save(asset_id=asset_id,@@ -446,14 +444,11 @@ class WorkspaceFileAssetEndpoint(BaseAPIView):def patch(self, request, slug, asset_id):# get the asset idasset = FileAsset.objects.get(id=asset_id, workspace__slug=slug)- storage = S3Storage(request=request)# get the storage metadataasset.is_uploaded = True# get the storage metadata- if asset.storage_metadata is None:- asset.storage_metadata = storage.get_object_metadata(- object_name=asset.asset.name- )+ if not asset.storage_metadata:+ get_asset_object_metadata.delay(asset_id=str(asset_id))# get the entity and save the asset id for the request fieldself.entity_asset_save(asset_id=asset_id,@@ -686,14 +681,11 @@ class ProjectAssetEndpoint(BaseAPIView):asset = FileAsset.objects.get(id=pk,)- storage = S3Storage(request=request)# get the storage metadataasset.is_uploaded = True# get the storage metadata- if asset.storage_metadata is None:- asset.storage_metadata = storage.get_object_metadata(- object_name=asset.asset.name- )+ if not asset.storage_metadata:+ get_asset_object_metadata.delay(asset_id=str(pk))# update the attributesasset.attributes = request.data.get("attributes", asset.attributes)diff --git a/apiserver/plane/app/views/cycle/archive.py b/apiserver/plane/app/views/cycle/archive.pyindex 2209b47a45..4a0dd14a47 100644--- a/apiserver/plane/app/views/cycle/archive.py+++ b/apiserver/plane/app/views/cycle/archive.py@@ -520,7 +520,26 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):.annotate(first_name=F("assignees__first_name")).annotate(last_name=F("assignees__last_name")).annotate(assignee_id=F("assignees__id"))- .annotate(avatar_url=F("assignees__avatar_url"))+ .annotate(+ avatar_url=Case(+ # If `avatar_asset` exists, use it to generate the asset URL+ When(+ assignees__avatar_asset__isnull=False,+ then=Concat(+ Value("/api/assets/v2/static/"),+ "assignees__avatar_asset", # Assuming avatar_asset has an id or relevant field+ Value("/"),+ ),+ ),+ # If `avatar_asset` is None, fall back to using `avatar` field directly+ When(+ assignees__avatar_asset__isnull=True,+ then="assignees__avatar",+ ),+ default=Value(None),+ output_field=models.CharField(),+ )+ ).annotate(display_name=F("assignees__display_name")).values("first_name",diff --git a/apiserver/plane/app/views/issue/attachment.py b/apiserver/plane/app/views/issue/attachment.pyindex 816bc97936..1fb230a553 100644--- a/apiserver/plane/app/views/issue/attachment.py+++ b/apiserver/plane/app/views/issue/attachment.py@@ -20,6 +20,7 @@ from plane.db.models import FileAsset, Workspacefrom plane.bgtasks.issue_activities_task import issue_activityfrom plane.app.permissions import allow_permission, ROLEfrom plane.settings.storage import S3Storage+from plane.bgtasks.storage_metadata_task import get_asset_object_metadataclass IssueAttachmentEndpoint(BaseAPIView):@@ -254,10 +255,7 @@ class IssueAttachmentV2Endpoint(BaseAPIView):issue_attachment.is_uploaded = True# Get the storage metadata- if issue_attachment.storage_metadata is None:- storage = S3Storage(request=request)- issue_attachment.storage_metadata = storage.get_object_metadata(- issue_attachment.asset.name- )+ if not issue_attachment.storage_metadata:+ get_asset_object_metadata.delay(str(issue_attachment.id))issue_attachment.save()return Response(status=status.HTTP_204_NO_CONTENT)diff --git a/apiserver/plane/bgtasks/storage_metadata_task.py b/apiserver/plane/bgtasks/storage_metadata_task.pynew file mode 100644index 0000000000..dc52b6ef37--- /dev/null+++ b/apiserver/plane/bgtasks/storage_metadata_task.py@@ -0,0 +1,28 @@+# Third party imports+from celery import shared_task++# Module imports+from plane.db.models import FileAsset+from plane.settings.storage import S3Storage+from plane.utils.exception_logger import log_exception+++@shared_task+def get_asset_object_metadata(asset_id):+ try:+ # Get the asset+ asset = FileAsset.objects.get(pk=asset_id)+ # Create an instance of the S3 storage+ storage = S3Storage()+ # Get the storage+ asset.storage_metadata = storage.get_object_metadata(+ object_name=asset.asset.name+ )+ # Save the asset+ asset.save()+ return+ except FileAsset.DoesNotExist:+ return+ except Exception as e:+ log_exception(e)+ returndiff --git a/apiserver/plane/settings/storage.py b/apiserver/plane/settings/storage.pyindex c0d4f440dd..ac99077f31 100644--- a/apiserver/plane/settings/storage.py+++ b/apiserver/plane/settings/storage.py@@ -39,7 +39,11 @@ class S3Storage(S3Boto3Storage):aws_access_key_id=self.aws_access_key_id,aws_secret_access_key=self.aws_secret_access_key,region_name=self.aws_region,- endpoint_url=f"{request.scheme}://{request.get_host()}",+ endpoint_url=(+ f"{request.scheme}://{request.get_host()}"+ if request+ else self.aws_s3_endpoint_url+ ),config=boto3.session.Config(signature_version="s3v4"),)else:diff --git a/apiserver/plane/space/views/asset.py b/apiserver/plane/space/views/asset.pyindex 1e8cfcaf36..0ffe20ce7e 100644--- a/apiserver/plane/space/views/asset.py+++ b/apiserver/plane/space/views/asset.py@@ -15,6 +15,7 @@ from rest_framework.response import Responsefrom .base import BaseAPIViewfrom plane.db.models import DeployBoard, FileAssetfrom plane.settings.storage import S3Storage+from plane.bgtasks.storage_metadata_task import get_asset_object_metadataclass EntityAssetEndpoint(BaseAPIView):@@ -159,14 +160,11 @@ class EntityAssetEndpoint(BaseAPIView):# get the asset idasset = FileAsset.objects.get(id=pk, workspace=deploy_board.workspace)- storage = S3Storage(request=request)# get the storage metadataasset.is_uploaded = True# get the storage metadata- if asset.storage_metadata is None:- asset.storage_metadata = storage.get_object_metadata(- object_name=asset.asset.name- )+ if not asset.storage_metadata:+ get_asset_object_metadata.delay(str(asset.id))# update the attributesasset.attributes = request.data.get("attributes", asset.attributes)diff --git a/deploy/selfhost/docker-compose.yml b/deploy/selfhost/docker-compose.ymlindex 635cb88f80..fe47e625f6 100644--- a/deploy/selfhost/docker-compose.yml+++ b/deploy/selfhost/docker-compose.yml@@ -34,7 +34,7 @@ x-app-env: &app-env- SECRET_KEY=${SECRET_KEY:-60gp0byfz2dvffa45cxl20p1scy9xbpf6d8c5y0geejgkyp1b5}# DATA STORE SETTINGS- USE_MINIO=${USE_MINIO:-1}- - AWS_REGION=${AWS_REGION:-""}+ - AWS_REGION=${AWS_REGION:-}- AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID:-"access-key"}- AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY:-"secret-key"}- AWS_S3_ENDPOINT_URL=${AWS_S3_ENDPOINT_URL:-http://plane-minio:9000}diff --git a/nginx/nginx.conf.dev b/nginx/nginx.conf.devindex 7c1c4397dd..7b94982104 100644--- a/nginx/nginx.conf.dev+++ b/nginx/nginx.conf.dev@@ -60,12 +60,12 @@ http {proxy_pass http://space:3002/spaces/;}- location /${BUCKET_NAME}/ {+ location /${BUCKET_NAME} {proxy_http_version 1.1;proxy_set_header Upgrade ${dollar}http_upgrade;proxy_set_header Connection "upgrade";proxy_set_header Host ${dollar}http_host;- proxy_pass http://plane-minio:9000/uploads/;+ proxy_pass http://plane-minio:9000/${BUCKET_NAME};}}}diff --git a/nginx/nginx.conf.template b/nginx/nginx.conf.templateindex e719a0f15d..819c00f21d 100644--- a/nginx/nginx.conf.template+++ b/nginx/nginx.conf.template@@ -68,12 +68,12 @@ http {proxy_pass http://space:3000/spaces/;}- location /${BUCKET_NAME}/ {+ location /${BUCKET_NAME} {proxy_http_version 1.1;proxy_set_header Upgrade ${dollar}http_upgrade;proxy_set_header Connection "upgrade";proxy_set_header Host ${dollar}http_host;- proxy_pass http://plane-minio:9000/uploads/;+ proxy_pass http://plane-minio:9000/${BUCKET_NAME};}}}