CLI and error messages

Author: ianardee

src/main/java/com/mindee/MindeeException.java

@@ -5,11 +5,11 @@
  */
 public class MindeeException extends RuntimeException {
 
-  public MindeeException(String errorMessage, Throwable err) {
-    super(errorMessage, err);
+  public MindeeException(String message, Throwable cause) {
+    super(message, cause);
   }
 
-  public MindeeException(String errorMessage) {
-    super(errorMessage);
+  public MindeeException(String message) {
+    super(message);
   }
 }

src/main/java/com/mindee/v2/MindeeClient.java

@@ -280,9 +280,9 @@ private <TResponse extends CommonResponse> TResponse pollAndFetch(
       attempts++;
     }
 
-    ErrorResponse error = resp.getJob().getError();
-    if (error != null) {
-      throw new MindeeHttpExceptionV2(error.getStatus(), error.getDetail());
+    ErrorResponse errorResponse = resp.getJob().getError();
+    if (errorResponse != null) {
+      throw new MindeeHttpExceptionV2(errorResponse);
     }
     throw new RuntimeException("Max retries exceeded (" + max + ").");
   }

src/main/java/com/mindee/v2/cli/BaseCommand.java

@@ -11,7 +11,11 @@
  * Handles common options (path, model-id, api-key, alias, output) and output formatting.
  */
 public abstract class BaseCommand implements Callable<Integer> {
-  @CommandLine.Option(names = { "-k", "--api-key" }, description = "Mindee V2 API key.")
+  @CommandLine.Option(
+      names = { "-k", "--api-key" },
+      description = "Mindee V2 API key.",
+      defaultValue = ""
+  )
   protected String apiKey;
 
   /** Output format for the command. */
@@ -24,8 +28,8 @@ public enum OutputType {
   @CommandLine.Option(
       names = { "-o", "--output" },
       description = "Specify how to output the data.\n"
-        + "- summary: a basic summary (default)\n"
-        + "- full: detail extraction results, including options\n"
+        + "- summary: basic formatted response (default)\n"
+        + "- full: complete formatted response\n"
         + "- raw: full JSON object",
       defaultValue = "summary"
   )
@@ -38,7 +42,7 @@ public enum OutputType {
    * @param response the response
    * @return the summary string
    */
-  protected abstract String getSummary(CommonResponse response);
+  protected abstract String getSummaryOutput(CommonResponse response);
 
   /**
    * Returns the full string for the given response.
@@ -62,7 +66,7 @@ protected void printOutput(CommonResponse response) throws Exception {
         System.out.println(mapper.writeValueAsString(jsonNode));
         break;
       default:
-        System.out.println(getSummary(response));
+        System.out.println(getSummaryOutput(response));
         break;
     }
   }

src/main/java/com/mindee/v2/cli/BaseInferenceCommand.java

@@ -51,7 +51,7 @@ protected abstract CommonResponse executeRequest(
 
   @Override
   public Integer call() throws Exception {
-    var client = new MindeeClient(String.valueOf(apiKey));
+    var client = new MindeeClient(apiKey);
     var inputSource = new LocalInputSource(file);
     var response = executeRequest(client, inputSource);
     printOutput(response);

src/main/java/com/mindee/v2/cli/ClassificationCommand.java

@@ -31,7 +31,7 @@ protected CommonResponse executeRequest(
   }
 
   @Override
-  protected String getSummary(CommonResponse response) {
+  protected String getSummaryOutput(CommonResponse response) {
     return ((ClassificationResponse) response).getInference().getResult().toString();
   }
 

src/main/java/com/mindee/v2/cli/CropCommand.java

@@ -27,7 +27,7 @@ protected CommonResponse executeRequest(
   }
 
   @Override
-  protected String getSummary(CommonResponse response) {
+  protected String getSummaryOutput(CommonResponse response) {
     return ((CropResponse) response).getInference().getResult().toString();
   }
 

src/main/java/com/mindee/v2/cli/ExtractionCommand.java

@@ -77,7 +77,7 @@ protected CommonResponse executeRequest(
   }
 
   @Override
-  protected String getSummary(CommonResponse response) {
+  protected String getSummaryOutput(CommonResponse response) {
     return ((ExtractionResponse) response).getInference().getResult().toString();
   }
 

src/main/java/com/mindee/v2/cli/OcrCommand.java

@@ -27,7 +27,7 @@ protected CommonResponse executeRequest(
   }
 
   @Override
-  protected String getSummary(CommonResponse response) {
+  protected String getSummaryOutput(CommonResponse response) {
     return ((OcrResponse) response).getInference().getResult().toString();
   }
 

src/main/java/com/mindee/v2/cli/SearchModelsCommand.java

@@ -39,18 +39,22 @@ public enum ModelType {
 
   @Override
   public Integer call() throws Exception {
-    var client = new MindeeClient(String.valueOf(apiKey));
+    var client = new MindeeClient(apiKey);
     var response = client
       .search(
         ModelSearchResponse.class,
-        ModelSearchParameters.builder().name(name).modelType(String.valueOf(modelType)).build()
+        ModelSearchParameters
+          .builder()
+          .name(name)
+          .modelType(modelType != null ? modelType.name() : null)
+          .build()
       );
     printOutput(response);
     return 0;
   }
 
   @Override
-  protected String getSummary(CommonResponse response) {
+  protected String getSummaryOutput(CommonResponse response) {
     return ((ModelSearchResponse) response).getModels().toString();
   }
 

src/main/java/com/mindee/v2/cli/SearchRagDocumentsCommand.java

@@ -27,7 +27,7 @@ public class SearchRagDocumentsCommand extends BaseCommand {
   private String filename;
 
   @Override
-  protected String getSummary(CommonResponse response) {
+  protected String getSummaryOutput(CommonResponse response) {
     return ((RagDocumentSearchResponse) response).getRagDocuments().toString();
   }
 
@@ -38,11 +38,14 @@ protected String getFullOutput(CommonResponse response) {
 
   @Override
   public Integer call() throws Exception {
-    var client = new MindeeClient(String.valueOf(apiKey));
+    var client = new MindeeClient(apiKey);
     var response = client
       .search(
         RagDocumentSearchResponse.class,
-        RagDocumentSearchParameters.builder(modelId).filename(filename).build()
+        RagDocumentSearchParameters
+          .builder(modelId)
+          .filename(filename != null ? filename : null)
+          .build()
       );
     printOutput(response);
     return 0;