updated implementation

cvat-core/src/about.ts

@@ -0,0 +1,41 @@
+// Copyright (C) CVAT.ai Corporation
+//
+// SPDX-License-Identifier: MIT
+
+import { SerializedAbout } from './server-response-types';
+
+export default class AboutData {
+    #description: string;
+    #name: string;
+    #version: string;
+    #logoURL: string;
+    #subtitle: string;
+
+    constructor(initialData: SerializedAbout) {
+        this.#description = initialData.description;
+        this.#name = initialData.name;
+        this.#version = initialData.version;
+        this.#logoURL = initialData.logo_url;
+        this.#subtitle = initialData.subtitle;
+    }
+
+    get description(): string {
+        return this.#description;
+    }
+
+    get name(): string {
+        return this.#name;
+    }
+
+    get version(): string {
+        return this.#version;
+    }
+
+    get logoURL(): string {
+        return this.#logoURL;
+    }
+
+    get subtitle(): string {
+        return this.#subtitle;
+    }
+}

cvat-core/src/api-implementation.ts

@@ -35,6 +35,7 @@ import {
     QualitySettingsFilter, SerializedAsset,
 } from './server-response-types';
 import QualityReport from './quality-report';
+import AboutData from './about';
 import QualityConflict, { ConflictSeverity } from './quality-conflict';
 import QualitySettings from './quality-settings';
 import { getFramesMeta } from './frames';
