Push Feature - Merged

backend/src/main/java/ai/giskard/domain/Callable.java

@@ -1,10 +1,10 @@
 package ai.giskard.domain;
 
 import ai.giskard.utils.SimpleJSONStringAttributeConverter;
+import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.Setter;
 
-import jakarta.persistence.*;
 import java.io.Serializable;
 import java.util.List;
 import java.util.UUID;
@@ -13,9 +13,6 @@
 @Setter
 @Inheritance(strategy = InheritanceType.SINGLE_TABLE)
 @Entity(name = "callable_functions")
-@Table(uniqueConstraints = {
-    @UniqueConstraint(columnNames = {"name", "module", "version"})
-})
 @DiscriminatorColumn(name = "callable_type", discriminatorType = DiscriminatorType.STRING)
 public class Callable implements Serializable {
     @Id

backend/src/main/java/ai/giskard/domain/ml/CallToActionKind.java

@@ -0,0 +1,25 @@
+package ai.giskard.domain.ml;
+
+import com.dataiku.j2ts.annotations.UIModel;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+@UIModel
+public enum CallToActionKind {
+    NONE,
+    CREATE_SLICE,
+    CREATE_TEST,
+    CREATE_PERTURBATION,
+    SAVE_PERTURBATION,
+    CREATE_ROBUSTNESS_TEST,
+    CREATE_SLICE_OPEN_DEBUGGER,
+    OPEN_DEBUGGER_BORDERLINE,
+    ADD_TEST_TO_CATALOG,
+    SAVE_EXAMPLE,
+    OPEN_DEBUGGER_OVERCONFIDENCE,
+    CREATE_UNIT_TEST;
+
+    @JsonValue
+    public int toValue() {
+        return ordinal();
+    }
+}

backend/src/main/java/ai/giskard/domain/ml/PushKind.java

@@ -0,0 +1,18 @@
+package ai.giskard.domain.ml;
+
+import com.dataiku.j2ts.annotations.UIModel;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+@UIModel
+public enum PushKind {
+    INVALID,
+    PERTURBATION,
+    CONTRIBUTION,
+    OVERCONFIDENCE,
+    BORDERLINE;
+
+    @JsonValue
+    public int toValue() {
+        return ordinal();
+    }
+}

backend/src/main/java/ai/giskard/domain/ml/SuiteTestExecution.java

@@ -7,11 +7,11 @@
 import ai.giskard.web.dto.ml.TestResultMessageDTO;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import jakarta.persistence.*;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

backend/src/main/java/ai/giskard/ml/MLWorkerWSAction.java

@@ -13,9 +13,11 @@ public enum MLWorkerWSAction {
     GENERATE_TEST_SUITE("generateTestSuite"),
     STOP_WORKER("stopWorker"),
     GET_CATALOG("getCatalog"),
-    GENERATE_QUERY_BASED_SLICING_FUNCTION("generateQueryBasedSlicingFunction");
+    GENERATE_QUERY_BASED_SLICING_FUNCTION("generateQueryBasedSlicingFunction"),
+    GET_PUSH("getPush");
 
     private final String actionName;
+
     MLWorkerWSAction(String name) {
         actionName = name;
     }

backend/src/main/java/ai/giskard/ml/dto/MLWorkerWSGetPushDTO.java

@@ -0,0 +1,35 @@
+package ai.giskard.ml.dto;
+
+import ai.giskard.domain.ml.CallToActionKind;
+import ai.giskard.domain.ml.PushKind;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.annotation.Nullable;
+import java.util.Map;
+
+@Getter
+@Setter
+@Builder
+public class MLWorkerWSGetPushDTO implements MLWorkerWSBaseDTO {
+    private MLWorkerWSArtifactRefDTO dataset;
+    private MLWorkerWSArtifactRefDTO model;
+    private int rowIdx;
+    private MLWorkerWSDataFrameDTO dataframe;
+
+    private String target;
+
+    @JsonProperty("column_types")
+    private Map<String, String> columnTypes;
+
+    @JsonProperty("column_dtypes")
+    private Map<String, String> columnDtypes;
+    @Nullable
+    @JsonProperty("push_kind")
+    private PushKind pushKind;
+    @Nullable
+    @JsonProperty("cta_kind")
+    private CallToActionKind ctaKind;
+}

backend/src/main/java/ai/giskard/ml/dto/MLWorkerWSGetPushResultDTO.java

@@ -0,0 +1,21 @@
+package ai.giskard.ml.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.annotation.Nullable;
+
+@Getter
+@Setter
+public class MLWorkerWSGetPushResultDTO implements MLWorkerWSBaseDTO {
+    @Nullable
+    private MLWorkerWSPushDTO perturbation;
+    @Nullable
+    private MLWorkerWSPushDTO contribution;
+    @Nullable
+    private MLWorkerWSPushDTO borderline;
+    @Nullable
+    private MLWorkerWSPushDTO overconfidence;
+    @Nullable
+    private MLWorkerWSPushActionDTO action;
+}

backend/src/main/java/ai/giskard/ml/dto/MLWorkerWSPushActionDTO.java

@@ -0,0 +1,17 @@
+package ai.giskard.ml.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+@Getter
+@Setter
+public class MLWorkerWSPushActionDTO implements MLWorkerWSBaseDTO {
+
+    @JsonProperty("object_uuid")
+    private String objectUuid;
+
+    private List<MLWorkerWSFuncArgumentDTO> arguments;
+}

backend/src/main/java/ai/giskard/ml/dto/MLWorkerWSPushDTO.java

@@ -0,0 +1,24 @@
+package ai.giskard.ml.dto;
+
+import ai.giskard.domain.ml.PushKind;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.annotation.Nullable;
+import java.util.List;
+
+@Getter
+@Setter
+public class MLWorkerWSPushDTO implements MLWorkerWSBaseDTO {
+    private PushKind kind;
+    @Nullable
+    private String key;
+    @Nullable
+    private String value;
+    @JsonProperty("push_title")
+    private String pushTitle;
+
+    @JsonProperty("push_details")
+    private List<MLWorkerWSPushDetailsDTO> pushDetails;
+}

backend/src/main/java/ai/giskard/ml/dto/MLWorkerWSPushDetailsDTO.java

@@ -0,0 +1,14 @@
+package ai.giskard.ml.dto;
+
+import ai.giskard.domain.ml.CallToActionKind;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class MLWorkerWSPushDetailsDTO implements MLWorkerWSBaseDTO {
+    private String action;
+    private String explanation;
+    private String button;
+    private CallToActionKind cta;
+}

backend/src/main/java/ai/giskard/repository/ml/CallableRepository.java

@@ -9,6 +9,6 @@
 @NoRepositoryBean
 public interface CallableRepository<E extends Callable> extends MappableJpaRepository<E, UUID> {
 
-    int countByNameAndModule(String name, String module);
+    int countByDisplayName(String displayName);
 
 }

backend/src/main/java/ai/giskard/service/SlicingFunctionService.java

@@ -9,6 +9,7 @@
 import ai.giskard.web.dto.SlicingFunctionDTO;
 import ai.giskard.web.dto.mapper.GiskardMapper;
 import com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.logging.log4j.util.Strings;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -42,10 +43,16 @@ public SlicingFunctionDTO save(SlicingFunctionDTO slicingFunction) {
     protected SlicingFunction create(SlicingFunctionDTO dto) {
         SlicingFunction function = giskardMapper.fromDTO(dto);
         function.setProjectKey(dto.getProjectKey());
+
         if (function.getArgs() != null) {
             function.getArgs().forEach(arg -> arg.setFunction(function));
         }
-        function.setVersion(slicingFunctionRepository.countByNameAndModule(function.getName(), function.getModule()) + 1);
+
+        if (Strings.isBlank(function.getDisplayName())) {
+            function.setDisplayName(function.getModule() + "." + function.getName());
+        }
+
+        function.setVersion(slicingFunctionRepository.countByDisplayName(function.getDisplayName()) + 1);
         return function;
     }
 
@@ -82,7 +89,7 @@ public SlicingFunctionDTO generate(List<ComparisonClauseDTO> comparisonClauses)
         slicingFunction.setModuleDoc("");
         slicingFunction.setName(name);
         slicingFunction.setTags(List.of("pickle", "ui"));
-        slicingFunction.setVersion(slicingFunctionRepository.countByNameAndModule(slicingFunction.getName(), slicingFunction.getModule()) + 1);
+        slicingFunction.setVersion(slicingFunctionRepository.countByDisplayName(name) + 1);
         slicingFunction.setCellLevel(false);
         slicingFunction.setColumnType("");
         slicingFunction.setProcessType(DatasetProcessFunctionType.CLAUSES);

backend/src/main/java/ai/giskard/service/TestFunctionService.java

@@ -4,6 +4,7 @@
 import ai.giskard.repository.ml.TestFunctionRepository;
 import ai.giskard.web.dto.TestFunctionDTO;
 import ai.giskard.web.dto.mapper.GiskardMapper;
+import org.apache.logging.log4j.util.Strings;
 import org.springframework.stereotype.Service;
 
 @Service
@@ -29,7 +30,13 @@ protected TestFunction create(TestFunctionDTO dto) {
         if (function.getArgs() != null) {
             function.getArgs().forEach(arg -> arg.setFunction(function));
         }
-        function.setVersion(testFunctionRepository.countByNameAndModule(function.getName(), function.getModule()) + 1);
+
+        if (Strings.isBlank(function.getDisplayName())) {
+            function.setDisplayName(function.getModule() + "." + function.getName());
+        }
+
+        function.setVersion(testFunctionRepository.countByDisplayName(function.getDisplayName()) + 1);
+
         return function;
     }
 

backend/src/main/java/ai/giskard/service/TransformationFunctionService.java

@@ -4,6 +4,7 @@
 import ai.giskard.repository.ml.TransformationFunctionRepository;
 import ai.giskard.web.dto.TransformationFunctionDTO;
 import ai.giskard.web.dto.mapper.GiskardMapper;
+import org.apache.logging.log4j.util.Strings;
 import org.springframework.stereotype.Service;
 
 @Service
@@ -29,7 +30,13 @@ protected TransformationFunction create(TransformationFunctionDTO dto) {
         if (function.getArgs() != null) {
             function.getArgs().forEach(arg -> arg.setFunction(function));
         }
-        function.setVersion(transformationFunctionRepository.countByNameAndModule(function.getName(), function.getModule()) + 1);
+
+        if (Strings.isBlank(function.getDisplayName())) {
+            function.setDisplayName(function.getModule() + "." + function.getName());
+        }
+
+        function.setVersion(transformationFunctionRepository.countByDisplayName(function.getDisplayName()) + 1);
+
         return function;
     }
 

backend/src/main/java/ai/giskard/service/ml/MLWorkerWSCommService.java

@@ -83,6 +83,7 @@ public MLWorkerWSBaseDTO performAction(MLWorkerID workerID, MLWorkerWSAction act
                 case ECHO -> parseReplyDTO(result, MLWorkerWSEchoMsgDTO.class);
                 case GENERATE_TEST_SUITE -> parseReplyDTO(result, MLWorkerWSGenerateTestSuiteDTO.class);
                 case GET_CATALOG -> parseReplyDTO(result, MLWorkerWSCatalogDTO.class);
+                case GET_PUSH -> parseReplyDTO(result, MLWorkerWSGetPushResultDTO.class);
             };
         } catch (JsonProcessingException e) {
             return parseReplyErrorDTO(result);

backend/src/main/java/ai/giskard/web/dto/ApplyPushDTO.java

@@ -0,0 +1,24 @@
+package ai.giskard.web.dto;
+
+import ai.giskard.domain.ml.CallToActionKind;
+import ai.giskard.domain.ml.PushKind;
+import com.dataiku.j2ts.annotations.UIModel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.util.Map;
+import java.util.UUID;
+
+@Getter
+@Setter
+@UIModel
+@NoArgsConstructor
+public class ApplyPushDTO {
+    private UUID modelId;
+    private UUID datasetId;
+    private int rowIdx;
+    private PushKind pushKind;
+    private CallToActionKind ctaKind;
+    private Map<String, String> features;
+}

backend/src/main/java/ai/giskard/web/dto/PushActionDTO.java

@@ -0,0 +1,17 @@
+package ai.giskard.web.dto;
+
+import com.dataiku.j2ts.annotations.UIModel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.util.Map;
+
+@Getter
+@Setter
+@UIModel
+@NoArgsConstructor
+public class PushActionDTO {
+    private String objectUuid;
+    private Map<String, String> parameters;
+}