cloudoll 2.3.2__tar.gz → 2.4.0__tar.gz

{cloudoll-2.3.2 → cloudoll-2.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudoll
-Version: 2.3.2
+Version: 2.4.0
 Summary: 辅助快速创建可分布的微服务。
 Home-page: https://gitee.com/chuchur/cloudoll-py
 Author: chuchur
@@ -16,7 +16,6 @@ Requires-Python: >=3.6.0
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: watchfiles
-Requires-Dist: curl_cffi
 Requires-Dist: colorlog
 Requires-Dist: aiomysql
 Requires-Dist: aiopg

cloudoll-2.4.0/cloudoll/__init__.py

@@ -0,0 +1 @@
+__version__ = "2.4.0"

{cloudoll-2.3.2 → cloudoll-2.4.0}/cloudoll/utils/common.py

@@ -1,4 +1,9 @@
 import asyncio
+from ..logging import warning
+
+EADDRINUSE: int
+
+
 class Object(dict):
     # __setattr__ = dict.__setitem__
     # __getattr__ = dict.__getitem__
@@ -7,20 +12,21 @@ class Object(dict):
 
     def __getattr__(self, key):
         return self.get(key, None)
-    
+
     def __delattr__(self, key):
         try:
             del self[key]
         except KeyError:
             raise AttributeError(f"'DotDict' object has no attribute '{key}'")
-    
+
     def __getstate__(self):
-        '''to fix pickle.dumps '''
+        """to fix pickle.dumps"""
         return dict(self)
 
     def __setstate__(self, state):
         self.update(state)
 
+
 def chainMap(*dicts):
     merged_dict = Object()
     for d in dicts:

cloudoll-2.4.0/cloudoll/web/requests.py

@@ -0,0 +1,161 @@
+import aiohttp
+import asyncio
+from typing import Optional, Dict, Any, Union
+
+
+class AsyncRequest:
+    def __init__(
+        self,
+        timeout: int = 30,
+        max_retries: int = 3,
+        retry_delay: float = 1.0,
+        session: Optional[aiohttp.ClientSession] = None,
+    ):
+        """
+        异步HTTP请求客户端
+
+        :param timeout: 请求超时时间(秒)
+        :param max_retries: 最大重试次数
+        :param retry_delay: 重试延迟(秒)
+        :param session: 可复用的aiohttp会话
+        """
+        self.timeout = aiohttp.ClientTimeout(total=timeout)
+        self.max_retries = max_retries
+        self.retry_delay = retry_delay
+        self._session = session
+
+    async def request(
+        self,
+        method: str,
+        url: str,
+        params: Optional[Dict[str, Any]] = None,
+        data: Optional[Union[Dict[str, Any], str, bytes]] = None,
+        json_data: Optional[Any] = None,
+        headers: Optional[Dict[str, str]] = None,
+        cookies: Optional[Dict[str, str]] = None,
+        allow_redirects: bool = True,
+        raise_for_status: bool = True,
+    ) -> aiohttp.ClientResponse:
+        """
+        执行异步HTTP请求
+
+        :param method: HTTP方法 (GET, POST, PUT, DELETE等)
+        :param url: 请求URL
+        :param params: URL查询参数
+        :param data: 请求体数据 (表单或原始数据)
+        :param json_data: JSON格式的请求体数据
+        :param headers: 请求头
+        :param cookies: cookies
+        :param allow_redirects: 是否允许重定向
+        :param raise_for_status: 是否在HTTP错误状态时抛出异常
+        :return: aiohttp.ClientResponse
+        """
+        session = self._session or aiohttp.ClientSession(timeout=self.timeout)
+        last_exception = None
+
+        for attempt in range(self.max_retries):
+            try:
+                async with session.request(
+                    method=method,
+                    url=url,
+                    params=params,
+                    data=data,
+                    json=json_data,
+                    headers=headers,
+                    cookies=cookies,
+                    allow_redirects=allow_redirects,
+                ) as response:
+                    if raise_for_status:
+                        response.raise_for_status()
+                    return response
+
+            except (aiohttp.ClientError, asyncio.TimeoutError) as e:
+                last_exception = e
+                if attempt < self.max_retries - 1:
+                    await asyncio.sleep(self.retry_delay * (attempt + 1))
+                continue
+
+        if self._session is None:
+            await session.close()
+
+        raise last_exception or RuntimeError("Request failed")
+
+    async def get(
+        self,
+        url: str,
+        params: Optional[Dict[str, Any]] = None,
+        headers: Optional[Dict[str, str]] = None,
+        **kwargs
+    ) -> aiohttp.ClientResponse:
+        """发送GET请求"""
+        return await self.request("GET", url, params=params, headers=headers, **kwargs)
+
+    async def post(
+        self,
+        url: str,
+        data: Optional[Union[Dict[str, Any], str, bytes]] = None,
+        json_data: Optional[Any] = None,
+        headers: Optional[Dict[str, str]] = None,
+        **kwargs
+    ) -> aiohttp.ClientResponse:
+        """发送POST请求"""
+        return await self.request(
+            "POST", url, data=data, json_data=json_data, headers=headers, **kwargs
+        )
+
+    async def put(
+        self,
+        url: str,
+        data: Optional[Union[Dict[str, Any], str, bytes]] = None,
+        json_data: Optional[Any] = None,
+        headers: Optional[Dict[str, str]] = None,
+        **kwargs
+    ) -> aiohttp.ClientResponse:
+        """发送PUT请求"""
+        return await self.request(
+            "PUT", url, data=data, json_data=json_data, headers=headers, **kwargs
+        )
+
+    async def delete(
+        self, url: str, headers: Optional[Dict[str, str]] = None, **kwargs
+    ) -> aiohttp.ClientResponse:
+        """发送DELETE请求"""
+        return await self.request("DELETE", url, headers=headers, **kwargs)
+
+    async def close(self) -> None:
+        """关闭客户端会话"""
+        if self._session is not None:
+            await self._session.close()
+            self._session = None
+
+    async def __aenter__(self):
+        return self
+
+    async def __aexit__(self, exc_type, exc_val, exc_tb):
+        await self.close()
+
+
+# 使用示例
+"""
+async def test():
+    async with AsyncRequest() as client:
+        try:
+            # GET请求示例
+            response = await client.get(
+                "https://httpbin.org/get",
+                params={"key": "value"},
+                headers={"User-Agent": "AsyncRequest/1.0"},
+            )
+            print(await response.json())
+
+            # POST请求示例
+            response = await client.post(
+                "https://httpbin.org/post",
+                json_data={"key": "value"},
+                headers={"Content-Type": "application/json"},
+            )
+            print(await response.json())
+
+        except Exception as e:
+            print(f"Request failed: {e}")
+"""

{cloudoll-2.3.2 → cloudoll-2.4.0}/cloudoll.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudoll
-Version: 2.3.2
+Version: 2.4.0
 Summary: 辅助快速创建可分布的微服务。
 Home-page: https://gitee.com/chuchur/cloudoll-py
 Author: chuchur
@@ -16,7 +16,6 @@ Requires-Python: >=3.6.0
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: watchfiles
-Requires-Dist: curl_cffi
 Requires-Dist: colorlog
 Requires-Dist: aiomysql
 Requires-Dist: aiopg

{cloudoll-2.3.2 → cloudoll-2.4.0}/cloudoll.egg-info/SOURCES.txt

@@ -23,10 +23,6 @@ cloudoll/orm/model.py
 cloudoll/orm/mysql.py
 cloudoll/orm/parse.py
 cloudoll/orm/postgres.py
-cloudoll/robot/__init__.py
-cloudoll/robot/dingtalk.py
-cloudoll/robot/feishu.py
-cloudoll/robot/slack.py
 cloudoll/utils/__init__.py
 cloudoll/utils/cli_main.py
 cloudoll/utils/common.py
@@ -38,6 +34,6 @@ cloudoll/web/__init__.py
 cloudoll/web/core.py
 cloudoll/web/exception.py
 cloudoll/web/html.py
-cloudoll/web/http.py
 cloudoll/web/jwt.py
+cloudoll/web/requests.py
 cloudoll/web/settings.py

{cloudoll-2.3.2 → cloudoll-2.4.0}/cloudoll.egg-info/requires.txt

@@ -1,5 +1,4 @@
 watchfiles
-curl_cffi
 colorlog
 aiomysql
 aiopg

{cloudoll-2.3.2 → cloudoll-2.4.0}/setup.py

@@ -25,7 +25,6 @@ VERSION = version.__version__
 # What packages are required for this module to be executed?
 REQUIRED = [
     "watchfiles",
-    "curl_cffi",
     "colorlog",
     "aiomysql",
     "aiopg",

cloudoll-2.3.2/cloudoll/__init__.py

@@ -1 +0,0 @@
-__version__ = "2.3.2"

cloudoll-2.3.2/cloudoll/robot/dingtalk.py

@@ -1,209 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-# docs: https://open.dingtalk.com/document/group/message-types-and-data-format
-__author__ = "chuchur/chuchur.com"
-
-import base64
-import hashlib
-import hmac
-from ..logging import print_error
-from curl_cffi import requests as http
-import time
-from urllib import parse
-
-
-class Client(object):
-    def __init__(self, **kw):
-        self._webhook = kw.get("webhook")
-        self._secret = kw.get("secret")
-        self._access_token = kw.get("access_token")
-
-    def _get_sign(self):
-        secret = self._secret
-        if not secret:
-            print_error("缺少secret")
-            return None, None
-
-        # 拼接timestamp和secret
-        timestamp = str(round(time.time() * 1000))
-        string_to_sign = "{}\n{}".format(timestamp, secret)
-        hmac_code = hmac.new(
-            secret.encode("utf-8"),
-            string_to_sign.encode("utf-8"),
-            digestmod=hashlib.sha256,
-        ).digest()
-
-        # 对结果进行base64处理
-        sign = base64.b64encode(hmac_code).decode("utf-8")
-        sign = parse.quote(sign)
-        return timestamp, sign
-
-    def upload(self, type: str, filepath: str):
-        """
-        上传媒体
-        :params access_token
-        :params type 文件类型 image|voice|video|file
-        :params filepath 要上传的文件路径
-        """
-        access_token = self._access_token
-        if not access_token:
-            print_error("请配置access_token")
-            return False
-        url = "https://oapi.dingtalk.com/media/upload?access_token=%s" % access_token
-        with open(filepath, "rb") as f:
-            files = {"media": f}
-            result = http.post(url=url, files=files, data={"type": type})
-            res = result.json()
-            if res["errcode"] == 0:
-                return res
-            else:
-                print_error(res["errmsg"])
-
-    def send(self, data: dict):
-        """
-        发送除签名外的自定义消息结构体 https://open.dingtalk.com/document/orgapp-server/message-types-and-data-format
-        :params data 自定义消息结构体
-        """
-        webhook = self._webhook
-        if not webhook:
-            print_error("缺少webhook")
-            return False
-        timestamp, sign = self._get_sign()
-        if not timestamp or not sign:
-            return False
-        url = webhook + "&timestamp=%s&sign=%s" % (timestamp, sign)
-        result = http.post(
-            url=url,
-            json={**data},
-            # data=data
-            # data=json.dumps(data)
-        )
-        if result:
-            res = result.json()
-            if res["errcode"] == 0:
-                print_error("发送成功！")
-                return True
-            else:
-                print_error("发送失败")
-                print_error(res["errmsg"])
-                return False
-
-    def send_text(self, text: str):
-        """
-        发送文本消息
-        :params text 消息内容
-        """
-
-        return self.send(
-            data={
-                "msgtype": "text",
-                "text": {"content": text},
-            }
-        )
-
-    def _send_media(self, type, media_id, **kw):
-        """
-        发送媒体
-        :params type 媒体类型 image|voice|video|file
-        :params media_id 媒体ID
-        """
-        data = {"msgtype": type}
-        data[type] = {"media_id": media_id}
-        if type == "voice":
-            data["voice"]["duration"] = kw.get("duration")
-        return self.send(data)
-
-    def send_markdown(self, title, text):
-        """
-        发送Markdown消息
-        :params title 标题
-        :params text markdown结构体
-        """
-        return self.send(
-            data={"msgtype": "markdown", "markdown": {"title": title, "text": text}}
-        )
-
-    def send_image(self, media_id: str):
-        """
-        发送图片消息
-        :params media_id 媒体ID
-        """
-        return self._send_media("image", media_id)
-
-    def send_voice(self, media_id: str, duration: str):
-        """
-        发送语音消息
-        :params media_id 媒体ID
-        :params duration 正整数，小于60，表示音频时长。
-        """
-        return self._send_media("voice", media_id, duration=duration)
-
-    def send_file(self, media_id: str):
-        """
-        发送文件消息
-        :params media_id 媒体ID
-        """
-        return self._send_media("file", media_id)
-
-    def send_link(self, messageUrl, picUrl, title, text):
-        """
-        发送链接消息
-        :params messageUrl 链接地址
-        :params picUrl 链接的小图
-        :params title 链接标题 100字内
-        :params text 链接副标题 500字内
-        """
-        return self.send(
-            data={
-                "msgtype": "link",
-                "link": {
-                    "picUrl": picUrl,
-                    "messageUrl": messageUrl,
-                    "title": title,
-                    "text": text,
-                },
-            }
-        )
-
-    def send_card(self, **kw):
-        """
-        发送卡片消息
-        :params title 标题
-        :params text 消息内容 必填
-        :params single_title 查看详情(按钮文字) btns 二选一
-        :params single_url 查看详情(链接) btns 二选一
-        :params btn_orientation 按钮排列顺序。0|1
-        :params btns 按钮 [{title:'',actionURL:''}]
-        """
-        title = kw.get("title", "")
-        text = kw.get("text", "")
-        single_title = kw.get("single_title", "")
-        single_url = kw.get("single_url", "")
-        btn_orientation = kw.get("btn_orientation", 0)
-        btns = kw.get("btns", []) or []
-        return self.send(
-            data={
-                "msgtype": "actionCard",
-                "actionCard": {
-                    "title": title,
-                    "text": text,
-                    "singleTitle": single_title,
-                    "singleUrl": single_url,
-                    "btnOrientation": btn_orientation,
-                    "btns": btns,
-                },
-            }
-        )
-
-    def send_freecard(self, links: list):
-        """
-        发送卡片消息
-        :params links [{ title:'',messageURL:'',picURL:''}]
-        """
-        return self.send(
-            data={
-                "msgtype": "feedCard",
-                "feedCard": {"links": links},
-            }
-        )

cloudoll-2.3.2/cloudoll/robot/feishu.py

@@ -1,102 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-__author__ = "chuchur/chuchur.com"
-
-import hashlib, hmac, time, base64
-from curl_cffi import requests as http
-from ..logging import print_error, print_info
-
-
-class Client(object):
-    def __init__(self, **kw):
-        self._webhook = kw.get("webhook")
-        self._secret = kw.get("secret")
-
-    def _get_sign(self):
-        secret = self._secret
-        if not secret:
-            print_error("缺少secret")
-            return None, None
-        # 拼接timestamp和secret
-        timestamp = int(time.time())
-        string_to_sign = "{}\n{}".format(timestamp, secret)
-        hmac_code = hmac.new(
-            string_to_sign.encode("utf-8"), digestmod=hashlib.sha256
-        ).digest()
-
-        # 对结果进行base64处理
-        sign = base64.b64encode(hmac_code).decode("utf-8")
-
-        return timestamp, sign
-
-    def send(self, data: dict):
-        """
-        发送除签名外的自定义消息结构体
-        :params data 自定义消息结构体
-        """
-        webhook = self._webhook
-        if not webhook:
-            print_error("缺少webhook")
-            return False
-        timestamp, sign = self._get_sign()
-        if not timestamp or not sign:
-            return False
-        result = http.post(
-            url=webhook,
-            json={"timestamp": timestamp, "sign": sign, **data},
-        )
-        if result:
-            res = result.json()
-            if res["StatusCode"] == 0:
-                print_info("发送成功")
-                return False
-            else:
-                print_error("发送失败！")
-                return True
-
-    def send_text(self, text: str):
-        """
-        发送文本消息
-        :params text 消息内容
-        """
-        return self.send(
-            data={
-                "msg_type": "text",
-                "content": {"text": text},
-            }
-        )
-
-    def send_card(self, **kw):
-        """
-        发送卡片消息
-        :params content 卡片内容,str
-        :params elements 参见 ：https://open.feishu.cn/document/ukTMukTMukTM/uMjNwUjLzYDM14yM2ATN
-        :params template 标题背景颜色 blue|wathet|truquoise|green|yellow|orange|red|carmine|violet|purple|indigo|grey
-        :params i18n 多语言 {'zh_cn':'...'}
-        """
-        content = kw.get("content", "")
-        i18n = kw.get("i18n", {})
-        elements = kw.get("elements", [])
-        template = kw.get("template", "blue")
-        return self.send(
-            data={
-                "msg_type": "interactive",
-                "card": {
-                    "config": {
-                        "wide_screen_mode": True,
-                        "enable_forward": True,
-                        "update_multi": True,
-                    },
-                    "header": {
-                        "title": {
-                            "tag": "plain_text",
-                            "content": content,
-                            "i18n": i18n,
-                        },
-                        "template": template,
-                    },
-                    "elements": elements,
-                },
-            }
-        )

cloudoll-2.3.2/cloudoll/robot/slack.py

@@ -1,115 +0,0 @@
-from cloudoll.web import http
-
-""" 
-web_hook: https://infloww.slack.com/apps/A0F7XDUAZ-incoming-webhook?tab=settings&next_id=0
-blocks_info: https://api.slack.com/messaging/composing/layouts
-"""
-
-
-class Header:
-    def __init__(self, text: str):
-        self._text = text
-
-    def get_json(self):
-        return {"type": "header", "text": {"type": "plain_text", "text": self._text}}
-
-
-class Text:
-    def __init__(self, text: str | int):
-        self._text = text
-
-    def get_json(self):
-        return {"type": "section", "text": {"type": "mrkdwn", "text": self._text}}
-
-
-class Field:
-    def __init__(self, title: str | int, text: str | int):
-        self._title = title
-        self._text = text
-
-    def get_json(self):
-        return {"type": "mrkdwn", "text": f"{self._title}\n{self._text}"}
-
-
-class Link:
-    def __init__(self, title: str | int, url: str | int):
-        self._title = title
-        self._url = url
-
-    def get_json(self):
-        return {
-            "type": "context",
-            "elements": [{"type": "mrkdwn", "text": f"<{self._url}|_{self._title}_>"}],
-        }
-
-
-class Section:
-    def __init__(self):
-        self._fileds: list[Field] = []
-
-    def add(self, field: Field):
-        self._fileds.append(field.get_json())
-        return self
-
-    def get_json(self):
-        return {"type": "section", "fileds": self._fileds}
-
-
-class Elements:
-    def __init__(self):
-        self._elements: list[Field] = []
-
-    def add(self, field: Field):
-        self._elements.append(field.get_json())
-        return self
-
-    def get_json(self):
-        return {"type": "context", "elements": self._elements}
-
-
-class Divider:
-    def __init__(self):
-        self._fileds: list[Field] = []
-
-    def get_json(self):
-        return {"type": "divider"}
-
-
-class Blocks:
-    def __init__(self):
-        self._blocks = []
-
-    def add(self, block: Section | Header | Text | Divider | Link):
-        self._blocks.append(block)
-        return self
-
-    def add_header(self, text):
-        self._blocks.append(Header(text))
-        return self
-
-    def add_link(self, title, url: str):
-        self._blocks.append(Link(title, url))
-        return self
-
-    def add_text(self, text):
-        self._blocks.append(Text(text))
-        return self
-
-    def add_divider(self):
-        self._blocks.append(Divider())
-        return self
-
-    def get_json(self):
-        blocks = []
-        for block in self._blocks:
-            blocks.append(block.get_json())
-        return blocks
-
-
-class Slack:
-    def __init__(self, url: str):
-        self._url = url
-
-    def send_notify(self, blocks: Blocks):
-        res = http.post(url=self._url, json={"blocks": blocks})
-        return res

cloudoll-2.3.2/cloudoll/web/http.py

@@ -1,79 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-__author__ = "chuchur/chuchur.com"
-# from aiohttp.web import middleware
-from curl_cffi import requests
-
-
-class Client(object):
-    def __init__(self):
-        self.session = requests.Session()
-
-    def requests(self, method, url, **kw) -> requests.Response:
-        impersonate = kw.get("impersonate", None)
-        if not impersonate:
-            kw["impersonate"] = "chrome133a"
-        fun = getattr(self.session, method, None)
-        result: requests.Response = fun(url, **kw)
-        return result
-
-
-http = Client()
-
-
-def get(url, **kw):
-    """
-    get 请求
-    :params params=dict() 传参
-    """
-    return http.requests("get", url, **kw)
-
-
-def post(url, **kw):
-    """
-    post 请求
-    :params data=dict() or json=dict() 传参
-    """
-    return http.requests("post", url, **kw)
-
-
-def put(url, **kw):
-    """
-    post 请求
-    data=dict()传参
-    """
-    return http.requests("put", url, **kw)
-
-
-def delete(url, **kw):
-    return http.requests("delete", url, **kw)
-
-
-def head(url, **kw):
-    return http.requests("head", url, **kw)
-
-
-def option(url, **kw):
-    return http.requests("option", url, **kw)
-
-
-def download(url, savepath=None, **kw):
-    """
-    下载文件
-    :params url 文件的地址
-    :params savepath 保存路径
-    """
-    response = http.requests("get", url, **kw)
-    if response.status_code == 200:
-        # 如果传入了保存路径，保存文件
-        if savepath:
-            with open(savepath, "wb") as file:
-                file.write(response.content)
-            print(f"File saved to {savepath}")
-        else:
-            # 如果没有传入保存路径，返回文件内容
-            return response.content
-    else:
-        print(f"Failed to download the file. Status code: {response.status_code}")
-        return None