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

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 (14) hide show
  1. arpakitlib/_arpakit_project_template/example.env +2 -0
  2. arpakitlib/_arpakit_project_template/manage/example_docker_run_postgres_for_dev.sh +4 -0
  3. arpakitlib/_arpakit_project_template/manage/example_docker_start_postgres_for_dev.sh +2 -0
  4. arpakitlib/_arpakit_project_template/manage/example_docker_stop_postgres_for_dev.sh +2 -0
  5. arpakitlib/_arpakit_project_template/src/core/settings.py +3 -1
  6. arpakitlib/_arpakit_project_template/src/core/util.py +1 -0
  7. arpakitlib/ar_settings_util.py +2 -1
  8. arpakitlib/ar_sqlalchemy_util.py +2 -2
  9. {arpakitlib-1.7.8.dist-info → arpakitlib-1.7.9.dist-info}/METADATA +1 -1
  10. {arpakitlib-1.7.8.dist-info → arpakitlib-1.7.9.dist-info}/RECORD +14 -11
  11. {arpakitlib-1.7.8.dist-info → arpakitlib-1.7.9.dist-info}/LICENSE +0 -0
  12. {arpakitlib-1.7.8.dist-info → arpakitlib-1.7.9.dist-info}/NOTICE +0 -0
  13. {arpakitlib-1.7.8.dist-info → arpakitlib-1.7.9.dist-info}/WHEEL +0 -0
  14. {arpakitlib-1.7.8.dist-info → arpakitlib-1.7.9.dist-info}/entry_points.txt +0 -0
arpakitlib/_arpakit_project_template/example.env CHANGED
@@ -1,4 +1,5 @@
1
1
  # mode_type=
2
+ name=
2
3
  # var_dirname=
3
4
  # var_dirpath=
4
5
  # log_filename=
@@ -9,3 +10,4 @@
9
10
  # media_dirpath=
10
11
  # dump_dirname=
11
12
  # dump_dirpath=
13
+ # db_url=
arpakitlib/_arpakit_project_template/manage/example_docker_run_postgres_for_dev.sh ADDED
@@ -0,0 +1,4 @@
1
+ cd ..
2
+ docker rm ..._postgres
3
+ docker run --name ..._postgres -d -p ...:5432 -e POSTGRES_USER=... -e POSTGRES_PASSWORD=... -e POSTGRES_DB=... postgres:16 -c max_connections=100
4
+ docker start ..._postgres
arpakitlib/_arpakit_project_template/manage/example_docker_start_postgres_for_dev.sh ADDED
@@ -0,0 +1,2 @@
1
+ cd ..
2
+ docker start ..._postgres
arpakitlib/_arpakit_project_template/manage/example_docker_stop_postgres_for_dev.sh ADDED
@@ -0,0 +1,2 @@
1
+ cd ..
2
+ docker stop ..._postgres
arpakitlib/_arpakit_project_template/src/core/settings.py CHANGED
@@ -30,7 +30,9 @@ class Settings(SimpleSettings):
30
30
 
31
31
  dump_dirpath: str = os.path.join(var_dirpath, dump_dirname)
32
32
 
33
- db_url: str | None = "postgresql://cosmos:cosmos@localhost:5432/cosmos"
33
+ db_url: str | None = None
34
+
35
+ db_echo: bool = False
34
36
 
35
37
 
36
38
  @lru_cache()
arpakitlib/_arpakit_project_template/src/core/util.py CHANGED
@@ -46,6 +46,7 @@ def create_sqlalchemy_db() -> SQLAlchemyDB:
46
46
 
47
47
  return SQLAlchemyDB(
48
48
  db_url=get_cached_settings().db_url,
49
+ db_echo=get_cached_settings().db_echo
49
50
  )
50
51
 
51
52
 
arpakitlib/ar_settings_util.py CHANGED
@@ -3,6 +3,7 @@
3
3
  from typing import Union
4
4
 
5
5
  from pydantic import ConfigDict, field_validator
6
+ from pydantic_core import PydanticUndefined
6
7
  from pydantic_settings import BaseSettings
7
8
 
8
9
  from arpakitlib.ar_enumeration_util import Enumeration
@@ -11,7 +12,7 @@ from arpakitlib.ar_enumeration_util import Enumeration
11
12
  def generate_env_example(settings_class: Union[BaseSettings, type[BaseSettings]]):
12
13
  res = ""
13
14
  for k, f in settings_class.model_fields.items():
14
- if f.default:
15
+ if f.default is not PydanticUndefined:
15
16
  res += f"# {k}=\n"
16
17
  else:
17
18
  res += f"{k}=\n"
arpakitlib/ar_sqlalchemy_util.py CHANGED
@@ -26,7 +26,7 @@ class SQLAlchemyDB:
26
26
  self,
27
27
  *,
28
28
  db_url: str = "postgresql://arpakitlib:arpakitlib@localhost:50629/arpakitlib",
29
- echo: bool = False,
29
+ db_echo: bool = False,
30
30
  need_include_operation_dbm: bool = False,
