Adding Token.from_api_repr() in language.

dhermes · dhermes · commit 44d9faa80c66 · 2016-08-29T12:59:36.000-07:00
Also fixing two small docstring typos.
diff --git a/gcloud/language/sentiment.py b/gcloud/language/sentiment.py
@@ -28,7 +28,6 @@ class Sentiment(object):
 
     See `Sentiment message`_ and `Sentiment basics`_.
 
-
     :type polarity: float
     :param polarity: Polarity of the sentiment in the ``[-1.0, 1.0]`` range.
                      Larger numbers represent more positive sentiments.
@@ -45,7 +44,7 @@ def __init__(self, polarity, magnitude):
 
     @classmethod
     def from_api_repr(cls, payload):
-        """Convert an Sentiment from the JSON API into a :class:`Sentiment`.
+        """Convert a Sentiment from the JSON API into a :class:`Sentiment`.
 
         :param payload: dict
         :type payload: The value from the backend.
diff --git a/gcloud/language/test_token.py b/gcloud/language/test_token.py
@@ -50,7 +50,7 @@ def test_constructor(self):
         part_of_speech = PartOfSpeech.DETERMINER
         edge_index = 3
         edge_label = 'PREDET'
-        lemma = 'All'
+        lemma = text_content
         token = self._makeOne(text_content, text_begin, part_of_speech,
                               edge_index, edge_label, lemma)
         self.assertEqual(token.text_content, text_content)
@@ -59,3 +59,35 @@ def test_constructor(self):
         self.assertEqual(token.edge_index, edge_index)
         self.assertEqual(token.edge_label, edge_label)
         self.assertEqual(token.lemma, lemma)
+
+    def test_from_api_repr(self):
+        from gcloud.language.token import PartOfSpeech
+
+        klass = self._getTargetClass()
+        text_content = 'pretty'
+        text_begin = -1
+        part_of_speech = PartOfSpeech.ADJECTIVE
+        edge_index = 3
+        edge_label = 'AMOD'
+        lemma = text_content
+        payload = {
+            'text': {
+                'content': text_content,
+                'beginOffset': text_begin,
+            },
+            'partOfSpeech': {
+                'tag': part_of_speech,
+            },
+            'dependencyEdge': {
+                'headTokenIndex': edge_index,
+                'label': edge_label,
+            },
+            'lemma': lemma,
+        }
+        token = klass.from_api_repr(payload)
+        self.assertEqual(token.text_content, text_content)
+        self.assertEqual(token.text_begin, text_begin)
+        self.assertEqual(token.part_of_speech, part_of_speech)
+        self.assertEqual(token.edge_index, edge_index)
+        self.assertEqual(token.edge_label, edge_label)
+        self.assertEqual(token.lemma, lemma)
diff --git a/gcloud/language/token.py b/gcloud/language/token.py
@@ -145,3 +145,24 @@ def __init__(self, text_content, text_begin, part_of_speech,
         self.edge_index = edge_index
         self.edge_label = edge_label
         self.lemma = lemma
+
+    @classmethod
+    def from_api_repr(cls, payload):
+        """Convert a token from the JSON API into a :class:`Sentiment`.
+
+        :param payload: dict
+        :type payload: The value from the backend.
+
+        :rtype: :class:`Token`
+        :returns: The token parsed from the API representation.
+        """
+        text_span = payload['text']
+        text_content = text_span['content']
+        text_begin = text_span['beginOffset']
+        part_of_speech = payload['partOfSpeech']['tag']
+        edge = payload['dependencyEdge']
+        edge_index = edge['headTokenIndex']
+        edge_label = edge['label']
+        lemma = payload['lemma']
+        return cls(text_content, text_begin, part_of_speech,
+                   edge_index, edge_label, lemma)
