增加单次预测服务

predic_fac.py

@@ -43,6 +43,8 @@ class PredictorFac:
             return 1, res
         elif predict_type == 'brand':
             return 1, res
+        elif predict_type == 'gn':
+            return 1, res
 
 if __name__ == "__main__":
     def get_test_data():

valid_server.py

@@ -11,8 +11,10 @@ from utils.redis_cli import redis_cli
 from predict.kw_predict import KwPredict
 from utils.status import code2msg
 
+import re
+class KwHandler(tornado.web.RequestHandler):
+    pat = re.compile(r'(?:.*\-.*|\d+)')
 
-class BrandKwHandler(tornado.web.RequestHandler):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.predic = KwPredict('validSingle')
@@ -20,9 +22,10 @@ class BrandKwHandler(tornado.web.RequestHandler):
 
     async def get(self):
         target = unquote(self.get_argument('keyword', ''))
+        predic_type = unquote(self.get_argument('predic_type', 'brand'))
         brand_set = redis_cli.smembers('brand_set')
 
-        if not target:
+        if not target or not predic_type:
             code = '100001'
             res = code2msg(code)
         else:
@@ -49,14 +52,27 @@ class BrandKwHandler(tornado.web.RequestHandler):
         self.write(res)
 
     async def post(self):
-        target = self.request.body
         list_data = json.loads(self.request.body)
+        dic_res = {}
+        for kw in list_data:
+            if len(kw) <=2:
+                dic_res[kw] = 0
 
+            elif self.pat.findall(kw):
+                dic_res[kw] = 1
+            else:
+                res1 = self.predic.predict(kw, 'gn')
+                res2 = self.predic.predict(kw, 'param')
+                if res1['result'] == 1 or res2['result'] == 1:
+                    dic_res[kw] = 1
+                else:
+                    dic_res[kw] = 0
+        self.write({'status': 1,'result':dic_res})
 def gen_app():
     return tornado.web.Application(handlers=[(k, v) for k, v in register_tornado_handlers.items()])
 
 
-register_tornado_handlers = {'/brandkw': BrandKwHandler}
+register_tornado_handlers = {'/keyword': KwHandler}
 
 
 def http_server(port):