31
31
  need_include_story_dbm: bool = False,
32
32
  db_models: list[Any] | None = None
@@ -38,7 +38,7 @@ class SQLAlchemyDB:
38
38
  self.need_include_story_dbm = True
39
39
  self.engine = create_engine(
40
40
  url=db_url,
41
- echo=echo,
41
+ echo=db_echo,
42
42
  pool_size=5,
43
43
  max_overflow=10,
44
44
  poolclass=QueuePool,
{arpakitlib-1.7.8.dist-info → arpakitlib-1.7.9.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: arpakitlib
3
- Version: 1.7.8
3
+ Version: 1.7.9
4
4
  Summary: arpakitlib
5
5
  Home-page: https://github.com/ARPAKIT-Company/arpakitlib
6
6
  License: Apache-2.0
{arpakitlib-1.7.8.dist-info → arpakitlib-1.7.9.dist-info}/RECORD RENAMED
@@ -6,13 +6,16 @@ arpakitlib/_arpakit_project_template/AUTHOR.md,sha256=5s2zJB3cHS_hpNBOGXfQPAfS9v
6
6
  arpakitlib/_arpakit_project_template/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
7
7
  arpakitlib/_arpakit_project_template/NOTICE,sha256=95aUzaPJjVpDsGAsNzVnq7tHTxAl0s5UFznCTkVCau4,763
8
8
  arpakitlib/_arpakit_project_template/README.md,sha256=aR1tz5-7YOpCcs3Jc0C5UkAlYUzMw-x9Wqq4EGcj12A,22
9
- arpakitlib/_arpakit_project_template/example.env,sha256=yxbxCKH_KxjymRGR1V8szwO9E07sN0as9ZaeN7K5L_E,175
9
+ arpakitlib/_arpakit_project_template/example.env,sha256=j3oF-r6mrY80NNJN7ipEw7l4YcUxqHntyRhKfevkDSg,191
10
10
  arpakitlib/_arpakit_project_template/example_pyproject.toml,sha256=Cg8VgGbSXsbvCb63cYwYQAb1bDA49IbuIMP5ShxTMK4,486
11
11
  arpakitlib/_arpakit_project_template/manage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
12
12
  arpakitlib/_arpakit_project_template/manage/beutify_json.py,sha256=mzmt-5piAHqgihLsqOpPx1JjDc1qA5F1XHBxDdR-BxY,215
13
13
  arpakitlib/_arpakit_project_template/manage/check_logging.py,sha256=rfrl4MK5ItRKaLKb0UU_EfQLckRQSYJ1S_2VAQJQ2Yk,212
14
14
  arpakitlib/_arpakit_project_template/manage/check_settings.py,sha256=JYR-IPgvYQOmJedKY9vOctbxEcUlaxZR-P0JXT9L2JQ,143
15
15
  arpakitlib/_arpakit_project_template/manage/docker_ps.sh,sha256=uwm8vHgeuNLCOn0o9hgP_uc-PUkS9FwLyzZh6ItZ3do,15
16
+ arpakitlib/_arpakit_project_template/manage/example_docker_run_postgres_for_dev.sh,sha256=cVPEu7xiEuPig7QDlz151Hob0RqVhWA_aSWzWEKR9I8,200
17
+ arpakitlib/_arpakit_project_template/manage/example_docker_start_postgres_for_dev.sh,sha256=-jDvShXoPtD0EsNXJEoovvE4PBbHbz4glLtiVuG68Zg,32
18
+ arpakitlib/_arpakit_project_template/manage/example_docker_stop_postgres_for_dev.sh,sha256=5HFIgaCJvY6CdYVD2i3FkSzltIL0B-8BPKbdHH18LRM,30
16
19
  arpakitlib/_arpakit_project_template/manage/example_init_arpakit_project_template.sh,sha256=0J1mESu315fb8KRnUq9SIOg6Oj8QpJgIcjbs8vhvgsQ,162
17
20
  arpakitlib/_arpakit_project_template/manage/example_nginx_proxy.nginx,sha256=Ch4vCoa1QBdDpfRAz2tgOMO8Gw-6tgNyvOkte7A3MsA,326
18
21
  arpakitlib/_arpakit_project_template/manage/example_systemd.service,sha256=Cunp3074ZKg1AQiX4Q_Xe5Q39Jca7hQj5ljXqryWwTU,143
@@ -63,8 +66,8 @@ arpakitlib/_arpakit_project_template/src/additional_model/additional_model.py,sh
63
66
  arpakitlib/_arpakit_project_template/src/business_service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
64
67
  arpakitlib/_arpakit_project_template/src/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
65
68
  arpakitlib/_arpakit_project_template/src/core/const.py,sha256=CZZew674y7LhCAlYhvuF5cV4Zb9nQ17j2Tcuj2GEBf4,1232
66
- arpakitlib/_arpakit_project_template/src/core/settings.py,sha256=OwwGS7znZCBy51nwGUQJOsdkbEf6f404Vga97eXxxxs,1261
67
- arpakitlib/_arpakit_project_template/src/core/util.py,sha256=fVKgZYbf_QIuvRPA_69O10Xh24q5zl1-yvOy9ZGMbn0,1660
69
+ arpakitlib/_arpakit_project_template/src/core/settings.py,sha256=9NtT7KNpyqjZKbYkYRjVKfBzHnD7aLPsrOVyCyPyK5c,1242
70
+ arpakitlib/_arpakit_project_template/src/core/util.py,sha256=PG0RlXrcAMtRBd9BB-Zp3N5009wASqTI2T6PNixj1ZM,1706
68
71
  arpakitlib/_arpakit_project_template/src/db/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
69
72
  arpakitlib/_arpakit_project_template/src/db/sqlalchemy_model.py,sha256=dcvj5C9E2F2KCsGZPBBncQf_EvVJAC1qQgnyD8P4ZEw,6
70
73
  arpakitlib/_arpakit_project_template/src/test_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -127,18 +130,18 @@ arpakitlib/ar_postgresql_util.py,sha256=1AuLjEaa1Lg4pzn-ukCVnDi35Eg1k91APRTqZhIJ
127
130
  arpakitlib/ar_project_template_util.py,sha256=RpzLFTjutqKmGTI6PrewfJFMwXGz7ZbXJjHjGHh6KpI,3164
128
131
  arpakitlib/ar_run_cmd_util.py,sha256=D_rPavKMmWkQtwvZFz-Io5Ak8eSODHkcFeLPzNVC68g,1072
129
132
  arpakitlib/ar_schedule_uust_api_client_util.py,sha256=JD-hRUQSs-euK0zq9w_4QUfGO00yWM08gllWUVKTtHc,6109
130
- arpakitlib/ar_settings_util.py,sha256=wGNWhC5B777qCK6BBm1OD1Ix9rk7FXQNZ1_EjWUj3_s,1147
133
+ arpakitlib/ar_settings_util.py,sha256=pWinOOnBDRhFxvkkuAjOq_U37QQJL-WwjIyVgsJTJB4,1216
131
134
  arpakitlib/ar_sleep_util.py,sha256=OaLtRaJQWMkGjfj_mW1RB2P4RaSWsAIH8LUoXqsH0zM,1061
132
135
  arpakitlib/ar_sqlalchemy_model_util.py,sha256=ttdgOwQfoHTKqgivBtXoSbJoBCASHDjLEFK5tJ9kNNE,4779
133
- arpakitlib/ar_sqlalchemy_util.py,sha256=1PuNg9vsQcJfuatcrd8xOhkX3znbwVakEYs3YXolKVo,4201
136
+ arpakitlib/ar_sqlalchemy_util.py,sha256=Hcg1THrDsSR_-8dsY1CG3NWPEv0FqCbkPXFXLtjlSJ0,4207
134
137
  arpakitlib/ar_ssh_runner_util.py,sha256=jlnss4V4pziBN1rBzoK_lDiWm6nMOqGXfa6NFJSKH-Y,6796
135
138
  arpakitlib/ar_str_util.py,sha256=oCEtQ_TTn35OEz9jCNLjbhopq76JmaifD_iYR-nEJJ4,2142
136
139
  arpakitlib/ar_type_util.py,sha256=GNc9PgFKonj5lRlAHSnVPBN5nLIslrG8GTiZHjkf05w,2138
137
140
  arpakitlib/ar_yookassa_api_client_util.py,sha256=sh4fcUkAkdOetFn9JYoTvjcSXP-M1wU04KEY-ECLfLg,5137
138
141
  arpakitlib/ar_zabbix_api_client_util.py,sha256=Q-VR4MvoZ9aHwZeYZr9G3LwN-ANx1T5KFmF6pvPM-9M,6402
139
- arpakitlib-1.7.8.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
140
- arpakitlib-1.7.8.dist-info/METADATA,sha256=yT-Y40gKyrs6fm8gd_c7ezMNHr93Q03dNe4DOLQ7_RQ,2771
141
- arpakitlib-1.7.8.dist-info/NOTICE,sha256=95aUzaPJjVpDsGAsNzVnq7tHTxAl0s5UFznCTkVCau4,763
142
- arpakitlib-1.7.8.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
143
- arpakitlib-1.7.8.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
144
- arpakitlib-1.7.8.dist-info/RECORD,,
142
+ arpakitlib-1.7.9.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
143
+ arpakitlib-1.7.9.dist-info/METADATA,sha256=z70VyS1vRn89wLfxiGzqgC58b0Peo_b5EncIJzXIqhc,2771
144
+ arpakitlib-1.7.9.dist-info/NOTICE,sha256=95aUzaPJjVpDsGAsNzVnq7tHTxAl0s5UFznCTkVCau4,763
145
+ arpakitlib-1.7.9.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
146
+ arpakitlib-1.7.9.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
147
+ arpakitlib-1.7.9.dist-info/RECORD,,