arpakitlib 1.7.5__py3-none-any.whl → 1.7.9__py3-none-any.whl

arpakitlib/_arpakit_project_template/example.env

@@ -1,4 +1,5 @@
 # mode_type=
+name=
 # var_dirname=
 # var_dirpath=
 # log_filename=
@@ -9,3 +10,4 @@
 # media_dirpath=
 # dump_dirname=
 # dump_dirpath=
+# db_url=

arpakitlib/_arpakit_project_template/manage/example_docker_run_postgres_for_dev.sh

@@ -0,0 +1,4 @@
+cd ..
+docker rm ..._postgres
+docker run --name ..._postgres -d -p ...:5432 -e POSTGRES_USER=... -e POSTGRES_PASSWORD=... -e POSTGRES_DB=... postgres:16 -c max_connections=100
+docker start ..._postgres

arpakitlib/_arpakit_project_template/manage/example_docker_start_postgres_for_dev.sh

@@ -0,0 +1,2 @@
+cd ..
+docker start ..._postgres

arpakitlib/_arpakit_project_template/manage/example_docker_stop_postgres_for_dev.sh

@@ -0,0 +1,2 @@
+cd ..
+docker stop ..._postgres

arpakitlib/_arpakit_project_template/manage/example_nginx_proxy.nginx

@@ -0,0 +1,14 @@
+server {
+    listen 80;
+    listen [::]:80;
+
+    server_name www...;
+
+    location / {
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_pass ...;
+    }
+}

arpakitlib/_arpakit_project_template/src/core/settings.py

@@ -30,7 +30,9 @@ class Settings(SimpleSettings):
 
     dump_dirpath: str = os.path.join(var_dirpath, dump_dirname)
 
-    db_url: str | None = "postgresql://cosmos:cosmos@localhost:5432/cosmos"
+    db_url: str | None = None
+
+    db_echo: bool = False
 
 
 @lru_cache()

arpakitlib/_arpakit_project_template/src/core/util.py

@@ -46,6 +46,7 @@ def create_sqlalchemy_db() -> SQLAlchemyDB:
 
     return SQLAlchemyDB(
         db_url=get_cached_settings().db_url,
+        db_echo=get_cached_settings().db_echo
     )
 
 

arpakitlib/{ar_arpakitlib_cli.py → ar_arpakitlib_cli_util.py}

@@ -8,7 +8,7 @@ from arpakitlib.ar_project_template_util import init_arpakit_project_template
 from arpakitlib.ar_str_util import raise_if_string_blank
 
 
-def arpakitlib_cli(*, full_command: str | None = None):
+def execute_arpakitlib_cli(*, full_command: str | None = None):
     if full_command is None:
         full_command = " ".join(sys.argv)
 
@@ -57,4 +57,4 @@ def arpakitlib_cli(*, full_command: str | None = None):
 
 
 if __name__ == '__main__':
-    arpakitlib_cli(full_command="/arpakitlib -c help")
+    execute_arpakitlib_cli(full_command="/arpakitlib -c help")

arpakitlib/ar_fastapi_util.py

@@ -582,11 +582,11 @@ def create_fastapi_app(
         contact: dict[str, Any] | None = None,
         media_dirpath: str | None = None
 ):
+    setup_normal_logging(log_filepath=log_filepath)
+
     if contact is None:
         contact = _DEFAULT_CONTACT
 
-    setup_normal_logging(log_filepath=log_filepath)
-
     if not startup_api_events:
         startup_api_events = [BaseStartupAPIEvent()]
 

arpakitlib/ar_settings_util.py

@@ -3,6 +3,7 @@
 from typing import Union
 
 from pydantic import ConfigDict, field_validator
+from pydantic_core import PydanticUndefined
 from pydantic_settings import BaseSettings
 
 from arpakitlib.ar_enumeration_util import Enumeration
@@ -11,7 +12,7 @@ from arpakitlib.ar_enumeration_util import Enumeration
 def generate_env_example(settings_class: Union[BaseSettings, type[BaseSettings]]):
     res = ""
     for k, f in settings_class.model_fields.items():
