rename search_api -> search-api, searchsvr -> search-service; refacto…

…ring search-api
datamut · Sep 19, 2016 · 8a75472 · 8a75472
1 parent fd9d837
commit 8a75472
Show file tree

Hide file tree

Showing 14 changed files with 18 additions and 10 deletions.
diff --git a/search_api/README.md → search-api/README.md b/search_api/README.md → search-api/README.md
diff --git a/search_api/application.py → search-api/application.py b/search_api/application.py → search-api/application.py
@@ -3,7 +3,7 @@
 Date: 09/18/2016
 """
 
-from search_api import application
+from searchapi.service import application
 
 if __name__ == '__main__':
-    application.run(debug=True)
+    application.run()
diff --git a/search_api/requirements.txt → search-api/requirements.txt b/search_api/requirements.txt → search-api/requirements.txt
diff --git a/searchsvr/__init__.py → search-api/searchapi/__init__.py b/searchsvr/__init__.py → search-api/searchapi/__init__.py
diff --git a/search_api/search_api/provider.py → search-api/searchapi/provider.py b/search_api/search_api/provider.py → search-api/searchapi/provider.py
@@ -7,7 +7,6 @@
 
 
 class AuthService(object):
-
     def __init__(self, server):
         self.prefix = server
 
@@ -18,7 +17,6 @@ def verify(self, client_id, token):
 
 
 class SearchService(object):
-
     def __init__(self, server):
         self.prefix = server
 
@@ -29,5 +27,7 @@ def search(self, query, limit):
         return response.json()
 
 
-auth_service = AuthService('http://authsvr.kc7ctmpd2z.us-west-2.elasticbeanstalk.com')
-search_service = SearchService('http://searchsvr.kc7ctmpd2z.us-west-2.elasticbeanstalk.com')
+auth_service = AuthService(
+    'http://authsvr.kc7ctmpd2z.us-west-2.elasticbeanstalk.com')
+search_service = SearchService(
+    'http://searchsvr.kc7ctmpd2z.us-west-2.elasticbeanstalk.com')
diff --git a/search_api/search_api/__init__.py → search-api/searchapi/service.py b/search_api/search_api/__init__.py → search-api/searchapi/service.py
@@ -6,19 +6,24 @@
 from flask import Flask, Response, request, render_template
 import json
 
-from search_api.provider import auth_service, search_service
+from searchapi.provider import auth_service, search_service
 
 
 application = Flask(__name__)
 
 
 @application.route('/')
 def index():
+    """A simple web interface of API for better interaction.
+    """
     return render_template('index.html')
 
 
 @application.route('/search/<client_id>/<token>', methods=['POST'])
 def search(client_id, token):
+    """Search API for external use.
+    """
+
     # TODO: retry when request failed for each service
 
     auth_resp = auth_service.verify(client_id, token)
@@ -30,8 +35,8 @@ def search(client_id, token):
     if 'limit' in request.form:
         try:
             limit = min(int(request.form['limit']), 100)
-        except:
-            pass # TODO: deal with error here
+        except ValueError:
+            pass  # TODO: deal with error here
 
     search_resp = search_service.search(query, limit)
     return Response(json.dumps(search_resp), mimetype='application/json')
diff --git a/search_api/search_api/templates/index.html → search-api/searchapi/templates/index.html b/search_api/search_api/templates/index.html → search-api/searchapi/templates/index.html
diff --git a/searchsvr/application.py → search-service/application.py b/searchsvr/application.py → search-service/application.py
diff --git a/searchsvr/requirements.txt → search-service/requirements.txt b/searchsvr/requirements.txt → search-service/requirements.txt
diff --git a/searchsvr/tests/__init__.py → search-service/searchsvr/__init__.py b/searchsvr/tests/__init__.py → search-service/searchsvr/__init__.py
diff --git a/searchsvr/flask_mongo.py → search-service/searchsvr/flask_mongo.py b/searchsvr/flask_mongo.py → search-service/searchsvr/flask_mongo.py
diff --git a/searchsvr/service.py → search-service/searchsvr/service.py b/searchsvr/service.py → search-service/searchsvr/service.py
@@ -3,13 +3,16 @@
 Date: 09/19/2016
 """
 
-from flask import Flask, Response, request, g
 import json
 
+from flask import Flask, Response, request, g
+
 from searchsvr.flask_mongo import MongoConnection
 
 mongo_connection = MongoConnection()
+
 application = Flask(__name__)
+
 application.config['MONGO_HOSTS'] = 'mongodb://{}@{},{}/whatsnews'.format(
     'ureadonly:u1s2e3r', 'aws-us-east-1-portal.9.dblayer.com:15345',
     'aws-us-east-1-portal.6.dblayer.com:15345'

diff --git a/search-service/searchsvr/tests/__init__.py b/search-service/searchsvr/tests/__init__.py
diff --git a/searchsvr/tests/test_search_service.py → ...ce/searchsvr/tests/test_search_service.py b/searchsvr/tests/test_search_service.py → ...ce/searchsvr/tests/test_search_service.py