arpakitlib 1.8.172__tar.gz → 1.8.173__tar.gz

{arpakitlib-1.8.172 → arpakitlib-1.8.173}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: arpakitlib
-Version: 1.8.172
+Version: 1.8.173
 Summary: arpakitlib
 License: Apache-2.0
 Keywords: arpakitlib,arpakit,arpakit-company,arpakitcompany,arpakit_company

arpakitlib-1.8.173/arpakitlib/_arpakit_project_template_v_5/arpakitlib_project_template_info.json

@@ -0,0 +1,4 @@
+{
+  "arpakitlib_project_template_version": "5",
+  "arpakitlib_project_template_subversion": "38"
+}

{arpakitlib-1.8.172 → arpakitlib-1.8.173}/arpakitlib/_arpakit_project_template_v_5/command/check_logging.py

@@ -1,6 +1,6 @@
 import logging
 
-from project.core.util import setup_logging
+from project.core.setup_logging import setup_logging
 
 _logger = logging.getLogger(__name__)
 

{arpakitlib-1.8.172 → arpakitlib-1.8.173}/arpakitlib/_arpakit_project_template_v_5/command/check_sqlalchemy_db.py

@@ -1,4 +1,4 @@
-from project.core.util import setup_logging
+from project.core.setup_logging import setup_logging
 from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 
 

{arpakitlib-1.8.172 → arpakitlib-1.8.173}/arpakitlib/_arpakit_project_template_v_5/command/drop_json_db.py

@@ -1,5 +1,5 @@
 from project.core.settings import get_cached_settings
-from project.core.util import setup_logging
+from project.core.setup_logging import setup_logging
 from project.json_db.json_db import get_cached_json_db
 
 

{arpakitlib-1.8.172 → arpakitlib-1.8.173}/arpakitlib/_arpakit_project_template_v_5/command/drop_sqlalchemy_db.py

@@ -1,5 +1,5 @@
 from project.core.settings import get_cached_settings
-from project.core.util import setup_logging
+from project.core.setup_logging import setup_logging
 from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 
 

{arpakitlib-1.8.172 → arpakitlib-1.8.173}/arpakitlib/_arpakit_project_template_v_5/command/init_json_db.py

@@ -1,4 +1,4 @@
-from project.core.util import setup_logging
+from project.core.setup_logging import setup_logging
 from project.json_db.json_db import get_cached_json_db
 
 

{arpakitlib-1.8.172 → arpakitlib-1.8.173}/arpakitlib/_arpakit_project_template_v_5/command/init_sqlalchemy_db.py

@@ -1,4 +1,4 @@
-from project.core.util import setup_logging
+from project.core.setup_logging import setup_logging
 from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 
 

{arpakitlib-1.8.172 → arpakitlib-1.8.173}/arpakitlib/_arpakit_project_template_v_5/command/reinit_all_sqlalchemy_db.py

@@ -1,5 +1,5 @@
 from project.core.settings import get_cached_settings
-from project.core.util import setup_logging
+from project.core.setup_logging import setup_logging
 from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 
 

{arpakitlib-1.8.172 → arpakitlib-1.8.173}/arpakitlib/_arpakit_project_template_v_5/command/reinit_json_db.py

@@ -1,5 +1,5 @@
 from project.core.settings import get_cached_settings
-from project.core.util import setup_logging
+from project.core.setup_logging import setup_logging
 from project.json_db.json_db import get_cached_json_db
 
 

{arpakitlib-1.8.172 → arpakitlib-1.8.173}/arpakitlib/_arpakit_project_template_v_5/command/reinit_sqlalchemy_db.py

@@ -1,5 +1,5 @@
 from project.core.settings import get_cached_settings
-from project.core.util import setup_logging
+from project.core.setup_logging import setup_logging
 from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 
 

{arpakitlib-1.8.172 → arpakitlib-1.8.173}/arpakitlib/_arpakit_project_template_v_5/command/remove_operations.py

@@ -1,6 +1,6 @@
 from project.business_service.remove_operations import remove_operations
 from project.core.settings import get_cached_settings
-from project.core.util import setup_logging
+from project.core.setup_logging import setup_logging
 
 
 def __command():

{arpakitlib-1.8.172 → arpakitlib-1.8.173}/arpakitlib/_arpakit_project_template_v_5/command/remove_rows_from_tables_sqlalchemy_db.py

@@ -1,4 +1,4 @@
-from project.core.util import setup_logging
+from project.core.setup_logging import setup_logging
 from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 
 

