Adds auxiliary funcions to Topics and Lang responses and bumps the version to 1.2.2.

Author: bgalego

README.md

@@ -138,10 +138,10 @@ try:
     # If there are no errors in the request, we will use the language detected to make a request to Sentiment and Topics
     if lang_response.isSuccessful():
         print("\nThe request to 'Language Identification' finished successfully!\n")
-        languages = lang_response.getLanguages()
-        if languages:
-            language = lang_response.getLanguageCode(languages[0])
-            print("\tLanguage detected: " + lang_response.getLanguageName(languages[0]) + ' (' + language + ")\n")
+        first_lang = lang_response.getFirstLanguage()
+        if first_lang:
+            language = lang_response.getLanguageCode(first_lang)
+            print("\tLanguage detected: " + lang_response.getLanguageName(first_lang) + ' (' + language + ")\n")
         else:
             print("\tNo language detected!\n")
 

example/Client.py

@@ -60,10 +60,10 @@
     # If there are no errors in the request, we will use the language detected to make a request to Sentiment and Topics
     if lang_response.isSuccessful():
         print("\nThe request to 'Language Identification' finished successfully!\n")
-        languages = lang_response.getLanguages()
-        if languages:
-            language = lang_response.getLanguageCode(languages[0])
-            print("\tLanguage detected: " + lang_response.getLanguageName(languages[0]) + ' (' + language + ")\n")
+        first_lang = lang_response.getFirstLanguage()
+        if first_lang:
+            language = lang_response.getLanguageCode(first_lang)
+            print("\tLanguage detected: " + lang_response.getLanguageName(first_lang) + ' (' + language + ")\n")
         else:
             print("\tNo language detected!\n")
 

meaningcloud/LanguageResponse.py

@@ -28,6 +28,19 @@ def getLanguages(self):
                 if (('language_list' in self._response.keys()) and (self._response['language_list'] is not None))
                 else {})
 
+    def getFirstLanguage(self):
+        """
+        Get first language returned for the analyzed text
+
+        :return:
+            Array with the field of the language detected
+        """
+
+        languages = (self._response['language_list']
+                if (('language_list' in self._response.keys()) and (self._response['language_list'] is not None))
+                else {})
+        return languages[0] if((len(languages) > 0) and (languages[0] is not None)) else []
+
     def getLanguageCode(self, language):
         """
         Get the code of a language

meaningcloud/Request.py

@@ -105,8 +105,8 @@ def sendRequest(self, extraHeaders=""):
         :return:
             Response object set to None if there is an error
         """
-
-        self.addParam('src', 'mc-python')
+        if not 'src' in self._params.keys():
+            self.addParam('src', 'mc-python')
 
         params = urlencode(self._params)
 

meaningcloud/TopicsResponse.py

@@ -174,6 +174,21 @@ def getTypeLastNode(self, type_):
             lastNode = aType[len(aType) - 1]
         return lastNode
 
+    def getTypeFirstNode(self, type_):
+        """
+        Obtains the firstlevel node of the type specified
+        :param type_:
+            Type we want to analize (sementity, semtheme)
+        :return:
+            First node of the type (or Top if there's no first type)
+        """
+
+        firstNode = ""
+        if type_ and (type(type_) is not list) and (type(type_) is not dict):
+            aType = type_.split('>')
+            firstNode = aType[1] if len(aType)>1 else aType[0]
+        return firstNode
+
     def getNumberOfAppearances(self, topic):
         """
         Gets the number of appearances of a topic

setup.py

@@ -14,7 +14,7 @@
 setup(
 
     name='MeaningCloud-python',
-    version='1.2.1',
+    version='1.2.2',
     description='Official Python SDK for MeaningCloud APIs',
     long_description=readme,
     long_description_content_type='text/markdown',

tests/LanguageResponseTest.py

@@ -31,6 +31,14 @@ def testGetLanguages(self):
     def testGetNonexistentLanguages(self):
         self.assertEqual(len(self.empty_response.getLanguages()), 0)
 
+    def testGetFirstLanguage(self):
+        language = self.response.getFirstLanguage()
+        self.assertIsNotNone(language)
+
+    def testGetNonExistentFirstLanguage(self):
+        language = self.empty_response.getFirstLanguage()
+        self.assertEqual(len(language), 0)
+
     def testGetLanguageCode(self):
         languages = self.response.getLanguages()
         language = languages[0] if((len(languages) > 0) and (languages[0] is not None)) else []

tests/TopicsResponseTest.py

@@ -141,6 +141,30 @@ def testGetTypeLastNode(self):
         wrongFormatArray = self.response.getTypeLastNode({'dummy_key': 'dummy_value'})
         self.assertEqual(wrongFormatArray, "")
 
+    def testGetTypeFirstNode(self):
+        # correct_values
+        firstEntityFirstNode = self.response.getTypeFirstNode(self.response.getOntoType(self.response.getEntities()[0]))
+        self.assertIsNotNone(firstEntityFirstNode)
+        self.assertEqual(firstEntityFirstNode, 'Location')
+
+        firstConceptFirstNode = self.response.getTypeFirstNode(self.response.getOntoType(self.response.getConcepts()[0]))
+        self.assertIsNotNone(firstConceptFirstNode)
+        self.assertEqual(firstConceptFirstNode, 'Location')
+
+        responseNoFirstNode = '{"status":{"code":"0","msg":"OK","credits":"1","remaining_credits":"5000"},"entity_list":[{"form":"DummyTopValue","id":"__madeUpID","sementity":{"class":"instance","id":"__madeupValue","type":"Top"},"variant_list":[{"form":"DummyTopValue","inip":"0","endp":"12"}],"relevance":"100"}]}'
+        localResponse = meaningcloud.TopicsResponse(responseNoFirstNode)
+        localFirstEntityFirstNode = localResponse.getTypeFirstNode(localResponse.getOntoType(localResponse.getEntities()[0]))
+        self.assertIsNotNone(localFirstEntityFirstNode)
+        self.assertEqual(localFirstEntityFirstNode, 'Top')
+
+        # wrong_values
+        wrongFormat = self.response.getTypeLastNode('dummy_value')
+        self.assertEqual(wrongFormat, 'dummy_value')
+
+        wrongFormatArray = self.response.getTypeLastNode({'dummy_key': 'dummy_value'})
+        self.assertEqual(wrongFormatArray, "")
+
+
     def testIsUserDefined(self):
         self.assertEqual(self.response.isUserDefined(self.response.getEntities()[0]), False)
         self.assertEqual(self.response.isUserDefined(self.response.getConcepts()[0]), False)