Merge pull request #97 from rosette-api/WS-2589-remove-genre-from-entities-example

seth-mg · web-flow · commit 0ab6df0f0b41 · 2022-11-17T11:11:01.000-06:00
WS-2589: removing genre from doc &amp; future print_function
diff --git a/examples/address_similarity.py b/examples/address_similarity.py
@@ -2,7 +2,6 @@
 """
 Example code to call Rosette API to get match score (similarity) of two addresses.
 """
-from __future__ import print_function
 
 import argparse
 import json
@@ -36,4 +35,4 @@ def run(key, alt_url='https://api.rosette.com/rest/v1/'):
 if __name__ == '__main__':
     ARGS = PARSER.parse_args()
     RESULT = run(ARGS.key, ARGS.url)
-    print(json.dumps(RESULT, indent=2, ensure_ascii=False, sort_keys=True).encode("utf8"))
+    print(RESULT)
diff --git a/examples/categories.py b/examples/categories.py
@@ -3,7 +3,6 @@
 """
 Example code to call Rosette API to get the category of a document (at a given URL).
 """
-from __future__ import print_function
 
 import argparse
 import json
@@ -48,4 +47,4 @@ def run(key, alt_url='https://api.rosette.com/rest/v1/'):
 if __name__ == '__main__':
     ARGS = PARSER.parse_args()
     RESULT = run(ARGS.key, ARGS.url)
-    print(json.dumps(RESULT, indent=2, ensure_ascii=False, sort_keys=True).encode("utf8"))
+    print(RESULT)
diff --git a/examples/entities.py b/examples/entities.py
@@ -2,7 +2,6 @@
 """
 Example code to call Rosette API to get entities from a piece of text.
 """
-from __future__ import print_function
 
 import argparse
 import json
@@ -27,7 +26,7 @@ def run(key, alt_url='https://api.rosette.com/rest/v1/'):
     entities_text_data = "The Securities and Exchange Commission today announced the leadership of the agency’s trial unit.  Bridget Fitzpatrick has been named Chief Litigation Counsel of the SEC and David Gottesman will continue to serve as the agency’s Deputy Chief Litigation Counsel. Since December 2016, Ms. Fitzpatrick and Mr. Gottesman have served as Co-Acting Chief Litigation Counsel.  In that role, they were jointly responsible for supervising the trial unit at the agency’s Washington D.C. headquarters as well as coordinating with litigators in the SEC’s 11 regional offices around the country."
     params = DocumentParameters()
     params["content"] = entities_text_data
-    params["genre"] = "social-media"
+
     try:
         return api.entities(params)
     except RosetteException as exception:
@@ -43,4 +42,4 @@ def run(key, alt_url='https://api.rosette.com/rest/v1/'):
 if __name__ == '__main__':
     ARGS = PARSER.parse_args()
     RESULT = run(ARGS.key, ARGS.url)
-    print(json.dumps(RESULT, indent=2, ensure_ascii=False, sort_keys=True).encode("utf8"))
+    print(RESULT)
diff --git a/examples/info.py b/examples/info.py
@@ -2,7 +2,6 @@
 """
 Example code to call Rosette API to get information such as version and build
 """
-from __future__ import print_function
 
 import argparse
 import json
@@ -32,4 +31,4 @@ def run(key, alt_url='https://api.rosette.com/rest/v1/'):
 if __name__ == '__main__':
     ARGS = PARSER.parse_args()
     RESULT = run(ARGS.key, ARGS.url)
-    print(json.dumps(RESULT, indent=2, ensure_ascii=False, sort_keys=True).encode("utf8"))
+    print(RESULT)
diff --git a/examples/language.py b/examples/language.py
@@ -2,7 +2,6 @@
 """
 Example code to call Rosette API to determine the language of a piece of text.
 """
-from __future__ import print_function
 
 import argparse
 import json
@@ -36,4 +35,4 @@ def run(key, alt_url='https://api.rosette.com/rest/v1/'):
 if __name__ == '__main__':
     ARGS = PARSER.parse_args()
     RESULT = run(ARGS.key, ARGS.url)
-    print(json.dumps(RESULT, indent=2, ensure_ascii=False, sort_keys=True).encode("utf8"))
+    print(RESULT)
diff --git a/examples/language_multilingual.py b/examples/language_multilingual.py
@@ -2,7 +2,6 @@
 """
 Example code to call Rosette API to determine the language of a piece of text.
 """