-        if f.default:
+        if f.default is not PydanticUndefined:
             res += f"# {k}=\n"
         else:
             res += f"{k}=\n"
@@ -22,11 +23,10 @@ class SimpleSettings(BaseSettings):
     model_config = ConfigDict(extra="ignore")
 
     class ModeTypes(Enumeration):
-        local: str = "local"
-        test: str = "preprod"
+        dev: str = "dev"
         prod: str = "prod"
 
-    mode_type: str = ModeTypes.local
+    mode_type: str = ModeTypes.dev
 
     @field_validator("mode_type")
     @classmethod
@@ -35,12 +35,8 @@ class SimpleSettings(BaseSettings):
         return v
 
     @property
-    def is_mode_type_local(self) -> bool:
-        return self.mode_type == self.ModeTypes.local
-
-    @property
-    def is_mode_type_test(self) -> bool:
-        return self.mode_type == self.ModeTypes.test
+    def is_mode_type_dev(self) -> bool:
+        return self.mode_type == self.ModeTypes.dev
 
     @property
     def is_mode_type_prod(self) -> bool:

arpakitlib/ar_sqlalchemy_util.py

@@ -26,7 +26,7 @@ class SQLAlchemyDB:
             self,
             *,
             db_url: str = "postgresql://arpakitlib:arpakitlib@localhost:50629/arpakitlib",
-            echo: bool = False,
+            db_echo: bool = False,
             need_include_operation_dbm: bool = False,
             need_include_story_dbm: bool = False,
             db_models: list[Any] | None = None
