arpakitlib 1.7.19__tar.gz → 1.7.22__tar.gz

{arpakitlib-1.7.19 → arpakitlib-1.7.22}/PKG-INFO

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

arpakitlib-1.7.22/arpakitlib/_arpakit_project_template/manage/docker_ps_a.sh

@@ -0,0 +1,2 @@
+cd ..
+docker ps -a

arpakitlib-1.7.22/arpakitlib/_arpakit_project_template/manage/example_poetry_arpakitlib.sh

@@ -0,0 +1 @@
+poetry run arpakitlib -c init_arpakit_project_template -project_dirpath ./ -overwrite_if_exists true -project_name ... -sql_db_port ... -api_port ... -ignore_paths_startswith /src -only_paths_startswith ...

{arpakitlib-1.7.19 → arpakitlib-1.7.22}/arpakitlib/_arpakit_project_template/src/api/create_api_app.py

@@ -1,7 +1,7 @@
 from fastapi import FastAPI
 
 from arpakitlib.ar_fastapi_util import create_fastapi_app, InitSqlalchemyDBStartupAPIEvent, InitFileStoragesInDir, \
-    create_handle_exception, create_handle_exception_creating_story_log
+    create_handle_exception, create_handle_exception_creating_story_log, _DEFAULT_CONTACT
 from src.api.event import FirstStartupAPIEvent, FirstShutdownAPIEvent
 from src.api.router.v1.main_router import api_v1_main_router
 from src.api.transmitted_api_data import TransmittedAPIData
@@ -36,9 +36,9 @@ def create_api_app() -> FastAPI:
             FirstStartupAPIEvent(transmitted_api_data=transmitted_api_data),
             InitFileStoragesInDir(
                 file_storages_in_dir=[
-                    get_cached_media_file_storage_in_dir(),
-                    get_cached_cache_file_storage_in_dir(),
-                    get_cached_dump_file_storage_in_dir()
+                    get_cached_media_file_storage_in_dir() if settings.media_dirpath is not None else None,
+                    get_cached_cache_file_storage_in_dir() if settings.cache_dirpath is not None else None,
+                    get_cached_dump_file_storage_in_dir() if settings.dump_dirpath is not None else None
                 ]
             ),
             (
@@ -51,6 +51,7 @@ def create_api_app() -> FastAPI:
         ],
         transmitted_api_data=transmitted_api_data,
         main_api_router=api_v1_main_router,
+        contact=_DEFAULT_CONTACT,
         media_dirpath=settings.media_dirpath
     )
 

{arpakitlib-1.7.19 → arpakitlib-1.7.22}/arpakitlib/_arpakit_project_template/src/core/settings.py

@@ -10,25 +10,25 @@ from src.core.const import BASE_DIRPATH, ENV_FILEPATH
 class Settings(SimpleSettings):
     # ...
 
-    var_dirname: str = "var"
+    var_dirname: str | None = "var"
 
-    var_dirpath: str = os.path.join(BASE_DIRPATH, var_dirname)
+    var_dirpath: str | None = os.path.join(BASE_DIRPATH, var_dirname)
 
-    log_filename: str = "story.log"
+    log_filename: str | None = "story.log"
 
-    log_filepath: str = os.path.join(var_dirpath, log_filename)
+    log_filepath: str | None = os.path.join(var_dirpath, log_filename)
 
-    cache_dirname: str = "cache"
+    cache_dirname: str | None = "cache"
 
-    cache_dirpath: str = os.path.join(var_dirpath, cache_dirname)
+    cache_dirpath: str | None = os.path.join(var_dirpath, cache_dirname)
 
-    media_dirname: str = "media"
+    media_dirname: str | None = "media"
 
-    media_dirpath: str = os.path.join(var_dirpath, media_dirname)
+    media_dirpath: str | None = os.path.join(var_dirpath, media_dirname)
 
-    dump_dirname: str = "dump"
+    dump_dirname: str | None = "dump"
 
-    dump_dirpath: str = os.path.join(var_dirpath, dump_dirname)
+    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}"

arpakitlib-1.7.22/arpakitlib/_arpakit_project_template/src/db/sqlalchemy_model.py

@@ -0,0 +1,5 @@
+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.22/arpakitlib/api_key_util.py

@@ -0,0 +1,9 @@
+from uuid import uuid4
+
+from arpakitlib.ar_datetime_util import now_utc_dt
+
+
+def generate_default_api_key_value() -> str:
+    return (
+        f"apikey{str(uuid4()).replace('-', '')}{str(now_utc_dt().timestamp()).replace('.', '')}"
+    )

{arpakitlib-1.7.19 → arpakitlib-1.7.22}/arpakitlib/ar_dream_ai_api_client_util.py

@@ -29,11 +29,11 @@ class GenerateImageFromNumberResApiModel(BaseAPIModel):
         return filepath
 
 
