fastgenerateapi 1.1.9__tar.gz → 1.1.11__tar.gz

{fastgenerateapi-1.1.9 → fastgenerateapi-1.1.11}/PKG-INFO

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

{fastgenerateapi-1.1.9 → fastgenerateapi-1.1.11}/fastgenerateapi/__version__.py

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

{fastgenerateapi-1.1.9 → fastgenerateapi-1.1.11}/fastgenerateapi/channel/connection_manager.py

@@ -9,15 +9,22 @@ class ConnectionManager:
 
     @classmethod
     def add_connection(cls, user_id: str, websocket: WebSocket):
+        conn = cls.active_connections.get(user_id)
+        if conn:
+            conn.close()
         cls.active_connections[user_id] = websocket
 
     @classmethod
     def del_connection(cls, user_id: str):
         if user_id in cls.active_connections:
+            cls.active_connections[user_id].close()
             del cls.active_connections[user_id]
 
     @classmethod
     def add_group_connection(cls, group_id: str, user_id: str, connection: WebSocket):
+        conn = cls.active_group_connections.get(group_id, {}).get(user_id)
+        if conn:
+            conn.close()
         cls.active_group_connections.setdefault(group_id, {})[user_id] = connection
 
     @classmethod
@@ -25,6 +32,7 @@ class ConnectionManager:
         if group_id in cls.active_group_connections:
             user_dict = cls.active_group_connections[group_id]
             if user_id in user_dict:
+                user_dict[user_id].close()
                 del user_dict[user_id]
                 if not user_dict:
                     del cls.active_group_connections[group_id]

{fastgenerateapi-1.1.9 → fastgenerateapi-1.1.11}/fastgenerateapi/channel/consumer.py

@@ -36,7 +36,7 @@ class Consumer(WebSocketEndpoint):
     # 断开 删除
     async def on_disconnect(self, websocket, close_code):
         if self.group_id and self.user_id:
-            await ConnectionManager.del_group_connection(self.group_id, self.user_id)
+            ConnectionManager.del_group_connection(self.group_id, self.user_id)
         pass
 
     async def check_args(self, group_id, user_id):
@@ -56,7 +56,7 @@ class Consumer(WebSocketEndpoint):
             await self.error(websocket, code=422, msg="未获取到用户信息")
         if not await self.check_args(group_id, user_key):
             await self.error(websocket, code=422, msg="无连接权限")
-        await ConnectionManager.add_group_connection(group_id, user_key, websocket)
+        ConnectionManager.add_group_connection(group_id, user_key, websocket)
 
     # 群发消息
     @classmethod

fastgenerateapi-1.1.11/fastgenerateapi/settings/all_settings.py

@@ -0,0 +1,98 @@
+from functools import lru_cache
+from pathlib import Path
+from typing import Union
+
+import yaml
+from pydantic import BaseModel
+from pydantic.fields import FieldInfo
+
+from fastgenerateapi.settings.redis_settings import RedisSettings
+from fastgenerateapi.settings.app_settings import AppSettings
+from fastgenerateapi.settings.system_settings import SystemSettings
+
+
+class SettingsModel(BaseModel):
+    # 应用配置
+    app_settings: AppSettings = AppSettings()
+    # 系统配置
+    system_settings: SystemSettings = SystemSettings()
+    # 缓存配置
+    redis_settings: RedisSettings = RedisSettings()
+
+    @classmethod
+    def generate_file(cls, path='./.env'):
+        """
+        生成配置文件
+        .env 会增加前缀
+        .yaml 忽略前缀
+        :param path: 可选 .env / application.yaml
+        :return:
+        """
+        content = ''
+        setting_models = cls.model_fields.copy()
+        if path.__contains__('.env'):
+            for k, v in setting_models.items():
+                if isinstance(v, FieldInfo):
+                    content += f"[{v.annotation.__name__}]\n"
+                    env_prefix = v.annotation.model_config.get("env_prefix", "")
+                    fields = v.annotation.model_fields.copy()
+                    for k, v in fields.items():
+                        field_name = f'{env_prefix}{k}'
+                        if v.description is None:
+                            content += f"{field_name}={v.default}\n"
+                        else:
+                            content += f"# {v.description}\n{field_name}={v.default}\n"
+                    content += "\n"
+        elif path.__contains__('.yaml'):
+            for k, v in setting_models.items():
+                if isinstance(v, FieldInfo):
+                    content += f"[{v.annotation.__name__}]\n"
+                    env_prefix = v.annotation.model_config.get("env_prefix", "")
+                    fields = v.annotation.model_fields.copy()
+                    for k, v in fields.items():
+                        field_name = f'{env_prefix}{k}'
+                        content += f"  {field_name}: {v.default}"
+                        if v.description is None:
+                            content += f"\n"
+                        else:
+                            content += f"  # {v.description}\n"
+                    content += "\n"
+        with open(file=path, mode='w', encoding='utf-8') as f:
+            f.writelines(content)
+
+    @classmethod
+    @lru_cache
+    def get_global_settings(cls, path: Union[Path, str, None] = '.env'):
+        """
+        get global settings and set into cache
+        :param path: 可选 .env / application.yaml
+        :return:
+        """
+        setting_models = cls.model_fields.copy()
+
+        setting_dict = {}
+        if str(path).__contains__('.env'):
+            for k, v in setting_models.items():
+                if isinstance(v, FieldInfo):
+                    setting_dict[k] = v.annotation(_env_file=str(path))
+        elif str(path).__contains__('.yaml'):
+            with open(path, 'r', encoding='utf-8') as file:
+                data_dict = yaml.safe_load(file)
+            for k, v in setting_models.items():
+                if isinstance(v, FieldInfo):
+                    setting_dict[k] = v.annotation(**data_dict.get(v.annotation.__name__, {}))
+
+        setting_data = cls(**setting_dict)
+        global settings
+        settings.app_settings = setting_data.app_settings
+        settings.system_settings = setting_data.system_settings
+        settings.redis_settings = setting_data.redis_settings
+        return setting_data
+
+
+settings = SettingsModel()
+
+
+if __name__ == '__main__':
+    settings.generate_file()
+

