修复加载字典逻辑

BiddingKG/dl/entityLink/entityLink.py

@@ -191,26 +191,28 @@ SET_TAIL_ENTERPRISE_HUGE_FILE = "SET_TAIL_ENTERPRISE_HUGE.pk"
 def getDict_enterprise():
     global DICT_ENTERPRISE_DONE,SET_ENTERPRISE,SET_PREFIX_ENTERPRISE,SET_TAIL_ENTERPRISE
     real_path,is_huge = getEnterprisePath()
+    _ok = False
     if is_huge:
         if os.path.exists(SET_PREFIX_ENTERPRISE_HUGE_FILE) and os.path.exists(SET_TAIL_ENTERPRISE_HUGE_FILE):
             SET_PREFIX_ENTERPRISE = load(SET_PREFIX_ENTERPRISE_HUGE_FILE)
             SET_TAIL_ENTERPRISE = load(SET_TAIL_ENTERPRISE_HUGE_FILE)
-        else:
-            with open(real_path,"r",encoding="UTF8") as f:
-                for _e in f:
-                    if not _e:
-                        continue
-                    _e = _e.strip()
-                    if len(_e)>=4:
-                        key_enter = _e[:ENTERPRISE_KEY_LEN]
-                        SET_PREFIX_ENTERPRISE.add(key_enter)
-                        SET_TAIL_ENTERPRISE.add(_e[-ENTERPRISE_TAIL_LEN:])
-                        if not is_huge:
-                            SET_ENTERPRISE.add(_e)
-            #仅在大文件情况下才使用缓存加载
-            if is_huge:
-                save(SET_PREFIX_ENTERPRISE,SET_PREFIX_ENTERPRISE_HUGE_FILE)
-                save(SET_TAIL_ENTERPRISE,SET_TAIL_ENTERPRISE_HUGE_FILE)
+            _ok = True
+    if not _ok:
+        with open(real_path,"r",encoding="UTF8") as f:
+            for _e in f:
+                if not _e:
+                    continue
+                _e = _e.strip()
+                if len(_e)>=4:
+                    key_enter = _e[:ENTERPRISE_KEY_LEN]
+                    SET_PREFIX_ENTERPRISE.add(key_enter)
+                    SET_TAIL_ENTERPRISE.add(_e[-ENTERPRISE_TAIL_LEN:])
+                    if not is_huge:
+                        SET_ENTERPRISE.add(_e)
+        #仅在大文件情况下才使用缓存加载
+        if is_huge:
+            save(SET_PREFIX_ENTERPRISE,SET_PREFIX_ENTERPRISE_HUGE_FILE)
+            save(SET_TAIL_ENTERPRISE,SET_TAIL_ENTERPRISE_HUGE_FILE)
 
 
     log("SET_PREFIX_ENTERPRISE takes memory:%.2fM size:%d"%(sys.getsizeof(SET_PREFIX_ENTERPRISE)/1024/1024,len(SET_PREFIX_ENTERPRISE)))

BiddingKG/dl/interface/test/3.py

@@ -0,0 +1,22 @@
+
+
+import json
+
+
+# 自定义jsonEncoder
+class MyEncoder(json.JSONEncoder):
+    def default(self, obj):
+        if isinstance(obj, np.ndarray):
+            return obj.tolist()
+        elif isinstance(obj, bytes):
+            return str(obj, encoding='utf-8')
+        elif isinstance(obj, (np.float_, np.float16, np.float32,
+                              np.float64)):
+            return float(obj)
+        elif isinstance(obj,str):
+            return obj
+        return json.JSONEncoder.default(self, obj)
+
+a = ['1231"23']
+
+print(json.dumps(a,cls=MyEncoder))