Update Visual Recognition and add new services

pom.xml

@@ -4,9 +4,9 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>it.polpetta</groupId>
+    <groupId>com.tfederico</groupId>
     <artifactId>libris</artifactId>
-    <version>2.0.1</version>
+    <version>2.3</version>
     <packaging>jar</packaging>
 
     <name>Reverse Image Search Lib</name>
@@ -21,7 +21,7 @@
     </licenses>
 
     <scm>
-        <url>https://github.com/Polpetta/libris</url>
+        <url>https://github.com/tfederico/libris</url>
     </scm>
 
     <properties>
@@ -100,7 +100,7 @@
         <dependency>
             <groupId>com.ibm.watson.developer_cloud</groupId>
             <artifactId>java-sdk</artifactId>
-            <version>3.8.0</version>
+            <version>4.1.0</version>
 
         </dependency>
 

src/main/java/com/tfederico/libris/Main.java

@@ -0,0 +1,57 @@
+package com.tfederico.libris;
+
+import com.ibm.watson.developer_cloud.natural_language_understanding.v1.model.KeywordsResult;
+import com.ibm.watson.developer_cloud.visual_recognition.v3.model.ClassifiedImage;
+import com.ibm.watson.developer_cloud.visual_recognition.v3.model.ClassifiedImages;
+import com.ibm.watson.developer_cloud.visual_recognition.v3.model.Classifier;
+import com.tfederico.libris.image.ibm.contract.IIBMCustomClassifierUtility;
+import com.tfederico.libris.image.ibm.visualRecognition.IBMCustomClassifierUtility;
+import com.tfederico.libris.text.naturalLanguageUnderstanding.contract.IIBMNaturalLanguageUnderstandingUtility;
+import com.tfederico.libris.text.naturalLanguageUnderstanding.ibm.IBMNaturalLanguageUnderstandingUtility;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.List;
+
+public class Main {
+    public static void main(String[] args) {
+        IBMCustomClassifierUtility.setSubscriptionKey("");
+        IIBMCustomClassifierUtility customClassifierUtility = new IBMCustomClassifierUtility();
+
+        /*List<Classifier> classifiersList = customClassifierUtility.getClassifiersList();
+        for(Classifier c : classifiersList)
+            customClassifierUtility.deleteClassifier(c.getClassifierId());*/
+
+        /*ClassifiedImages image = null;
+        try {
+            image = customClassifierUtility.classify("/home/federico/Downloads/hello.jpg");
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        if(image != null){
+            System.out.println(image.getImages().get(0).getClassifiers().get(0).getName());
+        }*/
+
+        IBMNaturalLanguageUnderstandingUtility
+                .setUsernameAndPassword("",
+                        "");
+
+        IIBMNaturalLanguageUnderstandingUtility nlu = new IBMNaturalLanguageUnderstandingUtility();
+        String s = "The young sitter is assumed to be Maria Trip, the daughter of a wealthy " +
+                "Amsterdam merchant. She displaysher wealth with pride. Her dress is trimmed " +
+                "with white linen so fine it is almost transparent. She sports a fortune in " +
+                "pearls, and in her left hand she casually holds the knobbed handle of a folding " +
+                "fan. In 1639 thiswas still a rare and costly accessory.\n";
+        List<KeywordsResult> keywordsResults = nlu.getKeywordsFromText(s);
+
+        for(KeywordsResult k : keywordsResults){
+            System.out.println(k.getText());
+            System.out.println(k.getRelevance());
+        }
+
+
+    }
+}

src/main/java/it/polpetta/libris/contract/AbstractURLSearcher.java → src/main/java/com/tfederico/libris/contract/AbstractURLSearcher.java

@@ -1,4 +1,4 @@
-package it.polpetta.libris.contract;
+package com.tfederico.libris.contract;
 
 import java.io.BufferedReader;
 import java.io.IOException;

src/main/java/it/polpetta/libris/contract/IAbstractFactoryReverseSearchProvider.java → src/main/java/com/tfederico/libris/contract/IAbstractFactoryReverseSearchProvider.java

