Fixed some code problems

.gitlab-ci.yml

@@ -31,19 +31,29 @@ test-2.7:
   variables:
     PYTHON_VERSION: "2.7"
 
-push:
+.image: &image_definition
   stage: push
   script:
-    - make -e push
+    - make -e push-$PYTHON_VERSION
   only:
     - tags
     - triggers
     - fix-makefiles
 
+push-3.5:
+  <<: *image_definition
+  variables:
+    PYTHON_VERSION: "3.5"
+
+push-2.7:
+  <<: *image_definition
+  variables:
+    PYTHON_VERSION: "2.7"
+
 push-latest:
-  stage: push
-  script:
-    - make -e push-latest
+  <<: *image_definition
+  variables:
+    PYTHON_VERSION: latest
   only:
     - master
     - triggers

.makefiles/git.mk

@@ -22,4 +22,7 @@ else
 	rm $(KEY_FILE)
 endif
 
-.PHONY:: commit tag git-push git-pull push-github 
+push:: git-push
+pull:: git-pull
+
+.PHONY:: commit tag push git-push git-pull push-github 

.makefiles/makefiles.mk

@@ -1,15 +1,17 @@
 makefiles-remote:
-	git ls-remote --exit-code  makefiles 2> /dev/null || git remote add makefiles ssh://git@lab.cluster.gsi.dit.upm.es:2200/docs/templates/makefiles.git
+	@git remote add makefiles ssh://git@lab.cluster.gsi.dit.upm.es:2200/docs/templates/makefiles.git 2>/dev/null || true
 
 makefiles-commit: makefiles-remote
 	git add -f .makefiles
 	git commit -em "Updated makefiles from ${NAME}"
 
 makefiles-push:
-	git fetch makefiles $(NAME)
 	git subtree push --prefix=.makefiles/ makefiles $(NAME)
 
 makefiles-pull: makefiles-remote
 	git subtree pull --prefix=.makefiles/ makefiles master --squash
 
-.PHONY:: makefiles-remote makefiles-commit makefiles-push makefiles-pull
+pull:: makefiles-pull
+push:: makefiles-push
+
+.PHONY:: makefiles-remote makefiles-commit makefiles-push makefiles-pull pull push

example-plugins/async_plugin.py

@@ -11,7 +11,7 @@ class Async(AnalysisPlugin):
     '''An example of an asynchronous module'''
     author = '@balkian'
     version = '0.2'
-    sync = False
+    async = True
 
     def _do_async(self, num_processes):
         pool = multiprocessing.Pool(processes=num_processes)

senpy/api.py

@@ -175,8 +175,8 @@ def parse_params(indict, *specs):
             parameters=outdict,
             errors=wrong_params)
         raise message
-    if 'algorithm' in outdict and not isinstance(outdict['algorithm'], tuple):
-        outdict['algorithm'] = tuple(outdict['algorithm'].split(','))
+    if 'algorithm' in outdict and not isinstance(outdict['algorithm'], list):
+        outdict['algorithm'] = list(outdict['algorithm'].split(','))
     return outdict
 
 

senpy/blueprints.py

@@ -69,7 +69,7 @@ def encoded_url(url=None, base=None):
         if request.method == 'GET':
             url = request.full_path[1:]  # Remove the first slash
         else:
-            hash(frozenset(tuple(request.parameters.items())))
+            hash(frozenset(request.form.params().items()))
             code = 'hash:{}'.format(hash)
 
     code = code or base64.urlsafe_b64encode(url.encode()).decode()
@@ -196,7 +196,7 @@ def api_root(plugin):
     if plugin:
         plugin = plugin.replace('+', '/')
         plugin = plugin.split('/')
-        req.parameters['algorithm'] = tuple(plugin)
+        req.parameters['algorithm'] = plugin
     return current_app.senpy.analyse(req)
 
 

senpy/client.py