-from __future__ import print_function
 
 import argparse
 import json
@@ -38,4 +37,4 @@ def run(key, alt_url='https://api.rosette.com/rest/v1/'):
 if __name__ == '__main__':
     ARGS = PARSER.parse_args()
     RESULT = run(ARGS.key, ARGS.url)
-    print(json.dumps(RESULT, indent=2, ensure_ascii=False, sort_keys=True).encode("utf8"))
+    print(RESULT)
diff --git a/examples/morphology_complete.py b/examples/morphology_complete.py
@@ -2,7 +2,6 @@
 """
 Example code to call Rosette API to get the complete morphological analysis of a piece of text.
 """
-from __future__ import print_function
 
 import argparse
 import json
@@ -42,4 +41,4 @@ def run(key, alt_url='https://api.rosette.com/rest/v1/'):
 if __name__ == '__main__':
     ARGS = PARSER.parse_args()
     RESULT = run(ARGS.key, ARGS.url)
-    print(json.dumps(RESULT, indent=2, ensure_ascii=False, sort_keys=True).encode("utf8"))
+    print(RESULT)
diff --git a/examples/morphology_compound-components.py b/examples/morphology_compound-components.py
@@ -2,7 +2,6 @@
 """
 Example code to call Rosette API to get de-compounded words from a piece of text.
 """
-from __future__ import print_function
 
 import argparse
 import json
@@ -42,4 +41,4 @@ def run(key, alt_url='https://api.rosette.com/rest/v1/'):
 if __name__ == '__main__':
     ARGS = PARSER.parse_args()
     RESULT = run(ARGS.key, ARGS.url)
-    print(json.dumps(RESULT, indent=2, ensure_ascii=False, sort_keys=True).encode("utf8"))
+    print(RESULT)
diff --git a/examples/morphology_han-readings.py b/examples/morphology_han-readings.py
@@ -2,7 +2,6 @@
 """
 Example code to call Rosette API to get Chinese readings of words in a piece of text.
 """
-from __future__ import print_function
 
 import argparse
 import json
@@ -41,4 +40,4 @@ def run(key, alt_url='https://api.rosette.com/rest/v1/'):
 if __name__ == '__main__':
     ARGS = PARSER.parse_args()
     RESULT = run(ARGS.key, ARGS.url)
-    print(json.dumps(RESULT, indent=2, ensure_ascii=False, sort_keys=True).encode("utf8"))
+    print(RESULT)
diff --git a/examples/morphology_lemmas.py b/examples/morphology_lemmas.py
@@ -2,7 +2,6 @@
 """
 Example code to call Rosette API to get lemmas for words in a piece of text.
 """
-from __future__ import print_function
 
 import argparse
 import json
@@ -42,4 +41,4 @@ def run(key, alt_url='https://api.rosette.com/rest/v1/'):
 if __name__ == '__main__':
     ARGS = PARSER.parse_args()
     RESULT = run(ARGS.key, ARGS.url)
-    print(json.dumps(RESULT, indent=2, ensure_ascii=False, sort_keys=True).encode("utf8"))
+    print(RESULT)
diff --git a/examples/morphology_parts-of-speech.py b/examples/morphology_parts-of-speech.py
@@ -2,7 +2,6 @@
 """
 Example code to call Rosette API to get part-of-speech tags for words in a piece of text.
 """
-from __future__ import print_function
 
 import argparse
 import json
@@ -42,4 +41,4 @@ def run(key, alt_url='https://api.rosette.com/rest/v1/'):
 if __name__ == '__main__':
     ARGS = PARSER.parse_args()
     RESULT = run(ARGS.key, ARGS.url)
-    print(json.dumps(RESULT, indent=2, ensure_ascii=False, sort_keys=True).encode("utf8"))
+    print(RESULT)
diff --git a/examples/name_deduplication.py b/examples/name_deduplication.py
@@ -2,7 +2,6 @@
 """
 Example code to call Rosette API to deduplicate a list of names.
 """
-from __future__ import print_function
 
 import argparse
 import json
@@ -37,4 +36,4 @@ def run(key, alt_url='https://api.rosette.com/rest/v1/'):
 if __name__ == '__main__':
     ARGS = PARSER.parse_args()
     RESULT = run(ARGS.key, ARGS.url)
