arpakitlib 1.8.66__py3-none-any.whl → 1.8.68__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 (18) hide show
  1. arpakitlib/_arpakit_project_template_v_5/project/api/router/client/get_current_user_token.py +4 -4
  2. arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/admin/common.py +1 -1
  3. arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/admin/operation.py +1 -1
  4. arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/admin/story_log.py +1 -1
  5. arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/admin/user.py +1 -1
  6. arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/client/common.py +1 -1
  7. arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/client/user.py +1 -1
  8. arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/client/user_token.py +1 -1
  9. arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/general/api_key.py +1 -1
  10. arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/general/common.py +1 -1
  11. arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/general/user.py +1 -1
  12. arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/general/user_token.py +1 -1
  13. arpakitlib/_arpakit_project_template_v_5/project/test_data/make_test_data_1.py +1 -1
  14. {arpakitlib-1.8.66.dist-info → arpakitlib-1.8.68.dist-info}/METADATA +1 -1
  15. {arpakitlib-1.8.66.dist-info → arpakitlib-1.8.68.dist-info}/RECORD +18 -18
  16. {arpakitlib-1.8.66.dist-info → arpakitlib-1.8.68.dist-info}/LICENSE +0 -0
  17. {arpakitlib-1.8.66.dist-info → arpakitlib-1.8.68.dist-info}/WHEEL +0 -0
  18. {arpakitlib-1.8.66.dist-info → arpakitlib-1.8.68.dist-info}/entry_points.txt +0 -0
@@ -1,3 +1,5 @@
1
+ from __future__ import annotations
2
+
1
3
  import fastapi.requests
2
4
  from fastapi import APIRouter
3
5
 
@@ -13,13 +15,11 @@ class _UserToken1ClientSO(UserToken1ClientSO):
13
15
  user: User1ClientSO
14
16
 
15
17
  @classmethod
16
- def from_dbm(cls, *, simple_dbm: UserTokenDBM) -> UserToken1ClientSO:
18
+ def from_dbm(cls, *, simple_dbm: UserTokenDBM, **kwargs) -> _UserToken1ClientSO:
17
19
  simple_dict = simple_dbm.simple_dict(
18
20
  include_columns_and_sd_properties=cls.model_fields.keys(),
19
21
  kwargs={
20
- "user": simple_dbm.user.simple_dict(
21
- include_columns_and_sd_properties=User1ClientSO.model_fields.keys()
22
- )
22
+ "user": User1ClientSO.from_dbm(simple_dbm=simple_dbm.user)
23
23
  }
24
24
  )
25
25
  return cls.model_validate(simple_dict)
@@ -17,7 +17,7 @@ class SimpleDBMAdminSO(BaseSO):
17
17
  entity_name: str
18
18
 
19
19
  @classmethod
20
- def from_dbm(cls, *, simple_dbm: SimpleDBM) -> SimpleDBMAdminSO:
20
+ def from_dbm(cls, *, simple_dbm: SimpleDBM, **kwargs) -> SimpleDBMAdminSO:
21
21
  return cls.model_validate(simple_dbm.simple_dict(
22
22
  include_columns_and_sd_properties=cls.model_fields.keys()
23
23
  ))
@@ -22,7 +22,7 @@ class Operation1AdminSO(SimpleDBMAdminSO):
22
22
  allowed_types: list[str]
23
23
 
24
24
  @classmethod
25
- def from_dbm(cls, *, simple_dbm: OperationDBM) -> Operation1AdminSO:
25
+ def from_dbm(cls, *, simple_dbm: OperationDBM, **kwargs) -> Operation1AdminSO:
26
26
  return cls.model_validate(simple_dbm.simple_dict(
27
27
  include_columns_and_sd_properties=cls.model_fields.keys()
28
28
  ))
@@ -13,7 +13,7 @@ class StoryLog1AdminSO(SimpleDBMAdminSO):
13
13
  allowed_types: list[str]
