xbase-util 0.1.5__tar.gz → 0.1.7__tar.gz

{xbase_util-0.1.5 → xbase_util-0.1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xbase_util
-Version: 0.1.5
+Version: 0.1.7
 Summary: 网络安全基础工具
 Home-page: https://gitee.com/jimonik/xbase_util.git
 Author: xyt

{xbase_util-0.1.5 → xbase_util-0.1.7}/setup.py

@@ -3,7 +3,7 @@ from distutils.core import setup
 from setuptools import find_packages
 
 setup(name="xbase_util",
-      version="0.1.5",
+      version="0.1.7",
       description="网络安全基础工具",
       long_description="包含提取，预测，训练的基础工具",
       author="xyt",

{xbase_util-0.1.5 → xbase_util-0.1.7}/xbase_util/esreq.py

@@ -2,7 +2,7 @@ import requests
 
 
 class EsReq:
-    def __init__(self, url,timeout=120):
+    def __init__(self, url, timeout=120):
         self.es_url = url
         self.timeout = timeout
         print("初始化自定义es请求类")
@@ -10,11 +10,11 @@ class EsReq:
     def clear_all_scroll(self):
         return requests.delete(self.es_url + "/_search/scroll", timeout=self.timeout, json={'scroll_id': '_all'})
 
-    def search(self, body, scroll):
-        requests.post(self.es_url + "/_search/scroll", data=body, timeout=self.timeout, json={'scroll_id': scroll})
+    def search(self, body):
+        return requests.post(self.es_url + "/_search", timeout=self.timeout, json=body)
 
     def start_scroll(self, exp, scroll):
-        return requests.post(self.es_url + "/_search/scroll", timeout=self.timeout,
+        return requests.post(self.es_url + f"/_search?scroll={scroll}", timeout=self.timeout,
                              json=exp)
 
     def scroll_by_id(self, scroll_id, scroll):

{xbase_util-0.1.5 → xbase_util-0.1.7}/xbase_util/handle_features_util.py

@@ -4,9 +4,12 @@ import traceback
 from urllib.parse import unquote
 
 import pandas as pd
+from tqdm import tqdm
+
 
 
 def handle_uri(data):
+    tqdm.pandas()
     print(f"处理URI:{len(data)}")
     # 定义正则表达式，确保精确匹配各种攻击特征
     regex_patterns = {
@@ -100,6 +103,7 @@ def handle_uri(data):
 
 
 def handle_ua(data):
+    tqdm.pandas()
     print("处理UA")
     data['http.useragent'] = data['http.useragent'].fillna('').astype(str)
     # 处理换行符及多余空格

{xbase_util-0.1.5 → xbase_util-0.1.7}/xbase_util.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xbase-util
-Version: 0.1.5
+Version: 0.1.7
 Summary: 网络安全基础工具
 Home-page: https://gitee.com/jimonik/xbase_util.git
 Author: xyt