arpakitlib 1.6.33__py3-none-any.whl → 1.6.35__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.
@@ -477,7 +477,7 @@ def create_fastapi_app(
477
477
  startup_api_events: list[BaseStartupAPIEvent] | None = None,
478
478
  shutdown_api_events: list[BaseStartupAPIEvent] | None = None,
479
479
  transmitted_api_data: BaseTransmittedAPIData = BaseTransmittedAPIData(),
480
- main_router: APIRouter = simple_api_router_for_testing()
480
+ main_api_router: APIRouter = simple_api_router_for_testing()
481
481
  ):
482
482
  setup_normal_logging(log_filepath=log_filepath)
483
483
 
@@ -516,7 +516,7 @@ def create_fastapi_app(
516
516
 
517
517
  add_needed_api_router_to_app(app=app)
518
518
 
519
- app.include_router(router=main_router)
519
+ app.include_router(router=main_api_router)
520
520
 
521
521
  return app
522
522
 
@@ -52,23 +52,26 @@ class ScheduleUUSTAPIClient:
52
52
  elif self.api_password_first_part:
53
53
  return {
54
54
  "login": self.api_login,
55
- "pass": self.generate_v2_token(password_first_part=self.api_password_first_part)
55
+ "pass": self.generate_v2_token()
56
56
  }
57
57
  else:
58
58
  return {}
59
59
 
60
60
  @classmethod
61
- def hash_token(cls, token: str) -> str:
61
+ def hash_new_token(cls, token: str) -> str:
62
62
  sha256 = hashlib.sha256()
63
63
  sha256.update(token.encode('utf-8'))
64
64
  return sha256.hexdigest()
65
65
 
66
66
  @classmethod
67
- def generate_v2_token(cls, password_first_part: str) -> str:
68
- return cls.hash_token(
67
+ def generate_new_v2_token(cls, password_first_part: str) -> str:
68
+ return cls.hash_new_token(
69
69
  password_first_part + datetime.now(tz=pytz.timezone("Asia/Yekaterinburg")).strftime("%Y-%m-%d")
70
70
  )
71
71
 
72
+ def generate_v2_token(self) -> str:
73
+ return self.generate_new_v2_token(password_first_part=self.api_password_first_part)
74
+
72
75
  async def _async_make_http_get_request(
73
76
  self,
74
77
  *,
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: arpakitlib
3
- Version: 1.6.33
3
+ Version: 1.6.35
4
4
  Summary: arpakitlib
5
5
  Home-page: https://github.com/ARPAKIT-Company/arpakitlib
6
6
  License: Apache-2.0
@@ -6,7 +6,7 @@ arpakitlib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
6
6
  arpakitlib/ar_additional_model_util.py,sha256=t95M4Ggl7EBRj7qOJHmuo5p2YmE7LlJdEAMNzse3vhE,309
7
7
  arpakitlib/ar_aiogram_util.py,sha256=zQ5txWe359U8LCSD-jvSz1Ol8N40bEg3DdTRbdRD8fU,11974
8
8
  arpakitlib/ar_arpakit_lib_module_util.py,sha256=V_mc3Ml73Tzz3arxmwEfIxruKMyrwbe8XZ9FfVDtUXY,5446
9
- arpakitlib/ar_arpakit_schedule_uust_api_client.py,sha256=SYWWQDohPnw0qpBIu2hEvGZRVdaI4NUUQdEjnMnseo4,18237
9
+ arpakitlib/ar_arpakit_schedule_uust_api_client_util.py,sha256=SYWWQDohPnw0qpBIu2hEvGZRVdaI4NUUQdEjnMnseo4,18237
10
10
  arpakitlib/ar_arpakitlib_info.py,sha256=cvgrLnEznmYkCAg1adbY46ATjD6GJd-Yk8PTgOPjpKM,248
11
11
  arpakitlib/ar_base64_util.py,sha256=aZkg2cZTuAaP2IWeG_LXJ6RO7qhyskVwec-Lks0iM-k,676
12
12
  arpakitlib/ar_base_worker_util.py,sha256=8ruBoF9pARf3yc5duAajUOBi7Cce5KFAkp66lShRf7U,2796
@@ -35,7 +35,7 @@ arpakitlib/ar_fastapi_static/swagger-ui/swagger-ui.css,sha256=jzPZlgJTFwSdSphk9C
35
35
  arpakitlib/ar_fastapi_static/swagger-ui/swagger-ui.css.map,sha256=5wq8eXMLU6Zxb45orZPL1zAsBFJReFw6GjYqGpUX3hg,262650
36
36
  arpakitlib/ar_fastapi_static/swagger-ui/swagger-ui.js,sha256=ffrLZHHEQ_g84A-ul3yWa10Kk09waOAxHcQXPuZuavg,339292
37
37
  arpakitlib/ar_fastapi_static/swagger-ui/swagger-ui.js.map,sha256=9UhIW7MqCOZPAz1Sl1IKfZUuhWU0p-LJqrnjjJD9Xhc,1159454
38
- arpakitlib/ar_fastapi_util.py,sha256=pitlZSHXM9jB-FnzQZun7znOjZ8ni-UwO5WIwiu8g-8,16763
38
+ arpakitlib/ar_fastapi_util.py,sha256=6QZLbAs_OHSDSype-Beb93op4Y403Elk5kTvyIng7RQ,16771
39
39
  arpakitlib/ar_file_storage_in_dir_util.py,sha256=D3e3rGuHoI6xqAA5mVvEpVVpOWY1jyjNsjj2UhyHRbE,3674
40
40
  arpakitlib/ar_generate_env_example.py,sha256=R_pdbFZe-mIZxEps2dm-K9m8rAg1pAaMzFOBPTGe4s4,370
41
41
  arpakitlib/ar_hash_util.py,sha256=Iqy6KBAOLBQMFLWv676boI5sV7atT2B-fb7aCdHOmIQ,340
@@ -54,7 +54,7 @@ arpakitlib/ar_operation_execution_util.py,sha256=w_dz4XYEM4WbTxpBoYVkknG3U3_391c
54
54
  arpakitlib/ar_parse_command.py,sha256=qpr2OwG3Bf7DFiL9S3iWgtbvtE80RSC35E5zFJvjG1I,2714
55
55
  arpakitlib/ar_postgresql_util.py,sha256=1AuLjEaa1Lg4pzn-ukCVnDi35Eg1k91APRTqZhIJAdo,945
56
56
  arpakitlib/ar_run_cmd_util.py,sha256=D_rPavKMmWkQtwvZFz-Io5Ak8eSODHkcFeLPzNVC68g,1072
57
- arpakitlib/ar_schedule_uust_api_client_util.py,sha256=NpCN8GT96aPvE3Lc-IRn653abjI95CmOqNc4pbHIWxo,5780
57
+ arpakitlib/ar_schedule_uust_api_client_util.py,sha256=Z5BNiHdKWqHmmycinwCbX5_pSNBB59Qn9urvUXU0RDk,5877
58
58
  arpakitlib/ar_sleep_util.py,sha256=9ZN4Qo4eZ_q3hjM7vNBQjFRcH-9-sqv3QLSjnxVJE90,1405
59
59
  arpakitlib/ar_sqlalchemy_model_util.py,sha256=ttdgOwQfoHTKqgivBtXoSbJoBCASHDjLEFK5tJ9kNNE,4779
60
60
  arpakitlib/ar_sqlalchemy_util.py,sha256=3jKHu5aUFPUQ492dWaisN0Y_-r2Pif16SfNawrQ_6xY,4012
@@ -63,8 +63,8 @@ arpakitlib/ar_str_util.py,sha256=xSEzmsDvRiZVaxyqFFjcgzpphktCbXg2FHcvsd1DYpA,188
63
63
  arpakitlib/ar_type_util.py,sha256=I6jbTz7_dxR1lkhz1JfUb5ZyLLdXVhG_-hzjdgT6N6s,1932
64
64
  arpakitlib/ar_yookassa_api_client_util.py,sha256=5GMvu8paByni8buhc1vpHB7n6oXe0gPfj1LSvnyZCrQ,5307
65
65
  arpakitlib/ar_zabbix_util.py,sha256=Q-VR4MvoZ9aHwZeYZr9G3LwN-ANx1T5KFmF6pvPM-9M,6402
66
- arpakitlib-1.6.33.dist-info/LICENSE,sha256=1jqWIkbnMxDfs_i0SXP5qbV6PHjBr1g8506oW7uPjfg,11347
67
- arpakitlib-1.6.33.dist-info/METADATA,sha256=jNxNJM1GpwqfqL-hbKILUKB8_UtTHv-8qC9V1Z3Zg_w,2320
68
- arpakitlib-1.6.33.dist-info/NOTICE,sha256=wHwmiq3wExfFfgMsE5U5TOBP9_l72ocIG82KurEels0,43
69
- arpakitlib-1.6.33.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
70
- arpakitlib-1.6.33.dist-info/RECORD,,
66
+ arpakitlib-1.6.35.dist-info/LICENSE,sha256=1jqWIkbnMxDfs_i0SXP5qbV6PHjBr1g8506oW7uPjfg,11347
67
+ arpakitlib-1.6.35.dist-info/METADATA,sha256=LCWIZq03r-0lHFxO-Z2cEZTW_GTL-uIxaWTaOL8gX-8,2320
68
+ arpakitlib-1.6.35.dist-info/NOTICE,sha256=wHwmiq3wExfFfgMsE5U5TOBP9_l72ocIG82KurEels0,43
69
+ arpakitlib-1.6.35.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
70
+ arpakitlib-1.6.35.dist-info/RECORD,,