@@ -25,11 +25,7 @@ class Client(object):
 
     def request(self, path=None, method='GET', **params):
         url = '{}{}'.format(self.endpoint.rstrip('/'), path)
-        if method == 'POST':
-            response = requests.post(url=url, data=params)
-        else:
-            response = requests.request(method=method, url=url, params=params)
-
+        response = requests.request(method=method, url=url, params=params)
         try:
             resp = models.from_dict(response.json())
         except Exception as ex:

senpy/extensions.py

@@ -351,7 +351,7 @@ class Senpy(object):
 
         logger.info("Activating plugin: {}".format(plugin.name))
 
-        if sync or not getattr(plugin, 'async', True) or getattr(plugin, 'sync', False):
+        if sync or not getattr(plugin, 'async', True):
             return self._activate(plugin)
         else:
             th = Thread(target=partial(self._activate, plugin))
@@ -374,7 +374,7 @@ class Senpy(object):
 
         self._set_active(plugin, False)
 
-        if sync or not getattr(plugin, 'async', True) or not getattr(plugin, 'sync', False):
+        if sync or not getattr(plugin, 'async', True):
             self._deactivate(plugin)
         else:
             th = Thread(target=partial(self._deactivate, plugin))

senpy/gsitk_compat.py

@@ -1,7 +1,5 @@
 import logging
 
-from pkg_resources import parse_version, get_distribution, DistributionNotFound
-
 logger = logging.getLogger(__name__)
 
 MSG = 'GSITK is not (properly) installed.'
@@ -14,18 +12,12 @@ def raise_exception(*args, **kwargs):
 
 
 try:
-    gsitk_distro = get_distribution("gsitk")
-    GSITK_VERSION = parse_version(gsitk_distro.version)
-    GSITK_AVAILABLE = GSITK_VERSION > parse_version("0.1.9.1")  # Earlier versions have a bug
-except DistributionNotFound:
-    GSITK_AVAILABLE = False
-    GSITK_VERSION = ()
-
-if GSITK_AVAILABLE:
     from gsitk.datasets.datasets import DatasetManager
     from gsitk.evaluation.evaluation import Evaluation as Eval
     from sklearn.pipeline import Pipeline
+    GSITK_AVAILABLE = True
     modules = locals()
-else:
-    logger.warning(IMPORTMSG)
+except ImportError:
+    logger.warn(IMPORTMSG)
+    GSITK_AVAILABLE = False
     DatasetManager = Eval = Pipeline = raise_exception

senpy/plugins/emotion/maxSentiment_plugin.py

