MeUtils 2024.12.12.17.3.48__py3-none-any.whl → 2024.12.12.19.4.48__py3-none-any.whl

{MeUtils-2024.12.12.17.3.48.dist-info → MeUtils-2024.12.12.19.4.48.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MeUtils
-Version: 2024.12.12.17.3.48
+Version: 2024.12.12.19.4.48
 Summary: description
 Home-page: https://github.com/yuanjie-ai/MeUtils
 Author: yuanjie
@@ -62,42 +62,42 @@ Requires-Dist: sse-starlette ; extra == 'ai'
 Requires-Dist: openai ; extra == 'ai'
 Requires-Dist: langchain ; extra == 'ai'
 Provides-Extra: all
-Requires-Dist: pyarrow ; extra == 'all'
-Requires-Dist: langchain ; extra == 'all'
-Requires-Dist: asyncmy ; extra == 'all'
-Requires-Dist: pymongo ; extra == 'all'
+Requires-Dist: jinja2 ; extra == 'all'
 Requires-Dist: fastapi[all] ; extra == 'all'
-Requires-Dist: geopy ; extra == 'all'
 Requires-Dist: redis-py-cluster ; extra == 'all'
-Requires-Dist: pretty-errors ; extra == 'all'
+Requires-Dist: langchain ; extra == 'all'
+Requires-Dist: fastapi ; extra == 'all'
+Requires-Dist: cachetools ; extra == 'all'
+Requires-Dist: pymongo ; extra == 'all'
+Requires-Dist: asyncmy ; extra == 'all'
+Requires-Dist: pymysql ; extra == 'all'
 Requires-Dist: gunicorn ; extra == 'all'
 Requires-Dist: pymilvus ; extra == 'all'
-Requires-Dist: polars ; extra == 'all'
-Requires-Dist: sqlalchemy ; extra == 'all'
+Requires-Dist: reportlab ; extra == 'all'
+Requires-Dist: pandas-profiling[notebook] ; extra == 'all'
 Requires-Dist: pandas-summary ; extra == 'all'
-Requires-Dist: streamlit ; extra == 'all'
-Requires-Dist: faiss-cpu ; extra == 'all'
 Requires-Dist: pymupd ; extra == 'all'
-Requires-Dist: jieba ; extra == 'all'
-Requires-Dist: openai ; extra == 'all'
-Requires-Dist: filetype ; extra == 'all'
-Requires-Dist: cachetools ; extra == 'all'
-Requires-Dist: reportlab ; extra == 'all'
-Requires-Dist: schedule ; extra == 'all'
+Requires-Dist: pyarrow ; extra == 'all'
+Requires-Dist: sse-starlette ; extra == 'all'
 Requires-Dist: iteration-utilities ; extra == 'all'
+Requires-Dist: pretty-errors ; extra == 'all'
+Requires-Dist: schedule ; extra == 'all'
+Requires-Dist: seaborn ; extra == 'all'
+Requires-Dist: missingno ; extra == 'all'
+Requires-Dist: openai ; extra == 'all'
 Requires-Dist: uvicorn ; extra == 'all'
+Requires-Dist: faiss-cpu ; extra == 'all'
+Requires-Dist: thriftpy2 ; extra == 'all'
 Requires-Dist: jmespath ; extra == 'all'
-Requires-Dist: pymysql ; extra == 'all'
-Requires-Dist: missingno ; extra == 'all'
-Requires-Dist: thefuck ; extra == 'all'
 Requires-Dist: simplejson ; extra == 'all'
-Requires-Dist: pandas-profiling[notebook] ; extra == 'all'
-Requires-Dist: jinja2 ; extra == 'all'
-Requires-Dist: thriftpy2 ; extra == 'all'
-Requires-Dist: sse-starlette ; extra == 'all'
+Requires-Dist: streamlit ; extra == 'all'
+Requires-Dist: polars ; extra == 'all'
+Requires-Dist: sqlalchemy ; extra == 'all'
+Requires-Dist: jieba ; extra == 'all'
+Requires-Dist: thefuck ; extra == 'all'
+Requires-Dist: filetype ; extra == 'all'
 Requires-Dist: dataframe-image ; extra == 'all'
-Requires-Dist: seaborn ; extra == 'all'
-Requires-Dist: fastapi ; extra == 'all'
+Requires-Dist: geopy ; extra == 'all'
 Provides-Extra: ann
 Requires-Dist: pymilvus ; extra == 'ann'
 Requires-Dist: faiss-cpu ; extra == 'ann'

{MeUtils-2024.12.12.17.3.48.dist-info → MeUtils-2024.12.12.19.4.48.dist-info}/RECORD

@@ -471,7 +471,7 @@ meutils/cmds/subprocess_demo.py,sha256=oTeTIx8k6XwtOT6hZpmy9XNcRErzilqWcdoxcrVcH
 meutils/comp_utils/__init__.py,sha256=Q4BW-gHnOUiSSpupHsprsOAPp4kuBLcH60sL1RfS3PQ,361
 meutils/comp_utils/reverse_metric.py,sha256=qwcGgiHhaupIJER4gO0HQhhO07FDLFv-vfFhg6K6Q4s,1705
 meutils/config_utils/__init__.py,sha256=GhgsStfGJDC8F_YgC6X5Jnj9HkgXJXxeYiJWTAkWKTo,271
-meutils/config_utils/config_manager.py,sha256=RYbyBJHtyZUxm4y_scJ5WYzFvUgwxTy41IEnB8Tj-6g,2012
+meutils/config_utils/manager.py,sha256=li3NgSfbO3-QTo5NPkMD3Hl5dnEr5q_J5F2WgmyhRqk,3106
 meutils/config_utils/nacosx.py,sha256=5x6WlCvjExaA7R9moBxc3DV9l1oFTtNazC6pObaYjMg,1110
 meutils/config_utils/lark_utils/__init__.py,sha256=Gf-5Y8uZiqY9jdbfiIboL92MQjOTOo0ZZ245PGxCbaY,297
 meutils/config_utils/lark_utils/common.py,sha256=WB1VKB3vdYyzqWosp5T-7uBIupNXl1L7SM3Lf5GRaOU,14274
@@ -479,7 +479,7 @@ meutils/config_utils/lark_utils/demo.py,sha256=3g0Fs7oLaeW75T60gYWMLgyNg1OnfOjfH
 meutils/config_utils/lark_utils/x.py,sha256=MlMQGhehP9xMEgetxVCX68XFaosfKoW1JA5cZ3JqN2w,1857
 meutils/crawlers/__init__.py,sha256=TBU4xA-IOsHV-0yIkW7YXxn_QT7TT8NncqxO7IykEfs,271
 meutils/data/SimHei.ttf,sha256=-XEnekS5yHP_URkT4XBI2w22ylV-KxudhkeIYFbrILA,10062565
-meutils/data/VERSION,sha256=8g-FoFS4bFiabfQJ079kgAnlU9X1abUW0amfVFiZQvM,19
+meutils/data/VERSION,sha256=dVfZd2A1H6Eivbd-XprrXnpN0aIbQ359KN1yqy-9m5A,19
 meutils/data/_FLAG,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meutils/data/_SUCCESS,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meutils/data/__init__.py,sha256=Hfwkkxs4zHqKhxht0YrhS566a9P5axtmgNvM5wF8ceQ,243
@@ -816,9 +816,9 @@ meutils/tools/seize.py,sha256=nOKAS63w-Lbi48I0m2MPhdsokUTwxco0laPxYVmW4Mw,1064
 meutils/tools/service_monitor.py,sha256=ibsLtBN2g2DL7ZnLJ8vhiZOiOcqTAyx711djDdBK-3M,1255
 meutils/tools/sys_monitor.py,sha256=6MoyzrItqDUOSjfHcMJmMofQkEPTW36CT_aKui0rg84,429
 meutils/tools/token_monitor.py,sha256=Np-YK-R4P4IPAXyZvMxwvXI4sFmNJQAQK1lSegNaYpA,997
-MeUtils-2024.12.12.17.3.48.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-MeUtils-2024.12.12.17.3.48.dist-info/METADATA,sha256=7JmZT3tBmD0XxNWam8VAcbhvmHIYjNbvy3rc5jZR_1Q,6170
-MeUtils-2024.12.12.17.3.48.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-MeUtils-2024.12.12.17.3.48.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
-MeUtils-2024.12.12.17.3.48.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
-MeUtils-2024.12.12.17.3.48.dist-info/RECORD,,
+MeUtils-2024.12.12.19.4.48.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+MeUtils-2024.12.12.19.4.48.dist-info/METADATA,sha256=Jv1oYUjQjZ-E2BC4oZs_08Aq1pDdkB3333xZvh-lKOU,6170
+MeUtils-2024.12.12.19.4.48.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+MeUtils-2024.12.12.19.4.48.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
+MeUtils-2024.12.12.19.4.48.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
+MeUtils-2024.12.12.19.4.48.dist-info/RECORD,,

meutils/config_utils/manager.py

@@ -0,0 +1,109 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Project      : AI.  @by PyCharm
+# @File         : config_manager
+# @Time         : 2024/12/4 12:07
+# @Author       : betterme
+# @WeChat       : meutils
+# @Software     : PyCharm
+# @Description  :
+
+import nacos
+from meutils.pipe import *
+
+
+class Manager(object):
+    _instance = None
+    _config: str = ""
+
+    def __new__(cls, *args):
+        if cls._instance is None:
+            cls._instance = super().__new__(cls)
+        return cls._instance
+
+    def __init__(self, namespace: str, data_id: str, group: str = "DEFAULT_GROUP", ):
+        NACOS_URL = os.getenv("NACOS_URL")
+        assert NACOS_URL
+        if NACOS_URL:
+            server_addresses = NACOS_URL.split('@')[1]
+            username, password = NACOS_URL.split('@')[0].split(":")
+
+            # Nacos客户端配置
+            self.client = nacos.NacosClient(
+                server_addresses=server_addresses,  # Nacos服务器地址
+                namespace=namespace,  # 命名空间
+                username=username,  # 用户名
+                password=password  # 密码
+            )
+
+        self.init_config(data_id, group)
+
+    def init_config(self, data_id: str, group: str = "DEFAULT_GROUP"):
+        """初始化配置并添加监听器"""
+        # 获取初始配置
+        config = self.client.get_config(data_id, group)
+        logger.info(f"初始配置\n{config}")
+        if config:
+            self._config = config
+
+        # 添加配置变更监听器
+        self.client.add_config_watcher(
+            data_id,
+            group,
+            self._config_changed_callback
+        )
+
+    def _config_changed_callback(self, args):
+        """配置变更回调函数"""
+        logger.debug(f"配置发生变更: {json.dumps(args, indent=4)}")
+        # {'data_id': 'testdata', 'group': 'DEFAULT_GROUP', 'namespace': 'test', 'raw_content': 'sk-\nsk-',
+        #  'content': 'sk-\nsk-'}
+        self._config = args['content']
+
+    @property
+    def text(self) -> str:
+        """获取当前配置: 原始内容"""
+        return self._config
+
+    @property
+    def json(self) -> Dict[str, Any]:
+        text = self._config
+        try:
+            return json.loads(text)
+        except json.decoder.JSONDecodeError as e:
+            logger.warning(f"标准json 配置加载失败: {e}")
+
+            logger.debug(f"尝试用json_repair解析")
+            return json_repair.repair_json(text, return_objects=True)
+
+    @property
+    def yaml(self) -> Dict[str, Any]:
+        text = self._config
+
+        try:
+            return yaml.safe_load(text)
+        except Exception as e:
+            logger.error(f"yaml 配置加载失败: {e}")
+
+    @property
+    def xml(self):
+        return self._config
+
+    @property
+    def html(self):
+        return self._config
+
+    @property
+    def properties(self):
+        return self._config
+
+
+if __name__ == '__main__':
+    # 初始化配置管理器
+    namespace = 'test'
+    data_id = "testdata"
+
+    manager = Manager(namespace, data_id)
+    # manager_ = Manager(namespace, data_id, group)
+
+    print(manager.text)

meutils/data/VERSION

@@ -1 +1 @@
-2024.12.12.17.03.48
+2024.12.12.19.04.48

meutils/config_utils/config_manager.py

@@ -1,77 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# @Project      : AI.  @by PyCharm
-# @File         : config_manager
-# @Time         : 2024/12/4 12:07
-# @Author       : betterme
-# @WeChat       : meutils
-# @Software     : PyCharm
-# @Description  :
-
-import nacos
-import yaml
-
-from meutils.pipe import *
-
-
-class ConfigManager:
-    _instance = None
-    _config: Dict[str, Any] = {}
-
-    def __new__(cls):
-        if cls._instance is None:
-            cls._instance = super().__new__(cls)
-        return cls._instance
-
-    def __init__(self):
-        # Nacos客户端配置
-        self.client = nacos.NacosClient(
-            server_addresses="nacos.chatfire.cc",  # Nacos服务器地址
-            namespace="test",  # 命名空间
-            username="chatfire",  # 用户名
-            password="chatfirechatfire"  # 密码
-        )
-
-    def init_config(self, data_id: str, group: str = "DEFAULT_GROUP"):
-        """初始化配置并添加监听器"""
-        # 获取初始配置
-        config = self.client.get_config(data_id, group)
-        logger.debug(config)
-
-        if config:
-            self._config = yaml.safe_load(config)
-
-        # 添加配置变更监听器
-        self.client.add_config_watcher(
-            data_id,
-            group,
-            self._config_changed_callback
-        )
-
-    def _config_changed_callback(self, args):
-        """配置变更回调函数"""
-        print(f"配置发生变更: {args}")
-        try:
-            self._config = yaml.safe_load(args['content'])
-            print(f"最新配置: {self._config}")
-        except Exception as e:
-            print(f"配置更新失败: {e}")
-
-    @property
-    def config(self) -> Dict[str, Any]:
-        """获取当前配置"""
-        return self._config
-
-
-if __name__ == '__main__':
-    # 初始化配置管理器
-
-    data_id = "testdata"
-    group = "DEFAULT_GROUP"
-
-    config_manager = ConfigManager()
-    config_manager.init_config(
-        data_id=data_id,  # 配置ID
-    )
-
-    # yaml.safe_load("- 1")