Merge pull request #1378 from Giskard-AI/advanced-giskard-license-hfspaces

[GSK-1664][GSK-1677] Advanced Giskard license for Hugging Face Spaces

Author: kevinmessiaen

backend/src/main/java/ai/giskard/service/ee/KeygenLicenseReader.java

@@ -44,6 +44,9 @@ public static License read(JsonNode json) {
             license.setUserLimit(policyMeta.get("userLimit").asInt(0));
         }
 
+        if (policyMeta.has("modelPerProjectLimit")) {
+            license.setModelPerProjectLimit(policyMeta.get("modelPerProjectLimit").asInt(0));
+        }
 
         license.setFeatures(feats);
         JsonNode licenseAttributes = json.get("data").get("attributes"); // NOSONAR

backend/src/main/java/ai/giskard/service/ee/License.java

@@ -18,6 +18,7 @@ public class License {
     private List<String> features;
 
     private Integer projectLimit;
+    private Integer modelPerProjectLimit;
     private Integer userLimit;
     private Instant expiresOn;
 

backend/src/main/java/ai/giskard/service/ee/LicenseService.java

@@ -4,6 +4,7 @@
 import ai.giskard.service.FileLocationService;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
 import org.bouncycastle.crypto.params.Ed25519PublicKeyParameters;
 import org.bouncycastle.crypto.signers.Ed25519Signer;
@@ -12,7 +13,6 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
-import jakarta.annotation.PostConstruct;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.time.Instant;
@@ -36,18 +36,22 @@ public class LicenseService {
      * Also initialize default license (for now)
      */
     @PostConstruct
-    public void init() throws IOException {
+    public void init() {
         try {
             this.currentLicense = readLicenseFromFile();
         } catch (LicenseException e) {
             log.warn("Invalid license file", e);
         }
     }
 
-    public synchronized License readLicenseFromFile() throws IOException {
+    public synchronized License readLicenseFromFile() {
         if (Files.exists(fileLocationService.licensePath())) {
-            String licenseFile = Files.readString(fileLocationService.licensePath());
-            return readLicense(licenseFile);
+            try {
+                String licenseFile = Files.readString(fileLocationService.licensePath());
+                return readLicense(licenseFile);
+            } catch (IOException e) {
+                log.warn("Invalid license file", e);
+            }
         }
         return new License();
     }

backend/src/main/java/ai/giskard/web/rest/controllers/ModelController.java

@@ -14,20 +14,23 @@
 import ai.giskard.service.ModelService;
 import ai.giskard.service.ProjectFileDeletionService;
 import ai.giskard.service.UsageService;
+import ai.giskard.service.ee.LicenseException;
+import ai.giskard.service.ee.LicenseService;
 import ai.giskard.web.dto.*;
 import ai.giskard.web.dto.mapper.GiskardMapper;
 import ai.giskard.web.dto.ml.ModelDTO;
 import ai.giskard.web.rest.errors.Entity;
 import ai.giskard.web.rest.errors.EntityNotFoundException;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -46,6 +49,7 @@ public class ModelController {
     private final PermissionEvaluator permissionEvaluator;
     private final ModelService modelService;
     private final ProjectFileDeletionService deletionService;
+    private final LicenseService licenseService;
 
 
     /**
@@ -84,12 +88,25 @@ public ModelDTO getModelMeta(@PathVariable("projectKey") @NotNull String project
 
     @PostMapping("project/{projectKey}/models")
     @PreAuthorize("@permissionEvaluator.canWriteProjectKey(#projectKey)")
+    @Transactional
     public void createModelMeta(@PathVariable("projectKey") @NotNull String projectKey, @RequestBody @NotNull ModelDTO dto) {
         if (modelRepository.existsById(dto.getId())) {
             log.info("Model already exists {}", dto.getId());
             return;
         }
         Project project = projectRepository.getOneByKey(projectKey);
+        Integer modelPerProject = licenseService.getCurrentLicense().getModelPerProjectLimit();
+        if (modelPerProject != null && project.getModels().size() >= modelPerProject) {
+            log.info("Exceed model numbers in project '{}'", project.getName());
+            throw new LicenseException(
+                "You've reached your limit of " +
+                    licenseService.getCurrentLicense().getModelPerProjectLimit() +
+                    " models per project allowed by the " +
+                    licenseService.getCurrentLicense().getPlanName() +
+                    " plan. " +
+                "Please upgrade your license to keep more versions."
+            );
+        }
         ProjectModel model = giskardMapper.fromDTO(dto);
         model.setProject(project);
         modelRepository.save(model);

backend/src/main/java/ai/giskard/web/rest/controllers/SettingsController.java

@@ -28,7 +28,6 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.io.IOException;
 import java.time.Instant;
 import java.time.OffsetDateTime;
 import java.time.format.DateTimeFormatter;
@@ -117,7 +116,7 @@ public MLWorkerConnectionInfoDTO getMLWorkerConnectionInfo() {
     }
 
     @GetMapping("/api/v2/settings/license")
-    public LicenseDTO getLicense() throws IOException {
+    public LicenseDTO getLicense() {
         LicenseDTO.LicenseDTOBuilder dtoBuilder = LicenseDTO.builder();
         License currentLicense = licenseService.getCurrentLicense();