14
14
 
15
15
  @classmethod
16
- def from_dbm(cls, *, simple_dbm: StoryLogDBM) -> StoryLog1AdminSO:
16
+ def from_dbm(cls, *, simple_dbm: StoryLogDBM, **kwargs) -> StoryLog1AdminSO:
17
17
  return cls.model_validate(simple_dbm.simple_dict(
18
18
  include_columns_and_sd_properties=cls.model_fields.keys()
19
19
  ))
@@ -29,7 +29,7 @@ class User1AdminSO(SimpleDBMAdminSO):
29
29
  tg_data_link_by_username: str | None
30
30
 
31
31
  @classmethod
32
- def from_dbm(cls, *, simple_dbm: UserDBM) -> User1AdminSO:
32
+ def from_dbm(cls, *, simple_dbm: UserDBM, **kwargs) -> User1AdminSO:
33
33
  return cls.model_validate(simple_dbm.simple_dict(
34
34
  include_columns_and_sd_properties=cls.model_fields.keys()
35
35
  ))
@@ -15,7 +15,7 @@ class SimpleDBMClientSO(BaseSO):
15
15
  entity_name: str
16
16
 
17
17
  @classmethod
18
- def from_dbm(cls, *, simple_dbm: SimpleDBM) -> SimpleDBMClientSO:
18
+ def from_dbm(cls, *, simple_dbm: SimpleDBM, **kwargs) -> SimpleDBMClientSO:
19
19
  return cls.model_validate(simple_dbm.simple_dict(
20
20
  include_columns_and_sd_properties=cls.model_fields.keys()
21
21
  ))
@@ -28,7 +28,7 @@ class User1ClientSO(SimpleDBMClientSO):
28
28
  tg_data_link_by_username: str | None
29
29
 
30
30
  @classmethod
31
- def from_dbm(cls, *, simple_dbm: UserDBM) -> User1ClientSO:
31
+ def from_dbm(cls, *, simple_dbm: UserDBM, **kwargs) -> User1ClientSO:
32
32
  return cls.model_validate(simple_dbm.simple_dict(
33
33
  include_columns_and_sd_properties=cls.model_fields.keys()
34
34
  ))
@@ -10,7 +10,7 @@ class UserToken1ClientSO(SimpleDBMClientSO):
10
10
  is_active: bool
11
11
 
12
12
  @classmethod
13
- def from_dbm(cls, *, simple_dbm: UserTokenDBM) -> UserToken1ClientSO:
13
+ def from_dbm(cls, *, simple_dbm: UserTokenDBM, **kwargs) -> UserToken1ClientSO:
14
14
  return cls.model_validate(simple_dbm.simple_dict(
15
15
  include_columns_and_sd_properties=cls.model_fields.keys()
16
16
  ))
@@ -10,7 +10,7 @@ class ApiKey1GeneralSO(SimpleDBMGeneralSO):
10
10
  is_active: bool
11
11
 
12
12
  @classmethod
13
- def from_dbm(cls, *, simple_dbm: ApiKeyDBM) -> ApiKey1GeneralSO:
13
+ def from_dbm(cls, *, simple_dbm: ApiKeyDBM, **kwargs) -> ApiKey1GeneralSO:
14
14
  return cls.model_validate(simple_dbm.simple_dict(
15
15
  include_columns_and_sd_properties=cls.model_fields.keys()
16
16
  ))
@@ -15,7 +15,7 @@ class SimpleDBMGeneralSO(BaseSO):
15
15
  entity_name: str
16
16
 
17
17
  @classmethod
18
- def from_dbm(cls, *, simple_dbm: SimpleDBM) -> SimpleDBMGeneralSO:
18
+ def from_dbm(cls, *, simple_dbm: SimpleDBM, **kwargs) -> SimpleDBMGeneralSO:
19
19
  return cls.model_validate(simple_dbm.simple_dict(
20
20
  include_columns_and_sd_properties=cls.model_fields.keys()
21
21
  ))
