arpakitlib 1.6.31__tar.gz → 1.6.33__tar.gz

{arpakitlib-1.6.31 → arpakitlib-1.6.33}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: arpakitlib
-Version: 1.6.31
+Version: 1.6.33
 Summary: arpakitlib
 Home-page: https://github.com/ARPAKIT-Company/arpakitlib
 License: Apache-2.0

{arpakitlib-1.6.31 → arpakitlib-1.6.33}/arpakitlib/ar_fastapi_util.py

@@ -477,7 +477,7 @@ def create_fastapi_app(
         startup_api_events: list[BaseStartupAPIEvent] | None = None,
         shutdown_api_events: list[BaseStartupAPIEvent] | None = None,
         transmitted_api_data: BaseTransmittedAPIData = BaseTransmittedAPIData(),
-        api_router: APIRouter = simple_api_router_for_testing()
+        main_router: APIRouter = simple_api_router_for_testing()
 ):
     setup_normal_logging(log_filepath=log_filepath)
 
@@ -516,7 +516,7 @@ def create_fastapi_app(
 
     add_needed_api_router_to_app(app=app)
 
-    app.include_router(router=api_router)
+    app.include_router(router=main_router)
 
     return app
 

{arpakitlib-1.6.31 → arpakitlib-1.6.33}/arpakitlib/ar_sqlalchemy_model_util.py

@@ -25,11 +25,18 @@ class BaseDBM(DeclarativeBase):
             self._bus_data = {}
         return self._bus_data
 
-    def simple_dict(self) -> dict[str, Any]:
-        return {c.key: getattr(self, c.key) for c in inspect(self).mapper.column_attrs}
+    def simple_dict(self, *, include_sd_properties: bool = True) -> dict[str, Any]:
+        res = {c.key: getattr(self, c.key) for c in inspect(self).mapper.column_attrs}
 
-    def simple_json(self) -> str:
-        return safely_transfer_to_json_str(self.simple_dict())
+        if include_sd_properties:
+            for attr_name in dir(self):
+                if attr_name.startswith("sdp_") and isinstance(getattr(type(self), attr_name, None), property):
+                    res[attr_name.removesuffix("sdp_")] = getattr(self, attr_name)
+
+        return res
+
+    def simple_json(self, *, include_sd_properties: bool = True) -> str:
+        return safely_transfer_to_json_str(self.simple_dict(include_sd_properties=include_sd_properties))
 
 
 class SimpleDBM(BaseDBM):

{arpakitlib-1.6.31 → arpakitlib-1.6.33}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "arpakitlib"
-version = "1.6.31"
+version = "1.6.33"
 description = "arpakitlib"
 authors = ["arpakit <arpakit@gmail.com>", "arpakit <support@arpakit.com>"]
 license = "Apache License 2.0"