MeUtils 2024.12.12.17.3.48__tar.gz → 2024.12.12.18.26.47__tar.gz

{meutils-2024.12.12.17.3.48 → meutils-2024.12.12.18.26.47/MeUtils.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MeUtils
-Version: 2024.12.12.17.3.48
+Version: 2024.12.12.18.26.47
 Summary: description
 Home-page: https://github.com/yuanjie-ai/MeUtils
 Author: yuanjie
@@ -107,42 +107,42 @@ Requires-Dist: pandas-profiling[notebook]; extra == "pd"
 Requires-Dist: pandas_summary; extra == "pd"
 Requires-Dist: polars; extra == "pd"
 Provides-Extra: all
-Requires-Dist: pyarrow; extra == "all"
-Requires-Dist: langchain; extra == "all"
-Requires-Dist: asyncmy; extra == "all"
+Requires-Dist: pretty_errors; extra == "all"
+Requires-Dist: gunicorn; extra == "all"
 Requires-Dist: pymongo; extra == "all"
-Requires-Dist: fastapi[all]; extra == "all"
+Requires-Dist: pymysql; extra == "all"
 Requires-Dist: geopy; extra == "all"
+Requires-Dist: iteration_utilities; extra == "all"
+Requires-Dist: openai; extra == "all"
+Requires-Dist: pyarrow; extra == "all"
 Requires-Dist: redis-py-cluster; extra == "all"
-Requires-Dist: pretty_errors; extra == "all"
-Requires-Dist: gunicorn; extra == "all"
-Requires-Dist: pymilvus; extra == "all"
-Requires-Dist: polars; extra == "all"
-Requires-Dist: sqlalchemy; extra == "all"
+Requires-Dist: jinja2; 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: fastapi[all]; extra == "all"
 Requires-Dist: schedule; extra == "all"
-Requires-Dist: iteration_utilities; extra == "all"
-Requires-Dist: uvicorn; extra == "all"
 Requires-Dist: jmespath; extra == "all"
-Requires-Dist: pymysql; extra == "all"
+Requires-Dist: seaborn; extra == "all"
+Requires-Dist: pymupd; extra == "all"
+Requires-Dist: pandas-profiling[notebook]; extra == "all"
 Requires-Dist: missingno; extra == "all"
-Requires-Dist: thefuck; extra == "all"
+Requires-Dist: reportlab; extra == "all"
+Requires-Dist: sse_starlette; extra == "all"
+Requires-Dist: polars; extra == "all"
+Requires-Dist: langchain; extra == "all"
+Requires-Dist: asyncmy; extra == "all"
 Requires-Dist: simplejson; extra == "all"
-Requires-Dist: pandas-profiling[notebook]; extra == "all"
-Requires-Dist: jinja2; extra == "all"
+Requires-Dist: jieba; extra == "all"
+Requires-Dist: cachetools; extra == "all"
+Requires-Dist: faiss-cpu; extra == "all"
+Requires-Dist: pymilvus; extra == "all"
 Requires-Dist: thriftpy2; extra == "all"
-Requires-Dist: sse_starlette; extra == "all"
-Requires-Dist: dataframe_image; extra == "all"
-Requires-Dist: seaborn; extra == "all"
+Requires-Dist: streamlit; extra == "all"
+Requires-Dist: uvicorn; extra == "all"
+Requires-Dist: sqlalchemy; extra == "all"
 Requires-Dist: fastapi; extra == "all"
+Requires-Dist: dataframe_image; extra == "all"
+Requires-Dist: thefuck; extra == "all"
+Requires-Dist: filetype; extra == "all"
 
 [![Downloads](http://pepy.tech/badge/meutils)](http://pepy.tech/project/meutils)
 

{meutils-2024.12.12.17.3.48 → meutils-2024.12.12.18.26.47}/MeUtils.egg-info/SOURCES.txt

@@ -263,7 +263,7 @@ meutils/cmds/subprocess_demo.py
 meutils/comp_utils/__init__.py
 meutils/comp_utils/reverse_metric.py
 meutils/config_utils/__init__.py
-meutils/config_utils/config_manager.py
+meutils/config_utils/manager.py
 meutils/config_utils/nacosx.py
 meutils/config_utils/lark_utils/__init__.py
 meutils/config_utils/lark_utils/common.py

{meutils-2024.12.12.17.3.48/MeUtils.egg-info → meutils-2024.12.12.18.26.47}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MeUtils
-Version: 2024.12.12.17.3.48
+Version: 2024.12.12.18.26.47
 Summary: description
 Home-page: https://github.com/yuanjie-ai/MeUtils
 Author: yuanjie
@@ -107,42 +107,42 @@ Requires-Dist: pandas-profiling[notebook]; extra == "pd"
 Requires-Dist: pandas_summary; extra == "pd"
 Requires-Dist: polars; extra == "pd"
 Provides-Extra: all
-Requires-Dist: pyarrow; extra == "all"
-Requires-Dist: langchain; extra == "all"
-Requires-Dist: asyncmy; extra == "all"
+Requires-Dist: pretty_errors; extra == "all"
+Requires-Dist: gunicorn; extra == "all"
 Requires-Dist: pymongo; extra == "all"
-Requires-Dist: fastapi[all]; extra == "all"
+Requires-Dist: pymysql; extra == "all"
 Requires-Dist: geopy; extra == "all"
+Requires-Dist: iteration_utilities; extra == "all"
+Requires-Dist: openai; extra == "all"
+Requires-Dist: pyarrow; extra == "all"
 Requires-Dist: redis-py-cluster; extra == "all"
-Requires-Dist: pretty_errors; extra == "all"
-Requires-Dist: gunicorn; extra == "all"
-Requires-Dist: pymilvus; extra == "all"
-Requires-Dist: polars; extra == "all"
-Requires-Dist: sqlalchemy; extra == "all"
+Requires-Dist: jinja2; 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: fastapi[all]; extra == "all"
 Requires-Dist: schedule; extra == "all"
-Requires-Dist: iteration_utilities; extra == "all"
-Requires-Dist: uvicorn; extra == "all"
 Requires-Dist: jmespath; extra == "all"
-Requires-Dist: pymysql; extra == "all"
+Requires-Dist: seaborn; extra == "all"
+Requires-Dist: pymupd; extra == "all"
+Requires-Dist: pandas-profiling[notebook]; extra == "all"
 Requires-Dist: missingno; extra == "all"
-Requires-Dist: thefuck; extra == "all"
+Requires-Dist: reportlab; extra == "all"
+Requires-Dist: sse_starlette; extra == "all"
+Requires-Dist: polars; extra == "all"
+Requires-Dist: langchain; extra == "all"
+Requires-Dist: asyncmy; extra == "all"
 Requires-Dist: simplejson; extra == "all"
-Requires-Dist: pandas-profiling[notebook]; extra == "all"
-Requires-Dist: jinja2; extra == "all"
+Requires-Dist: jieba; extra == "all"
+Requires-Dist: cachetools; extra == "all"
+Requires-Dist: faiss-cpu; extra == "all"
+Requires-Dist: pymilvus; extra == "all"
 Requires-Dist: thriftpy2; extra == "all"
-Requires-Dist: sse_starlette; extra == "all"
-Requires-Dist: dataframe_image; extra == "all"
-Requires-Dist: seaborn; extra == "all"
+Requires-Dist: streamlit; extra == "all"
+Requires-Dist: uvicorn; extra == "all"
+Requires-Dist: sqlalchemy; extra == "all"
 Requires-Dist: fastapi; extra == "all"
+Requires-Dist: dataframe_image; extra == "all"
+Requires-Dist: thefuck; extra == "all"
+Requires-Dist: filetype; extra == "all"
 
 [![Downloads](http://pepy.tech/badge/meutils)](http://pepy.tech/project/meutils)
 

meutils-2024.12.12.18.26.47/meutils/config_utils/manager.py

@@ -0,0 +1,107 @@
+#!/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:
+    _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]:
+        try:
+            return json.loads(self.text)
+        except json.decoder.JSONDecodeError as e:
+            logger.warning(f"标准json 配置加载失败: {e}")
+
+            logger.debug(f"尝试用json_repair解析")
+            return json_repair.repair_json(self.text, return_objects=True)
+
+    @property
+    def yaml(self) -> Dict[str, Any]:
+        try:
+            return yaml.safe_load(self.text)
+        except Exception as e:
+            logger.error(f"yaml 配置加载失败: {e}")
+
+    @property
+    def xml(self):
+        return self.text
+
+    @property
+    def html(self):
+        return self.text
+
+    @property
+    def properties(self):
+        return self.text
+
+
+if __name__ == '__main__':
+    # 初始化配置管理器
+    namespace = 'test'
+    data_id = "testdata"
+    group = "DEFAULT_GROUP"
+
+    manager = Manager(namespace, data_id, group)
+    # manager_ = Manager(namespace, data_id, group)
+
+    print(manager.text)

meutils-2024.12.12.18.26.47/meutils/data/VERSION

@@ -0,0 +1 @@
+2024.12.12.18.26.47

meutils-2024.12.12.17.3.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")

meutils-2024.12.12.17.3.48/meutils/data/VERSION

@@ -1 +0,0 @@
-2024.12.12.17.03.48

{meutils-2024.12.12.17.3.48 → meutils-2024.12.12.18.26.47}/MeUtils.egg-info/requires.txt

@@ -44,42 +44,42 @@ openai
 langchain
 
 [all]
-pyarrow
-langchain
-asyncmy
+pretty_errors
+gunicorn
 pymongo
-fastapi[all]
+pymysql
 geopy
+iteration_utilities
+openai
+pyarrow
 redis-py-cluster
-pretty_errors
-gunicorn
-pymilvus
-polars
-sqlalchemy
+jinja2
 pandas_summary
-streamlit
-faiss-cpu
-pymupd
-jieba
-openai
-filetype
-cachetools
-reportlab
+fastapi[all]
 schedule
-iteration_utilities
-uvicorn
 jmespath
-pymysql
+seaborn
+pymupd
+pandas-profiling[notebook]
 missingno
-thefuck
+reportlab
+sse_starlette
+polars
+langchain
+asyncmy
 simplejson
-pandas-profiling[notebook]
-jinja2
+jieba
+cachetools
+faiss-cpu
+pymilvus
 thriftpy2
-sse_starlette
-dataframe_image
-seaborn
+streamlit
+uvicorn
+sqlalchemy
 fastapi
+dataframe_image
+thefuck
+filetype
 
 [ann]
 pymilvus