Merge branch 'master' into EFRS-1342_link_is_not_a_link

Author: VolodymyrBushko

.github/workflows/Azure-Compreface-AIB-image.yml

@@ -0,0 +1,50 @@
+---
+name: (Azure) Сompreface AIB image
+on: 
+  workflow_dispatch:
+    inputs:
+      version:
+        description: Version (e.g., 1.0.0)
+        required: true
+env:
+  RESOURCE_GROUP_NAME: compreFaceGallery-RG
+  MANAGED_IDENTITY: compreFace-MI
+  GALLERY_NAME: compreFaceGallery
+  IMAGE_NAME: compreFace
+  VERSION: ${{ github.event.inputs.version }}
+jobs:
+  build-image:
+    runs-on: ubuntu-latest    
+    steps:
+
+    - name: Login via Az module
+      uses: azure/login@v1
+      with:
+        creds: ${{secrets.AZURE_CREDENTIALS}}
+
+    - name: Build custom VM image
+      id: imageBuilder      
+      uses: azure/build-vm-image@v0
+      with:        
+        resource-group-name: "${{ env.RESOURCE_GROUP_NAME }}"
+        managed-identity: "${{ env.MANAGED_IDENTITY }}"
+        location: 'eastus'
+        source-os-type: 'linux'
+        source-image-type: 'PlatformImage'     
+        source-image: Canonical:0001-com-ubuntu-server-focal:20_04-lts-gen2:latest
+        vm-size: 'Standard_B2s'
+        dist-type: 'SharedImageGallery'
+        dist-resource-id: "/subscriptions/${{secrets.AZURE_SUBSCRIPTION_ID}}/resourceGroups/${{ env.RESOURCE_GROUP_NAME }}/providers/Microsoft.Compute/galleries/${{ env.GALLERY_NAME }}/images/${{ env.IMAGE_NAME }}/versions/${{ env.VERSION }}"
+        dist-location: 'eastus'
+        customizer-script: |
+          apt update
+          apt upgrade -y
+          apt install -y docker.io unzip
+          docker version
+          curl -L https://github.com/docker/compose/releases/latest/download/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose
+          chmod +x /usr/local/bin/docker-compose
+          docker-compose version
+          wget -q -O tmp.zip "https://github.com/exadel-inc/CompreFace/releases/download/v${{ env.VERSION }}/CompreFace_${{ env.VERSION }}.zip" && unzip tmp.zip && rm tmp.zip
+          chmod 666 /var/run/docker.sock
+          docker-compose pull --quiet
+          docker-compose up -d

embedding-calculator/requirements.txt

@@ -5,7 +5,7 @@ flasgger==0.9.5
 Flask==1.1.2
 itsdangerous==2.0.1 # itsdangerous is a Flask dependency, update it with Flask
 jinja2<3.1.0 # jinja2 is a Flask dependency, update it with Flask
-gdown~=4.3.0
+gdown~=4.5.4
 Werkzeug==1.0.1
 PyYAML==5.4.1
 

java/admin/src/main/java/com/exadel/frs/FrsApplication.java

@@ -27,4 +27,4 @@ public class FrsApplication {
     public static void main(String[] args) {
         SpringApplication.run(FrsApplication.class, args);
     }
-}
+}

java/admin/src/main/java/com/exadel/frs/controller/AppController.java

@@ -16,10 +16,13 @@
 
 package com.exadel.frs.controller;
 
-import com.exadel.frs.commonservice.annotation.CollectStatistics;
 import com.exadel.frs.commonservice.enums.AppRole;
-import com.exadel.frs.commonservice.enums.StatisticsType;
-import com.exadel.frs.dto.ui.*;
+import com.exadel.frs.dto.AppCreateDto;
+import com.exadel.frs.dto.AppResponseDto;
+import com.exadel.frs.dto.AppUpdateDto;
+import com.exadel.frs.dto.UserInviteDto;
+import com.exadel.frs.dto.UserRoleResponseDto;
+import com.exadel.frs.dto.UserRoleUpdateDto;
 import com.exadel.frs.helpers.SecurityUtils;
 import com.exadel.frs.mapper.AppMapper;
 import com.exadel.frs.mapper.UserAppRoleMapper;

java/admin/src/main/java/com/exadel/frs/controller/AppStatusController.java

@@ -4,7 +4,7 @@
 import static com.exadel.frs.commonservice.enums.AppStatus.NOT_READY;
 import static com.exadel.frs.commonservice.enums.AppStatus.OK;
 import com.exadel.frs.commonservice.enums.AppStatus;
-import com.exadel.frs.dto.ui.AppStatusResponseDto;
+import com.exadel.frs.dto.AppStatusResponseDto;
 import io.swagger.annotations.ApiOperation;
 import java.sql.Connection;
 import java.sql.SQLException;

java/admin/src/main/java/com/exadel/frs/controller/ConfigController.java

@@ -1,7 +1,7 @@
 package com.exadel.frs.controller;
 
 import static com.exadel.frs.system.global.Constants.ADMIN;
