re-common 10.0.21__py3-none-any.whl → 10.0.22__py3-none-any.whl

re_common/baselibrary/utils/baseencoding.py

@@ -1,29 +1,29 @@
-import encodings
-import os
-import pkgutil
-
-
-class BaseEncoding(object):
-
-    def __init__(self):
-        pass
-
-    def all_encodings(self):
-        """
-
-        :return:
-        """
-        modnames = set([modname for importer, modname, ispkg in pkgutil.walk_packages(
-            path=[os.path.dirname(encodings.__file__)], prefix='')])
-        aliases = set(encodings.aliases.aliases.values())
-        return modnames.union(aliases)
-
-    def is_encoding(self,text=b'\x96'):
-        for enc in self.all_encodings():
-            try:
-                msg = text.decode(enc)
-            except Exception:
-                continue
-            print('Decoding {t} with {enc} is {m}'.format(t=text, enc=enc, m=msg))
-
+import encodings
+import os
+import pkgutil
+
+
+class BaseEncoding(object):
+
+    def __init__(self):
+        pass
+
+    def all_encodings(self):
+        """
+
+        :return:
+        """
+        modnames = set([modname for importer, modname, ispkg in pkgutil.walk_packages(
+            path=[os.path.dirname(encodings.__file__)], prefix='')])
+        aliases = set(encodings.aliases.aliases.values())
+        return modnames.union(aliases)
+
+    def is_encoding(self,text=b'\x96'):
+        for enc in self.all_encodings():
+            try:
+                msg = text.decode(enc)
+            except Exception:
+                continue
+            print('Decoding {t} with {enc} is {m}'.format(t=text, enc=enc, m=msg))
+
 # BaseEncoding().is_encoding(b'\0\x93')

re_common/baselibrary/utils/baseesdsl.py

@@ -1,86 +1,86 @@
-class BaseEsDSL(object):
-    """
-    将条件转换成dsl语句
-    """
-
-    def __init__(self):
-        self.size = 10000
-        self.dsl = {}
-        # 字段列表
-        self.source = []
-
-    def set_size(self, size):
-        """
-        设置返回大小一般为10000
-        :param size:
-        :return:
-        """
-        self.size = size
-        return self
-
-    def set_source(self, source):
-        """
-        字段列表
-        例如 ["keyid", "lngid", "title", "author", "pub_year", "source_type"]
-        :param source:
-        :return:
-        """
-        self.source = source
-
-    def term(self, key, values, is_keyword=True):
-        if is_keyword:
-            key = key + ".keyword"
-        return {"term": {key, values}}
-
-    def terms(self, key, lists: list):
-        """
-        terms：查询某个字段里含有多个关键词的文档
-        :param key:
-        :param lists:
-        :return:
-        """
-        return {"terms": {key: lists}}
-
-    def match(self, key, values, is_fuzziness=True):
-        """
-        注意 match 和 match_phrase 之间的关系是should
-        :param key:
-        :param values:
-        :param is_fuzziness:
-        :return:
-        """
-        if is_fuzziness:
-            values = {"query": values, "fuzziness": "1"}
-        return {"match": {key, values}}
-
-    def match_phrase(self, key, values):
-        """
-         注意 match 和 match_phrase 之间的关系是should
-        :return:
-        """
-        return {"match_phrase": {key, values}}
-
-    def range(self, key, dicts):
-        """
-        key 比如 pub_year
-        传入一个字典 {"gte": "2011", "lte": "2021"}
-        :param key:
-        :param dicts:
-        :return:
-        """
-        return {"range": {key: dicts}}
-
-    def get_must(self):
-        """
-        获取一个must的结构
-        :return:
-        """
-        return {"bool": {"must": []}}
-
-    def set_query(self, dicts):
-        self.dsl["query"] = dicts
-
-    def build(self):
-        self.dsl["size"] = self.size
-        self.dsl["_source"] = self.source
-        self.set_query(self.get_must())
+class BaseEsDSL(object):
+    """
+    将条件转换成dsl语句
+    """
+
+    def __init__(self):
+        self.size = 10000
+        self.dsl = {}
+        # 字段列表
+        self.source = []
+
+    def set_size(self, size):
+        """
+        设置返回大小一般为10000
+        :param size:
+        :return:
+        """
+        self.size = size
+        return self
+
+    def set_source(self, source):
+        """
+        字段列表
+        例如 ["keyid", "lngid", "title", "author", "pub_year", "source_type"]
+        :param source:
+        :return:
+        """
+        self.source = source
+
+    def term(self, key, values, is_keyword=True):
+        if is_keyword:
+            key = key + ".keyword"
+        return {"term": {key, values}}
+
+    def terms(self, key, lists: list):
+        """
+        terms：查询某个字段里含有多个关键词的文档
+        :param key:
+        :param lists:
+        :return:
+        """
+        return {"terms": {key: lists}}
+
+    def match(self, key, values, is_fuzziness=True):
+        """
+        注意 match 和 match_phrase 之间的关系是should
+        :param key:
+        :param values:
+        :param is_fuzziness:
+        :return:
+        """
+        if is_fuzziness:
+            values = {"query": values, "fuzziness": "1"}
+        return {"match": {key, values}}
+
+    def match_phrase(self, key, values):
+        """
+         注意 match 和 match_phrase 之间的关系是should
+        :return:
+        """
+        return {"match_phrase": {key, values}}
+
+    def range(self, key, dicts):
+        """
+        key 比如 pub_year
+        传入一个字典 {"gte": "2011", "lte": "2021"}
+        :param key:
+        :param dicts:
+        :return:
+        """
+        return {"range": {key: dicts}}
+
+    def get_must(self):
+        """
+        获取一个must的结构
+        :return:
+        """
+        return {"bool": {"must": []}}
+
+    def set_query(self, dicts):
+        self.dsl["query"] = dicts
+
+    def build(self):
+        self.dsl["size"] = self.size
+        self.dsl["_source"] = self.source
+        self.set_query(self.get_must())