arpakitlib 1.7.255__tar.gz → 1.7.257__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (236) hide show
  1. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/PKG-INFO +3 -4
  2. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/README.md +2 -3
  3. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/alembic/env.py +4 -2
  4. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/example.env +12 -10
  5. arpakitlib-1.7.257/arpakitlib/_arpakit_project_template/manage/docker_run_postgres.sh +5 -0
  6. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/api/event.py +1 -1
  7. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/api/util.py +2 -2
  8. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/core/_show_settings.py +0 -1
  9. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/operation_execution/_start_operation_executor_worker.py +1 -1
  10. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/operation_execution/_start_scheduled_operation_creator_worker.py +1 -1
  11. {arpakitlib-1.7.255/arpakitlib/_arpakit_project_template/src/sql_db → arpakitlib-1.7.257/arpakitlib/_arpakit_project_template/src/sqlalchemy_db}/_check_conn_sqlalchemy_db.py +1 -1
  12. {arpakitlib-1.7.255/arpakitlib/_arpakit_project_template/src/sql_db → arpakitlib-1.7.257/arpakitlib/_arpakit_project_template/src/sqlalchemy_db}/_drop_sqlalchemy_db.py +1 -1
  13. {arpakitlib-1.7.255/arpakitlib/_arpakit_project_template/src/sql_db → arpakitlib-1.7.257/arpakitlib/_arpakit_project_template/src/sqlalchemy_db}/_init_sqlalchemy_db.py +1 -1
  14. {arpakitlib-1.7.255/arpakitlib/_arpakit_project_template/src/sql_db → arpakitlib-1.7.257/arpakitlib/_arpakit_project_template/src/sqlalchemy_db}/_reinit_sqlalchemy_db.py +1 -1
  15. {arpakitlib-1.7.255/arpakitlib/_arpakit_project_template/src/sql_db → arpakitlib-1.7.257/arpakitlib/_arpakit_project_template/src/sqlalchemy_db}/_remove_operations.py +1 -1
  16. {arpakitlib-1.7.255/arpakitlib/_arpakit_project_template/src/sql_db → arpakitlib-1.7.257/arpakitlib/_arpakit_project_template/src/sqlalchemy_db}/_remove_story_logs.py +1 -1
  17. {arpakitlib-1.7.255/arpakitlib/_arpakit_project_template/src/sql_db → arpakitlib-1.7.257/arpakitlib/_arpakit_project_template/src/sqlalchemy_db}/util.py +4 -4
  18. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/tg_bot/event.py +1 -1
  19. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/tg_bot/util.py +2 -2
  20. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_arpakit_project_template_util.py +4 -1
  21. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_arpakitlib_cli_util.py +11 -6
  22. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_need_type_util.py +3 -0
  23. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_settings_util.py +27 -27
  24. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/pyproject.toml +1 -1
  25. arpakitlib-1.7.255/arpakitlib/_arpakit_project_template/manage/docker_run_postgres.sh +0 -5
  26. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/LICENSE +0 -0
  27. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/__init__.py +0 -0
  28. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/.gitignore +0 -0
  29. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/.python-version +0 -0
  30. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/ARPAKITLIB +0 -0
  31. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/LICENSE +0 -0
  32. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/README.md +0 -0
  33. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/alembic/README +0 -0
  34. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/alembic/script.py.mako +0 -0
  35. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/alembic.ini +0 -0
  36. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/manage/__init__.py +0 -0
  37. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/manage/alembic_upgrade_head .sh +0 -0
  38. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/manage/docker_ps.sh +0 -0
  39. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/manage/docker_ps_a.sh +0 -0
  40. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/manage/docker_rm_postgres.sh +0 -0
  41. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/manage/docker_start_postgres.sh +0 -0
  42. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/manage/docker_stop_postgres.sh +0 -0
  43. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/manage/git_branch.sh +0 -0
  44. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/manage/git_commit.sh +0 -0
  45. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/manage/git_push_arpakit_company_github_1.sh +0 -0
  46. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/manage/git_push_arpakit_company_gitlab_1.sh +0 -0
  47. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/manage/git_push_arpakit_github_1.sh +0 -0
  48. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/manage/git_push_arpakit_gitlab_1.sh +0 -0
  49. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/manage/git_remote_v.sh +0 -0
  50. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/manage/git_set_arpakit_company_origin.sh +0 -0
  51. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/manage/git_set_arpakit_origin.sh +0 -0
  52. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/manage/git_status.sh +0 -0
  53. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/manage/hello_world.py +0 -0
  54. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/manage/json_beautify.py +0 -0
  55. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/manage/note/__init__.py +0 -0
  56. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/manage/note/note_1.txt +0 -0
  57. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/manage/note/note_2.txt +0 -0
  58. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/manage/note/note_3.txt +0 -0
  59. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/manage/note/note_4.txt +0 -0
  60. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/manage/note/note_5.txt +0 -0
  61. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/manage/poetry_add_plugin_export.sh +0 -0
  62. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/manage/poetry_check.sh +0 -0
  63. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/manage/poetry_clear_cache.sh +0 -0
  64. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/manage/poetry_config.sh +0 -0
  65. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/manage/poetry_config_virtualenvs_in_project_true.sh +0 -0
  66. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/manage/poetry_install.sh +0 -0
  67. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/manage/poetry_lock.sh +0 -0
  68. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/manage/poetry_remove_and_add_arpakitlib.sh +0 -0
  69. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/manage/poetry_self_add_plugin_export.sh +0 -0
  70. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/manage/poetry_show.sh +0 -0
  71. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/manage/poetry_show_arpakitlib.sh +0 -0
  72. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/manage/poetry_update.sh +0 -0
  73. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/manage/poetry_update_arpakitlib.sh +0 -0
  74. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/resource/__init__.py +0 -0
  75. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/resource/static/__init__.py +0 -0
  76. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/resource/static/healthcheck +0 -0
  77. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/resource/static/helloworld +0 -0
  78. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/__init__.py +0 -0
  79. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/additional_model/__init__.py +0 -0
  80. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/additional_model/additional_model.py +0 -0
  81. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/admin1/__init__.py +0 -0
  82. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/admin1/add_admin_in_app.py +0 -0
  83. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/admin1/admin_auth.py +0 -0
  84. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/admin1/model_view.py +0 -0
  85. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/api/__init__.py +0 -0
  86. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/api/_start_api_with_reload.py +0 -0
  87. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/api/_start_api_without_reload.py +0 -0
  88. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/api/asgi.py +0 -0
  89. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/api/auth.py +0 -0
  90. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/api/const.py +0 -0
  91. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/api/create_api_app.py +0 -0
  92. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/api/create_handle_exception_.py +0 -0
  93. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/api/router/__init__.py +0 -0
  94. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/api/router/main_router.py +0 -0
  95. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/api/router/v1/__init__.py +0 -0
  96. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/api/router/v1/get_api_error_info.py +0 -0
  97. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/api/router/v1/main_router.py +0 -0
  98. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/api/schema/__init__.py +0 -0
  99. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/api/schema/v1/__init__.py +0 -0
  100. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/api/schema/v1/in_.py +0 -0
  101. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/api/schema/v1/out.py +0 -0
  102. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/api/transmitted_api_data.py +0 -0
  103. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/business_service/__init__.py +0 -0
  104. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/business_service/hello_world.py +0 -0
  105. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/core/__init__.py +0 -0
  106. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/core/_check_logging.py +0 -0
  107. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/core/_generate_settings_env_example.py +0 -0
  108. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/core/const.py +0 -0
  109. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/core/settings.py +0 -0
  110. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/core/util.py +0 -0
  111. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/json_db/__init__.py +0 -0
  112. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/json_db/_drop_json_db.py +0 -0
  113. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/json_db/_init_json_db.py +0 -0
  114. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/json_db/_reinit_json_db.py +0 -0
  115. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/json_db/_rm_all_records_in_json_db.py +0 -0
  116. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/json_db/json_db.py +0 -0
  117. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/json_db/util.py +0 -0
  118. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/just_script/__init__.py +0 -0
  119. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/just_script/example.py +0 -0
  120. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/operation_execution/__init__.py +0 -0
  121. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/operation_execution/const.py +0 -0
  122. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/operation_execution/operation_executor.py +0 -0
  123. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/operation_execution/scheduled_operations.py +0 -0
  124. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/operation_execution/util.py +0 -0
  125. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/sandbox/__init__.py +0 -0
  126. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/sandbox/sandbox_1.py +0 -0
  127. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/sandbox/sandbox_2.py +0 -0
  128. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/sandbox/sandbox_3.py +0 -0
  129. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/sandbox/sandbox_4.py +0 -0
  130. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/sandbox/sandbox_5.py +0 -0
  131. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/sandbox/sandbox_6.py +0 -0
  132. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/sandbox/sandbox_7.py +0 -0
  133. {arpakitlib-1.7.255/arpakitlib/_arpakit_project_template/src/sql_db → arpakitlib-1.7.257/arpakitlib/_arpakit_project_template/src/sqlalchemy_db}/__init__.py +0 -0
  134. {arpakitlib-1.7.255/arpakitlib/_arpakit_project_template/src/sql_db → arpakitlib-1.7.257/arpakitlib/_arpakit_project_template/src/sqlalchemy_db}/const.py +0 -0
  135. {arpakitlib-1.7.255/arpakitlib/_arpakit_project_template/src/sql_db → arpakitlib-1.7.257/arpakitlib/_arpakit_project_template/src/sqlalchemy_db}/sqlalchemy_model.py +0 -0
  136. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/test_data/__init__.py +0 -0
  137. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/test_data/make_test_data_1.py +0 -0
  138. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/test_data/make_test_data_2.py +0 -0
  139. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/test_data/make_test_data_3.py +0 -0
  140. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/test_data/make_test_data_4.py +0 -0
  141. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/test_data/make_test_data_5.py +0 -0
  142. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/tg_bot/__init__.py +0 -0
  143. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/tg_bot/blank/__init__.py +0 -0
  144. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/tg_bot/blank/blank.py +0 -0
  145. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/tg_bot/blank/util.py +0 -0
  146. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/tg_bot/const.py +0 -0
  147. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/tg_bot/filter/__init__.py +0 -0
  148. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/tg_bot/filter/not_prod_mode.py +0 -0
  149. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/tg_bot/filter/prod_mode.py +0 -0
  150. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/tg_bot/handler/__init__.py +0 -0
  151. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/tg_bot/handler/cmd_arpakitlib.py +0 -0
  152. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/tg_bot/handler/cmd_healthcheck.py +0 -0
  153. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/tg_bot/kb/__init__.py +0 -0
  154. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/tg_bot/kb/inline_/__init__.py +0 -0
  155. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/tg_bot/kb/inline_/callback.py +0 -0
  156. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/tg_bot/kb/inline_/common.py +0 -0
  157. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/tg_bot/kb/static_/__init__.py +0 -0
  158. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/tg_bot/kb/static_/common.py +0 -0
  159. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/tg_bot/middleware/__init__.py +0 -0
  160. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/tg_bot/router/__init__.py +0 -0
  161. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/tg_bot/router/error.py +0 -0
  162. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/tg_bot/router/router.py +0 -0
  163. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/tg_bot/start_tg_bot.py +0 -0
  164. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/tg_bot/transmitted_tg_data.py +0 -0
  165. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/util/__init__.py +0 -0
  166. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_additional_model_util.py +0 -0
  167. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_aiogram_util.py +0 -0
  168. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_api_key_util.py +0 -0
  169. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_arpakit_lib_module_util.py +0 -0
  170. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_arpakit_schedule_uust_api_client_util.py +0 -0
  171. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_arpakit_schedule_uust_site_util.py +0 -0
  172. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_base64_util.py +0 -0
  173. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_base_worker_util.py +0 -0
  174. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_blank_util.py +0 -0
  175. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_cache_file_util.py +0 -0
  176. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_class_util.py +0 -0
  177. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_cryptomus_api_client_util.py +0 -0
  178. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_datetime_util.py +0 -0
  179. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_dict_util.py +0 -0
  180. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_dream_ai_api_client_util.py +0 -0
  181. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_encrypt_decrypt_util.py +0 -0
  182. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_enumeration_util.py +0 -0
  183. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_exception_util.py +0 -0
  184. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_fastapi_static/healthcheck +0 -0
  185. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_fastapi_static/redoc/redoc.standalone.js +0 -0
  186. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_fastapi_static/swagger-ui/favicon-16x16.png +0 -0
  187. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_fastapi_static/swagger-ui/favicon-32x32.png +0 -0
  188. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_fastapi_static/swagger-ui/index.css +0 -0
  189. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_fastapi_static/swagger-ui/index.html +0 -0
  190. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_fastapi_static/swagger-ui/oauth2-redirect.html +0 -0
  191. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_fastapi_static/swagger-ui/swagger-initializer.js +0 -0
  192. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_fastapi_static/swagger-ui/swagger-ui-bundle.js +0 -0
  193. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_fastapi_static/swagger-ui/swagger-ui-bundle.js.map +0 -0
  194. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_fastapi_static/swagger-ui/swagger-ui-es-bundle-core.js +0 -0
  195. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_fastapi_static/swagger-ui/swagger-ui-es-bundle-core.js.map +0 -0
  196. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_fastapi_static/swagger-ui/swagger-ui-es-bundle.js +0 -0
  197. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_fastapi_static/swagger-ui/swagger-ui-es-bundle.js.map +0 -0
  198. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_fastapi_static/swagger-ui/swagger-ui-standalone-preset.js +0 -0
  199. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_fastapi_static/swagger-ui/swagger-ui-standalone-preset.js.map +0 -0
  200. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_fastapi_static/swagger-ui/swagger-ui.css +0 -0
  201. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_fastapi_static/swagger-ui/swagger-ui.css.map +0 -0
  202. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_fastapi_static/swagger-ui/swagger-ui.js +0 -0
  203. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_fastapi_static/swagger-ui/swagger-ui.js.map +0 -0
  204. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_fastapi_util.py +0 -0
  205. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_file_storage_in_dir_util.py +0 -0
  206. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_file_util.py +0 -0
  207. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_func_util.py +0 -0
  208. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_hash_util.py +0 -0
  209. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_http_request_util.py +0 -0
  210. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_ip_util.py +0 -0
  211. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_json_db_util.py +0 -0
  212. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_json_util.py +0 -0
  213. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_jwt_util.py +0 -0
  214. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_list_of_dicts_to_xlsx.py +0 -0
  215. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_list_util.py +0 -0
  216. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_logging_util.py +0 -0
  217. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_mongodb_util.py +0 -0
  218. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_openai_api_client_util.py +0 -0
  219. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_operation_execution_util.py +0 -0
  220. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_parse_command.py +0 -0
  221. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_postgresql_util.py +0 -0
  222. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_rat_func_util.py +0 -0
  223. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_retry_func_util.py +0 -0
  224. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_run_cmd_util.py +0 -0
  225. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_schedule_uust_api_client_util.py +0 -0
  226. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_sleep_util.py +0 -0
  227. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_sqladmin_util.py +0 -0
  228. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_sqlalchemy_model_util.py +0 -0
  229. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_sqlalchemy_util.py +0 -0
  230. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_ssh_runner_util.py +0 -0
  231. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_steam_payment_api_client_util.py +0 -0
  232. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_str_util.py +0 -0
  233. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_type_util.py +0 -0
  234. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_wata_api_client.py +0 -0
  235. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_yookassa_api_client_util.py +0 -0
  236. {arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_zabbix_api_client_util.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.3
2
2
  Name: arpakitlib
3
- Version: 1.7.255
3
+ Version: 1.7.257
4
4
  Summary: arpakitlib
5
5
  License: Apache-2.0
6
6
  Keywords: arpakitlib,arpakit,arpakit-company,arpakitcompany,arpakit_company
@@ -85,11 +85,10 @@ poetry add arpakitlib
85
85
  pip install arpakitlib
86
86
  ```
87
87
 
88
- ### Init template
88
+ ### arpakitlib command
89
89
 
90
90
  ```
91
- # poetry run arpakitlib -c help
92
- poetry run arpakitlib -c init_arpakit_project_template -project_dirpath ./ -overwrite_if_exists true -project_name ... -sql_db_port ... (optional) -api_port ... (optional) -ignore_paths_startswith ... (optional) -only_paths_startswith ...(optional)
91
+ poetry run arpakitlib -c help
93
92
  ```
94
93
 
95
94
  ---
@@ -25,11 +25,10 @@ poetry add arpakitlib
25
25
  pip install arpakitlib
26
26
  ```
27
27
 
28
- ### Init template
28
+ ### arpakitlib command
29
29
 
30
30
  ```
31
- # poetry run arpakitlib -c help
32
- poetry run arpakitlib -c init_arpakit_project_template -project_dirpath ./ -overwrite_if_exists true -project_name ... -sql_db_port ... (optional) -api_port ... (optional) -ignore_paths_startswith ... (optional) -only_paths_startswith ...(optional)
31
+ poetry run arpakitlib -c help
33
32
  ```
34
33
 
35
34
  ---
@@ -4,14 +4,16 @@ from alembic import context
4
4
  from sqlalchemy import engine_from_config
5
5
  from sqlalchemy import pool
6
6
 
7
+ from arpakitlib.ar_type_util import raise_for_type
7
8
  from src.core.settings import get_cached_settings
8
- from src.sql_db.util import get_base_dbm
9
+ from src.sqlalchemy_db.util import get_base_dbm
9
10
 
10
11
  # this is the Alembic Config object, which provides
11
12
  # access to the values within the .ini file in use.
12
13
  config = context.config
13
14
 
14
- config.set_section_option("alembic", "sqlalchemy.url", get_cached_settings().sync_sql_db_url)
15
+ raise_for_type(get_cached_settings().sqlalchemy_sync_db_url, str)
16
+ config.set_section_option("alembic", "sqlalchemy.url", get_cached_settings().sqlalchemy_sync_db_url)
15
17
 
16
18
  # Interpret the config file for Python logging.
17
19
  # This line sets up loggers basically.
@@ -1,15 +1,15 @@
1
1
  # mode_type=
2
2
  # project_name=
3
- # sql_db_user=
4
- # sql_db_password=
5
- # sql_db_host=
6
- # sql_db_port=
7
- # sql_db_database=
8
- # sync_sql_db_url=
9
- # async_sql_db_url=
10
- # sql_db_echo=
3
+ # sqlalchemy_db_user=
4
+ # sqlalchemy_db_password=
5
+ # sqlalchemy_db_host=
6
+ # sqlalchemy_db_port=
7
+ # sqlalchemy_db_database=
8
+ # sqlalchemy_sync_db_url=
9
+ # sqlalchemy_async_db_url=
10
+ # sqlalchemy_db_echo=
11
11
  # api_port=
12
- # api_init_sql_db=
12
+ # api_init_sqlalchemy_db=
13
13
  # api_init_json_db=
14
14
  # api_logging__api_func_before_in_handle_exception=
15
15
  # api_story_log__api_func_before_in_handle_exception=
@@ -19,7 +19,9 @@
19
19
  # api_start_operation_executor_worker=
20
20
  # api_start_scheduled_operation_creator_worker=
21
21
  # admin1_secret_key=
22
- # tg_bot_init_sql_db=
22
+ # tg_bot_token=
23
+ # tg_bot_proxy_url=
24
+ # tg_bot_init_sqlalchemy_db=
23
25
  # tg_bot_init_json_db=
24
26
  # var_dirpath=
25
27
  # log_filepath=
@@ -0,0 +1,5 @@
1
+ cd ..
2
+ source .env
3
+ docker rm ${project_name}_postgres
4
+ docker run --name ${project_name}_postgres -d -p ${sqlalchemy_db_port}:5432 -e POSTGRES_USER=${sqlalchemy_db_user} -e POSTGRES_PASSWORD=${sqlalchemy_db_password} -e POSTGRES_DB=${sqlalchemy_db_database} postgres:16 -c max_connections=100
5
+ docker start ${project_name}_postgres
@@ -26,7 +26,7 @@ class StartupAPIEvent(BaseStartupAPIEvent):
26
26
  if self.transmitted_api_data.dump_file_storage_in_dir is not None:
27
27
  self.transmitted_api_data.dump_file_storage_in_dir.init()
28
28
 
29
- if self.transmitted_api_data.settings.api_init_sql_db:
29
+ if self.transmitted_api_data.settings.api_init_sqlalchemy_db:
30
30
  self.transmitted_api_data.sqlalchemy_db.init()
31
31
 
32
32
  if self.transmitted_api_data.settings.api_init_json_db:
@@ -5,13 +5,13 @@ from src.core.settings import get_cached_settings
5
5
  from src.core.util import get_cached_media_file_storage_in_dir, get_cached_cache_file_storage_in_dir, \
6
6
  get_cached_dump_file_storage_in_dir
7
7
  from src.json_db.util import get_json_db
8
- from src.sql_db.util import get_cached_sqlalchemy_db
8
+ from src.sqlalchemy_db.util import get_cached_sqlalchemy_db
9
9
 
10
10
 
11
11
  def create_transmitted_api_data() -> TransmittedAPIData:
12
12
  settings = get_cached_settings()
13
13
 
14
- sqlalchemy_db = get_cached_sqlalchemy_db() if settings.sync_sql_db_url is not None else None
14
+ sqlalchemy_db = get_cached_sqlalchemy_db() if settings.sqlalchemy_sync_db_url is not None else None
15
15
 
16
16
  json_db = get_json_db() if settings.json_db_dirpath is not None else None
17
17
 
@@ -4,7 +4,6 @@ from src.core.settings import get_cached_settings
4
4
 
5
5
  def _check_settings():
6
6
  print(safely_transfer_obj_to_json_str(get_cached_settings().model_dump(mode="json")))
7
- print(get_cached_settings().is_any_sql_db_url_set)
8
7
 
9
8
 
10
9
  if __name__ == '__main__':
@@ -1,7 +1,7 @@
1
1
  from arpakitlib.ar_operation_execution_util import OperationExecutorWorker
2
2
  from src.core.util import setup_logging
3
3
  from src.operation_execution.operation_executor import OperationExecutor
4
- from src.sql_db.util import get_cached_sqlalchemy_db
4
+ from src.sqlalchemy_db.util import get_cached_sqlalchemy_db
5
5
 
6
6
 
7
7
  def _start_operation_executor_worker():
@@ -1,7 +1,7 @@
1
1
  from arpakitlib.ar_operation_execution_util import ScheduledOperationCreatorWorker
2
2
  from src.core.util import setup_logging
3
3
  from src.operation_execution.scheduled_operations import SCHEDULED_OPERATIONS
4
- from src.sql_db.util import get_cached_sqlalchemy_db
4
+ from src.sqlalchemy_db.util import get_cached_sqlalchemy_db
5
5
 
6
6
 
7
7
  def _start_scheduled_operation_creator_worker():
@@ -1,5 +1,5 @@
1
1
  from src.core.util import setup_logging
2
- from src.sql_db.util import get_cached_sqlalchemy_db
2
+ from src.sqlalchemy_db.util import get_cached_sqlalchemy_db
3
3
 
4
4
 
5
5
  def _check_conn_sqlalchemy_db():
@@ -1,6 +1,6 @@
1
1
  from src.core.settings import get_cached_settings
2
2
  from src.core.util import setup_logging
3
- from src.sql_db.util import get_cached_sqlalchemy_db
3
+ from src.sqlalchemy_db.util import get_cached_sqlalchemy_db
4
4
 
5
5
 
6
6
  def _reinit_sqlalchemy_db():
@@ -1,5 +1,5 @@
1
1
  from src.core.util import setup_logging
2
- from src.sql_db.util import get_cached_sqlalchemy_db
2
+ from src.sqlalchemy_db.util import get_cached_sqlalchemy_db
3
3
 
4
4
 
5
5
  def _init_sqlalchemy_db():
@@ -1,6 +1,6 @@
1
1
  from src.core.settings import get_cached_settings
2
2
  from src.core.util import setup_logging
3
- from src.sql_db.util import get_cached_sqlalchemy_db
3
+ from src.sqlalchemy_db.util import get_cached_sqlalchemy_db
4
4
 
5
5
 
6
6
  def _reinit_sqlalchemy_db():
@@ -1,7 +1,7 @@
1
1
  from arpakitlib.ar_operation_execution_util import remove_operations
2
2
  from src.core.settings import get_cached_settings
3
3
  from src.core.util import setup_logging
4
- from src.sql_db.util import get_cached_sqlalchemy_db
4
+ from src.sqlalchemy_db.util import get_cached_sqlalchemy_db
5
5
 
6
6
 
7
7
  def _remove_operations():
@@ -1,7 +1,7 @@
1
1
  from arpakitlib.ar_sqlalchemy_model_util import StoryLogDBM
2
2
  from src.core.settings import get_cached_settings
3
3
  from src.core.util import setup_logging
4
- from src.sql_db.util import get_cached_sqlalchemy_db
4
+ from src.sqlalchemy_db.util import get_cached_sqlalchemy_db
5
5
 
6
6
 
7
7
  def _remove_story_logs():
@@ -8,16 +8,16 @@ from src.core.settings import get_cached_settings
8
8
  def get_base_dbm() -> type[BaseDBM]:
9
9
  from arpakitlib.ar_sqlalchemy_model_util import import_ar_sqlalchemy_models
10
10
  import_ar_sqlalchemy_models()
11
- from src.sql_db.sqlalchemy_model import import_project_sqlalchemy_models
11
+ from src.sqlalchemy_db.sqlalchemy_model import import_project_sqlalchemy_models
12
12
  import_project_sqlalchemy_models()
13
13
  return BaseDBM
14
14
 
15
15
 
16
16
  def create_sqlalchemy_db() -> SQLAlchemyDb:
17
17
  return SQLAlchemyDb(
18
- sync_db_url=get_cached_settings().sync_sql_db_url,
19
- async_db_url=get_cached_settings().async_sql_db_url,
20
- db_echo=get_cached_settings().sql_db_echo,
18
+ sync_db_url=get_cached_settings().sqlalchemy_sync_db_url,
19
+ async_db_url=get_cached_settings().sqlalchemy_async_db_url,
20
+ db_echo=get_cached_settings().sqlalchemy_db_echo,
21
21
  base_dbm=get_base_dbm()
22
22
  )
23
23
 
@@ -20,7 +20,7 @@ class StartupTgBotEvent:
20
20
  if self.transmitted_tg_bot_data.dump_file_storage_in_dir is not None:
21
21
  self.transmitted_tg_bot_data.dump_file_storage_in_dir.init()
22
22
 
23
- if self.transmitted_tg_bot_data.settings.api_init_sql_db:
23
+ if self.transmitted_tg_bot_data.settings.api_init_sqlalchemy_db:
24
24
  self.transmitted_tg_bot_data.sqlalchemy_db.init()
25
25
 
26
26
  if self.transmitted_tg_bot_data.settings.api_init_json_db:
@@ -4,14 +4,14 @@ from src.core.settings import get_cached_settings
4
4
  from src.core.util import get_cached_media_file_storage_in_dir, get_cached_cache_file_storage_in_dir, \
5
5
  get_cached_dump_file_storage_in_dir
6
6
  from src.json_db.util import get_json_db
7
- from src.sql_db.util import get_cached_sqlalchemy_db
7
+ from src.sqlalchemy_db.util import get_cached_sqlalchemy_db
8
8
  from src.tg_bot.transmitted_tg_data import TransmittedTgData
9
9
 
10
10
 
11
11
  def create_transmitted_tg_bot_data() -> TransmittedTgData:
12
12
  settings = get_cached_settings()
13
13
 
14
- sqlalchemy_db = get_cached_sqlalchemy_db() if settings.sync_sql_db_url is not None else None
14
+ sqlalchemy_db = get_cached_sqlalchemy_db() if settings.sqlalchemy_sync_db_url is not None else None
15
15
 
16
16
  json_db = get_json_db() if settings.json_db_dirpath is not None else None
17
17
 
@@ -15,10 +15,11 @@ def init_arpakit_project_template(
15
15
  *,
16
16
  project_dirpath: str = "./",
17
17
  overwrite_if_exists: bool = False,
18
- params: dict[str, str] | None = None,
19
18
  ignore_paths_startswith: list[str] | str | None = None,
20
19
  only_paths_startswith: list[str] | str | None = None,
20
+ params: dict[str, str] | None = None,
21
21
  ):
22
+ raise_for_type(project_dirpath, str)
22
23
  raise_if_string_blank(project_dirpath)
23
24
 
24
25
  raise_for_type(overwrite_if_exists, bool)
@@ -31,11 +32,13 @@ def init_arpakit_project_template(
31
32
  ignore_paths_startswith = [ignore_paths_startswith]
32
33
  if ignore_paths_startswith is None:
33
34
  ignore_paths_startswith = []
35
+ raise_for_type(ignore_paths_startswith, list)
34
36
 
35
37
  if isinstance(only_paths_startswith, str):
36
38
  only_paths_startswith = [only_paths_startswith]
37
39
  if only_paths_startswith is None:
38
40
  only_paths_startswith = []
41
+ raise_for_type(only_paths_startswith, list)
39
42
 
40
43
  def _generate_filepath_to_content() -> dict[str, str]:
41
44
  arpakit_project_template_dirpath = os.path.join(
@@ -5,7 +5,6 @@ import sys
5
5
  from arpakitlib.ar_arpakit_project_template_util import init_arpakit_project_template
6
6
  from arpakitlib.ar_need_type_util import parse_need_type, NeedTypes
7
7
  from arpakitlib.ar_parse_command import parse_command
8
- from arpakitlib.ar_str_util import raise_if_string_blank
9
8
 
10
9
  _ARPAKIT_LIB_MODULE_VERSION = "3.0"
11
10
 
@@ -27,20 +26,26 @@ def execute_arpakitlib_cli(*, full_command: str | None = None):
27
26
  print("Commands:")
28
27
  print()
29
28
  print("-c init_arpakit_project_template")
30
- print("-project_dirpath ...")
29
+ print("-project_dirpath ./")
31
30
  print("-overwrite_if_exists ...")
32
31
  print("-ignore_paths_startswith ...")
33
32
  print("-only_paths_startswith ...")
33
+ print("-param1 ...")
34
+ print("-param2 ...")
35
+ print("-param3 ...")
34
36
  print("\n")
35
37
 
36
38
  elif command == "init_arpakit_project_template":
37
- project_dirpath = raise_if_string_blank(parsed_command.get_value_by_keys(keys=["project_dirpath"]))
39
+ project_dirpath: str = parse_need_type(
40
+ value=parsed_command.get_value_by_keys(keys=["project_dirpath"]),
41
+ need_type=NeedTypes.str_,
42
+ allow_none=False
43
+ )
38
44
  overwrite_if_exists: bool = parse_need_type(
39
45
  value=parsed_command.get_value_by_keys(keys=["overwrite_if_exists"]),
40
46
  need_type=NeedTypes.bool_,
41
47
  allow_none=False
42
48
  )
43
- params = parsed_command.key_to_value
44
49
  ignore_paths_startswith: list[str] | None = parse_need_type(
45
50
  value=parsed_command.get_value_by_keys(keys=["ignore_paths_startswith"]),
46
51
  need_type=NeedTypes.list_of_str,
@@ -54,9 +59,9 @@ def execute_arpakitlib_cli(*, full_command: str | None = None):
54
59
  init_arpakit_project_template(
55
60
  project_dirpath=project_dirpath,
56
61
  overwrite_if_exists=overwrite_if_exists,
57
- params=params,
58
62
  ignore_paths_startswith=ignore_paths_startswith,
59
- only_paths_startswith=only_paths_startswith
63
+ only_paths_startswith=only_paths_startswith,
64
+ params=parsed_command.key_to_value,
60
65
  )
61
66
 
62
67
  else:
@@ -23,6 +23,9 @@ def parse_need_type(value: Any, need_type: str, allow_none: bool = False) -> Any
23
23
  if allow_none and value is None:
24
24
  return None
25
25
 
26
+ if not allow_none and value is None:
27
+ raise ValueError("value is None")
28
+
26
29
  NeedTypes.parse_and_validate_values(need_type)
27
30
 
28
31
  if need_type == NeedTypes.str_:
@@ -88,57 +88,57 @@ class AdvancedSettings(SimpleSettings):
88
88
  return v.strip()
89
89
  return v
90
90
 
91
- sql_db_user: str | None = None
91
+ sqlalchemy_db_user: str | None = None
92
92
 
93
- sql_db_password: str | None = None
93
+ sqlalchemy_db_password: str | None = None
94
94
 
95
- sql_db_host: str | None = None
95
+ sqlalchemy_db_host: str | None = None
96
96
 
97
- sql_db_port: int | None = None
97
+ sqlalchemy_db_port: int | None = None
98
98
 
99
- sql_db_database: str | None = None
99
+ sqlalchemy_db_database: str | None = None
100
100
 
101
- sync_sql_db_url: str | None = None
101
+ sqlalchemy_sync_db_url: str | None = None
102
102
 
103
- @field_validator("sync_sql_db_url", mode="after")
104
- def validate_sync_sql_db_url(cls, v: Any, validation_info: ValidationInfo, **kwargs) -> str | None:
103
+ @field_validator("sqlalchemy_sync_db_url", mode="after")
104
+ def validate_sqlalchemy_sync_db_url(cls, v: Any, validation_info: ValidationInfo, **kwargs) -> str | None:
105
105
  if v is not None:
106
106
  return v
107
107
 
108
108
  return generate_sqlalchemy_url(
109
109
  base="postgresql",
110
- user=validation_info.data.get("sql_db_user"),
111
- password=validation_info.data.get("sql_db_password"),
112
- host=validation_info.data.get("sql_db_host"),
113
- port=validation_info.data.get("sql_db_port"),
114
- database=validation_info.data.get("sql_db_database")
110
+ user=validation_info.data.get("sqlalchemy_db_user"),
111
+ password=validation_info.data.get("sqlalchemy_db_password"),
112
+ host=validation_info.data.get("sqlalchemy_db_host"),
113
+ port=validation_info.data.get("sqlalchemy_db_port"),
114
+ database=validation_info.data.get("sqlalchemy_db_database")
115
115
  )
116
116
 
117
- async_sql_db_url: str | None = None
117
+ sqlalchemy_async_db_url: str | None = None
118
118
 
119
- @field_validator("async_sql_db_url", mode="after")
120
- def validate_async_sql_db_url(cls, v: Any, validation_info: ValidationInfo, **kwargs) -> str | None:
119
+ @field_validator("sqlalchemy_async_db_url", mode="after")
120
+ def validate_sqlalchemy_async_db_url(cls, v: Any, validation_info: ValidationInfo, **kwargs) -> str | None:
121
121
  if v is not None:
122
122
  return v
123
123
 
124
124
  return generate_sqlalchemy_url(
125
- base="postgresql+asyncpg",
126
- user=validation_info.data.get("sql_db_user"),
127
- password=validation_info.data.get("sql_db_password"),
128
- host=validation_info.data.get("sql_db_host"),
129
- port=validation_info.data.get("sql_db_port"),
130
- database=validation_info.data.get("sql_db_database")
125
+ base="postgresql",
126
+ user=validation_info.data.get("sqlalchemy_db_user"),
127
+ password=validation_info.data.get("sqlalchemy_db_password"),
128
+ host=validation_info.data.get("sqlalchemy_db_host"),
129
+ port=validation_info.data.get("sqlalchemy_db_port"),
130
+ database=validation_info.data.get("sqlalchemy_db_database")
131
131
  )
132
132
 
133
133
  @property
134
134
  def is_any_sql_db_url_set(self) -> bool:
135
- if self.sync_sql_db_url is not None:
135
+ if self.sqlalchemy_sync_db_url is not None:
136
136
  return True
137
- if self.async_sql_db_url is not None:
137
+ if self.sqlalchemy_async_db_url is not None:
138
138
  return True
139
139
  return False
140
140
 
141
- sql_db_echo: bool = False
141
+ sqlalchemy_db_echo: bool = False
142
142
 
143
143
  api_port: int | None = None
144
144
 
@@ -149,7 +149,7 @@ class AdvancedSettings(SimpleSettings):
149
149
  return int(v)
150
150
  return None
151
151
 
152
- api_init_sql_db: bool = False
152
+ api_init_sqlalchemy_db: bool = False
153
153
 
154
154
  api_init_json_db: bool = False
155
155
 
@@ -173,7 +173,7 @@ class AdvancedSettings(SimpleSettings):
173
173
 
174
174
  tg_bot_proxy_url: str | None = None
175
175
 
176
- tg_bot_init_sql_db: bool = False
176
+ tg_bot_init_sqlalchemy_db: bool = False
177
177
 
178
178
  tg_bot_init_json_db: bool = False
179
179
 
@@ -1,6 +1,6 @@
1
1
  [project]
2
2
  name = "arpakitlib"
3
- version = "1.7.255"
3
+ version = "1.7.257"
4
4
  description = "arpakitlib"
5
5
  authors = [
6
6
  { name = "arpakit", email = "arpakit@gmail.com" },
@@ -1,5 +0,0 @@
1
- cd ..
2
- source .env
3
- docker rm ${project_name}_postgres
4
- docker run --name ${project_name}_postgres -d -p ${sql_db_port}:5432 -e POSTGRES_USER=${sql_db_user} -e POSTGRES_PASSWORD=${sql_db_password} -e POSTGRES_DB=${sql_db_database} postgres:16 -c max_connections=100
5
- docker start ${project_name}_postgres
File without changes