@@ -0,0 +1,187 @@
+from senpy import AnalysisPlugin, easy
+
+
+class maxSentiment(AnalysisPlugin):
+    '''Plugin to extract max emotion from a multi-empotion set'''
+    author = '@dsuarezsouto'
+    version = '0.1'
+
+    extra_params = {
+        'max': {
+            "aliases": ["maximum", "max"],
+            'required': True,
+            'options': [True, False],
+            "@id": 'maxSentiment',
+            'default': False
+        }
+    }
+
+    def analyse_entry(self, entry, params):
+        if not params["max"]:
+            yield entry
+            return
+
+        set_emotions= entry.emotions[0]['onyx:hasEmotion']  
+        max_emotion =set_emotions[0]
+     
+        # Extract max emotion from the set emotions (emotion with highest intensity)
+        for tmp_emotion in set_emotions:
+            if tmp_emotion['onyx:hasEmotionIntensity']>max_emotion['onyx:hasEmotionIntensity']:
+                max_emotion=tmp_emotion
+
+        if max_emotion['onyx:hasEmotionIntensity'] == 0:
+            max_emotion['onyx:hasEmotionCategory'] = "neutral"
+            max_emotion['onyx:hasEmotionIntensity'] = 1.0
+
+        entry.emotions[0]['onyx:hasEmotion'] = [max_emotion]
+        
+        
+        
+        entry.emotions[0]['prov:wasGeneratedBy'] = "maxSentiment"
+        #print(entry)
+        yield entry
+
+    # Test Cases:
+    #   1 Normal Situation.
+    #   2 Case to return a Neutral Emotion.
+    test_cases = [{
+        "entry": {
+            "@type": "entry",
+            "emotions": [
+                {
+                    "@id": "Emotions0",
+                    "@type": "emotionSet",
+                    "onyx:hasEmotion": [
+                        {
+                            "@id": "_:Emotion_1538121033.74",
+                            "@type": "emotion",
+                            "onyx:hasEmotionCategory": "anger",
+                            "onyx:hasEmotionIntensity": 0
+                        },
+                        {
+                            "@id": "_:Emotion_1538121033.74",
+                            "@type": "emotion",
+                            "onyx:hasEmotionCategory": "joy",
+                            "onyx:hasEmotionIntensity": 0.3333333333333333
+                        },
+                        {
+                            "@id": "_:Emotion_1538121033.74",
+                            "@type": "emotion",
+                            "onyx:hasEmotionCategory": "negative-fear",
+                            "onyx:hasEmotionIntensity": 0
+                        },
+                        {
+                            "@id": "_:Emotion_1538121033.74",
+                            "@type": "emotion",
+                            "onyx:hasEmotionCategory": "sadness",
+                            "onyx:hasEmotionIntensity": 0
+                        },
+                        {
+                            "@id": "_:Emotion_1538121033.74",
+                            "@type": "emotion",
+                            "onyx:hasEmotionCategory": "disgust",
+                            "onyx:hasEmotionIntensity": 0
+                        }
+                    ]
+
+                },
+            ],
+            "nif:isString": "This text makes me sad.\nwhilst this text makes me happy and surprised at the same time.\nI cannot believe it!"
+        },
+        'params': {
+            'max': True
+        },
+        'expected' : {
+            "@type": "entry",
+            "emotions": [
+                {
+                    "@id": "Emotions0",
+                    "@type": "emotionSet",
+                    "onyx:hasEmotion": [
+                        {
+                            "@id": "_:Emotion_1538121033.74",
+                            "@type": "emotion",
+                            "onyx:hasEmotionCategory": "joy",
+                            "onyx:hasEmotionIntensity": 0.3333333333333333
+                        }
+                    ],
+                    "prov:wasGeneratedBy" : 'maxSentiment'
+                }
+            ],
+            "nif:isString": "This text makes me sad.\nwhilst this text makes me happy and surprised at the same time.\nI cannot believe it!"
+        }
+    },
+    {
+        "entry": {
+            "@type": "entry",
+            "emotions": [
+                {
+                    "@id": "Emotions0",
+                    "@type": "emotionSet",
+                    "onyx:hasEmotion": [
+                        {
+                            "@id": "_:Emotion_1538121033.74",
+                            "@type": "emotion",
+                            "onyx:hasEmotionCategory": "anger",
+                            "onyx:hasEmotionIntensity": 0
+                        },
+                        {
+                            "@id": "_:Emotion_1538121033.74",
+                            "@type": "emotion",
+                            "onyx:hasEmotionCategory": "joy",
+                            "onyx:hasEmotionIntensity": 0
+                        },
+                        {
+                            "@id": "_:Emotion_1538121033.74",
+                            "@type": "emotion",
+                            "onyx:hasEmotionCategory": "negative-fear",
+                            "onyx:hasEmotionIntensity": 0
+                        },
+                        {
+                            "@id": "_:Emotion_1538121033.74",
+                            "@type": "emotion",
+                            "onyx:hasEmotionCategory": "sadness",
+                            "onyx:hasEmotionIntensity": 0
+                        },
+                        {
+                            "@id": "_:Emotion_1538121033.74",
+                            "@type": "emotion",
+                            "onyx:hasEmotionCategory": "disgust",
+                            "onyx:hasEmotionIntensity": 0
+                        }
+                    ]
+
+                }
+            ],
+            "nif:isString": "This text makes me sad.\nwhilst this text makes me happy and surprised at the same time.\nI cannot believe it!"
+        },
+        'params': {
+            'max': True
+        },
+        'expected' : {
+
+            "@type": "entry",
+            "emotions": [
+                {
+                    "@id": "Emotions0",
+                    "@type": "emotionSet",
+                    "onyx:hasEmotion": [
+                        {
+                            "@id": "_:Emotion_1538121033.74",
+                            "@type": "emotion",
+                            "onyx:hasEmotionCategory": "neutral",
+                            "onyx:hasEmotionIntensity": 1
+                        }
+                    ],
+                    "prov:wasGeneratedBy" : 'maxSentiment'
+                }
+            ],
+            "nif:isString": "This text makes me sad.\nwhilst this text makes me happy and surprised at the same time.\nI cannot believe it!"
+        }
+    
+    }]
+
+
+if __name__ == '__main__':
+    easy()
+