-    print(json.dumps(RESULT, indent=2, ensure_ascii=False, sort_keys=True).encode("utf8"))
+    print(RESULT)
diff --git a/examples/name_similarity.py b/examples/name_similarity.py
@@ -2,7 +2,6 @@
 """
 Example code to call Rosette API to get match score (similarity) of two names.
 """
-from __future__ import print_function
 
 import argparse
 import json
@@ -37,4 +36,4 @@ def run(key, alt_url='https://api.rosette.com/rest/v1/'):
 if __name__ == '__main__':
     ARGS = PARSER.parse_args()
     RESULT = run(ARGS.key, ARGS.url)
-    print(json.dumps(RESULT, indent=2, ensure_ascii=False, sort_keys=True).encode("utf8"))
+    print(RESULT)
diff --git a/examples/name_translation.py b/examples/name_translation.py
@@ -2,7 +2,6 @@
 """
 Example code to call Rosette API to translate a name from one language to another.
 """
-from __future__ import print_function
 
 import argparse
 import json
@@ -38,4 +37,4 @@ def run(key, alt_url='https://api.rosette.com/rest/v1/'):
 if __name__ == '__main__':
     ARGS = PARSER.parse_args()
     RESULT = run(ARGS.key, ARGS.url)
-    print(json.dumps(RESULT, indent=2, ensure_ascii=False, sort_keys=True).encode("utf8"))
+    print(RESULT)
diff --git a/examples/ping.py b/examples/ping.py
@@ -2,7 +2,6 @@
 """
 Example code to send Rosette API a ping to check its reachability.
 """
-from __future__ import print_function
 
 import argparse
 import json
@@ -32,4 +31,4 @@ def run(key, alt_url='https://api.rosette.com/rest/v1/'):
 if __name__ == '__main__':
     ARGS = PARSER.parse_args()
     RESULT = run(ARGS.key, ARGS.url)
-    print(json.dumps(RESULT, indent=2, ensure_ascii=False, sort_keys=True).encode("utf8"))
+    print(RESULT)
diff --git a/examples/relationships.py b/examples/relationships.py
@@ -2,7 +2,6 @@
 """
 Example code to call Rosette API to get entities's relationships from a piece of text.
 """
-from __future__ import print_function
 
 import argparse
 import json
@@ -34,4 +33,4 @@ def run(key, alt_url='https://api.rosette.com/rest/v1/'):
 if __name__ == '__main__':
     ARGS = PARSER.parse_args()
     RESULT = run(ARGS.key, ARGS.url)
-    print(json.dumps(RESULT, indent=2, ensure_ascii=False, sort_keys=True).encode("utf8"))
+    print(RESULT)
diff --git a/examples/semantic_vectors.py b/examples/semantic_vectors.py
@@ -2,7 +2,6 @@
 """
 Example code to call Rosette API to get text vectors from a piece of text.
 """
-from __future__ import print_function
 
 import argparse
 import json
@@ -42,5 +41,4 @@ def run(key, alt_url='https://api.rosette.com/rest/v1/'):
 if __name__ == '__main__':
     ARGS = PARSER.parse_args()
     RESULT = run(ARGS.key, ARGS.url)
-    print(json.dumps(RESULT, indent=2, ensure_ascii=False,
-                     sort_keys=True).encode("utf8"))
+    print(RESULT)
diff --git a/examples/sentences.py b/examples/sentences.py
@@ -2,7 +2,6 @@
 """
 Example code to call Rosette API to get sentences in a piece of text.
 """
-from __future__ import print_function
 
 import argparse
 import json
@@ -36,4 +35,4 @@ def run(key, alt_url='https://api.rosette.com/rest/v1/'):
 if __name__ == '__main__':
     ARGS = PARSER.parse_args()
     RESULT = run(ARGS.key, ARGS.url)
-    print(json.dumps(RESULT, indent=2, ensure_ascii=False, sort_keys=True).encode("utf8"))
+    print(RESULT)
diff --git a/examples/sentiment.py b/examples/sentiment.py
@@ -3,7 +3,6 @@
 """
 Example code to call Rosette API to get the sentiment of a local file.
 """
-from __future__ import print_function
 
 import argparse
 import json
@@ -57,5 +56,4 @@ def run(key, alt_url='https://api.rosette.com/rest/v1/'):
 if __name__ == '__main__':
     ARGS = PARSER.parse_args()
     RESULT = run(ARGS.key, ARGS.url)
