* Added POST on AlchmenyAPI

* Added Keyword Extraction to AlchemyAPI

Author: Dogukan Erenel

Scripts/Services/AlchemyAPI/AlchemyAPI.cs

@@ -40,6 +40,7 @@ public class AlchemyAPI : IWatsonService {
         private static fsSerializer sm_Serializer = new fsSerializer();
         #endregion
 
+
         #region Entity Extraction
         private const string SERVICE_ENTITY_EXTRACTION = "/calls/text/TextGetRankedNamedEntities";
 
@@ -124,6 +125,88 @@ private void OnGetEntityExtractionResponse(RESTConnector.Request req, RESTConnec
 
         #endregion
 
+        #region Keywoard Extraction
+
+        private const string SERVICE_KEYWOARD_EXTRACTION = "/calls/text/TextGetRankedKeywords";
+
+        public delegate void OnGetKeywoardExtraction( KeywoardExtractionData entityExtractionData, string data );
+
+        public bool GetKeywoardExtraction(OnGetKeywoardExtraction callback, string text, string customData = null)
+        {
+            if (callback == null)
+                throw new ArgumentNullException("callback");
+            if (string.IsNullOrEmpty(text))
+                throw new WatsonException("GetKeywoardExtraction needs to have some text to work.");
+            if (string.IsNullOrEmpty(mp_ApiKey))
+                mp_ApiKey = Config.Instance.GetVariableValue("ALCHEMY_API_KEY");
+            if (string.IsNullOrEmpty(mp_ApiKey))
+                throw new WatsonException("GetKeywoardExtraction - ALCHEMY_API_KEY needs to be defined in config.json");
+
+
+            RESTConnector connector = RESTConnector.GetConnector(SERVICE_ID, SERVICE_KEYWOARD_EXTRACTION);
+            if (connector == null)
+                return false;
+
+            GetKeywoardExtractionRequest req = new GetKeywoardExtractionRequest();
+            req.Callback = callback;
+
+            req.Parameters["apikey"] = mp_ApiKey; 
+            //req.Parameters["text"] = text;
+            req.Headers["Content-Type"] = "application/x-www-form-urlencoded";
+            req.Forms = new Dictionary<string, RESTConnector.Form>();
+            req.Forms["text"] = new RESTConnector.Form(text);
+
+            req.Parameters["url"] = "";
+            req.Parameters["maxRetrieve"] = "1000";
+            req.Parameters["keywordExtractMode"] = "strict"; //strict , normal
+            req.Parameters["sentiment"] = "1";
+            req.Parameters["outputMode"] = "json";
+            req.Parameters["showSourceText"] = "1";
+            //req.Parameters["baseUrl"] = "";
+            req.Parameters["knowledgeGraph"] = "0";
+
+            req.OnResponse = OnGetKeywoardExtractionResponse;
+            req.Data = string.IsNullOrEmpty(customData)? text : customData;
+
+            return connector.Send(req);
+        }
+
+        private class GetKeywoardExtractionRequest : RESTConnector.Request
+        {
+            public string Data { get; set;}
+            public OnGetKeywoardExtraction Callback { get; set; }
+        };
+
+        private void OnGetKeywoardExtractionResponse(RESTConnector.Request req, RESTConnector.Response resp)
+        {
+            KeywoardExtractionData keywoardExtractionData = new KeywoardExtractionData();
+            if (resp.Success)
+            {
+                try
+                {
+                    fsData data = null;
+                    fsResult r = fsJsonParser.Parse(Encoding.UTF8.GetString(resp.Data), out data);
+                    if (!r.Succeeded)
+                        throw new WatsonException(r.FormattedMessages);
+
+                    object obj = keywoardExtractionData;
+                    r = sm_Serializer.TryDeserialize(data, obj.GetType(), ref obj);
+                    if (!r.Succeeded)
+                        throw new WatsonException(r.FormattedMessages);
+                }
+                catch (Exception e)
+                {
+                    Log.Error("AlchemyAPI", "OnGetKeywoardExtractionResponse Exception: {0}", e.ToString());
+                    resp.Success = false;
+                }
+            }
+
+            if (((GetKeywoardExtractionRequest)req).Callback != null)
+                ((GetKeywoardExtractionRequest)req).Callback(resp.Success ? keywoardExtractionData : null, ((GetKeywoardExtractionRequest)req).Data);
+        }
+
+        #endregion
+
         #region Combined Call
 
         private const string SERVICE_COMBINED_CALLS = "/calls/text/TextGetCombinedData"; 
@@ -145,7 +228,8 @@ public bool GetCombinedCall(OnGetCombinedCall callback, string text,
             bool includeDocSentiment = false,
             bool includePageImage = false,
             bool includeImageKW = false,
-            string language = "english")
+            string language = "english", 
+            string customData = null)
         {
             if (callback == null)
                 throw new ArgumentNullException("callback");
@@ -203,14 +287,18 @@ public bool GetCombinedCall(OnGetCombinedCall callback, string text,
                 requestServices.Add("image-kw");
 
             req.Parameters["apikey"] = mp_ApiKey; 
-            req.Parameters["text"] = text;
+            //req.Parameters["text"] = text;
             req.Parameters["extract"] = string.Join(",", requestServices.ToArray());
             req.Parameters["outputMode"] = "json";
             req.Parameters["showSourceText"] = "1";
             req.Parameters["language"] = language;
 
+            req.Headers["Content-Type"] = "application/x-www-form-urlencoded";
+            req.Forms = new Dictionary<string, RESTConnector.Form>();
+            req.Forms["text"] = new RESTConnector.Form(text);
+
             req.OnResponse = OnGetCombinedCallResponse;
-            req.Data = text;
+            req.Data =  string.IsNullOrEmpty(customData)? text : customData;
 
             return connector.Send(req);
         }

Scripts/Services/AlchemyAPI/DataModels.cs

@@ -21,7 +21,7 @@
 
 namespace IBM.Watson.DeveloperCloud.Services.AlchemyAPI.v1
 {
-    
+
     [fsObject]
     public class EntityExtractionData
     {
@@ -30,6 +30,7 @@ public class EntityExtractionData
         public string url { get; set; }
         public string text { get; set; }
         public Entity[] entities { get; set; }
+        public KnowledgeGraph knowledgeGraph{ get; set; }
 
         public bool HasData
         {
@@ -105,6 +106,39 @@ public override string ToString()
 
     };
 
+
+    [fsObject]
+    public class KeywoardExtractionData
+    {
+        public string status { get; set; }
+        public string language { get; set; }
+        public string url { get; set; }
+        public string text { get; set; }
+        public Keyword[] keywords { get; set; }
+        public KnowledgeGraph knowledgeGraph{ get; set; }
+
+        public bool HasData
+        {
+            get
+            {
+                return keywords != null && keywords.Length > 0;
+            }
+        }
+
+        public override string ToString()
+        {
+            StringBuilder stringBuilder = new StringBuilder();
+            for (int indexKeyword = 0; keywords != null && indexKeyword < keywords.Length; indexKeyword++)
+            {
+                stringBuilder.Append("\n\t");
+                stringBuilder.Append(keywords[indexKeyword].ToString());
+            }
+            return string.Format("[KeywoardExtractionData: status={0}, language={1}, url={2}, text={3}, keywords={4}]", status, language, url, text, stringBuilder.ToString());
+        }
+
+    };
+
+
     public class PositionOnMap
     {
         public string PositionName;
@@ -765,6 +799,23 @@ public class Sentiment
         public string score { get; set; }
         public string mixed { get; set; }
 
+        private double m_Score = 0;
+        public double Score
+        {
+            get
+            {
+                if (m_Score == 0)
+                {
+                    if (!string.IsNullOrEmpty(score))
+                    {
+                        double.TryParse(score, out m_Score);
+                    }
+                }
+
+                return m_Score;
+            }
+        }
+
         public override string ToString()
         {
             return string.Format("[Sentiment: type={0}, score={1}, mixed={2}]", type, score, mixed);
@@ -857,6 +908,7 @@ public class Keyword
 
     };
 
+
     [fsObject]
     public class Concept
     {