-class DreamAIAPIClient:
+class DREAMAIAPIClient:
     def __init__(
             self,
             *,
-            base_url: str = "https://api.dream_ai.arpakit.com/api/v1",
+            base_url: str = "https://api.dreamai.arpakit.com/api/v1",
             api_key: str | None = "1"
     ):
         self._logger = logging.getLogger(__name__)

{arpakitlib-1.7.19 → arpakitlib-1.7.22}/arpakitlib/ar_fastapi_util.py

@@ -17,7 +17,7 @@ import fastapi.security
 import starlette.exceptions
 import starlette.requests
 import starlette.status
-from fastapi import FastAPI, APIRouter, Query, Security
+from fastapi import FastAPI, APIRouter, Query, Security, Depends
 from fastapi.openapi.docs import get_swagger_ui_html, get_redoc_html
 from fastapi.security import APIKeyHeader
 from pydantic import BaseModel, ConfigDict
@@ -33,6 +33,7 @@ from arpakitlib.ar_logging_util import setup_normal_logging
 from arpakitlib.ar_sqlalchemy_model_util import StoryLogDBM
 from arpakitlib.ar_sqlalchemy_util import SQLAlchemyDB
 from arpakitlib.ar_type_util import raise_for_type, raise_if_not_async_func
+from src.api.transmitted_api_data import TransmittedAPIData
 
 _ARPAKIT_LIB_MODULE_VERSION = "3.0"
 
@@ -259,6 +260,8 @@ 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:
@@ -415,8 +418,9 @@ class SafeRunWorkerStartupAPIEvent(BaseStartupAPIEvent):
 
 
 class InitFileStoragesInDir(BaseStartupAPIEvent):
-    def __init__(self, file_storages_in_dir: list[FileStorageInDir]):
+    def __init__(self, file_storages_in_dir: list[FileStorageInDir | None]):
         super().__init__()
+        file_storages_in_dir = [v for v in file_storages_in_dir if v is not None]
         self.file_storages_in_dir = file_storages_in_dir
 
     async def async_on_startup(self, *args, **kwargs):
@@ -527,6 +531,32 @@ def base_api_auth(
     return func
 
 
+def api_auth_check_api_key(
+        *,
+        need_check_api_key: bool = True,
+        check_api_key_func: Callable | None = None,
+        correct_api_key: str | None = None
+):
+    if need_check_api_key:
+        require_api_key_string = True
+
+    if correct_api_key is not None:
+        check_api_key_func = lambda v: v == correct_api_key
+
+    async def func(
+            *,
+            base_need_api_auth_data: BaseAPIAuthData = Depends(base_api_auth(
+                require_api_key_string=need_check_api_key,
+                require_token_string=False
+            )),
+            transmitted_api_data: TransmittedAPIData = Depends(get_transmitted_api_data),
+            request: fastapi.Request
+    ):
+        print(111, type(request))
+
+        # TODO
+
+
 def simple_api_router_for_testing():
     router = APIRouter(tags=["Testing"])
 

{arpakitlib-1.7.19 → arpakitlib-1.7.22}/arpakitlib/ar_sqlalchemy_model_util.py

@@ -15,6 +15,14 @@ from arpakitlib.ar_json_util import safely_transfer_to_json_str
 _ARPAKIT_LIB_MODULE_VERSION = "3.0"
 
 
+def generate_default_long_id():
+    return (
+        f"longid"
+        f"{str(uuid4()).replace('-', '')}"
+        f"{str(now_utc_dt().timestamp()).replace('.', '')}"
+    )
+
+
 class BaseDBM(DeclarativeBase):
     __abstract__ = True
     _bus_data: dict[str, Any] | None = None
@@ -46,7 +54,7 @@ class SimpleDBM(BaseDBM):
         INTEGER, primary_key=True, autoincrement=True, sort_order=-3, nullable=False
     )
     long_id: Mapped[str] = mapped_column(
-        TEXT, insert_default=uuid4, unique=True, sort_order=-2, nullable=False
+        TEXT, insert_default=generate_default_long_id, unique=True, sort_order=-2, nullable=False
     )
     creation_dt: Mapped[datetime] = mapped_column(
         TIMESTAMP(timezone=True), insert_default=now_utc_dt, index=True, sort_order=-1, nullable=False

{arpakitlib-1.7.19 → arpakitlib-1.7.22}/pyproject.toml

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

arpakitlib-1.7.19/arpakitlib/_arpakit_project_template/manage/example_init_arpakit_project_template.sh

@@ -1 +0,0 @@
-arpakitlib -c init_arpakit_project_template -project_dirpath ./ -overwrite_if_exists ... -project_name ... -sql_db_port ... -api_port ... -ignore_paths_startswith ... -only_paths_startswith ...