Modified examples to new format

Chris Park · Chris Park · commit 19366573a3a7 · 2016-01-26T14:14:34.000-05:00
diff --git a/examples/__init__.py b/examples/__init__.py
diff --git a/examples/base64_input.py b/examples/base64_input.py
@@ -9,16 +9,16 @@
 import os
 import base64
 
-from rosette.api import API, DocumentParameters
+from rosette.api import API, DocumentParameters, DataFormat
 
 
 def run(key, altUrl='https://api.rosette.com/rest/v1/'):
     # Create an API instance
     api = API(user_key=key, service_url=altUrl)
     params = DocumentParameters()
-    text = base64.b64encode(u"Bill Murray will appear in new Ghostbusters film: Dr. Peter Venkman was spotted filming a cameo in Boston this… http://dlvr.it/BnsFfS ")
-    params["content"] = text
-    params["contentType"] = "text/html"
+    entities_text_data = "Bill Murray will appear in new Ghostbusters film: Dr. Peter Venkman was spotted filming a cameo in Boston this… http://dlvr.it/BnsFfS"
+    params["content"] = entities_text_data
+    params["contentType"] = DataFormat.UNSPECIFIED
     return api.entities(params)  # entity linking is turned off
 
 parser = argparse.ArgumentParser(formatter_class=argparse.ArgumentDefaultsHelpFormatter, description='Calls the ' + os.path.splitext(os.path.basename(__file__))[0] + ' endpoint')
diff --git a/examples/categories.py b/examples/categories.py
@@ -12,7 +12,8 @@
 
 
 def run(key, altUrl='https://api.rosette.com/rest/v1/'):
-    url = "Sony Pictures is planning to shoot a good portion of the new "Ghostbusters" in Boston as well."
+    categories_url_data = "http://www.onlocationvacations.com/2015/03/05/the-new-ghostbusters-movie-begins-filming-in-boston-in-june/"
+    url = categories_url_data
     # Create an API instance
     api = API(user_key=key, service_url=altUrl)
     params = DocumentParameters()
diff --git a/examples/entities.py b/examples/entities.py
@@ -14,8 +14,9 @@
 def run(key, altUrl='https://api.rosette.com/rest/v1/'):
     # Create an API instance
     api = API(user_key=key, service_url=altUrl)
+    entities_text_data = "Bill Murray will appear in new Ghostbusters film: Dr. Peter Venkman was spotted filming a cameo in Boston this… http://dlvr.it/BnsFfS"
     params = DocumentParameters()
-    params["content"] = u"Bill Murray will appear in new Ghostbusters film: Dr. Peter Venkman was spotted filming a cameo in Boston this… http://dlvr.it/BnsFfS "
+    params["content"] = entities_text_data
     return api.entities(params)  # entity linking is turned off
 
 parser = argparse.ArgumentParser(formatter_class=argparse.ArgumentDefaultsHelpFormatter, description='Calls the ' + os.path.splitext(os.path.basename(__file__))[0] + ' endpoint')
diff --git a/examples/entities_linked.py b/examples/entities_linked.py
@@ -15,8 +15,9 @@ def run(key, altUrl='https://api.rosette.com/rest/v1/'):
     # Create an API instance
     api = API(user_key=key, service_url=altUrl)
 
+    entities_linked_text_data = "Last month director Paul Feig announced the movie will have an all-star female cast including Kristen Wiig, Melissa McCarthy, Leslie Jones and Kate McKinnon."
     params = DocumentParameters()
-    params["content"] = u"Last month director Paul Feig announced the movie will have an all-star female cast including Kristen Wiig, Melissa McCarthy, Leslie Jones and Kate McKinnon."
+    params["content"] = entities_linked_text_data
     return api.entities(params, True)  # entity linking is turned on
 
 
diff --git a/examples/language.py b/examples/language.py
@@ -15,9 +15,10 @@ def run(key, altUrl='https://api.rosette.com/rest/v1/'):
     # Create an API instance
     api = API(user_key=key, service_url=altUrl)
 