{arpakitlib-1.8.172 → arpakitlib-1.8.173}/arpakitlib/_arpakit_project_template_v_5/command/remove_story_logs.py

@@ -1,5 +1,5 @@
 from project.core.settings import get_cached_settings
-from project.core.util import setup_logging
+from project.core.setup_logging import setup_logging
 from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 from project.sqlalchemy_db_.sqlalchemy_model import StoryLogDBM
 

{arpakitlib-1.8.172 → arpakitlib-1.8.173}/arpakitlib/_arpakit_project_template_v_5/command/rm_all_records_in_json_db.py

@@ -1,5 +1,5 @@
 from project.core.settings import get_cached_settings
-from project.core.util import setup_logging
+from project.core.setup_logging import setup_logging
 from project.json_db.json_db import get_cached_json_db
 
 

{arpakitlib-1.8.172 → arpakitlib-1.8.173}/arpakitlib/_arpakit_project_template_v_5/command/set_tg_bot_commands.py

@@ -1,6 +1,6 @@
 import asyncio
 
-from project.core.util import setup_logging
+from project.core.setup_logging import setup_logging
 from project.tg_bot.tg_bot import get_cached_tg_bot
 from project.tg_bot.util.set_tg_bot_commands import set_client_tg_bot_commands, set_admin_tg_bot_commands
 

{arpakitlib-1.8.172 → arpakitlib-1.8.173}/arpakitlib/_arpakit_project_template_v_5/command/show_sqlalchemy_db_table_name_to_amount.py

@@ -1,7 +1,7 @@
 import logging
 
 from arpakitlib.ar_json_util import transfer_data_to_json_str
-from project.core.util import setup_logging
+from project.core.setup_logging import setup_logging
 from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 
 _logger = logging.getLogger()

{arpakitlib-1.8.172 → arpakitlib-1.8.173}/arpakitlib/_arpakit_project_template_v_5/command/start_operation_executor_worker.py

@@ -1,4 +1,4 @@
-from project.core.util import setup_logging
+from project.core.setup_logging import setup_logging
 from project.operation_execution.operation_executor_worker import OperationExecutorWorker
 from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 

{arpakitlib-1.8.172 → arpakitlib-1.8.173}/arpakitlib/_arpakit_project_template_v_5/command/start_operation_executor_workers_mode_async_task.py

@@ -1,7 +1,7 @@
 import asyncio
 
 from arpakitlib.ar_base_worker_util import safe_run_workers_in_background, SafeRunInBackgroundModes
-from project.core.util import setup_logging
+from project.core.setup_logging import setup_logging
 from project.operation_execution.operation_executor_worker import OperationExecutorWorker
 from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 

{arpakitlib-1.8.172 → arpakitlib-1.8.173}/arpakitlib/_arpakit_project_template_v_5/command/start_operation_executor_workers_mode_thread.py

@@ -1,6 +1,6 @@
 from arpakitlib.ar_base_worker_util import safe_run_workers_in_background, SafeRunInBackgroundModes
 
-from project.core.util import setup_logging
+from project.core.setup_logging import setup_logging
 from project.operation_execution.operation_executor_worker import OperationExecutorWorker
 from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 

{arpakitlib-1.8.172 → arpakitlib-1.8.173}/arpakitlib/_arpakit_project_template_v_5/command/start_scheduled_operation_creator_worker.py

@@ -1,4 +1,4 @@
-from project.core.util import setup_logging
+from project.core.setup_logging import setup_logging
 from project.operation_execution.scheduled_operation_creator_worker import create_scheduled_operation_creator_worker
 
 

{arpakitlib-1.8.172 → arpakitlib-1.8.173}/arpakitlib/_arpakit_project_template_v_5/command/start_sqladmin.py

@@ -1,7 +1,7 @@
 import uvicorn
 
 from project.core.settings import get_cached_settings
-from project.core.util import setup_logging
+from project.core.setup_logging import setup_logging
 
 
 def __command():

{arpakitlib-1.8.172 → arpakitlib-1.8.173}/arpakitlib/_arpakit_project_template_v_5/command/start_sqladmin_for_prod.py

@@ -1,7 +1,7 @@
 import uvicorn
 
 from project.core.settings import get_cached_settings
-from project.core.util import setup_logging
+from project.core.setup_logging import setup_logging
 
 
 def __command():

{arpakitlib-1.8.172 → arpakitlib-1.8.173}/arpakitlib/_arpakit_project_template_v_5/command/start_sqladmin_with_reload.py

@@ -1,7 +1,7 @@
 import uvicorn
 
 from project.core.settings import get_cached_settings
