arpakitlib 1.7.25__tar.gz → 1.7.28__tar.gz

{arpakitlib-1.7.25 → arpakitlib-1.7.28}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: arpakitlib
-Version: 1.7.25
+Version: 1.7.28
 Summary: arpakitlib
 Home-page: https://github.com/ARPAKIT-Company/arpakitlib
 License: Apache-2.0
@@ -55,40 +55,7 @@ Description-Content-Type: text/markdown
 
 # arpakitlib
 
-## 🚀 Simplify Your Development Workflow
-
-A collection of lightweight and convenient development tools by Arpakit, designed to simplify and accelerate your
-workflow
-
----
-
-### Supported Python version
-
-- Python 3.12.4
-
----
-
-### Installation with Poetry
-
-```
-poetry add arpakitlib
-```
-
-### Installation with pip
-
-```
-pip install arpakitlib
-```
-
----
-
-### Links
-
-- https://pypi.org/project/arpakitlib/
-- https://test.pypi.org/project/arpakitlib/
-- https://github.com/ARPAKIT-Company/arpakitlib
-
----
+...
 
 ## ❤️ Made by ARPAKIT Company ❤️
 

arpakitlib-1.7.28/README.md

@@ -0,0 +1,6 @@
+# arpakitlib
+
+...
+
+## ❤️ Made by ARPAKIT Company ❤️
+

{arpakitlib-1.7.25 → arpakitlib-1.7.28}/arpakitlib/_arpakit_project_template/example.env

@@ -1,4 +1,7 @@
 # mode_type=
+# sql_db_url=
+# sql_db_echo=
+# api_init_sql_db_at_start=
 # var_dirname=
 # var_dirpath=
 # log_filename=
@@ -9,5 +12,3 @@
 # media_dirpath=
 # dump_dirname=
 # dump_dirpath=
-# db_url=
-# db_echo=

arpakitlib-1.7.28/arpakitlib/_arpakit_project_template/resource/static/helloworld

@@ -0,0 +1 @@
+HELLO WORLD

{arpakitlib-1.7.25 → arpakitlib-1.7.28}/arpakitlib/_arpakit_project_template/src/api/create_api_app.py