@@ -72,7 +73,7 @@ export default function implementAPI(cvat: CVATCore): CVATCore {
 
     implementationMixin(cvat.server.about, async () => {
         const result = await serverProxy.server.about();
-        return result;
+        return new AboutData(result);
     });
     implementationMixin(cvat.server.share, async (directory: string, searchPrefix?: string) => {
         const result = await serverProxy.server.share(directory, searchPrefix);

cvat-core/src/index.ts

@@ -34,6 +34,7 @@ import AnalyticsReport from './analytics-report';
 import AnnotationGuide from './guide';
 import { JobValidationLayout, TaskValidationLayout } from './validation-layout';
 import { Request } from './request';
+import AboutData from './about';
 import {
     runAction,
     callAction,
@@ -61,7 +62,7 @@ export default interface CVATCore {
         requests: typeof lambdaManager.requests;
     };
     server: {
-        about: typeof serverProxy.server.about;
+        about: () => Promise<AboutData>;
         share: (dir: string) => Promise<{
             mimeType: string;
             name: string;

cvat-core/src/server-response-types.ts

@@ -177,7 +177,7 @@ export interface SerializedAbout {
     description: string;
     name: string;
     version: string;
-    logo: string;
+    logo_url: string;
     subtitle: string;
 }
 

cvat-ui/src/actions/about-actions.ts

@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: MIT
 
 import { ActionUnion, createAction, ThunkAction } from 'utils/redux';
-import { getCore } from 'cvat-core-wrapper';
+import { AboutData, getCore } from 'cvat-core-wrapper';
 
 const core = getCore();
 
@@ -15,7 +15,7 @@ export enum AboutActionTypes {
 
 const aboutActions = {
     getAbout: () => createAction(AboutActionTypes.GET_ABOUT),
-    getAboutSuccess: (server: any) => createAction(AboutActionTypes.GET_ABOUT_SUCCESS, { server }),
+    getAboutSuccess: (server: AboutData) => createAction(AboutActionTypes.GET_ABOUT_SUCCESS, { server }),
     getAboutFailed: (error: any) => createAction(AboutActionTypes.GET_ABOUT_FAILED, { error }),
 };
 

cvat-ui/src/components/common/cvat-logo.tsx

@@ -7,7 +7,7 @@ import { useSelector } from 'react-redux';
 import { CombinedState } from 'reducers';
 
 function CVATLogo(): JSX.Element {
-    const logo = useSelector((state: CombinedState) => state.about.server.logo);
+    const logo = useSelector((state: CombinedState) => state.about.server.logoURL);
 
     return (
         <div className='cvat-logo-icon'>

cvat-ui/src/cvat-core-wrapper.ts

@@ -44,6 +44,7 @@ import { BaseShapesAction } from 'cvat-core/src/annotations-actions/base-shapes-
 import { BaseCollectionAction } from 'cvat-core/src/annotations-actions/base-collection-action';
 import { ActionParameterType, BaseAction } from 'cvat-core/src/annotations-actions/base-action';
 import { Request, RequestOperation } from 'cvat-core/src/request';
+import AboutData from 'cvat-core/src/about';
 
 const cvat: CVATCore = _cvat;
 
@@ -114,6 +115,7 @@ export {
     JobValidationLayout,
     TaskValidationLayout,
     StorageLocation,
+    AboutData,
 };
 
 export type {

cvat-ui/src/reducers/index.ts

@@ -9,6 +9,7 @@ import {
     Webhook, MLModel, Organization, Job, Task, Project, Label, User,
     QualityConflict, FramesMetaData, RQStatus, Event, Invitation, SerializedAPISchema,
     Request, JobValidationLayout, QualitySettings, TaskValidationLayout, ObjectState,
+    AboutData,
 } from 'cvat-core-wrapper';
 import { IntelligentScissors } from 'utils/opencv-wrapper/intelligent-scissors';
 import { KeyMap, KeyMapItem } from 'utils/mousetrap-react';
@@ -336,7 +337,7 @@ export interface PluginsState {
 }
 
 export interface AboutState {
-    server: any;
+    server: AboutData;
     packageVersion: {
         ui: string;
     };

cvat/apps/engine/serializers.py

@@ -2627,7 +2627,7 @@ class AboutSerializer(serializers.Serializer):
     name = serializers.CharField(max_length=128)
     description = serializers.CharField(max_length=2048)
     version = serializers.CharField(max_length=64)
-    logo = serializers.CharField()
+    logo_url = serializers.CharField()
     subtitle = serializers.CharField(max_length=1024)
 
 class FrameMetaSerializer(serializers.Serializer):

cvat/apps/engine/views.py

@@ -36,6 +36,7 @@
 from django.utils.decorators import method_decorator
 from django.views.decorators.cache import never_cache
 from django_rq.queues import DjangoRQ
+from django.core.files.storage import storages
 from drf_spectacular.types import OpenApiTypes
 from drf_spectacular.utils import (
     OpenApiExample,
@@ -189,9 +190,6 @@
 _DATA_UPDATED_DATE_HEADER_NAME = 'X-Updated-Date'
 _RETRY_AFTER_TIMEOUT = 10
 
-def get_logo_uri(request) -> str:
-    return request.build_absolute_uri(f'{settings.STATIC_URL}{settings.LOGO_FILENAME}')
-
 @extend_schema(tags=['server'])
 class ServerViewSet(viewsets.ViewSet):
     serializer_class = None
@@ -213,11 +211,17 @@ def get_serializer(self, *args, **kwargs):
     def about(request):
         from cvat import __version__ as cvat_version
         about = {
-            "name": settings.ABOUT_INFO["name"],
+            "name": "Computer Vision Annotation Tool",
             "subtitle": settings.ABOUT_INFO["subtitle"],
-            "description": settings.ABOUT_INFO["description"],
+            "description": "CVAT is completely re-designed and re-implemented " +
+                "version of Video Annotation Tool from Irvine, California " +
+                "tool. It is free, online, interactive video and image annotation " +
+                "tool for computer vision. It is being used by our team to " +
+                "annotate million of objects with different properties. Many UI " +
+                "and UX decisions are based on feedbacks from professional data " +
+                "annotation team.",
             "version": cvat_version,
-            "logo": get_logo_uri(request),
+            "logo_url": request.build_absolute_uri(storages["staticfiles"].url(settings.LOGO_FILENAME)),
         }
         serializer = AboutSerializer(data=about)
         if serializer.is_valid(raise_exception=True):

cvat/schema.yml

@@ -6905,14 +6905,14 @@ components:
         version:
           type: string
           maxLength: 64
-        logo:
+        logo_url:
           type: string
         subtitle:
           type: string
           maxLength: 1024
       required:
       - description
-      - logo
+      - logo_url
       - name
       - subtitle
       - version

cvat/settings/base.py

@@ -770,15 +770,7 @@ class CVAT_QUEUES(Enum):
 # Indicates the maximum number of days a file or directory is retained in the temporary directory
 TMP_FILE_OR_DIR_RETENTION_DAYS = 3
 
-LOGO_FILENAME = 'logo.png'
+LOGO_FILENAME = 'logo.svg'
 ABOUT_INFO = {
-    "name": "Computer Vision Annotation Tool",
     "subtitle": "Open Data Annotation Platform",
-    "description": "CVAT is completely re-designed and re-implemented " +
-                "version of Video Annotation Tool from Irvine, California " +
-                "tool. It is free, online, interactive video and image annotation " +
-                "tool for computer vision. It is being used by our team to " +
-                "annotate million of objects with different properties. Many UI " +
-                "and UX decisions are based on feedbacks from professional data " +
-                "annotation team.",
 }