arpakitlib 1.8.295__tar.gz → 1.8.299__tar.gz

{arpakitlib-1.8.295 → arpakitlib-1.8.299}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arpakitlib
-Version: 1.8.295
+Version: 1.8.299
 Summary: arpakitlib
 License: Apache-2.0
 License-File: LICENSE
@@ -33,7 +33,6 @@ Requires-Dist: emoji (>=2.14.1,<3.0.0)
 Requires-Dist: fastapi (>=0.118.0,<0.119.0)
 Requires-Dist: gunicorn (>=23.0.0,<24.0.0)
 Requires-Dist: itsdangerous (>=2.2.0,<3.0.0)
-Requires-Dist: jupyter (>=1.1.1,<2.0.0)
 Requires-Dist: markdown (>=3.7,<4.0)
 Requires-Dist: openai (>=2.2.0,<3.0.0)
 Requires-Dist: openpyxl (>=3.1.5,<4.0.0)
@@ -73,7 +72,7 @@ Description-Content-Type: text/markdown
 
 # arpakitlib
 
-## Текущая версия шаблона arpakit_project_template_v_5 находится в разработке. В скором времени будет stable version.
+## Текущая версия шаблона arpakit_project_template_v_5 находится в разработке, она неверная. В скором времени будет stable version.
 
 ## 🚀 Simplify Your Development Workflow
 

{arpakitlib-1.8.295 → arpakitlib-1.8.299}/README.md

@@ -1,6 +1,6 @@
 # arpakitlib
 
-## Текущая версия шаблона arpakit_project_template_v_5 находится в разработке. В скором времени будет stable version.
+## Текущая версия шаблона arpakit_project_template_v_5 находится в разработке, она неверная. В скором времени будет stable version.
 
 ## 🚀 Simplify Your Development Workflow
 

arpakitlib-1.8.299/arpakitlib/ar_log_async_func_if_error.py

@@ -0,0 +1,21 @@
+# arpakit
+
+_ARPAKIT_LIB_MODULE_VERSION = "3.0"
+
+import logging
+
+_logger = logging.getLogger()
+
+
+async def log_async_func_if_error(async_func, **kwargs):
+    try:
+        await async_func(**kwargs)
+    except Exception as exception:
+        _logger.error(
+            f"error in async_func, {async_func.__name__=}",
+            exc_info=exception,
+            extra={
+                "log_async_func_if_error": True,
+                "async_func_name": async_func.__name__
+            }
+        )

{arpakitlib-1.8.295 → arpakitlib-1.8.299}/arpakitlib/ar_logging_util.py

@@ -7,7 +7,9 @@ from typing import Optional
 _ARPAKIT_LIB_MODULE_VERSION = "3.0"
 
 
-def init_log_file(*, log_filepath: str, write_blank: bool = True):
+def init_log_file(*, log_filepath: str | None):
+    if not log_filepath:
+        return
     directory = os.path.dirname(log_filepath)
     if directory and not os.path.exists(directory):
         os.makedirs(directory, exist_ok=True)
@@ -19,13 +21,16 @@ def init_log_file(*, log_filepath: str, write_blank: bool = True):
 _logging_was_setup: bool = False
 
 
-def setup_normal_logging(log_filepath: Optional[str] = None):
+def setup_normal_logging(
+        *,
+        log_filepath: Optional[str] = None,
+):
     global _logging_was_setup
     if _logging_was_setup:
+        logging.getLogger().info("normal logging was already setup")
         return
 
-    if log_filepath:
-        init_log_file(log_filepath=log_filepath)
+    init_log_file(log_filepath=log_filepath)
 
     logger = logging.getLogger()
     logger.setLevel(logging.INFO)
@@ -33,8 +38,9 @@ def setup_normal_logging(log_filepath: Optional[str] = None):
     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"
+        "%(asctime)s %(msecs)03d | %(levelname)s | %(name)s | %(filename)s | "
+        "%(funcName)s:%(lineno)d - %(message)s",
+        datefmt="%d.%m.%Y %H:%M:%S %p %Z %z",
     )
     stream_handler.setFormatter(stream_formatter)
     logger.addHandler(stream_handler)