@@ -28,7 +28,7 @@ class User1GeneralSO(SimpleDBMGeneralSO):
28
28
  tg_data_link_by_username: str | None
29
29
 
30
30
  @classmethod
31
- def from_dbm(cls, *, simple_dbm: UserDBM) -> User1GeneralSO:
31
+ def from_dbm(cls, *, simple_dbm: UserDBM, **kwargs) -> User1GeneralSO:
32
32
  return cls.model_validate(simple_dbm.simple_dict(
33
33
  include_columns_and_sd_properties=cls.model_fields.keys()
34
34
  ))
@@ -10,7 +10,7 @@ class UserToken1GeneralSO(SimpleDBMGeneralSO):
10
10
  is_active: bool
11
11
 
12
12
  @classmethod
13
- def from_dbm(cls, *, simple_dbm: UserTokenDBM) -> UserToken1GeneralSO:
13
+ def from_dbm(cls, *, simple_dbm: UserTokenDBM, **kwargs) -> UserToken1GeneralSO:
14
14
  return cls.model_validate(simple_dbm.simple_dict(
15
15
  include_columns_and_sd_properties=cls.model_fields.keys()
16
16
  ))
@@ -37,7 +37,7 @@ def make_test_data_1():
37
37
  _logger.info(arpakit_user)
38
38
 
39
39
  for i in range(1000):
40
- user_token_dbm = UserTokenDBM(user_id=arpakit_user.id)
40
+ user_token_dbm = UserTokenDBM(user_id=arpakit_user.id, value=str(i))
41
41
  session.add(user_token_dbm)
42
42
  _logger.info(user_token_dbm)
43
43
  session.commit()
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.3
2
2
  Name: arpakitlib
3
- Version: 1.8.66
3
+ Version: 1.8.68
4
4
  Summary: arpakitlib
5
5
  License: Apache-2.0
6
6
  Keywords: arpakitlib,arpakit,arpakit-company,arpakitcompany,arpakit_company
@@ -114,7 +114,7 @@ arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/raise_fake_err
114
114
  arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/reinit_sqlalchemy_db.py,sha256=CdTXbkkl0IWa-tAFSwc5dq-rx0u1EBhOAlwbat5mPOU,1325
115
115
  arpakitlib/_arpakit_project_template_v_5/project/api/router/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
116
116
  arpakitlib/_arpakit_project_template_v_5/project/api/router/client/get_current_user.py,sha256=5cT2Z2tK0Hld6a9Aev2vxe-LpVS3sc_Zq0CZduJ-3qE,1217
117
- arpakitlib/_arpakit_project_template_v_5/project/api/router/client/get_current_user_token.py,sha256=fJbdpezvsmWb44-4iDMDIFQpz44EAWW2wRZ1w78fO1Y,1814
117
+ arpakitlib/_arpakit_project_template_v_5/project/api/router/client/get_current_user_token.py,sha256=9_kV6U2iKXy1oqUOHrQNlQXu75M-PN3V61xmGKS00RI,1777
118
118
  arpakitlib/_arpakit_project_template_v_5/project/api/router/client/main_router.py,sha256=IIy6VxG5xPR4ZjGaMwDM59izMIMoFxjqVmAvh-Fq330,386
119
119
  arpakitlib/_arpakit_project_template_v_5/project/api/router/general/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
120
120
  arpakitlib/_arpakit_project_template_v_5/project/api/router/general/check_authorization.py,sha256=NUQK4KI0XpwzPEGjgQMxU43ZaTm-dEXrmU1BMIFcA3k,1853
@@ -136,24 +136,24 @@ arpakitlib/_arpakit_project_template_v_5/project/api/schema/in_/general/__init__
136
136
  arpakitlib/_arpakit_project_template_v_5/project/api/schema/in_/general/common.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