tests/test_blueprints.py

@@ -67,21 +67,6 @@ class BlueprintsTest(TestCase):
         logging.debug("Got response: %s", js)
         assert "@context" in js
         assert "entries" in js
-        assert len(js['analysis']) == 1
-
-    def test_analysis_post(self):
-        """
-        The results for a POST request should be the same as for a GET request.
-        """
-        resp = self.client.post("/api/", data={'i': 'My aloha mohame',
-                                               'algorithm': 'rand',
-                                               'with_parameters': True})
-        self.assertCode(resp, 200)
-        js = parse_resp(resp)
-        logging.debug("Got response: %s", js)
-        assert "@context" in js
-        assert "entries" in js
-        assert len(js['analysis']) == 1
 
     def test_analysis_extra(self):
         """

tests/test_client.py

@@ -24,19 +24,6 @@ class ModelsTest(TestCase):
             except Error:
                 pass
 
-    def test_client_post(self):
-        endpoint = 'http://dummy/'
-        client = Client(endpoint)
-        with patch_requests('http://dummy/', Results()):
-            resp = client.analyse('hello')
-            assert isinstance(resp, Results)
-        with patch_requests('http://dummy/', Error('Nothing'), method='POST'):
-            try:
-                client.analyse(input='hello', method='POST', algorithm='NONEXISTENT')
-                raise Exception('Exceptions should be raised. This is not golang')
-            except Error:
-                pass
-
     def test_plugins(self):
         endpoint = 'http://dummy/'
         client = Client(endpoint)

tests/test_plugins.py

@@ -1,15 +1,15 @@
 #!/bin/env python
 
 import os
+import sys
 import pickle
 import shutil
 import tempfile
 
-from unittest import TestCase, skipIf
+from unittest import TestCase
 from senpy.models import Results, Entry, EmotionSet, Emotion, Plugins
 from senpy import plugins
 from senpy.plugins.conversion.emotion.centroids import CentroidConversion
-from senpy.gsitk_compat import GSITK_AVAILABLE
 
 import pandas as pd
 
@@ -346,15 +346,13 @@ class PluginsTest(TestCase):
         smart_metrics = results[0].metrics[0]
         assert abs(smart_metrics['accuracy'] - 1) < 0.01
 
-    @skipIf(not GSITK_AVAILABLE, "GSITK is not available")
     def test_evaluation(self):
-        self._test_evaluation()
-
-    @skipIf(GSITK_AVAILABLE, "GSITK is available")
-    def test_evaluation_unavailable(self):
-        with self.assertRaises(Exception) as context:
+        if sys.version_info < (3, 0):
+            with self.assertRaises(Exception) as context:
+                self._test_evaluation()
+            self.assertTrue('GSITK ' in str(context.exception))
+        else:
             self._test_evaluation()
-        self.assertTrue('GSITK ' in str(context.exception))
 
 
 def make_mini_test(fpath):