Switch to v3 api

Author: laurynas

detectlanguage/__init__.py

@@ -3,7 +3,7 @@
 from .exceptions import *
 from .configuration import Configuration
 from .client import Client
-from .api import simple_detect, detect, user_status, languages
+from .api import detect, detect_code, detect_batch, account_status, languages
 
 configuration = Configuration()
 client = Client(configuration)

detectlanguage/api.py

@@ -1,15 +1,20 @@
 import detectlanguage
 
 def detect(data):
-	result = detectlanguage.client.post('detect', { 'q': data })
-	return result['data']['detections']
+	if isinstance(data, list):
+		raise ValueError('use detect_batch instead for multiple texts')
 
-def simple_detect(data):
+	return detectlanguage.client.post('detect', { 'q': data })
+
+def detect_code(data):
 	result = detect(data)
 	return result[0]['language']
 
-def user_status():
-	return detectlanguage.client.get('user/status')
+def detect_batch(data):
+	return detectlanguage.client.post('detect-batch', { 'q': data })
+
+def account_status():
+	return detectlanguage.client.get('account/status')
 
 def languages():
 	return detectlanguage.client.get('languages')

detectlanguage/client.py

@@ -42,10 +42,7 @@ def handle_http_error(self, r, err):
 			raise DetectLanguageError(err)
 
 	def url(self, path):
-		return "%s://%s/%s/%s" % (self.protocol(), self.configuration.host, self.configuration.api_version, path)
-
-	def protocol(self):
-		return 'https' if self.configuration.secure else 'http'
+		return "https://%s/%s/%s" % (self.configuration.host, self.configuration.api_version, path)
 
 	def headers(self):
 		return {

detectlanguage/configuration.py

@@ -2,8 +2,7 @@
 
 class Configuration:
 	api_key = None
-	api_version = '0.2'
+	api_version = 'v3'
 	host = 'ws.detectlanguage.com'
 	user_agent = 'Detect Language API Python Client ' + detectlanguage.__version__
-	secure = False
 	timeout = 5

tests/test_api.py

@@ -8,36 +8,34 @@ class TestApi:
 	def setup_method(self):
 		detectlanguage.configuration.api_key = os.environ['DETECTLANGUAGE_API_KEY']
 
-	def test_simple_detect(self):
-		result = detectlanguage.simple_detect("Hello world")
+	def test_detect_code(self):
+		result = detectlanguage.detect_code("Hello world")
 		assert result == 'en'
 
 	def test_detect(self):
 		result = detectlanguage.detect("Hello world")
 		assert result[0]['language'] == 'en'
 
+	def test_detect_with_array(self):
+		with pytest.raises(ValueError):
+			detectlanguage.detect(["Hello world", "Ėjo ežiukas"])
+
 	def test_detect_unicode(self):
 		result = detectlanguage.detect("Ėjo ežiukas")
 		assert result[0]['language'] == 'lt'
 
-	def test_detect_array(self):
-		result = detectlanguage.detect(["Hello world", "Ėjo ežiukas"])
+	def test_detect_batch(self):
+		result = detectlanguage.detect_batch(["Hello world", "Ėjo ežiukas"])
 		assert result[0][0]['language'] == 'en'
 		assert result[1][0]['language'] == 'lt'
 
-	def test_user_status(self):
-		result = detectlanguage.user_status()
+	def test_account_status(self):
+		result = detectlanguage.account_status()
 		assert result['status'] == 'ACTIVE'
 
 	def test_languages(self):
 		result = detectlanguage.languages()
-		assert { 'code': 'en', 'name': 'ENGLISH' } in result
-
-	def test_secure(self):
-		detectlanguage.configuration.secure = True
-		result = detectlanguage.detect("Hello world")
-		assert result[0]['language'] == 'en'
-		detectlanguage.configuration.secure = False
+		assert { 'code': 'en', 'name': 'English' } in result
 
 class TestApiErrors:
 	def test_invalid_key(self):

tests/test_detectlanguage.py

@@ -3,9 +3,8 @@
 
 class TestDetectlanguage:
 	def testDefaults(self):
-		assert detectlanguage.configuration.api_version == '0.2'
+		assert detectlanguage.configuration.api_version == 'v3'
 		assert detectlanguage.configuration.host == 'ws.detectlanguage.com'
-		assert detectlanguage.configuration.secure == False
 
 	def testConfiguration(self):
 		detectlanguage.configuration.api_key = 'TEST'