137
137
  arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
138
138
  arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/admin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
139
- arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/admin/common.py,sha256=aKLBVc3H7PKoCtataAwTZTiJIJcG_vjBg9m-FvJf6nM,581
140
- arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/admin/operation.py,sha256=2tpHb6DawxHa7i__8jqHj4EF4c6BdtprrK5FIKEIJX4,823
141
- arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/admin/story_log.py,sha256=kGy5X3MJDhCQyXt7cKGuLjqF19TyQuX6XJBWsjLPgzY,555
142
- arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/admin/user.py,sha256=7gwB00A0QlKOSvlvaTLs0WdKk_yHcxhErLgXPrj1O8Q,1009
139
+ arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/admin/common.py,sha256=0vZOPql7ijaSr0yq5USSHNRSHnpUmCgYdh0vw4n8qak,591
140
+ arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/admin/operation.py,sha256=Gg0TSj9RmsaHBaWNzjJPLYnTN1wZ7Od0z8OaqMFa6hc,833
141
+ arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/admin/story_log.py,sha256=lOQWCpXrdVbLFRZFbY5aW9afM4vn5-KV3DwKb6_48N4,565
142
+ arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/admin/user.py,sha256=aZEniKyXa5wpyDU6-GbccEw3dDONYDPjeDp1rBjfhxc,1019
143
143
  arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
144
- arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/client/common.py,sha256=t5jDaS7As_1zmiTNl2b0p3gZs_2AAdhKvnbTLeCQdRY,529
145
- arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/client/user.py,sha256=hj7fngi0lfvQjrM73r4gxIjgqbVVU0FJr3SsUP4NmyQ,989
146
- arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/client/user_token.py,sha256=zHcKGhqZDDDnzoI0W1cQojMDcNx2Gk1D91hsqi76pDA,498
144
+ arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/client/common.py,sha256=vpE_bjT7fdaWe0LQxuVwEy7ZDSyVe4PrcX-gUTRWZbU,539
145
+ arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/client/user.py,sha256=HQIPEVc5dum60C3sAGBdPlRdwHIP90ZDGBLlYRkJ4Ek,999
146
+ arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/client/user_token.py,sha256=Emhpawd_jGWu9xzyYyXk9h0YDSnHGDkyfP-hIgenzpA,508
147
147
  arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
148
148
  arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/common/datetime_.py,sha256=YFo29Qc7JMVq-OR398kPy4ypjh9kYAxPuZZUsobhDdc,942
149
149
  arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/common/error.py,sha256=C8oaHotxmxBnN7Lr1qT7T5Mk0SIU2Ha7_tPDpgiR6M8,286
150
150
  arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/common/ok.py,sha256=6FINL5kdA60W0Keo8kykR_bgHYhYx_xzfWF3d_Fv7_0,90
151
151
  arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/common/raw_data.py,sha256=T7DWPHlno37-2qfQLLGXY2_4Ajs_l9_UxDDF1VGdpqk,136
152
152
  arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/general/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
153
- arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/general/api_key.py,sha256=45d1aTCowI5kdRbdcVeMTHd--F3YlI4xL8PtcavBjVc,496
154
- arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/general/common.py,sha256=T-PebdGZaPHgyCeGP4pNp2zwtYOQlyKPUcsBSHF3Pak,531
155
- arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/general/user.py,sha256=5offs2Q3662ZCY8ijHUM5InZWdE6-1_ojvQaPZ872mY,994
156
- arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/general/user_token.py,sha256=QBdIDUlGm3MImTYvGYKG5sms28aTAJIDSI_nldzgWLw,503
153
+ arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/general/api_key.py,sha256=S0b1t79VRJZMA1hNdJJe_bH-QN5qNY8uJIHVVDnQ6Is,506
154
+ arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/general/common.py,sha256=y-p4QJhvKnFL1I6ud3m_nzE0xtreT3CNApPkkkLAbG0,541
155
+ arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/general/user.py,sha256=HJctEpV31DA_SDEQvSlKkR85rG9OW6iSgO3ld2Cw-uc,1004
156
+ arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/general/user_token.py,sha256=iiuZXu_zo3FJX0W5qyyMGasUx-_d32yjqc_2KY3xpUA,513
157
157
  arpakitlib/_arpakit_project_template_v_5/project/api/util.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