+    language_data = "Por favor Señorita, says the man."
     params = DocumentParameters()
 
-    params["content"] = u"Por favor Señorita, says the man."
+    params["content"] = language_data
     return api.language(params)
 
 
diff --git a/examples/matched-name.py b/examples/matched-name.py
@@ -15,9 +15,11 @@ def run(key, altUrl='https://api.rosette.com/rest/v1/'):
     # Create an API instance
     api = API(user_key=key, service_url=altUrl)
 
+    matched_name_data1 = "Michael Jackson"
+    matched_name_data2 = "迈克尔·杰克逊"
     params = NameMatchingParameters()
-    params["name1"] = {"text": "Michael Jackson", "language": "eng", "entityType": "PERSON"}
-    params["name2"] = {"text": "迈克尔·杰克逊", "entityType": "PERSON"}
+    params["name1"] = {"text": matched_name_data1, "language": "eng", "entityType": "PERSON"}
+    params["name2"] = {"text": matched_name_data2, "entityType": "PERSON"}
     return api.matched_name(params)
 
 
diff --git a/examples/morphology_complete.py b/examples/morphology_complete.py
@@ -15,8 +15,9 @@ def run(key, altUrl='https://api.rosette.com/rest/v1/'):
     # Create an API instance
     api = API(user_key=key, service_url=altUrl)
 
+    morphology_complete_data = "The quick brown fox jumped over the lazy dog. Yes he did."
     params = DocumentParameters()
-    params["content"] = u"The quick brown fox jumped over the lazy dog. Yes he did."
+    params["content"] = morphology_complete_data
     return api.morphology(params)
 
 
diff --git a/examples/morphology_compound-components.py b/examples/morphology_compound-components.py
@@ -15,8 +15,9 @@ def run(key, altUrl='https://api.rosette.com/rest/v1/'):
     # Create an API instance
     api = API(user_key=key, service_url=altUrl)
 
+    morphology_compound_components_data = "Rechtsschutzversicherungsgesellschaften"
     params = DocumentParameters()
-    params["content"] = u"Rechtsschutzversicherungsgesellschaften"
+    params["content"] = morphology_compound_components_data
     return api.morphology(params, MorphologyOutput.COMPOUND_COMPONENTS)
 
 
diff --git a/examples/morphology_han-readings.py b/examples/morphology_han-readings.py
@@ -15,8 +15,9 @@ def run(key, altUrl='https://api.rosette.com/rest/v1/'):
     # Create an API instance
     api = API(user_key=key, service_url=altUrl)
 
+    morphology_han_readings_data = "北京大学生物系主任办公室内部会议"
     params = DocumentParameters()
-    params["content"] = u"北京大学生物系主任办公室内部会议"
+    params["content"] = morphology_han_readings_data
     return api.morphology(params, MorphologyOutput.HAN_READINGS)
 
 
diff --git a/examples/morphology_lemmas.py b/examples/morphology_lemmas.py
@@ -15,8 +15,9 @@ def run(key, altUrl='https://api.rosette.com/rest/v1/'):
     # Create an API instance
     api = API(user_key=key, service_url=altUrl)
 
+    morphology_lemmas_data = "The fact is that the geese just went back to get a rest and I'm not banking on their return soon"
     params = DocumentParameters()
-    params["content"] = u"The fact is that the geese just went back to get a rest and I'm not banking on their return soon"
+    params["content"] = morphology_lemmas_data
     return api.morphology(params, MorphologyOutput.LEMMAS)
 
 
diff --git a/examples/morphology_parts-of-speech.py b/examples/morphology_parts-of-speech.py
@@ -15,8 +15,9 @@ def run(key, altUrl='https://api.rosette.com/rest/v1/'):
     # Create an API instance
     api = API(user_key=key, service_url=altUrl)
 
+    morphology_parts_of_speech_data = "The fact is that the geese just went back to get a rest and I'm not banking on their return soon"
     params = DocumentParameters()