-from project.core.util import setup_logging
+from project.core.setup_logging import setup_logging
 
 
 def __command():

{arpakitlib-1.8.172 → arpakitlib-1.8.173}/arpakitlib/_arpakit_project_template_v_5/command/start_tg_bot.py

@@ -1,4 +1,4 @@
-from project.core.util import setup_logging
+from project.core.setup_logging import setup_logging
 from project.tg_bot.start_tg_bot import start_tg_bot
 
 

{arpakitlib-1.8.172 → arpakitlib-1.8.173}/arpakitlib/_arpakit_project_template_v_5/command/start_tg_bot_for_prod.py

@@ -1,4 +1,4 @@
-from project.core.util import setup_logging
+from project.core.setup_logging import setup_logging
 from project.tg_bot.start_tg_bot import start_tg_bot
 
 

{arpakitlib-1.8.172 → arpakitlib-1.8.173}/arpakitlib/_arpakit_project_template_v_5/project/api/create_api_app.py

@@ -12,7 +12,7 @@ from project.api.openapi_ui import add_local_openapi_ui_to_api_app
 from project.api.router.main_router import main_api_router
 from project.core.const import ProjectPaths
 from project.core.settings import get_cached_settings
-from project.core.util import setup_logging
+from project.core.setup_logging import setup_logging
 
 _logger = logging.getLogger(__name__)
 

{arpakitlib-1.8.172 → arpakitlib-1.8.173}/arpakitlib/_arpakit_project_template_v_5/project/api/create_first_data.py

@@ -1,6 +1,6 @@
 import logging
 
-from project.core.util import setup_logging
+from project.core.setup_logging import setup_logging
 from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM, ApiKeyDBM, UserTokenDBM
 

{arpakitlib-1.8.172 → arpakitlib-1.8.173}/arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/main_router.py

@@ -23,7 +23,6 @@ main_admin_api_router.include_router(
     prefix="/raise_fake_error"
 )
 