-import com.exadel.frs.dto.ui.ConfigDto;
+import com.exadel.frs.dto.ConfigDto;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.core.env.Environment;

java/admin/src/main/java/com/exadel/frs/controller/ModelController.java

@@ -20,12 +20,12 @@
 import static com.exadel.frs.system.global.Constants.GUID_EXAMPLE;
 import static org.springframework.http.HttpStatus.CREATED;
 import com.exadel.frs.commonservice.entity.Model;
-import com.exadel.frs.commonservice.entity.ModelStatisticProjection;
+import com.exadel.frs.commonservice.projection.ModelStatisticProjection;
 import com.exadel.frs.commonservice.exception.IncorrectModelTypeException;
-import com.exadel.frs.dto.ui.ModelCloneDto;
-import com.exadel.frs.dto.ui.ModelCreateDto;
-import com.exadel.frs.dto.ui.ModelResponseDto;
-import com.exadel.frs.dto.ui.ModelUpdateDto;
+import com.exadel.frs.dto.ModelCloneDto;
+import com.exadel.frs.dto.ModelCreateDto;
+import com.exadel.frs.dto.ModelResponseDto;
+import com.exadel.frs.dto.ModelUpdateDto;
 import com.exadel.frs.helpers.SecurityUtils;
 import com.exadel.frs.mapper.MlModelMapper;
 import com.exadel.frs.service.ModelService;
@@ -96,20 +96,12 @@ public ModelResponseDto createModel(
             @RequestBody
             final ModelCreateDto modelCreateDto
     ) {
-        Model model;
-        switch (modelCreateDto.getType()) {
-            case DETECTION:
-                model = modelService.createDetectionModel(modelCreateDto, appGuid, SecurityUtils.getPrincipalId());
-                break;
-            case RECOGNITION:
-                model = modelService.createRecognitionModel(modelCreateDto, appGuid, SecurityUtils.getPrincipalId());
-                break;
-            case VERIFY:
-                model = modelService.createVerificationModel(modelCreateDto, appGuid, SecurityUtils.getPrincipalId());
-                break;
-            default:
-                throw new IncorrectModelTypeException(modelCreateDto.getType());
-        }
+        Model model = switch (modelCreateDto.getType()) {
+            case DETECTION -> modelService.createDetectionModel(modelCreateDto, appGuid, SecurityUtils.getPrincipalId());
+            case RECOGNITION -> modelService.createRecognitionModel(modelCreateDto, appGuid, SecurityUtils.getPrincipalId());
+            case VERIFY -> modelService.createVerificationModel(modelCreateDto, appGuid, SecurityUtils.getPrincipalId());
+            default -> throw new IncorrectModelTypeException(modelCreateDto.getType());
+        };
 
         return modelMapper.toResponseDto(model, appGuid);
     }

java/admin/src/main/java/com/exadel/frs/controller/UserController.java

@@ -26,16 +26,16 @@
 import com.exadel.frs.commonservice.enums.GlobalRole;
 import com.exadel.frs.commonservice.enums.Replacer;
 import com.exadel.frs.commonservice.exception.DemoNotAvailableException;
-import com.exadel.frs.dto.ui.ChangePasswordDto;
-import com.exadel.frs.dto.ui.ForgotPasswordDto;
-import com.exadel.frs.dto.ui.ResetPasswordDto;
-import com.exadel.frs.dto.ui.UserAutocompleteDto;
-import com.exadel.frs.dto.ui.UserCreateDto;
-import com.exadel.frs.dto.ui.UserDeleteDto;
-import com.exadel.frs.dto.ui.UserResponseDto;
-import com.exadel.frs.dto.ui.UserRoleResponseDto;
-import com.exadel.frs.dto.ui.UserRoleUpdateDto;
-import com.exadel.frs.dto.ui.UserUpdateDto;
+import com.exadel.frs.dto.ChangePasswordDto;
+import com.exadel.frs.dto.ForgotPasswordDto;
+import com.exadel.frs.dto.ResetPasswordDto;
+import com.exadel.frs.dto.UserAutocompleteDto;
+import com.exadel.frs.dto.UserCreateDto;
+import com.exadel.frs.dto.UserDeleteDto;
+import com.exadel.frs.dto.UserResponseDto;
+import com.exadel.frs.dto.UserRoleResponseDto;
+import com.exadel.frs.dto.UserRoleUpdateDto;
+import com.exadel.frs.dto.UserUpdateDto;
 import com.exadel.frs.exception.AccessDeniedException;
 import com.exadel.frs.exception.UserDoesNotExistException;
 import com.exadel.frs.helpers.SecurityUtils;

java/admin/src/main/java/com/exadel/frs/dto/AccessToken.java

@@ -14,7 +14,7 @@
  * permissions and limitations under the License.
  */
 
-package com.exadel.frs.dto.ui;
+package com.exadel.frs.dto;
 
 import static com.exadel.frs.commonservice.system.global.RegExConstants.ALLOWED_SPECIAL_CHARACTERS;
 import javax.validation.constraints.NotBlank;