158
158
  arpakitlib/_arpakit_project_template_v_5/project/business_service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
159
159
  arpakitlib/_arpakit_project_template_v_5/project/business_service/hello_world.py,sha256=lvWlVF6SlnC33swSCd-_QK6guxBg50myOd8cPS7hZrA,251
@@ -245,7 +245,7 @@ arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model
245
245
  arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/util.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
246
246
  arpakitlib/_arpakit_project_template_v_5/project/test_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
247
247
  arpakitlib/_arpakit_project_template_v_5/project/test_data/make_test_api_keys.py,sha256=9F2bMfymaqx_Czh_tF945BKpKqNrVNjSIfCQl13Dkxw,911
248
- arpakitlib/_arpakit_project_template_v_5/project/test_data/make_test_data_1.py,sha256=UoGSmEMmgEw57maYGRotiiH6vaYfk3PH4SW0D7bDqLw,1530
248
+ arpakitlib/_arpakit_project_template_v_5/project/test_data/make_test_data_1.py,sha256=z8Ok1WaKxC3fZ5TmaJCTS5lvOW1RZPZ1PGq07-gT1Yg,1544
249
249
  arpakitlib/_arpakit_project_template_v_5/project/test_data/make_test_data_2.py,sha256=VcCvxRLA0XnLaQcsaoZkIVV8rTO3uMyLTYoEsdxKtYE,416
250
250
  arpakitlib/_arpakit_project_template_v_5/project/test_data/make_test_data_3.py,sha256=9QJTgM4qsJXPgFhfVueQ9vObXr_dAldzP_p8dPO42uA,416
251
251
  arpakitlib/_arpakit_project_template_v_5/project/test_data/make_test_data_4.py,sha256=OyU9601WACF7cCpPT33x6CpizNJeQIPDDFezIvEO01A,416
@@ -373,8 +373,8 @@ arpakitlib/ar_str_util.py,sha256=NisRtt4xwE7qthkkXzL49jvGKMGlvJ4KKcvpQfmRlIw,441
373
373
  arpakitlib/ar_type_util.py,sha256=Cs_tef-Fc5xeyAF54KgISCsP11NHyzIsglm4S3Xx7iM,4049
374
374
  arpakitlib/ar_yookassa_api_client_util.py,sha256=VozuZeCJjmLd1zj2BdC9WfiAQ3XYOrIMsdpNK-AUlm0,5347
375
375
  arpakitlib/ar_zabbix_api_client_util.py,sha256=oHNS-2WckQxp7cVqsRne9JgkP9I7RQGBKVKZSMLN8zw,9427
376
- arpakitlib-1.8.66.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
377
- arpakitlib-1.8.66.dist-info/METADATA,sha256=pHoQDnMUGkjC-F1JPf_UsX9v3M3nMMiBAX7xRzg6CFs,3475
378
- arpakitlib-1.8.66.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
379
- arpakitlib-1.8.66.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
380
- arpakitlib-1.8.66.dist-info/RECORD,,
376
+ arpakitlib-1.8.68.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
377
+ arpakitlib-1.8.68.dist-info/METADATA,sha256=ZT8kJF0pQ8evlfB6-ClU5jmowdYK_7kzCD7dQ_lMCzw,3475
378
+ arpakitlib-1.8.68.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
379
+ arpakitlib-1.8.68.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
380
+ arpakitlib-1.8.68.dist-info/RECORD,,