-    print(json.dumps(RESULT, indent=2, ensure_ascii=False,
-                     sort_keys=True).encode("utf8"))
+    print(RESULT)
diff --git a/examples/similar_terms.py b/examples/similar_terms.py
@@ -2,7 +2,6 @@
 """
 Example code to call Rosette API to get similar terms for an input.
 """
-from __future__ import print_function
 
 import argparse
 import json
@@ -42,5 +41,4 @@ def run(key, alt_url='https://api.rosette.com/rest/v1/'):
 if __name__ == '__main__':
     ARGS = PARSER.parse_args()
     RESULT = run(ARGS.key, ARGS.url)
-    print(json.dumps(RESULT, indent=2, ensure_ascii=False,
-                     sort_keys=True).encode("utf8"))
+    print(RESULT)
diff --git a/examples/syntax_dependencies.py b/examples/syntax_dependencies.py
@@ -2,7 +2,6 @@
 """
 Example code to call Rosette API to get the syntactic dependencies of a document (at a given URL).
 """
-from __future__ import print_function
 
 import argparse
 import json
@@ -34,5 +33,4 @@ def run(key, alt_url='https://api.rosette.com/rest/v1/'):
 if __name__ == '__main__':
     ARGS = PARSER.parse_args()
     RESULT = run(ARGS.key, ARGS.url)
-    print(json.dumps(RESULT, indent=2, ensure_ascii=False,
-                     sort_keys=True).encode("utf8"))
+    print(RESULT)
diff --git a/examples/tokens.py b/examples/tokens.py
@@ -2,7 +2,6 @@
 """
 Example code to call Rosette API to get the tokens (words) in a piece of text.
 """
-from __future__ import print_function
 
 import argparse
 import json
@@ -42,4 +41,4 @@ def run(key, alt_url='https://api.rosette.com/rest/v1/'):
 if __name__ == '__main__':
     ARGS = PARSER.parse_args()
     RESULT = run(ARGS.key, ARGS.url)
-    print(json.dumps(RESULT, indent=2, ensure_ascii=False, sort_keys=True).encode("utf8"))
+    print(RESULT)
diff --git a/examples/topics.py b/examples/topics.py
@@ -2,7 +2,6 @@
 """
 Example code to call Rosette API to get the topics (key phrases and concepts) in a piece of text.
 """
-from __future__ import print_function
 
 import argparse
 import json
@@ -43,4 +42,4 @@ def run(key, alt_url='https://api.rosette.com/rest/v1/'):
 if __name__ == '__main__':
     ARGS = PARSER.parse_args()
     RESULT = run(ARGS.key, ARGS.url)
-    print(json.dumps(RESULT, indent=2, ensure_ascii=False, sort_keys=True).encode("utf8"))
+    print(RESULT)
diff --git a/examples/transliteration.py b/examples/transliteration.py
@@ -2,7 +2,6 @@
 """
 Example code to call Rosette API to transliterate a piece of text.
 """
-from __future__ import print_function
 
 import argparse
 import json
@@ -44,5 +43,4 @@ def run(key, alt_url='https://api.rosette.com/rest/v1/'):
 if __name__ == '__main__':
     ARGS = PARSER.parse_args()
     RESULT = run(ARGS.key, ARGS.url)
-    print(json.dumps(RESULT, indent=2, ensure_ascii=False,
-                     sort_keys=True).encode("utf8"))
+    print(RESULT)
diff --git a/rosette/api.py b/rosette/api.py
@@ -153,12 +153,14 @@ class DocumentParameters(_DocumentParamSetBase):
     def __init__(self):
         """Create a L{DocumentParameters} object."""
         _DocumentParamSetBase.__init__(
-            self, ("content", "contentUri", "language", "genre", "profileId"))
+            self, ("content", "contentUri", "genre", "language", "profileId"))
         self.file_name = ""
         self.use_multipart = False
 
     def validate(self):
         """Internal. Do not use."""
+        if self["genre"] is not None:
+            warnings.warn("genre is deprecated and will be removed in the next release.")
         if self["content"] is None:
             if self["contentUri"] is None:
                 raise RosetteException(
@@ -236,8 +238,7 @@ def __init__(self):
              "sourceLanguageOfUse",
              "sourceScript",
              "targetScript",
-             "targetScheme",
-             "genre"))
+             "targetScheme"))
 
     def validate(self):
         """Internal. Do not use."""