@@ -38,7 +38,7 @@ class SQLAlchemyDB:
             self.need_include_story_dbm = True
         self.engine = create_engine(
             url=db_url,
-            echo=echo,
+            echo=db_echo,
             pool_size=5,
             max_overflow=10,
             poolclass=QueuePool,

{arpakitlib-1.7.5.dist-info → arpakitlib-1.7.9.dist-info}/METADATA

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

{arpakitlib-1.7.5.dist-info → arpakitlib-1.7.9.dist-info}/RECORD

@@ -6,14 +6,18 @@ arpakitlib/_arpakit_project_template/AUTHOR.md,sha256=5s2zJB3cHS_hpNBOGXfQPAfS9v
 arpakitlib/_arpakit_project_template/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
 arpakitlib/_arpakit_project_template/NOTICE,sha256=95aUzaPJjVpDsGAsNzVnq7tHTxAl0s5UFznCTkVCau4,763
 arpakitlib/_arpakit_project_template/README.md,sha256=aR1tz5-7YOpCcs3Jc0C5UkAlYUzMw-x9Wqq4EGcj12A,22
-arpakitlib/_arpakit_project_template/example.env,sha256=yxbxCKH_KxjymRGR1V8szwO9E07sN0as9ZaeN7K5L_E,175
+arpakitlib/_arpakit_project_template/example.env,sha256=j3oF-r6mrY80NNJN7ipEw7l4YcUxqHntyRhKfevkDSg,191
 arpakitlib/_arpakit_project_template/example_pyproject.toml,sha256=Cg8VgGbSXsbvCb63cYwYQAb1bDA49IbuIMP5ShxTMK4,486
 arpakitlib/_arpakit_project_template/manage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template/manage/beutify_json.py,sha256=mzmt-5piAHqgihLsqOpPx1JjDc1qA5F1XHBxDdR-BxY,215
 arpakitlib/_arpakit_project_template/manage/check_logging.py,sha256=rfrl4MK5ItRKaLKb0UU_EfQLckRQSYJ1S_2VAQJQ2Yk,212
 arpakitlib/_arpakit_project_template/manage/check_settings.py,sha256=JYR-IPgvYQOmJedKY9vOctbxEcUlaxZR-P0JXT9L2JQ,143
 arpakitlib/_arpakit_project_template/manage/docker_ps.sh,sha256=uwm8vHgeuNLCOn0o9hgP_uc-PUkS9FwLyzZh6ItZ3do,15
+arpakitlib/_arpakit_project_template/manage/example_docker_run_postgres_for_dev.sh,sha256=cVPEu7xiEuPig7QDlz151Hob0RqVhWA_aSWzWEKR9I8,200
+arpakitlib/_arpakit_project_template/manage/example_docker_start_postgres_for_dev.sh,sha256=-jDvShXoPtD0EsNXJEoovvE4PBbHbz4glLtiVuG68Zg,32
+arpakitlib/_arpakit_project_template/manage/example_docker_stop_postgres_for_dev.sh,sha256=5HFIgaCJvY6CdYVD2i3FkSzltIL0B-8BPKbdHH18LRM,30
 arpakitlib/_arpakit_project_template/manage/example_init_arpakit_project_template.sh,sha256=0J1mESu315fb8KRnUq9SIOg6Oj8QpJgIcjbs8vhvgsQ,162
+arpakitlib/_arpakit_project_template/manage/example_nginx_proxy.nginx,sha256=Ch4vCoa1QBdDpfRAz2tgOMO8Gw-6tgNyvOkte7A3MsA,326
 arpakitlib/_arpakit_project_template/manage/example_systemd.service,sha256=Cunp3074ZKg1AQiX4Q_Xe5Q39Jca7hQj5ljXqryWwTU,143
 arpakitlib/_arpakit_project_template/manage/generate_env_example.py,sha256=pRTr6SzBJxDUaxTXZgLJr7rJawHyvpyTJbrJSZW0hEc,330
 arpakitlib/_arpakit_project_template/manage/git_commit.sh,sha256=AW1NEel-ZHaYeVWFlRbgZSYPQdnVKsTkpR_07RQL1Mw,42
@@ -62,8 +66,8 @@ arpakitlib/_arpakit_project_template/src/additional_model/additional_model.py,sh
 arpakitlib/_arpakit_project_template/src/business_service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template/src/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template/src/core/const.py,sha256=CZZew674y7LhCAlYhvuF5cV4Zb9nQ17j2Tcuj2GEBf4,1232
-arpakitlib/_arpakit_project_template/src/core/settings.py,sha256=OwwGS7znZCBy51nwGUQJOsdkbEf6f404Vga97eXxxxs,1261
-arpakitlib/_arpakit_project_template/src/core/util.py,sha256=fVKgZYbf_QIuvRPA_69O10Xh24q5zl1-yvOy9ZGMbn0,1660
+arpakitlib/_arpakit_project_template/src/core/settings.py,sha256=9NtT7KNpyqjZKbYkYRjVKfBzHnD7aLPsrOVyCyPyK5c,1242
+arpakitlib/_arpakit_project_template/src/core/util.py,sha256=PG0RlXrcAMtRBd9BB-Zp3N5009wASqTI2T6PNixj1ZM,1706
 arpakitlib/_arpakit_project_template/src/db/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template/src/db/sqlalchemy_model.py,sha256=dcvj5C9E2F2KCsGZPBBncQf_EvVJAC1qQgnyD8P4ZEw,6
 arpakitlib/_arpakit_project_template/src/test_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -77,7 +81,7 @@ arpakitlib/ar_additional_model_util.py,sha256=tNzZhZtvtJ1qC6Cn4UnyoEL58HudfpCdQy
 arpakitlib/ar_aiogram_util.py,sha256=5JPCDZpdBGTE-EIWPRez9amCZAX7XemFIVu5YrQK7Pw,12264
 arpakitlib/ar_arpakit_lib_module_util.py,sha256=V_mc3Ml73Tzz3arxmwEfIxruKMyrwbe8XZ9FfVDtUXY,5446
 arpakitlib/ar_arpakit_schedule_uust_api_client_util.py,sha256=SYWWQDohPnw0qpBIu2hEvGZRVdaI4NUUQdEjnMnseo4,18237
-arpakitlib/ar_arpakitlib_cli.py,sha256=agGQZijh_qqhg6y_Z7AwsmmvHgpMO8KGG69z9YHU3Rg,2450
+arpakitlib/ar_arpakitlib_cli_util.py,sha256=v8zZmc_qV6Yuzuh_jKrf4klEXBEnXRK_fjlpHvZPZ_8,2466
 arpakitlib/ar_base64_util.py,sha256=aZkg2cZTuAaP2IWeG_LXJ6RO7qhyskVwec-Lks0iM-k,676
 arpakitlib/ar_base_worker_util.py,sha256=fW7kzbo7gKFaF7-l7DnOGTVkt4H_BeHSkTHSoGQR8Fw,3295
 arpakitlib/ar_cache_file_util.py,sha256=Fo2pH-Zqm966KWFBHG_pbiySGZvhIFCYqy7k1weRfJ0,3476
@@ -105,11 +109,10 @@ arpakitlib/ar_fastapi_static/swagger-ui/swagger-ui.css,sha256=jzPZlgJTFwSdSphk9C
 arpakitlib/ar_fastapi_static/swagger-ui/swagger-ui.css.map,sha256=5wq8eXMLU6Zxb45orZPL1zAsBFJReFw6GjYqGpUX3hg,262650
 arpakitlib/ar_fastapi_static/swagger-ui/swagger-ui.js,sha256=ffrLZHHEQ_g84A-ul3yWa10Kk09waOAxHcQXPuZuavg,339292
 arpakitlib/ar_fastapi_static/swagger-ui/swagger-ui.js.map,sha256=9UhIW7MqCOZPAz1Sl1IKfZUuhWU0p-LJqrnjjJD9Xhc,1159454
-arpakitlib/ar_fastapi_util.py,sha256=TPv3r_YXTeR_YkKGW0XG-VX-7p8o214m-zHCv2RYHMY,21844
+arpakitlib/ar_fastapi_util.py,sha256=Et9lypLbCEOFBV4WXGn8NUkXAk4gdG_tdJmTgKCszLY,21844
 arpakitlib/ar_file_storage_in_dir_util.py,sha256=D3e3rGuHoI6xqAA5mVvEpVVpOWY1jyjNsjj2UhyHRbE,3674
 arpakitlib/ar_file_util.py,sha256=XiwmeycxoLqtYnGOu5q6IEaJJXilZvtLvsKDKtwqSLY,137
 arpakitlib/ar_hash_util.py,sha256=Iqy6KBAOLBQMFLWv676boI5sV7atT2B-fb7aCdHOmIQ,340
-arpakitlib/ar_hello_world.py,sha256=5B3GTgxGIFh_s6ttyB4UKn78ncyA_8blRnDT04l-ELg,158
 arpakitlib/ar_http_request_util.py,sha256=DfzITtgbWJLkyaAIa0cBZZZqLE0EXx-TsHZkiaRy3Tg,3649
 arpakitlib/ar_ip_util.py,sha256=aEAa1Hvobh9DWX7cmBAPLqnXSTiKe2hRk-WJaiKMaI8,1009
 arpakitlib/ar_json_db_util.py,sha256=CEyhIU4WuNmX5mqwBVYxUKSdpFelXvWmf_tJ1fuxMSE,7187
@@ -127,18 +130,18 @@ arpakitlib/ar_postgresql_util.py,sha256=1AuLjEaa1Lg4pzn-ukCVnDi35Eg1k91APRTqZhIJ
 arpakitlib/ar_project_template_util.py,sha256=RpzLFTjutqKmGTI6PrewfJFMwXGz7ZbXJjHjGHh6KpI,3164
 arpakitlib/ar_run_cmd_util.py,sha256=D_rPavKMmWkQtwvZFz-Io5Ak8eSODHkcFeLPzNVC68g,1072
 arpakitlib/ar_schedule_uust_api_client_util.py,sha256=JD-hRUQSs-euK0zq9w_4QUfGO00yWM08gllWUVKTtHc,6109
-arpakitlib/ar_settings_util.py,sha256=NvFzpIaQhlMp-BZwttUY_9gamMC5cpJk2Kp2B3BtMug,1296
+arpakitlib/ar_settings_util.py,sha256=pWinOOnBDRhFxvkkuAjOq_U37QQJL-WwjIyVgsJTJB4,1216
 arpakitlib/ar_sleep_util.py,sha256=OaLtRaJQWMkGjfj_mW1RB2P4RaSWsAIH8LUoXqsH0zM,1061
 arpakitlib/ar_sqlalchemy_model_util.py,sha256=ttdgOwQfoHTKqgivBtXoSbJoBCASHDjLEFK5tJ9kNNE,4779
-arpakitlib/ar_sqlalchemy_util.py,sha256=1PuNg9vsQcJfuatcrd8xOhkX3znbwVakEYs3YXolKVo,4201
+arpakitlib/ar_sqlalchemy_util.py,sha256=Hcg1THrDsSR_-8dsY1CG3NWPEv0FqCbkPXFXLtjlSJ0,4207
 arpakitlib/ar_ssh_runner_util.py,sha256=jlnss4V4pziBN1rBzoK_lDiWm6nMOqGXfa6NFJSKH-Y,6796
 arpakitlib/ar_str_util.py,sha256=oCEtQ_TTn35OEz9jCNLjbhopq76JmaifD_iYR-nEJJ4,2142
 arpakitlib/ar_type_util.py,sha256=GNc9PgFKonj5lRlAHSnVPBN5nLIslrG8GTiZHjkf05w,2138
 arpakitlib/ar_yookassa_api_client_util.py,sha256=sh4fcUkAkdOetFn9JYoTvjcSXP-M1wU04KEY-ECLfLg,5137
 arpakitlib/ar_zabbix_api_client_util.py,sha256=Q-VR4MvoZ9aHwZeYZr9G3LwN-ANx1T5KFmF6pvPM-9M,6402
-arpakitlib-1.7.5.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.7.5.dist-info/METADATA,sha256=Kv3jhezlhHHRuFljSXbV-cwViAYjwJJSc9ziH03TFRM,2771
-arpakitlib-1.7.5.dist-info/NOTICE,sha256=95aUzaPJjVpDsGAsNzVnq7tHTxAl0s5UFznCTkVCau4,763
-arpakitlib-1.7.5.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-arpakitlib-1.7.5.dist-info/entry_points.txt,sha256=VHkTDXDOMrgcNzGfKhEhoOIIz6T8Kkt46hy95Zc1iL0,74
-arpakitlib-1.7.5.dist-info/RECORD,,
+arpakitlib-1.7.9.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.7.9.dist-info/METADATA,sha256=z70VyS1vRn89wLfxiGzqgC58b0Peo_b5EncIJzXIqhc,2771
+arpakitlib-1.7.9.dist-info/NOTICE,sha256=95aUzaPJjVpDsGAsNzVnq7tHTxAl0s5UFznCTkVCau4,763
+arpakitlib-1.7.9.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+arpakitlib-1.7.9.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
+arpakitlib-1.7.9.dist-info/RECORD,,

arpakitlib-1.7.9.dist-info/entry_points.txt

@@ -0,0 +1,3 @@
+[console_scripts]
+arpakitlib=arpakitlib.ar_arpakitlib_cli_util:execute_arpakitlib_cli
+

arpakitlib/ar_hello_world.py

@@ -1,11 +0,0 @@
-# arpakit
-
-_ARPAKIT_LIB_MODULE_VERSION = "3.0"
-
-
-def hello_world():
-    print("Hello world, it is arpakitlib")
-
-
-if __name__ == '__main__':
-    hello_world()

arpakitlib-1.7.5.dist-info/entry_points.txt

@@ -1,3 +0,0 @@
-[console_scripts]
-arpakitlib=arpakitlib.ar_arpakitlib_cli:arpakitlib_cli
-