lesscode-py 0.3.73__tar.gz → 0.3.74__tar.gz

{lesscode-py-0.3.73 → lesscode-py-0.3.74}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lesscode-py
-Version: 0.3.73
+Version: 0.3.74
 Summary: lesscode-python 是基于tornado的web开发脚手架项目，该项目初衷为简化开发过程，让研发人员更加关注业务。
 Home-page: https://gitee.com/yongchao9/lesscode-python
 Author: Chao.yy

{lesscode-py-0.3.73 → lesscode-py-0.3.74}/lesscode/db/es/es_request.py

@@ -1,14 +1,12 @@
 # -*- coding: utf-8 -*-
-import json
+import importlib
 import random
 
-import requests
-from requests.auth import HTTPBasicAuth
-
 
 class EsRequest:
 
     def __init__(self, host, port, user, password):
+
         # 主机地址
         self.host = host
         # 端口号
@@ -17,7 +15,11 @@ class EsRequest:
         self.user = user
         # 密码
         self.password = password
-        self.auth = HTTPBasicAuth(user, password)
+        try:
+            httpx = importlib.import_module("httpx")
+        except ImportError as e:
+            raise Exception(f"httpx is not exist,run:pip install httpx==0.24.1")
+        self.auth = httpx.BasicAuth(user, password)
         host_str = host.split(",")
         self.hosts = [host for host in host_str]
 
@@ -49,9 +51,13 @@ class EsRequest:
         :param body:
         :return:
         """
-        r = requests.post(
+        try:
+            httpx = importlib.import_module("httpx")
+        except ImportError as e:
+            raise Exception(f"httpx is not exist,run:pip install httpx==0.24.1")
+        r = httpx.post(
             url,
-            data=json.dumps(body),
+            json=body,
             headers={'content-type': "application/json"},
             params=params,
             auth=self.auth
@@ -67,10 +73,14 @@ class EsRequest:
         :param body:
         :return:
         """