{fastgenerateapi-1.1.9 → fastgenerateapi-1.1.11}/fastgenerateapi/settings/db_settings.py

@@ -21,7 +21,6 @@ class DBSettings(BaseSettings):
         return f"{self.DB_TYPE.lower()}://{self.DB_USERNAME}:{self.DB_PASSWORD}@{self.DB_HOST}:{self.DB_PORT}/{self.DB_DATABASE}"
 
     model_config = SettingsConfigDict(
-        env_prefix="",
         env_file=".env",
         case_sensitive=True,
         extra='ignore'

{fastgenerateapi-1.1.9 → fastgenerateapi-1.1.11}/fastgenerateapi/settings/file_settings.py

@@ -4,7 +4,7 @@ from pydantic import Field
 from pydantic_settings import BaseSettings, SettingsConfigDict
 
 
-class FileServerSettings(BaseSettings):
+class FileSettings(BaseSettings):
     """
     文件配置
     """
@@ -13,7 +13,6 @@ class FileServerSettings(BaseSettings):
     FILE_ROOT: Optional[str] = Field(default='static', description="文件储存路径", title="file storage path")
 
     model_config = SettingsConfigDict(
-        env_prefix="FILESERVER_",
         env_file=".env",
         case_sensitive=True,
         extra='ignore'

{fastgenerateapi-1.1.9 → fastgenerateapi-1.1.11}/fastgenerateapi.egg-info/PKG-INFO

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

fastgenerateapi-1.1.9/fastgenerateapi/settings/all_settings.py

@@ -1,91 +0,0 @@
-
-from pydantic import BaseModel
-
-from fastgenerateapi.settings.redis_settings import RedisSettings
-from fastgenerateapi.settings.app_settings import AppSettings
-from fastgenerateapi.settings.system_settings import SystemSettings
-
-
-class SettingsModel(BaseModel):
-    # 应用配置
-    app_settings: AppSettings = AppSettings()
-    # 系统配置
-    system_settings: SystemSettings = SystemSettings()
-    # 缓存配置
-    redis_settings: RedisSettings = RedisSettings()
-
-    # pydantic v2 不支持 ModelField, v.type_
-    # @classmethod
-    # def generate_file(cls, path='./.env'):
-    #     """
-    #     生成配置文件
-    #     .env 会增加前缀
-    #     .yaml 忽略前缀
-    #     :param path: 可选 .env / application.yaml
-    #     :return:
-    #     """
-    #     content = ''
-    #     setting_models = cls.__fields__.copy()
-    #     if path.__contains__('.env'):
-    #         for k, v in setting_models.items():
-    #             if issubclass(type(v), ModelField):
-    #                 sub_setting_class = v.type_
-    #                 content += f"[{sub_setting_class.__name__}]\n"
-    #                 fields = sub_setting_class.__fields__.copy()
-    #                 for k, v in fields.items():
-    #                     field_name = f'{sub_setting_class.Config.env_prefix}{k}'
-    #                     if v.field_info.description is None:
-    #                         content += f"{field_name}={v.default}\n"
-    #                     else:
-    #                         content += f"# {v.field_info.description}\n{field_name}={v.default}\n"
-    #                 content += "\n"
-    #     elif path.__contains__('.yaml'):
-    #         for k, v in setting_models.items():
-    #             if issubclass(type(v), ModelField):
-    #                 sub_setting_class = v.type_
-    #                 content += f"{sub_setting_class.__name__}:\n"
-    #                 fields = sub_setting_class.__fields__.copy()
-    #                 for k, v in fields.items():
-    #                     content += f"  {k}: {v.default}"
-    #                     if v.field_info.description is None:
-    #                         content += f"\n"
-    #                     else:
-    #                         content += f"  # {v.field_info.description}\n"
-    #                 content += "\n"
-    #     with open(file=path, mode='w', encoding='utf-8') as f:
-    #         f.writelines(content)
-    #
-    # @classmethod
-    # @lru_cache
-    # def get_global_settings(cls, path: Union[types.Path, str, None] = '.env'):
-    #     """
-    #     get global settings and set into cache
-    #     :param path: 可选 .env / application.yaml
-    #     :return:
-    #     """
-    #     setting_models = cls.__fields__.copy()
-    #
-    #     setting_dict = {}
-    #     if str(path).__contains__('.env'):
-    #         for k, v in setting_models.items():
-    #             if issubclass(type(v), ModelField):
-    #                 sub_setting_class = v.type_
-    #                 setting_dict[k] = sub_setting_class(_env_file=str(path))
-    #     elif str(path).__contains__('.yaml'):
-    #         with open(path, 'r', encoding='utf-8') as file:
-    #             data_dict = yaml.safe_load(file)
-    #         for k, v in setting_models.items():
-    #             if issubclass(type(v), ModelField):
-    #                 sub_setting_class = v.type_
-    #                 setting_dict[k] = sub_setting_class(**data_dict.get(sub_setting_class.__name__, {}))
-    #
-    #     setting_data = cls(**setting_dict)
-    #     global settings
-    #     settings.app_settings = setting_data.app_settings
-    #     settings.system_settings = setting_data.system_settings
-    #     settings.redis_settings = setting_data.redis_settings
-    #     return setting_data
-
-
-settings = SettingsModel()
-