-
 main_admin_api_router.include_router(
     router=raise_api_exception_1.api_router,
     prefix="/raise_api_exception_1"

{arpakitlib-1.8.172 → arpakitlib-1.8.173}/arpakitlib/_arpakit_project_template_v_5/project/api/start_api.py

@@ -2,7 +2,7 @@ import uvicorn
 
 from project.api.before_start_api import before_start_api
 from project.core.settings import get_cached_settings
-from project.core.util import setup_logging
+from project.core.setup_logging import setup_logging
 
 
 def start_api():

{arpakitlib-1.8.172 → arpakitlib-1.8.173}/arpakitlib/_arpakit_project_template_v_5/project/business_service/hello_world.py

@@ -1,6 +1,6 @@
 import logging
 
-from project.core.util import setup_logging
+from project.core.setup_logging import setup_logging
 
 _logger = logging.getLogger(__name__)
 

{arpakitlib-1.8.172 → arpakitlib-1.8.173}/arpakitlib/_arpakit_project_template_v_5/project/core/easy_openai_api_client.py

@@ -4,7 +4,6 @@ from functools import lru_cache
 import httpx
 from openai import OpenAI, AsyncOpenAI
 
-from arpakitlib.ar_logging_util import setup_normal_logging
 from arpakitlib.ar_openai_api_client_util import EasyOpenAIAPIClient
 from project.core.settings import get_cached_settings
 
@@ -38,7 +37,7 @@ def get_cached_easy_openai_api_client() -> EasyOpenAIAPIClient | None:
 
 
 async def __async_example():
-    setup_normal_logging()
+    pass
 
 
 if __name__ == '__main__':

arpakitlib-1.8.173/arpakitlib/_arpakit_project_template_v_5/project/core/setup_logging.py

@@ -0,0 +1,55 @@
+import asyncio
+import logging
+
+from arpakitlib.ar_logging_util import init_log_file
+from project.core.settings import get_cached_settings
+
+_logging_was_setup: bool = False
+
+
+def setup_logging():
+    global _logging_was_setup
+    if _logging_was_setup:
+        return
+
+    if get_cached_settings().log_filepath:
+        init_log_file(log_filepath=get_cached_settings().log_filepath)
+
+    logger = logging.getLogger()
+    logger.setLevel(logging.INFO)
+
+    stream_handler = logging.StreamHandler()
+    stream_handler.setLevel(logging.INFO)
+    stream_formatter = logging.Formatter(
+        "%(asctime)s %(msecs)03d | %(levelname)s | %(filename)s | %(funcName)s:%(lineno)d - %(message)s",
+        datefmt="%d.%m.%Y %I:%M:%S %p"
+    )
+    stream_handler.setFormatter(stream_formatter)
+    logger.addHandler(stream_handler)
+
+    if get_cached_settings().log_filepath:
+        file_handler = logging.FileHandler(get_cached_settings().log_filepath)
+        file_handler.setLevel(logging.WARNING)
+        file_formatter = logging.Formatter(
+            "%(asctime)s | %(levelname)s | %(filename)s | %(funcName)s:%(lineno)d - %(message)s",
+            datefmt="%d.%m.%Y %I:%M:%S%p"
+        )
+        file_handler.setFormatter(file_formatter)
+        logger.addHandler(file_handler)
+
+    _logging_was_setup = True
+
+    logger.info("normal logging was setup")
+
+
+def __example():
+    pass
+
+
+async def __async_example():
+    pass
+
+
+if __name__ == '__main__':
+    __example()
+    asyncio.run(__async_example())

{arpakitlib-1.8.172 → arpakitlib-1.8.173}/arpakitlib/_arpakit_project_template_v_5/project/core/util.py

@@ -1,29 +1,10 @@
-import asyncio
 from datetime import datetime
 
 from arpakitlib.ar_datetime_util import now_dt
-from arpakitlib.ar_logging_util import setup_normal_logging
 from arpakitlib.ar_type_util import raise_if_none
 from project.core.settings import get_cached_settings
 
 
-def setup_logging():
-    setup_normal_logging(log_filepath=get_cached_settings().log_filepath)
-
-
 def now_local_dt() -> datetime:
     raise_if_none(get_cached_settings().local_timezone_as_pytz)
     return now_dt(tz=get_cached_settings().local_timezone_as_pytz)
-
-
-def __example():
-    pass
-
-
-async def __async_example():
-    pass
-
-
-if __name__ == '__main__':
-    __example()
-    asyncio.run(__async_example())

{arpakitlib-1.8.172 → arpakitlib-1.8.173}/arpakitlib/_arpakit_project_template_v_5/project/emailer/send_email.py

@@ -6,7 +6,7 @@ from email.message import EmailMessage
 import aiosmtplib
 
 from project.core.settings import get_cached_settings
-from project.core.util import setup_logging
+from project.core.setup_logging import setup_logging
 
 _logger = logging.getLogger(__name__)
 

{arpakitlib-1.8.172 → arpakitlib-1.8.173}/arpakitlib/_arpakit_project_template_v_5/project/emailer/send_simple_email.py

@@ -1,7 +1,7 @@
 import asyncio
 
 from project.core.jinja2_templates import get_cached_jinja2_templates
-from project.core.util import setup_logging
+from project.core.setup_logging import setup_logging
 from project.emailer.send_email import async_send_email
 
 

arpakitlib-1.8.173/arpakitlib/_arpakit_project_template_v_5/project/site/create_site_app.py

@@ -0,0 +1,5 @@
+from project.core.setup_logging import setup_logging
+
+
+def create_site_app():
+    setup_logging()

{arpakitlib-1.8.172 → arpakitlib-1.8.173}/arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/create_sqladmin_app.py

@@ -4,7 +4,7 @@ from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
 
 from project.core.settings import get_cached_settings
-from project.core.util import setup_logging
+from project.core.setup_logging import setup_logging
 from project.sqladmin_.add_admin_in_app import add_sqladmin_in_app
 from project.sqladmin_.event import get_sqladmin_startup_events, get_sqladmin_shutdown_events
 

{arpakitlib-1.8.172 → arpakitlib-1.8.173}/arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/common.py

@@ -7,7 +7,7 @@ import starlette.responses
 from openpyxl import Workbook
 from sqladmin import ModelView
 
-from project.core.util import now_local_dt
+from arpakitlib.ar_datetime_util import now_utc_dt
 
 
 class SimpleMV(ModelView):
@@ -48,7 +48,7 @@ class SimpleMV(ModelView):
         wb.save(output)
         output.seek(0)
 
-        filename = f"{self.model.__name__}_export_{now_local_dt().strftime("%d.%m.%YT%H-%M-%S-%Z%z")}.xlsx"
+        filename = f"{self.model.__name__}_export_{now_utc_dt().strftime("%d.%m.%YT%H-%M-%S-%Z%z")}.xlsx"
 
         return starlette.responses.StreamingResponse(
             output,

{arpakitlib-1.8.172 → arpakitlib-1.8.173}/arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/start_sqladmin.py

@@ -1,7 +1,7 @@
 import uvicorn
 
 from project.core.settings import get_cached_settings
-from project.core.util import setup_logging
+from project.core.setup_logging import setup_logging
 
 
 def __command():

{arpakitlib-1.8.172 → arpakitlib-1.8.173}/arpakitlib/_arpakit_project_template_v_5/project/test_data/make_test_data_1.py

@@ -3,7 +3,7 @@ import logging
 
 from arpakitlib.ar_datetime_util import now_utc_dt
 from project.core.settings import get_cached_settings
-from project.core.util import setup_logging
+from project.core.setup_logging import setup_logging
 from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 from project.sqlalchemy_db_.sqlalchemy_model import ApiKeyDBM, UserDBM, UserTokenDBM
 

{arpakitlib-1.8.172 → arpakitlib-1.8.173}/arpakitlib/_arpakit_project_template_v_5/project/tg_bot/start_tg_bot.py

@@ -5,7 +5,7 @@ import aiohttp.web
 from aiogram.webhook.aiohttp_server import SimpleRequestHandler, setup_application
 
 from project.core.settings import get_cached_settings
-from project.core.util import setup_logging
+from project.core.setup_logging import setup_logging
 from project.tg_bot.tg_bot import get_cached_tg_bot
 from project.tg_bot.tg_bot_dispatcher import create_tg_bot_dispatcher
 

{arpakitlib-1.8.172 → arpakitlib-1.8.173}/arpakitlib/_arpakit_project_template_v_5/project/tg_bot/util/notify_admins.py

@@ -8,7 +8,7 @@ from emoji import emojize
 
 from arpakitlib.ar_str_util import remove_tags_and_html
 from project.core.settings import get_cached_settings
-from project.core.util import setup_logging
+from project.core.setup_logging import setup_logging
 from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 from project.tg_bot.tg_bot import get_cached_tg_bot

{arpakitlib-1.8.172 → arpakitlib-1.8.173}/arpakitlib/_arpakit_project_template_v_5/project/tg_bot/util/set_tg_bot_commands.py

@@ -5,7 +5,7 @@ from aiogram.types import BotCommand, BotCommandScopeChat
 
 from arpakitlib.ar_str_util import return_str_if_none
 from project.core.settings import get_cached_settings
-from project.core.util import setup_logging
+from project.core.setup_logging import setup_logging
 from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 from project.tg_bot.blank.client import get_cached_rus_client_tg_bot_blank

{arpakitlib-1.8.172 → arpakitlib-1.8.173}/arpakitlib/_arpakit_project_template_v_5/project/tg_bot_notifier/tg_bot_notifier.py

@@ -5,7 +5,7 @@ from aiogram.client.session.aiohttp import AiohttpSession
 from aiogram.enums import ParseMode
 
 from project.core.settings import get_cached_settings
-from project.core.util import setup_logging
+from project.core.setup_logging import setup_logging
 
 
 def create_async_tg_bot_notifier() -> aiogram.Bot | None:

{arpakitlib-1.8.172 → arpakitlib-1.8.173}/arpakitlib/_arpakit_project_template_v_5/project/util/send_email_.py

@@ -9,7 +9,7 @@ from email.utils import formataddr
 import aiosmtplib
 
 from project.core.settings import get_cached_settings
-from project.core.util import setup_logging
+from project.core.setup_logging import setup_logging
 
 _logger = logging.getLogger(__name__)
 

{arpakitlib-1.8.172 → arpakitlib-1.8.173}/arpakitlib/ar_logging_util.py

@@ -16,11 +16,11 @@ def init_log_file(*, log_filepath: str):
             file.write("")
 
 
-_normal_logging_was_setup: bool = False
+_logging_was_setup: bool = False
 
 
 def setup_normal_logging(log_filepath: Optional[str] = None):
-    global _normal_logging_was_setup
+    global _logging_was_setup
     if _normal_logging_was_setup is True:
         return
 

{arpakitlib-1.8.172 → arpakitlib-1.8.173}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "arpakitlib"
-version = "1.8.172"
+version = "1.8.173"
 description = "arpakitlib"
 authors = [
     { name = "arpakit_support", email = "support@arpakit.com" }

arpakitlib-1.8.172/arpakitlib/_arpakit_project_template_v_5/arpakitlib_project_template_info.json

@@ -1,4 +0,0 @@
-{
-  "arpakitlib_project_template_version": "5",
-  "arpakitlib_project_template_subversion": "37"
-}

arpakitlib-1.8.172/arpakitlib/_arpakit_project_template_v_5/project/site/create_site_app.py

@@ -1,5 +0,0 @@
-from project.core.util import setup_logging
-
-
-def create_site_app():
-    setup_logging()