-        r = requests.put(
+        try:
+            httpx = importlib.import_module("httpx")
+        except ImportError as e:
+            raise Exception(f"httpx is not exist,run:pip install httpx==0.24.1")
+        r = httpx.put(
             url,
             params=params,
-            data=json.dumps(body),
+            json=body,
             headers={'content-type': "application/json"},
             auth=self.auth
         )
@@ -82,10 +92,13 @@ class EsRequest:
         发送http请求
         :param params:
         :param url:
-        :param body:
         :return:
         """
-        r = requests.get(
+        try:
+            httpx = importlib.import_module("httpx")
+        except ImportError as e:
+            raise Exception(f"httpx is not exist,run:pip install httpx==0.24.1")
+        r = httpx.get(
             url,
             params=params,
             headers={'content-type': "application/json"},
@@ -94,17 +107,19 @@ class EsRequest:
         res = r.json()
         return res
 
-    def format_es_delete(self, url, body=None, params=None):
+    def format_es_delete(self, url, params=None):
         """
         发送http请求
         :param params:
         :param url:
-        :param body:
         :return:
         """
-        r = requests.delete(
+        try:
+            httpx = importlib.import_module("httpx")
+        except ImportError as e:
+            raise Exception(f"httpx is not exist,run:pip install httpx==0.24.1")
+        r = httpx.delete(
             url,
-            data=json.dumps(body) if body else body,
             params=params,
             headers={'content-type': "application/json"},
             auth=self.auth

{lesscode-py-0.3.73 → lesscode-py-0.3.74}/lesscode/utils/es_log/record_log.py

@@ -3,15 +3,13 @@
 # @Author  : navysummer
 # @Email   : navysummer@yeah.net
 import datetime
+import importlib
 import json
 import logging
 import traceback
 
-import requests
-from requests.auth import HTTPBasicAuth
 from tornado.options import options
 
-from lesscode.db.ds_helper import DSHelper
 from lesscode.utils.json import JSONEncoder
 
 
@@ -52,14 +50,18 @@ def es_record_log(request, message="", level="info", status_code=200, task_id=No
 
 
 def send_es(protocol, connect_name, es_index, body):
+    try:
+        httpx = importlib.import_module("httpx")
+    except ImportError as e:
+        raise Exception(f"httpx is not exist,run:pip install httpx==0.24.1")
     try:
         pool, conn_info = options.database[connect_name]
         url = f"{protocol}://{conn_info.host}:{conn_info.port}/{es_index}/_doc/"
-        res = requests.post(
+        res = httpx.post(
             url,
             data=json.dumps(body, ensure_ascii=False, cls=JSONEncoder).encode('utf-8'),
             headers={'content-type': "application/json"},
-            auth=HTTPBasicAuth(conn_info.user, conn_info.password)
+            auth=httpx.BasicAuth(conn_info.user, conn_info.password)
         )
 
         if res.ok:

{lesscode-py-0.3.73 → lesscode-py-0.3.74}/lesscode/utils/request.py

@@ -9,11 +9,11 @@ from lesscode.web.status_code import StatusCode
 
 
 async def common_request(method, path, params=None, data=None, json=None, base_url=options.data_server,
-                         result_type="json", pack=False, **kwargs):
+                         result_type="json", pack=False, connect_config=None, **kwargs):
     try:
-        aiohttp = importlib.import_module("aiohttp")
+        httpx = importlib.import_module("httpx")
     except ImportError as e:
-        raise Exception(f"aiohttp is not exist,run:pip install aiohttp==3.8.3")
+        raise Exception(f"httpx is not exist,run:pip install httpx==0.24.1")
     project_name = options.project_name.encode("utf-8")
     if not kwargs.get("headers"):
         kwargs.update({"headers": {
@@ -22,9 +22,11 @@ async def common_request(method, path, params=None, data=None, json=None, base_u
         }})
     else:
         kwargs["headers"].update({"Project-Name": project_name, "Request-Id": uuid.uuid1().hex})
-    async with aiohttp.ClientSession() as session:
-        _method = getattr(session, method.lower())
-        async with _method(base_url + path, params=params, json=json, data=data, **kwargs) as resp:
+    if not connect_config or not isinstance(connect_config, dict):
+        connect_config = dict()
+    with httpx.AsyncClient(**connect_config) as session:
+        async with session.request(method.upper(), url=base_url + path, params=params, json=json, data=data,
+                                   **kwargs) as resp:
             if result_type == "json":
                 result = await resp.json()
                 if not pack:
@@ -34,7 +36,7 @@ async def common_request(method, path, params=None, data=None, json=None, base_u
                         message = f'ori_message:{result.get("status", "")}, {result.get("message", "未知错误")}'
                         raise BusinessException(StatusCode.COMMON_CODE_MESSAGE("C0001", message))
             elif result_type == "text":
-                result = await resp.text()
+                result = await resp.text
             else:
                 result = await resp.content.read()
             return result
@@ -73,10 +75,9 @@ async def delete(path, params=None, data=None, json=None, base_url=options.data_
 def sync_common_request(method, path, params=None, data=None, json=None, base_url=None, result_type="json",
                         pack=False, connect_config=None, **kwargs):
     try:
-        requests = importlib.import_module("requests")
-        requests_adapters = importlib.import_module("requests.adapters")
+        httpx = importlib.import_module("httpx")
     except ImportError as e:
-        raise Exception(f"requests is not exist,run:pip install requests==2.27.1")
+        raise Exception(f"httpx is not exist,run:pip install httpx==0.24.1")
     project_name = options.project_name.encode("utf-8")
     if not base_url:
         base_url = options.data_server
@@ -87,38 +88,26 @@ def sync_common_request(method, path, params=None, data=None, json=None, base_ur
         }})
     else:
         kwargs["headers"].update({"Project-Name": project_name, "Request-Id": uuid.uuid1().hex})
-    if not connect_config:
-        connect_config = {
-            "pool_connections": 10,
-            "pool_maxsize": 10,
-            "max_retries": 0,
-            "pool_block": False
-        }
-    s = requests.session()
-    if connect_config and isinstance(connect_config, dict):
-        adapter = requests_adapters.HTTPAdapter(**connect_config)
-        s.mount(prefix="http", adapter=adapter)
-        s.mount(prefix="https", adapter=adapter)
-    try:
-        _method = getattr(s, method.lower())
-        res = _method(base_url + path, params=params, data=data, json=json, **kwargs)
-    except Exception as e:
-        raise e
-    finally:
-        s.close()
-    if result_type == "json":
-        res = res.json()
-        if not pack:
-            if res.get("status") == "00000":
-                res = res.get("data")
+    if not connect_config or not isinstance(connect_config, dict):
+        connect_config = dict()
+    with httpx.Client(**connect_config) as session:
+        try:
+            res = session.request(method.upper(), url=base_url + path, params=params, data=data, json=json, **kwargs)
+            if result_type == "json":
+                res = res.json()
+                if not pack:
+                    if res.get("status") == "00000":
+                        res = res.get("data")
+                    else:
+                        message = f'ori_message:{res.get("status", "")}, {res.get("message", "未知错误")}'
+                        raise BusinessException(StatusCode.COMMON_CODE_MESSAGE("C0001", message))
+            elif result_type == "text":
+                res = res.text
             else:
-                message = f'ori_message:{res.get("status", "")}, {res.get("message", "未知错误")}'
-                raise BusinessException(StatusCode.COMMON_CODE_MESSAGE("C0001", message))
-    elif result_type == "text":
-        res = res.text
-    else:
-        res = res.content
-    return res
+                res = res.content
+            return res
+        except Exception as e:
+            raise e
 
 
 def sync_get(path, params=None, base_url=None, result_type="json", pack=False, connect_config=None, **kwargs):

{lesscode-py-0.3.73 → lesscode-py-0.3.74}/lesscode/utils/upms_util.py

@@ -2,33 +2,37 @@
 # @Time    : 2022/8/10 11:32
 # @Author  : navysummer
 # @Email   : navysummer@yeah.net
+import importlib
 import logging
 
 from tornado.options import options
-from requests import post, get
 
 
 def upms_register(item, full_url):
     if options.rms_register_enable:
+        try:
+            httpx = importlib.import_module("httpx")
+        except ImportError as e:
+            raise Exception(f"httpx is not exist,run:pip install httpx==0.24.1")
         client_name = item[3] if item[3] else options.application_name
         title = item[4] if item[4] else full_url
         en_name = item[5] if item[5] else full_url
         access = item[6] if item[6] else 0
-        client_res = get(url=f"{options.rms_register_server}/upms/client/fetchall",
-                         params={"client_name": client_name}).json()
+        client_res = httpx.get(url=f"{options.rms_register_server}/upms/client/fetchall",
+                               params={"client_name": client_name}).json()
         if not client_res.get("data"):
-            post(url=f"{options.rms_register_server}/upms/client/insert",
-                 json={"client_name": client_name})
-            client_res = get(url=f"{options.rms_register_server}/upms/client/fetchall",
-                             params={"client_name": client_name}).json()
+            httpx.post(url=f"{options.rms_register_server}/upms/client/insert",
+                       json={"client_name": client_name})
+            client_res = httpx.get(url=f"{options.rms_register_server}/upms/client/fetchall",
+                                   params={"client_name": client_name}).json()
         client_id = client_res.get("data")[0].get("id")
-        resource_res = get(
+        resource_res = httpx.get(
             url=f"{options.rms_register_server}/upms/resource/fetchall",
             params={"client_name": client_name, "resource_type": 2, "url": full_url}).json()
         if not resource_res.get("data"):
-            res = post(url=f"{options.rms_register_server}/upms/resource/insert",
-                       json={"client_id": client_id, "resource_type": 2, "url": full_url, "label": title,
-                             "en_name": en_name, "access": access}).json()
+            res = httpx.post(url=f"{options.rms_register_server}/upms/resource/insert",
+                             json={"client_id": client_id, "resource_type": 2, "url": full_url, "label": title,
+                                   "en_name": en_name, "access": access}).json()
             if res.get("status") == "00000":
                 logging.info(f"add url={full_url} to rms success")
             else:
@@ -37,12 +41,16 @@ def upms_register(item, full_url):
 
 def resource_register(resource_type: int, url: str, label: str, access: int, parent_id: str, full_url: str = None):
     if options.resource_register_enable:
+        try:
+            httpx = importlib.import_module("httpx")
+        except ImportError as e:
+            raise Exception(f"httpx is not exist,run:pip install httpx==0.24.1")
         if resource_type == 2:
             url = url if url else full_url
             label = label if label else full_url
             access = access if access else 0
         client_id = options.client_id
-        resource_res = post(
+        resource_res = httpx.post(
             url=f"{options.rms_register_server}/upms/resource/lesscode/insert",
             json={"client_id": client_id, "resource_type": resource_type, "url": url, "label": label, "access": access,
                   "parent_id": parent_id}).json()

{lesscode-py-0.3.73 → lesscode-py-0.3.74}/lesscode/version.py

@@ -5,4 +5,4 @@
 lesscode python version file.
 """
 
-__version__ = "0.3.73"
+__version__ = "0.3.74"

{lesscode-py-0.3.73 → lesscode-py-0.3.74}/lesscode_py.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lesscode-py
-Version: 0.3.73
+Version: 0.3.74
 Summary: lesscode-python 是基于tornado的web开发脚手架项目，该项目初衷为简化开发过程，让研发人员更加关注业务。
 Home-page: https://gitee.com/yongchao9/lesscode-python
 Author: Chao.yy