@@ -44,7 +50,7 @@ def setup_normal_logging(log_filepath: Optional[str] = None):
         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"
+            datefmt="%d.%m.%Y %H:%M:%S %p %Z %z",
         )
         file_handler.setFormatter(file_formatter)
         logger.addHandler(file_handler)
@@ -55,7 +61,9 @@ def setup_normal_logging(log_filepath: Optional[str] = None):
 
 
 def __example():
-    pass
+    setup_normal_logging()
+    logging.getLogger().info("Hello world")
+    logging.getLogger().error("Hello world")
 
 
 if __name__ == '__main__':

{arpakitlib-1.8.295 → arpakitlib-1.8.299}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "arpakitlib"
-version = "1.8.295"
+version = "1.8.299"
 description = "arpakitlib"
 authors = [
     { name = "arpakit_company", email = "support@arpakit.com" }
@@ -39,7 +39,6 @@ dependencies = [
     "twine (>=6.1.0,<7.0.0)",
     "itsdangerous (>=2.2.0,<3.0.0)",
     "email-validator (>=2.2.0,<3.0.0)",
-    "jupyter (>=1.1.1,<2.0.0)",
     "openpyxl (>=3.1.5,<4.0.0)",
     "alembic (>=1.14.1,<2.0.0)",
     "pymongo (>=4.10.1,<5.0.0)",

arpakitlib-1.8.295/arpakitlib/_arpakit_project_template_v_5/project/core/easy_openai_api_client.py

@@ -1,44 +0,0 @@
-import asyncio
-from functools import lru_cache
-
-import httpx
-from openai import OpenAI, AsyncOpenAI
-
-from arpakitlib.ar_openai_api_client_util import EasyOpenAIAPIClient
-from project.core.settings import get_cached_settings
-
-
-def create_easy_openai_api_client() -> EasyOpenAIAPIClient | None:
-    if get_cached_settings().openai_api_key is None:
-        return None
-
-    return EasyOpenAIAPIClient(
-        open_ai=OpenAI(
-            api_key=get_cached_settings().openai_api_key,
-            base_url=get_cached_settings().openai_api_base_url,
-            timeout=httpx.Timeout(
-                timeout=60,
-                connect=15,
-                read=60,
-                write=60,
-                pool=15
-            )
-        ),
-        async_open_ai=AsyncOpenAI(
-            api_key=get_cached_settings().openai_api_key,
-            base_url=get_cached_settings().openai_api_base_url
-        )
-    )
-
-
-@lru_cache()
-def get_cached_easy_openai_api_client() -> EasyOpenAIAPIClient | None:
-    return create_easy_openai_api_client()
-
-
-async def __async_example():
-    pass
-
-
-if __name__ == '__main__':
-    asyncio.run(__async_example())

arpakitlib-1.8.295/arpakitlib/ar_openai_api_client_util.py

@@ -1,209 +0,0 @@
-# arpakit
-
-from __future__ import annotations
-
-import asyncio
-import logging
-
-import httpx
-from openai import OpenAI, AsyncOpenAI
-from openai.types.chat import ChatCompletion
-
-from arpakitlib.ar_base64_util import convert_file_to_base64_string
-
-_ARPAKIT_LIB_MODULE_VERSION = "3.0"
-
-"""
-https://platform.openai.com/docs/
-"""
-
-
-class EasyOpenAIAPIClient:
-    def __init__(
-            self,
-            *,
-            open_ai: OpenAI,
-            async_open_ai: AsyncOpenAI
-    ):
-        self._logger = logging.getLogger(self.__class__.__name__)
-
-        self.open_ai = open_ai
-        self.async_open_ai = async_open_ai
-
-    @classmethod
-    def create_easily(
-            cls,
-            openai_api_key: str,
-            openai_api_base_url: str | None = "https://api.proxyapi.ru/openai/v1"
-    ) -> EasyOpenAIAPIClient:
-        return EasyOpenAIAPIClient(
-            open_ai=OpenAI(
-                api_key=openai_api_key,
-                base_url=openai_api_base_url,
-                timeout=httpx.Timeout(
-                    timeout=300,  # общий таймаут
-                    connect=60,  # таймаут подключения
-                    read=300,  # чтение ответа
-                    write=60,  # запись запроса
-                    pool=60  # пул соединений
-                )
-            ),
-            async_open_ai=AsyncOpenAI(
-                api_key=openai_api_key,
-                base_url=openai_api_base_url,
-                http_client=httpx.AsyncClient(
-                    timeout=httpx.Timeout(
-                        timeout=300,
-                        connect=60,
-                        read=300,
-                        write=60,
-                        pool=60
-                    )
-                )
-            )
-        )
-
-    def check_conn(self):
-        self.open_ai.models.list()
-
-    def is_conn_good(self) -> bool:
-        try:
-            self.check_conn()
-            return True
-        except Exception as e:
-            self._logger.error(e)
-        return False
-
-    async def async_check_conn(self):
-        await self.async_open_ai.models.list()
-
-    async def async_is_conn_good(self) -> bool:
-        try:
-            await self.async_check_conn()
-            return True
-        except Exception as e:
-            self._logger.error(e)
-        return False
-
-    def simple_ask(
-            self,
-            *,
-            prompt: str | None = None,
-            text: str,
-            model: str = "gpt-4o",
-            image_links: str | list[str] | None = None,
-            image_filepaths: str | list[str] | None = None
-    ) -> ChatCompletion:
-        if isinstance(image_links, str):
-            image_links = [image_links]
-        if isinstance(image_filepaths, str):
-            image_filepaths = [image_filepaths]
-
-        messages = []
-
-        if prompt is not None:
-            messages.append({
-                "role": "system",
-                "content": prompt
-            })
-
-        content = [{"type": "text", "text": text}]
-
-        if image_links:
-            for link in image_links:
-                content.append({
-                    "type": "image_url",
-                    "image_url": {"url": link}
-                })
-
-        if image_filepaths:
-            for path in image_filepaths:
-                base64_url = convert_file_to_base64_string(filepath=path, raise_for_error=True)
-                content.append({
-                    "type": "image_url",
-                    "image_url": {"url": base64_url}
-                })
-
-        messages.append({
-            "role": "user",
-            "content": content
-        })
-
-        response: ChatCompletion = self.open_ai.chat.completions.create(
-            model=model,
-            messages=messages,
-            n=1,
-            temperature=0.1,
-            top_p=0.9,
-            max_tokens=1000
-        )
-
-        return response
-
-    async def async_simple_ask(
-            self,
-            *,
-            prompt: str | None = None,
-            text: str,
-            model: str = "gpt-4o",
-            image_links: str | list[str] | None = None,
-            image_filepaths: str | list[str] | None = None
-    ) -> ChatCompletion:
-        if isinstance(image_links, str):
-            image_links = [image_links]
-        if isinstance(image_filepaths, str):
-            image_filepaths = [image_filepaths]
-
-        messages = []
-
-        if prompt is not None:
-            messages.append({
-                "role": "system",
-                "content": prompt
-            })
-
-        content = [{"type": "text", "text": text}]
-
-        if image_links:
-            for link in image_links:
-                content.append({
-                    "type": "image_url",
-                    "image_url": {"url": link}
-                })
-
-        if image_filepaths:
-            for path in image_filepaths:
-                base64_url = convert_file_to_base64_string(filepath=path, raise_for_error=True)
-                content.append({
-                    "type": "image_url",
-                    "image_url": {"url": base64_url}
-                })
-
-        messages.append({
-            "role": "user",
-            "content": content
-        })
-
-        response: ChatCompletion = await self.async_open_ai.chat.completions.create(
-            model=model,
-            messages=messages,
-            n=1,
-            temperature=0.1,
-            top_p=0.9,
-            max_tokens=1000
-        )
-
-        return response
-
-
-def __example():
-    pass
-
-
-async def __async_example():
-    pass
-
-
-if __name__ == '__main__':
-    __example()
-    asyncio.run(__async_example())