@@ -43,7 +43,7 @@ def create_api_app() -> FastAPI:
             ),
             (
                 InitSqlalchemyDBStartupAPIEvent(sqlalchemy_db=sqlalchemy_db)
-                if (sqlalchemy_db is not None and settings.init_sql_db_at_start) else None
+                if (sqlalchemy_db is not None and settings.api_init_sql_db_at_start) else None
             ),
         ],
         shutdown_api_events=[

{arpakitlib-1.7.25 → arpakitlib-1.7.28}/arpakitlib/_arpakit_project_template/src/api/start_api_for_dev.py

@@ -1,7 +1,7 @@
 import uvicorn
 
 
-def start_api_for_dev(reload: bool = True):
+def start_api_for_dev(*, reload: bool = False):
     uvicorn.run(
         "src.api.asgi:app",
         port=int("{API_PORT}"),
@@ -12,4 +12,4 @@ def start_api_for_dev(reload: bool = True):
 
 
 if __name__ == '__main__':
-    start_api_for_dev()
+    start_api_for_dev(reload=False)

{arpakitlib-1.7.25 → arpakitlib-1.7.28}/arpakitlib/_arpakit_project_template/src/core/settings.py

@@ -8,7 +8,13 @@ from src.core.const import BASE_DIRPATH, ENV_FILEPATH
 
 
 class Settings(SimpleSettings):
-    # ...
+    sql_db_url: str | None = (
+        "postgresql://{PROJECT_NAME}:{PROJECT_NAME}@127.0.0.1:{SQL_DB_PORT}/{PROJECT_NAME}"
+    )
+
+    sql_db_echo: bool = False
+
+    api_init_sql_db_at_start: bool = False
 
     var_dirname: str | None = "var"
 
@@ -30,13 +36,7 @@ class Settings(SimpleSettings):
 
     dump_dirpath: str | None = os.path.join(var_dirpath, dump_dirname)
 
-    sql_db_url: str | None = (
-        "postgresql://{PROJECT_NAME}:{PROJECT_NAME}@127.0.0.1:{SQL_DB_PORT}/{PROJECT_NAME}"
-    )
-
-    init_sql_db_at_start: bool = False
-
-    sql_db_echo: bool = False
+    # ...
 
 
 @lru_cache()

{arpakitlib-1.7.25 → arpakitlib-1.7.28}/arpakitlib/_arpakit_project_template/src/db/sqlalchemy_model.py

@@ -1,5 +1,8 @@
 from arpakitlib.ar_sqlalchemy_model_util import SimpleDBM
 from arpakitlib.ar_sqlalchemy_util import get_string_info_from_declarative_base
 
+# ...
+
+
 if __name__ == '__main__':
     print(get_string_info_from_declarative_base(SimpleDBM))

{arpakitlib-1.7.25 → arpakitlib-1.7.28}/arpakitlib/ar_fastapi_util.py

@@ -368,7 +368,7 @@ def add_needed_api_router_to_app(*, app: FastAPI):
     async def _():
         return APIJSONResponse(
             status_code=starlette.status.HTTP_200_OK,
-            content=RawDataSO(data={"arpakitlib": "arpakitlib"})
+            content=RawDataSO(data={"arpakitlib": True})
         )
 
     app.include_router(router=api_router, prefix="")
@@ -454,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(
@@ -528,30 +528,57 @@ def base_api_auth(
     return func
 
 
-def api_auth_check_api_key(
+class CheckAPIKeyAPIAuthData(BaseAPIAuthData):
+    require_check_api_key: bool = False
+    is_api_key_correct: bool | None = None
+
+
+def check_api_key_api_auth(
         *,
-        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
+        check_api_key_func = lambda **kwargs: kwargs["api_key_string"] == correct_api_key
+
+    if require_check_api_key and check_api_key_func is None:
+        raise ValueError("require_check_api_key and check_api_key_func is None")
 
     async def func(
             *,
-            base_need_api_auth_data: BaseAPIAuthData = Depends(base_api_auth(
+            base_api_auth_data: BaseAPIAuthData = Depends(base_api_auth(
                 require_api_key_string=require_api_key_string,
                 require_token_string=False
             )),
             transmitted_api_data: BaseTransmittedAPIData = Depends(get_transmitted_api_data),
-            request: fastapi.Request
-    ):
-        print(111, type(request))
+            request: starlette.requests.Request
+    ) -> CheckAPIKeyAPIAuthData:
+        check_api_key_api_auth_data = CheckAPIKeyAPIAuthData.model_validate(base_api_auth_data)
+        check_api_key_api_auth_data.require_check_api_key = require_check_api_key
+        check_api_key_api_auth_data.is_api_key_correct = (
+            check_api_key_func(
+                api_key_string=base_api_auth_data.api_key_string,
+                base_api_auth_data=base_api_auth_data,
+                transmitted_api_data=transmitted_api_data,
+                request=request
+            )
+            if check_api_key_func is not None else None
+        )
+
+        if check_api_key_api_auth_data.require_check_api_key and not check_api_key_api_auth_data.is_api_key_correct:
+            raise APIException(
+                status_code=starlette.status.HTTP_401_UNAUTHORIZED,
+                error_code=ErrorSO.APIErrorCodes.cannot_authorize,
+                error_data=safely_transfer_to_json_str_to_json_obj(check_api_key_api_auth_data.model_dump())
+            )
+
+        return check_api_key_api_auth_data
 
     return func
 
@@ -585,7 +612,7 @@ def simple_api_router_for_testing():
         raise Exception("raise_fake_exception_3")
 
     @router.get(
-        "/check_params",
+        "/check_params_1",
         response_model=ErrorSO
     )
     async def _(name: int = Query()):

{arpakitlib-1.7.25 → arpakitlib-1.7.28}/arpakitlib/ar_settings_util.py

@@ -23,10 +23,10 @@ class SimpleSettings(BaseSettings):
     model_config = ConfigDict(extra="ignore")
 
     class ModeTypes(Enumeration):
-        dev: str = "dev"
+        not_prod: str = "not_prod"
         prod: str = "prod"
 
-    mode_type: str = ModeTypes.dev
+    mode_type: str = ModeTypes.not_prod
 
     @field_validator("mode_type")
     @classmethod

{arpakitlib-1.7.25 → arpakitlib-1.7.28}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "arpakitlib"
-version = "1.7.25"
+version = "1.7.28"
 description = "arpakitlib"
 authors = ["arpakit <arpakit@gmail.com>", "arpakit_support <support@arpakit.com>"]
 license = "Apache License 2.0"

arpakitlib-1.7.25/README.md

@@ -1,39 +0,0 @@
-# arpakitlib
-
-## 🚀 Simplify Your Development Workflow
-
-A collection of lightweight and convenient development tools by Arpakit, designed to simplify and accelerate your
-workflow
-
----
-
-### Supported Python version
-
-- Python 3.12.4
-
----
-
-### Installation with Poetry
-
-```
-poetry add arpakitlib
-```
-
-### Installation with pip
-
-```
-pip install arpakitlib
-```
-
----
-
-### Links
-
-- https://pypi.org/project/arpakitlib/
-- https://test.pypi.org/project/arpakitlib/
-- https://github.com/ARPAKIT-Company/arpakitlib
-
----
-
-## ❤️ Made by ARPAKIT Company ❤️
-