arpakitlib 1.7.24__py3-none-any.whl → 1.7.26__py3-none-any.whl

arpakitlib/ar_fastapi_util.py

@@ -259,8 +259,6 @@ def create_handle_exception_creating_story_log(
             exception: Exception,
             **kwargs
     ) -> (int, ErrorSO, dict[str, Any]):
-        print(222, type(request))
-
         sqlalchemy_db.init()
         traceback_str = "".join(traceback.format_exception(type(exception), exception, exception.__traceback__))
         with sqlalchemy_db.new_session() as session:
@@ -456,7 +454,7 @@ def base_api_auth(
                 fastapi.security.HTTPBearer(auto_error=False)
             ),
             api_key_string: str | None = Security(APIKeyHeader(name="apikey", auto_error=False)),
-            request: fastapi.Request
+            request: starlette.requests.Request
     ) -> BaseAPIAuthData:
 
         api_auth_data = BaseAPIAuthData(
@@ -530,14 +528,21 @@ def base_api_auth(
     return func
 
 
+class CheckAPIKeyAPIAuthData(BaseAPIAuthData):
+    require_check_api_key: bool = False
+    is_api_key_correct: bool | None = None
+
+
 def api_auth_check_api_key(
         *,
-        need_check_api_key: bool = True,
+        require_check_api_key: bool = True,
         check_api_key_func: Callable | None = None,
         correct_api_key: str | None = None
 ):
-    if need_check_api_key:
+    if require_check_api_key:
         require_api_key_string = True
+    else:
+        require_api_key_string = False
 
     if correct_api_key is not None:
         check_api_key_func = lambda v: v == correct_api_key
@@ -545,16 +550,18 @@ def api_auth_check_api_key(
     async def func(
             *,
             base_need_api_auth_data: BaseAPIAuthData = Depends(base_api_auth(
-                require_api_key_string=need_check_api_key,
+                require_api_key_string=require_api_key_string,
                 require_token_string=False
             )),
             transmitted_api_data: BaseTransmittedAPIData = Depends(get_transmitted_api_data),
-            request: fastapi.Request
+            request: starlette.requests.Request
     ):
-        print(111, type(request))
-
+        if not require_check_api_key:
+            return  # TODO
         # TODO
 
+    return func
+
 
 def simple_api_router_for_testing():
     router = APIRouter(tags=["Testing"])

{arpakitlib-1.7.24.dist-info → arpakitlib-1.7.26.dist-info}/METADATA

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

{arpakitlib-1.7.24.dist-info → arpakitlib-1.7.26.dist-info}/RECORD

@@ -133,7 +133,7 @@ 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=SSMRYJhfUN72q9BjZoNVFV67Uir0kM6YuR6dKaT1czs,23096
+arpakitlib/ar_fastapi_util.py,sha256=PrGTPwC9OzFbDOEWs7_X9ZsQ_legE3tZ9IlhPsOYELc,23321
 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
@@ -162,9 +162,9 @@ arpakitlib/ar_str_util.py,sha256=oCEtQ_TTn35OEz9jCNLjbhopq76JmaifD_iYR-nEJJ4,214
 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.24.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.7.24.dist-info/METADATA,sha256=CjYRLE7n_-02vediRlr2TzmlDgzNSMns8suYoZugAkE,2824
-arpakitlib-1.7.24.dist-info/NOTICE,sha256=95aUzaPJjVpDsGAsNzVnq7tHTxAl0s5UFznCTkVCau4,763
-arpakitlib-1.7.24.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-arpakitlib-1.7.24.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.7.24.dist-info/RECORD,,
+arpakitlib-1.7.26.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.7.26.dist-info/METADATA,sha256=1yIKkmYFSiBBRQlC4OBymOt9r000Onr59QUMHQrnZNs,2824
+arpakitlib-1.7.26.dist-info/NOTICE,sha256=95aUzaPJjVpDsGAsNzVnq7tHTxAl0s5UFznCTkVCau4,763
+arpakitlib-1.7.26.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+arpakitlib-1.7.26.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
+arpakitlib-1.7.26.dist-info/RECORD,,