@@ -1,4 +1,4 @@
-package it.polpetta.libris.contract;
+package com.tfederico.libris.contract;
 
 /**
  * Created by davide on 28/04/17.

src/main/java/it/polpetta/libris/contract/IQueryBuilder.java → src/main/java/com/tfederico/libris/contract/IQueryBuilder.java

@@ -1,4 +1,4 @@
-package it.polpetta.libris.contract;
+package com.tfederico.libris.contract;
 
 import java.io.File;
 import java.net.URL;

src/main/java/it/polpetta/libris/contract/ISearchResult.java → src/main/java/com/tfederico/libris/contract/ISearchResult.java

@@ -1,4 +1,4 @@
-package it.polpetta.libris.contract;
+package com.tfederico.libris.contract;
 
 /**
  * Created by davide on 06/05/17.

src/main/java/it/polpetta/libris/contract/ISearcher.java → src/main/java/com/tfederico/libris/contract/ISearcher.java

@@ -1,6 +1,4 @@
-package it.polpetta.libris.contract;
-
-import it.polpetta.libris.contract.ISearchResult;
+package com.tfederico.libris.contract;
 
 import java.io.IOException;
 

src/main/java/it/polpetta/libris/image/ReverseImageSearch.java → src/main/java/com/tfederico/libris/image/ReverseImageSearch.java

@@ -1,14 +1,14 @@
-package it.polpetta.libris.image;
+package com.tfederico.libris.image;
 
-import it.polpetta.libris.image.azure.AzureAbstractFactory;
-import it.polpetta.libris.contract.IAbstractFactoryReverseSearchProvider;
-import it.polpetta.libris.image.azure.contract.IAbstractAzureImageFactoryReverseSearchProvider;
-import it.polpetta.libris.image.google.GoogleAbstractFactory;
-import it.polpetta.libris.image.google.contract.IAbstractGoogleImageFactoryReverseSearchProvider;
-import it.polpetta.libris.image.ibm.IBMAbstractFactory;
-import it.polpetta.libris.image.ibm.contract.IAbstractIBMImageFactoryReverseSearchProvider;
-import it.polpetta.libris.image.imagga.ImaggaAbstractFactory;
-import it.polpetta.libris.image.imagga.contract.IAbstractImaggaImageFactoryReverseSearchProvider;
+import com.tfederico.libris.contract.IAbstractFactoryReverseSearchProvider;
+import com.tfederico.libris.image.google.GoogleAbstractFactory;
+import com.tfederico.libris.image.google.contract.IAbstractGoogleImageFactoryReverseSearchProvider;
+import com.tfederico.libris.image.imagga.ImaggaAbstractFactory;
+import com.tfederico.libris.image.imagga.contract.IAbstractImaggaImageFactoryReverseSearchProvider;
+import com.tfederico.libris.image.azure.AzureAbstractFactory;
+import com.tfederico.libris.image.azure.contract.IAbstractAzureImageFactoryReverseSearchProvider;
+import com.tfederico.libris.image.ibm.IBMAbstractFactory;
+import com.tfederico.libris.image.ibm.contract.IAbstractIBMImageFactoryReverseSearchProvider;
 
 /**
  * Created by davide on 28/04/17.

src/main/java/it/polpetta/libris/image/azure/AzureAbstractFactory.java → src/main/java/com/tfederico/libris/image/azure/AzureAbstractFactory.java

@@ -1,8 +1,7 @@
-package it.polpetta.libris.image.azure;
+package com.tfederico.libris.image.azure;
 
-import it.polpetta.libris.contract.IQueryBuilder;
-import it.polpetta.libris.image.azure.contract.IAbstractAzureImageFactoryReverseSearchProvider;
-import it.polpetta.libris.image.azure.imageRecognition.URLAzureImageSearcher;
+import com.tfederico.libris.image.azure.contract.IAbstractAzureImageFactoryReverseSearchProvider;
+import com.tfederico.libris.image.azure.imageRecognition.URLAzureImageSearcher;
 
 /**
  * Created by dpolonio on 05/05/17.

src/main/java/it/polpetta/libris/image/azure/contract/IAbstractAzureImageFactoryReverseSearchProvider.java → src/main/java/com/tfederico/libris/image/azure/contract/IAbstractAzureImageFactoryReverseSearchProvider.java

@@ -1,7 +1,7 @@
-package it.polpetta.libris.image.azure.contract;
+package com.tfederico.libris.image.azure.contract;
 
-import it.polpetta.libris.image.azure.imageRecognition.URLAzureImageSearcher;
-import it.polpetta.libris.image.contract.IAbstractImageFactoryReverseSearchProvider;
+import com.tfederico.libris.image.contract.IAbstractImageFactoryReverseSearchProvider;
+import com.tfederico.libris.image.azure.imageRecognition.URLAzureImageSearcher;
 
 /**
  * Created by dpolonio on 10/05/17.

src/main/java/it/polpetta/libris/image/azure/contract/IAzureImageSearchResult.java → src/main/java/com/tfederico/libris/image/azure/contract/IAzureImageSearchResult.java

@@ -1,6 +1,6 @@
-package it.polpetta.libris.image.azure.contract;
+package com.tfederico.libris.image.azure.contract;
 
-import it.polpetta.libris.image.contract.IImageSearchResult;
+import com.tfederico.libris.image.contract.IImageSearchResult;
 
 import java.util.ArrayList;
 

src/main/java/it/polpetta/libris/image/azure/contract/IAzureImageSearcher.java → src/main/java/com/tfederico/libris/image/azure/contract/IAzureImageSearcher.java

@@ -1,7 +1,6 @@
-package it.polpetta.libris.image.azure.contract;
+package com.tfederico.libris.image.azure.contract;
 
-import it.polpetta.libris.contract.ISearcher;
-import it.polpetta.libris.image.google.contract.IGoogleImageSearchResult;
+import com.tfederico.libris.contract.ISearcher;
 
 import java.io.IOException;
 

src/main/java/it/polpetta/libris/image/azure/imageRecognition/AzureImageSearchResult.java → src/main/java/com/tfederico/libris/image/azure/imageRecognition/AzureImageSearchResult.java

@@ -1,6 +1,6 @@
-package it.polpetta.libris.image.azure.imageRecognition;
+package com.tfederico.libris.image.azure.imageRecognition;
 
-import it.polpetta.libris.image.azure.contract.IAzureImageSearchResult;
+import com.tfederico.libris.image.azure.contract.IAzureImageSearchResult;
 
 import java.util.ArrayList;
 

src/main/java/it/polpetta/libris/image/azure/imageRecognition/URLAzureImageSearcher.java → src/main/java/com/tfederico/libris/image/azure/imageRecognition/URLAzureImageSearcher.java

@@ -1,14 +1,14 @@
-package it.polpetta.libris.image.azure.imageRecognition;
+package com.tfederico.libris.image.azure.imageRecognition;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
-import it.polpetta.libris.contract.IQueryBuilder;
-import it.polpetta.libris.image.azure.contract.IAzureImageSearchResult;
-import it.polpetta.libris.image.azure.contract.IAzureImageSearcher;
-import it.polpetta.libris.image.contract.AbstractURLImageSearcher;
-import it.polpetta.libris.util.Coordinates;
+import com.tfederico.libris.contract.IQueryBuilder;
+import com.tfederico.libris.image.azure.contract.IAzureImageSearchResult;
+import com.tfederico.libris.image.azure.contract.IAzureImageSearcher;
+import com.tfederico.libris.image.contract.AbstractURLImageSearcher;
+import com.tfederico.libris.util.Coordinates;
 
 import javax.net.ssl.HttpsURLConnection;
 import java.io.*;

src/main/java/it/polpetta/libris/image/contract/AbstractURLImageSearcher.java → src/main/java/com/tfederico/libris/image/contract/AbstractURLImageSearcher.java

@@ -1,7 +1,7 @@
-package it.polpetta.libris.image.contract;
+package com.tfederico.libris.image.contract;
 
-import it.polpetta.libris.contract.AbstractURLSearcher;
-import it.polpetta.libris.util.Coordinates;
+import com.tfederico.libris.contract.AbstractURLSearcher;
+import com.tfederico.libris.util.Coordinates;
 
 import java.net.URL;
 

src/main/java/it/polpetta/libris/image/contract/IAbstractImageFactoryReverseSearchProvider.java → src/main/java/com/tfederico/libris/image/contract/IAbstractImageFactoryReverseSearchProvider.java

@@ -1,6 +1,6 @@
-package it.polpetta.libris.image.contract;
+package com.tfederico.libris.image.contract;
 
-import it.polpetta.libris.contract.IAbstractFactoryReverseSearchProvider;
+import com.tfederico.libris.contract.IAbstractFactoryReverseSearchProvider;
 
 /**
  * Created by dpolonio on 10/05/17.

src/main/java/it/polpetta/libris/image/contract/IImageQueryBuilder.java → src/main/java/com/tfederico/libris/image/contract/IImageQueryBuilder.java

@@ -1,6 +1,6 @@
-package it.polpetta.libris.image.contract;
+package com.tfederico.libris.image.contract;
 
-import it.polpetta.libris.contract.IQueryBuilder;
+import com.tfederico.libris.contract.IQueryBuilder;
 
 /**
  * Created by zanna on 08/05/17.

src/main/java/it/polpetta/libris/image/contract/IImageSearchResult.java → src/main/java/com/tfederico/libris/image/contract/IImageSearchResult.java

@@ -1,6 +1,6 @@
-package it.polpetta.libris.image.contract;
+package com.tfederico.libris.image.contract;
 
-import it.polpetta.libris.contract.ISearchResult;
+import com.tfederico.libris.contract.ISearchResult;
 
 import java.util.ArrayList;
 

src/main/java/it/polpetta/libris/image/google/GoogleAbstractFactory.java → src/main/java/com/tfederico/libris/image/google/GoogleAbstractFactory.java

@@ -1,7 +1,7 @@
-package it.polpetta.libris.image.google;
+package com.tfederico.libris.image.google;
 
-import it.polpetta.libris.image.google.contract.IAbstractGoogleImageFactoryReverseSearchProvider;
-import it.polpetta.libris.image.google.hmtlImageSearch.URLGoogleImageSearcher;
+import com.tfederico.libris.image.google.contract.IAbstractGoogleImageFactoryReverseSearchProvider;
+import com.tfederico.libris.image.google.hmtlImageSearch.URLGoogleImageSearcher;
 
 /**
  * Created by davide on 29/04/17.

src/main/java/it/polpetta/libris/image/google/contract/IAbstractGoogleImageFactoryReverseSearchProvider.java → src/main/java/com/tfederico/libris/image/google/contract/IAbstractGoogleImageFactoryReverseSearchProvider.java

@@ -1,7 +1,7 @@
-package it.polpetta.libris.image.google.contract;
+package com.tfederico.libris.image.google.contract;
 
-import it.polpetta.libris.image.contract.IAbstractImageFactoryReverseSearchProvider;
-import it.polpetta.libris.image.google.hmtlImageSearch.URLGoogleImageSearcher;
+import com.tfederico.libris.image.contract.IAbstractImageFactoryReverseSearchProvider;
+import com.tfederico.libris.image.google.hmtlImageSearch.URLGoogleImageSearcher;
 
 /**
  * Created by dpolonio on 10/05/17.

src/main/java/it/polpetta/libris/image/google/contract/IGoogleImageSearchResult.java → src/main/java/com/tfederico/libris/image/google/contract/IGoogleImageSearchResult.java

@@ -1,7 +1,6 @@
-package it.polpetta.libris.image.google.contract;
+package com.tfederico.libris.image.google.contract;
 
-import it.polpetta.libris.contract.ISearchResult;
-import it.polpetta.libris.image.contract.IImageSearchResult;
+import com.tfederico.libris.image.contract.IImageSearchResult;
 
 import java.util.ArrayList;
 

src/main/java/it/polpetta/libris/image/google/contract/IGoogleImageSearcher.java → src/main/java/com/tfederico/libris/image/google/contract/IGoogleImageSearcher.java

@@ -1,7 +1,6 @@
-package it.polpetta.libris.image.google.contract;
+package com.tfederico.libris.image.google.contract;
 
-import it.polpetta.libris.contract.ISearcher;
-import it.polpetta.libris.image.google.contract.IGoogleImageSearchResult;
+import com.tfederico.libris.contract.ISearcher;
 
 import java.io.IOException;
 

src/main/java/it/polpetta/libris/image/google/hmtlImageSearch/GoogleImageSearchResult.java → src/main/java/com/tfederico/libris/image/google/hmtlImageSearch/GoogleImageSearchResult.java

@@ -1,6 +1,6 @@
-package it.polpetta.libris.image.google.hmtlImageSearch;
+package com.tfederico.libris.image.google.hmtlImageSearch;
 
-import it.polpetta.libris.image.google.contract.IGoogleImageSearchResult;
+import com.tfederico.libris.image.google.contract.IGoogleImageSearchResult;
 
 import java.util.ArrayList;
 

src/main/java/it/polpetta/libris/image/google/hmtlImageSearch/URLGoogleImageSearcher.java → src/main/java/com/tfederico/libris/image/google/hmtlImageSearch/URLGoogleImageSearcher.java

@@ -1,12 +1,12 @@
-package it.polpetta.libris.image.google.hmtlImageSearch;
+package com.tfederico.libris.image.google.hmtlImageSearch;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
-import it.polpetta.libris.image.contract.AbstractURLImageSearcher;
-import it.polpetta.libris.image.contract.IImageQueryBuilder;
-import it.polpetta.libris.image.google.contract.IGoogleImageSearchResult;
-import it.polpetta.libris.image.google.contract.IGoogleImageSearcher;
-import it.polpetta.libris.util.Coordinates;
+import com.tfederico.libris.image.google.contract.IGoogleImageSearchResult;
+import com.tfederico.libris.image.contract.AbstractURLImageSearcher;
+import com.tfederico.libris.image.contract.IImageQueryBuilder;
+import com.tfederico.libris.image.google.contract.IGoogleImageSearcher;
+import com.tfederico.libris.util.Coordinates;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
 import org.jsoup.parser.Parser;

src/main/java/it/polpetta/libris/image/ibm/IBMAbstractFactory.java → src/main/java/com/tfederico/libris/image/ibm/IBMAbstractFactory.java

@@ -1,8 +1,8 @@
-package it.polpetta.libris.image.ibm;
+package com.tfederico.libris.image.ibm;
 
-import it.polpetta.libris.contract.IQueryBuilder;
-import it.polpetta.libris.image.ibm.contract.IAbstractIBMImageFactoryReverseSearchProvider;
-import it.polpetta.libris.image.ibm.visualRecognition.URLIBMImageSearcher;
+
+import com.tfederico.libris.image.ibm.contract.IAbstractIBMImageFactoryReverseSearchProvider;
+import com.tfederico.libris.image.ibm.visualRecognition.URLIBMImageSearcher;
 
 /**
  * Created by dpolonio on 17/05/17.
@@ -20,5 +20,7 @@ public IBMAbstractFactory(String subscriptionKey) {
     public URLIBMImageSearcher.Builder imageSearchBuildQuery() {
         URLIBMImageSearcher.setSubscriptionKey(subscriptionKey);
         return new URLIBMImageSearcher.Builder();
+
+
     }
 }

src/main/java/it/polpetta/libris/image/ibm/contract/IAbstractIBMImageFactoryReverseSearchProvider.java → src/main/java/com/tfederico/libris/image/ibm/contract/IAbstractIBMImageFactoryReverseSearchProvider.java

@@ -1,7 +1,7 @@
-package it.polpetta.libris.image.ibm.contract;
+package com.tfederico.libris.image.ibm.contract;
 
-import it.polpetta.libris.image.contract.IAbstractImageFactoryReverseSearchProvider;
-import it.polpetta.libris.image.ibm.visualRecognition.URLIBMImageSearcher;
+import com.tfederico.libris.image.contract.IAbstractImageFactoryReverseSearchProvider;
+import com.tfederico.libris.image.ibm.visualRecognition.URLIBMImageSearcher;
 
 /**
  * Created by dpolonio on 17/05/17.

src/main/java/com/tfederico/libris/image/ibm/contract/IIBMCustomClassifierUtility.java

@@ -0,0 +1,29 @@
+package com.tfederico.libris.image.ibm.contract;
+
+import com.ibm.watson.developer_cloud.visual_recognition.v3.model.ClassifiedImages;
+import com.ibm.watson.developer_cloud.visual_recognition.v3.model.Classifier;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+public interface IIBMCustomClassifierUtility {
+
+    Classifier createClassifier(String name, HashMap<String, String> classesAndPaths,
+                                ArrayList<String> negativesPaths) throws FileNotFoundException;
+
+    Classifier getClassifierById(String id);
+
+    List<Classifier> getClassifiersList();
+
+    void deleteClassifier(String id);
+
+    Classifier updateClassifier(String id, HashMap<String, String> classesAndPaths,
+                                      ArrayList<String> negativesPaths) throws FileNotFoundException;
+
+    ClassifiedImages classifyById(ArrayList<String> classifierId, String imagePath) throws IOException;
+
+    ClassifiedImages classify(String imagePath) throws IOException;
+}

src/main/java/it/polpetta/libris/image/ibm/contract/IIBMImageSearchResult.java → src/main/java/com/tfederico/libris/image/ibm/contract/IIBMImageSearchResult.java

@@ -1,7 +1,7 @@
-package it.polpetta.libris.image.ibm.contract;
+package com.tfederico.libris.image.ibm.contract;
 
 
-import it.polpetta.libris.image.contract.IImageSearchResult;
+import com.tfederico.libris.image.contract.IImageSearchResult;
 
 import java.util.ArrayList;