-    params["content"] = u"The fact is that the geese just went back to get a rest and I'm not banking on their return soon"
+    params["content"] = morphology_parts_of_speech_data
     return api.morphology(params, MorphologyOutput.PARTS_OF_SPEECH)
 
 
diff --git a/examples/relationships.py b/examples/relationships.py
@@ -14,8 +14,9 @@
 def run(key, altUrl='https://api.rosette.com/rest/v1/'):
     # Create an API instance
     api = API(user_key=key, service_url=altUrl)
+    relationships_text_data = "Bill Murray is in the new Ghostbusters film!"
     params = RelationshipsParameters()
-    params["content"] = u"Bill Murray is in the new Ghostbusters film!"
+    params["content"] = relationships_text_data
     params["options"] = {"accuracyMode": "PRECISION"}
     return api.relationships(params)
 
diff --git a/examples/sentences.py b/examples/sentences.py
@@ -15,8 +15,9 @@ def run(key, altUrl='https://api.rosette.com/rest/v1/'):
     # Create an API instance
     api = API(user_key=key, service_url=altUrl)
 
+    sentences_data = "This land is your land. This land is my land\nFrom California to the New York island;\nFrom the red wood forest to the Gulf Stream waters\n\nThis land was made for you and Me.\n\nAs I was walking that ribbon of highway,\nI saw above me that endless skyway:\nI saw below me that golden valley:\nThis land was made for you and me."
     params = DocumentParameters()
-    params["content"] = u"This land is your land. This land is my land\nFrom California to the New York island;\nFrom the red wood forest to the Gulf Stream waters\n\nThis land was made for you and Me.\n\nAs I was walking that ribbon of highway,\nI saw above me that endless skyway:\nI saw below me that golden valley:\nThis land was made for you and me."
+    params["content"] = sentences_data
 
     return api.sentences(params)
 
diff --git a/examples/sentiment.py b/examples/sentiment.py
@@ -15,7 +15,8 @@
 def run(key, altUrl='https://api.rosette.com/rest/v1/'):
     # Create default file to read from
     f = tempfile.NamedTemporaryFile(suffix=".html")
-    message = "<html><head><title>New Ghostbusters Film</title></head><body><p>Original Ghostbuster Dan Aykroyd, who also co-wrote the 1984 Ghostbusters film, couldn’t be more pleased with the new all-female Ghostbusters cast, telling The Hollywood Reporter, “The Aykroyd family is delighted by this inheritance of the Ghostbusters torch by these most magnificent women in comedy.”</p></body></html>"
+    sentiment_file_data = "<html><head><title>New Ghostbusters Film</title></head><body><p>Original Ghostbuster Dan Aykroyd, who also co-wrote the 1984 Ghostbusters film, couldn’t be more pleased with the new all-female Ghostbusters cast, telling The Hollywood Reporter, “The Aykroyd family is delighted by this inheritance of the Ghostbusters torch by these most magnificent women in comedy.”</p></body></html>"
+    message = sentiment_file_data
     f.write(message)
     f.seek(0)
 
diff --git a/examples/tokens.py b/examples/tokens.py
@@ -15,8 +15,9 @@ def run(key, altUrl='https://api.rosette.com/rest/v1/'):
     # Create an API instance
     api = API(user_key=key, service_url=altUrl)
 
+    tokens_data = "北京大学生物系主任办公室内部会议"
     params = DocumentParameters()
-    params["content"] = u"北京大学生物系主任办公室内部会议"
+    params["content"] = tokens_data
     return api.tokens(params)
 
 
diff --git a/examples/translated-name.py b/examples/translated-name.py
@@ -15,8 +15,9 @@ def run(key, altUrl='https://api.rosette.com/rest/v1/'):
     # Create an API instance
     api = API(user_key=key, service_url=altUrl)
 
+    translated_name_data = "معمر محمد أبو منيار القذاف"
     params = NameTranslationParameters()
-    params["name"] = u"معمر محمد أبو منيار القذاف"
+    params["name"] = translated_name_data
     params["entityType"] = "PERSON"
     params["targetLanguage"] = "eng"
     return api.translated_name(params)
