fastgenerateapi 1.1.20__tar.gz → 1.1.21__tar.gz

{fastgenerateapi-1.1.20 → fastgenerateapi-1.1.21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastgenerateapi
-Version: 1.1.20
+Version: 1.1.21
 Summary: FastAPIView Class View
 Author: ShiLiang
 Author-email: 2509144896@qq.com

{fastgenerateapi-1.1.20 → fastgenerateapi-1.1.21}/fastgenerateapi/__version__.py

@@ -8,7 +8,7 @@
 #                                                  d8888P
 
 
-VERSION = (1, 1, 20)
+VERSION = (1, 1, 21)
 
 __version__ = '.'.join(map(str, VERSION))
 

{fastgenerateapi-1.1.20 → fastgenerateapi-1.1.21}/fastgenerateapi/settings/all_settings.py

@@ -1,7 +1,7 @@
 import os
 from functools import lru_cache
 from pathlib import Path
-from typing import Union, Optional, Type
+from typing import Union, Optional
 
 import yaml
 from fastapi.exceptions import ValidationException
@@ -66,10 +66,7 @@ class SettingsModel(BaseModel):
                             content += f"  # {v.description}\n"
                     content += "\n"
         if etcd_settings and etcd_settings.ETCD_SETTING_KEY:
-            import etcd3
-            etcd_dict = etcd_settings.model_dump(exclude_unset=True, by_alias=True, exclude={"ETCD_SETTING_KEY", })
-            etcd = etcd3.client(**{key.removeprefix("ETCD_").lower(): value for key, value in etcd_dict.items()})
-            etcd.put(etcd_settings.ETCD_SETTING_KEY, content)
+            etcd_settings.client.put(etcd_settings.ETCD_SETTING_KEY, content)
         else:
             with open(file=path, mode='w', encoding='utf-8') as f:
                 f.writelines(content)
@@ -103,10 +100,7 @@ class SettingsModel(BaseModel):
                 if not etcd_settings:
                     etcd_settings = EtcdSettings()
                 if etcd_settings.ETCD_SETTING_KEY:
-                    import etcd3
-                    etcd_dict = etcd_settings.model_dump(exclude_unset=True, by_alias=True, exclude={"ETCD_SETTING_KEY",})
-                    etcd = etcd3.client(**{key.removeprefix("ETCD_").lower(): value for key, value in etcd_dict.items()})
-                    res, metadata = etcd.get(etcd_settings.ETCD_SETTING_KEY)
+                    res, metadata = etcd_settings.client.get(etcd_settings.ETCD_SETTING_KEY)
                     data_dict = yaml.safe_load(res)
             if not data_dict:
                 raise ValidationException(errors="配置错误")
@@ -125,6 +119,14 @@ class SettingsModel(BaseModel):
         settings.redis_settings = setting_data.redis_settings
         return setting_data
 
+    def watch(self):
+        """
+        监听文件或这etcd变化，待完善
+        借用 etcd.watch(target)
+        :return:
+        """
+        ...
+
 
 settings = SettingsModel()
 

{fastgenerateapi-1.1.20 → fastgenerateapi-1.1.21}/fastgenerateapi/settings/etcd_settings.py

@@ -27,6 +27,13 @@ class EtcdSettings(BaseSettings):
         frozen=True,
     )
 
+    @property
+    def client(self):
+        import etcd3
+        etcd_dict = self.model_dump(exclude_unset=True, by_alias=True, exclude={"ETCD_SETTING_KEY", })
+        etcd = etcd3.client(**{key.removeprefix("ETCD_").lower(): value for key, value in etcd_dict.items()})
+
+        return etcd
 
 
 

{fastgenerateapi-1.1.20 → fastgenerateapi-1.1.21}/fastgenerateapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastgenerateapi
-Version: 1.1.20
+Version: 1.1.21
 Summary: FastAPIView Class View
 Author: ShiLiang
 Author-email: 2509144896@qq.com