arpakitlib 1.8.326__tar.gz → 1.8.328__tar.gz

{arpakitlib-1.8.326 → arpakitlib-1.8.328}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arpakitlib
-Version: 1.8.326
+Version: 1.8.328
 Summary: arpakitlib
 License-Expression: Apache-2.0
 License-File: LICENSE

{arpakitlib-1.8.326 → arpakitlib-1.8.328}/arpakitlib/_arpakit_project_template_v_5/project/api/raise_own_exception_if_exception_in_api_router.py

@@ -1,7 +1,7 @@
 from typing import Any
 
 import fastapi
-from arpakitlib.ar_raise_own_exception_if_exception import raise_own_exception_if_exception
+from arpakitlib.ar_raise_own_exception_if_exception_util import raise_own_exception_if_exception
 
 from project.api.api_exception import APIException
 from project.api.schema.out.common.error import ErrorCommonSO

{arpakitlib-1.8.326 → arpakitlib-1.8.328}/arpakitlib/_arpakit_project_template_v_5/project/sandbox/sandbox_3.py

@@ -1,6 +1,6 @@
 import asyncio
 
-from arpakitlib.ar_pydantic_schema_from_sqlalchemy_model import pydantic_schema_from_sqlalchemy_model
+from arpakitlib.ar_pydantic_schema_from_sqlalchemy_model_util import pydantic_schema_from_sqlalchemy_model
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 
 

{arpakitlib-1.8.326 → arpakitlib-1.8.328}/arpakitlib/_arpakit_project_template_v_5/project/sandbox/sandbox_4.py

@@ -1,6 +1,6 @@
 import asyncio
 
-from arpakitlib.ar_pydantic_schema_from_sqlalchemy_model import _get_property_name_to_type_from_model_class
+from arpakitlib.ar_pydantic_schema_from_sqlalchemy_model_util import _get_property_name_to_type_from_model_class
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 
 

{arpakitlib-1.8.326 → arpakitlib-1.8.328}/arpakitlib/ar_aiogram_as_tg_command_util.py

@@ -10,7 +10,7 @@ from aiogram.filters import CommandObject
 from pydantic import BaseModel
 
 from arpakitlib.ar_need_type_util import parse_need_type, NeedTypes
-from arpakitlib.ar_parse_command import BadCommandFormat, parse_command
+from arpakitlib.ar_parse_command_util import BadCommandFormat, parse_command
 from arpakitlib.ar_type_util import raise_for_types
 
 _ARPAKIT_LIB_MODULE_VERSION = "3.0"

{arpakitlib-1.8.326 → arpakitlib-1.8.328}/arpakitlib/ar_arpakitlib_cli_util.py

@@ -4,7 +4,7 @@ import sys
 
 from arpakitlib.ar_arpakit_project_template_util import init_arpakit_project_template
 from arpakitlib.ar_need_type_util import parse_need_type, NeedTypes
-from arpakitlib.ar_parse_command import parse_command
+from arpakitlib.ar_parse_command_util import parse_command
 
 _ARPAKIT_LIB_MODULE_VERSION = "3.0"
 

{arpakitlib-1.8.326 → arpakitlib-1.8.328}/arpakitlib/ar_base_worker_util.py

@@ -26,7 +26,7 @@ class BaseWorker(ABC):
             startup_funcs: list[Any] | None = None,
             worker_name: str | None = None,
             data: dict[str, Any] | None = None,
-            timeout_before_safe_run: timedelta | None= None,
+            timeout_before_safe_run: timedelta | None = None,
             **kwargs
     ):
         self.timeout_after_run = timeout_after_run

{arpakitlib-1.8.326 → arpakitlib-1.8.328}/arpakitlib/ar_blank_util.py

@@ -6,17 +6,17 @@ _ARPAKIT_LIB_MODULE_VERSION = "3.0"
 
 class BaseBlank:
     class Languages(Enumeration):
-        rus = "ru"        # Русский
-        eng = "en"        # Английский
-        spa = "es"        # Испанский
-        deu = "de"        # Немецкий
-        fra = "fr"        # Французский
-        ita = "it"        # Итальянский
-        por = "pt"        # Португальский
-        jpn = "ja"        # Японский
-        kor = "ko"        # Корейский
-        zho = "zh"        # Китайский
-        ara = "ar"        # Арабский
+        rus = "ru"  # Русский
+        eng = "en"  # Английский
+        spa = "es"  # Испанский
+        deu = "de"  # Немецкий
+        fra = "fr"  # Французский
+        ita = "it"  # Итальянский
+        por = "pt"  # Португальский
+        jpn = "ja"  # Японский
+        kor = "ko"  # Корейский
+        zho = "zh"  # Китайский
+        ara = "ar"  # Арабский
 
     def __init__(self, *, lang: str = "ru", **kwargs):
         self.lang = lang.strip()
@@ -28,7 +28,7 @@ class BaseBlank:
 
     def hello_world(self) -> str:
         if self.compare_lang(self.Languages.rus):
-            return "Привет, мир!"   # Русский
+            return "Привет, мир!"  # Русский
 
         if self.compare_lang(self.Languages.eng):
             return "Hello, world!"  # Английский
@@ -37,29 +37,28 @@ class BaseBlank:
             return "¡Hola, mundo!"  # Испанский
 
         if self.compare_lang(self.Languages.deu):
-            return "Hallo, Welt!"   # Немецкий
+            return "Hallo, Welt!"  # Немецкий
 
         if self.compare_lang(self.Languages.fra):
             return "Bonjour, le monde!"  # Французский
 
         if self.compare_lang(self.Languages.ita):
-            return "Ciao, mondo!"    # Итальянский
+            return "Ciao, mondo!"  # Итальянский
 
         if self.compare_lang(self.Languages.por):
-            return "Olá, mundo!"     # Португальский
+            return "Olá, mundo!"  # Португальский
 
         if self.compare_lang(self.Languages.jpn):
             return "こんにちは、世界！"  # Японский
 
         if self.compare_lang(self.Languages.kor):
-            return "안녕, 세상!"       # Корейский
+            return "안녕, 세상!"  # Корейский
 
         if self.compare_lang(self.Languages.zho):
-            return "你好，世界！"      # Китайский
+            return "你好，世界！"  # Китайский
 
         if self.compare_lang(self.Languages.ara):
-            return "مرحبا بالعالم!"   # Арабский
+            return "مرحبا بالعالم!"  # Арабский
 
         # если язык не найден
         return "Hello, world!"
-

{arpakitlib-1.8.326 → arpakitlib-1.8.328}/arpakitlib/ar_http_request_util.py

@@ -27,12 +27,18 @@ def sync_make_http_request(
         max_tries_: int = 9,
         proxy_url_: str | None = None,
         raise_for_status_: bool = False,
-        not_raise_for_statuses_: list[int] | None = None,
+        not_raise_for_statuses_: list[int] | set[int] | None = None,
         timeout_: timedelta | float = timedelta(seconds=15).total_seconds(),
         enable_logging_: bool = False,
         exception_class_: type[Exception] | None = None,
+        retry_delay_timeout: timedelta | int | None = timedelta(seconds=0.1),
         **kwargs
 ) -> requests.Response:
+    if isinstance(retry_delay_timeout, int):
+        retry_delay_timeout = timedelta(seconds=retry_delay_timeout)
+    if retry_delay_timeout is not None:
+        raise_for_type(retry_delay_timeout, timedelta)
+
     if isinstance(timeout_, float):
         timeout_ = timedelta(seconds=timeout_)
     raise_for_type(timeout_, timedelta)
@@ -69,7 +75,7 @@ def sync_make_http_request(
                 else:
                     try:
                         response.raise_for_status()
-                    except requests.HTTPError as raise_for_status_exception:
+                    except requests.HTTPError:
                         if enable_logging_:
                             try:
                                 json_data = response.json()
@@ -86,7 +92,7 @@ def sync_make_http_request(
                                     )
                                 except Exception:
                                     pass
-                        raise raise_for_status_exception
+                        raise
             if enable_logging_:
                 _logger.info(f"good try http {method} {url} {params}")
             return response
@@ -99,8 +105,9 @@ def sync_make_http_request(
                 if exception_class_ is not None:
                     raise exception_class_(exception)
                 else:
-                    raise exception
-            sync_safe_sleep(timedelta(seconds=0.1).total_seconds())
+                    raise
+            if retry_delay_timeout is not None:
+                sync_safe_sleep(retry_delay_timeout.total_seconds())
             continue
 
 
@@ -113,12 +120,22 @@ async def async_make_http_request(
         max_tries_: int = 9,
         proxy_url_: str | None = None,
         raise_for_status_: bool = False,
-        not_raise_for_statuses_: list[int] | None = None,
+        not_raise_for_statuses_: list[int] | set[int] | None = None,
         timeout_: timedelta | None = timedelta(seconds=15),
         enable_logging_: bool = False,
         exception_class_: type[Exception] | None = None,
+        retry_delay_timeout: timedelta | int | None = timedelta(seconds=0.1),
         **kwargs
 ) -> aiohttp.ClientResponse:
+    if isinstance(retry_delay_timeout, int):
+        retry_delay_timeout = timedelta(seconds=retry_delay_timeout)
+    if retry_delay_timeout is not None:
+        raise_for_type(retry_delay_timeout, timedelta)
+
+    if isinstance(timeout_, float):
+        timeout_ = timedelta(seconds=timeout_)
+    raise_for_type(timeout_, timedelta)
+
     tries_counter = 0
 
     kwargs["method"] = method
@@ -153,7 +170,7 @@ async def async_make_http_request(
                         else:
                             try:
                                 response.raise_for_status()
-                            except aiohttp.ClientResponseError as raise_for_status_exception:
+                            except aiohttp.ClientResponseError:
                                 if enable_logging_:
                                     try:
                                         json_data = await response.json()
@@ -170,7 +187,7 @@ async def async_make_http_request(
                                             )
                                         except Exception:
                                             pass
-                                raise raise_for_status_exception
+                                raise
                     await response.read()
                     if enable_logging_:
                         _logger.info(f"good try {method} {url} {params}")
@@ -184,8 +201,9 @@ async def async_make_http_request(
                 if exception_class_ is not None:
                     raise exception_class_(exception)
                 else:
-                    raise exception
-            await async_safe_sleep(timedelta(seconds=0.1).total_seconds())
+                    raise
+            if retry_delay_timeout is not None:
+                await async_safe_sleep(retry_delay_timeout.total_seconds())
             continue
 
 

{arpakitlib-1.8.326 → arpakitlib-1.8.328}/arpakitlib/ar_include_fastapi_routers_from_dir_util.py

@@ -1,5 +1,6 @@
 import importlib.util
 import os
+
 from fastapi import APIRouter
 
 

{arpakitlib-1.8.326 → arpakitlib-1.8.328}/arpakitlib/ar_list_util.py

@@ -59,8 +59,8 @@ def remove_from_lists_if_left(
 
 def __example():
     a = remove_from_list_if_left(
-        list_=[1,2,2,2,2,2,3,3,3,3,3,3],
-        values=[1,2,3]
+        list_=[1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3],
+        values=[1, 2, 3]
     )
     print(a)
 

arpakitlib-1.8.326/arpakitlib/ar_log_async_func_if_error.py → arpakitlib-1.8.328/arpakitlib/ar_log_async_func_if_error_util.py

@@ -4,14 +4,22 @@ _ARPAKIT_LIB_MODULE_VERSION = "3.0"
 
 import logging
 
-_logger = logging.getLogger()
 
+async def log_async_func_if_error(
+        async_func,
+        logger: logging.Logger | None = None,
+        logger_name: str | None = None,
+        **kwargs
+):
+    if logger is None:
+        logger = logging.getLogger()
+    if logger is None and logger_name is not None:
+        logger = logging.getLogger(logger_name)
 
-async def log_async_func_if_error(async_func, **kwargs):
     try:
         await async_func(**kwargs)
     except Exception as exception:
-        _logger.error(
+        logger.error(
             f"error in async_func, {async_func.__name__=}",
             exc_info=exception,
             extra={

{arpakitlib-1.8.326 → arpakitlib-1.8.328}/arpakitlib/ar_logging_util.py

@@ -2,7 +2,6 @@
 
 import logging
 import os
-from typing import Optional
 
 _ARPAKIT_LIB_MODULE_VERSION = "3.0"
 

arpakitlib-1.8.328/arpakitlib/ar_openai_api_client_util.py

@@ -0,0 +1,204 @@
+from __future__ import annotations
+
+import asyncio
+import logging
+
+import httpx
+from arpakitlib.ar_base64_util import convert_file_to_base64_string
+from openai import OpenAI, AsyncOpenAI
+from openai.types.chat import ChatCompletion
+
+"""
+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=5,  # таймаут подключения
+                    read=300,  # чтение ответа
+                    write=60,  # запись запроса
+                    pool=10
+                )
+            ),
+            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=5,
+                        read=300,
+                        write=60,
+                        pool=10
+                    )
+                )
+            )
+        )
+
+    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())

arpakitlib-1.8.326/arpakitlib/ar_raise_own_exception_if_exception.py → arpakitlib-1.8.328/arpakitlib/ar_raise_own_exception_if_exception_util.py

@@ -12,6 +12,7 @@ RESULT_SPEC = TypeVar("RESULT_SPEC")
 
 _logger = logging.getLogger(__name__)
 
+
 def raise_own_exception_if_exception(
         *,
         catching_exceptions: type[BaseException] | Tuple[type[BaseException], ...] | None = Exception,

{arpakitlib-1.8.326 → arpakitlib-1.8.328}/arpakitlib/ar_sqlalchemy_util.py

@@ -273,11 +273,11 @@ class SQLAlchemyDb:
         self._logger.info("alembic tables data were removed")
 
     def ensure_check_constraints(self):
-        from arpakitlib.ar_sqlalchemy_ensure_check_constraints import ensure_sqlalchemy_check_constraints
+        from arpakitlib.ar_sqlalchemy_ensure_check_constraints_util import ensure_sqlalchemy_check_constraints
         ensure_sqlalchemy_check_constraints(base_=self.base_dbm, engine=self.engine)
 
     def drop_check_constraints(self):
-        from arpakitlib.ar_sqlalchemy_drop_check_constraints import drop_sqlalchemy_check_constraints
+        from arpakitlib.ar_sqlalchemy_drop_check_constraints_util import drop_sqlalchemy_check_constraints
         drop_sqlalchemy_check_constraints(base_=self.base_dbm, engine=self.engine)
 
     def drop_and_ensure_check_constraints(self):

{arpakitlib-1.8.326 → arpakitlib-1.8.328}/arpakitlib/ar_yookassa_api_client_util.py

@@ -8,6 +8,7 @@ from typing import Any
 
 import aiohttp
 import requests
+
 from arpakitlib.ar_dict_util import combine_dicts
 from arpakitlib.ar_enumeration_util import Enumeration
 from arpakitlib.ar_http_request_util import sync_make_http_request, async_make_http_request

{arpakitlib-1.8.326 → arpakitlib-1.8.328}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "arpakitlib"
-version = "1.8.326"
+version = "1.8.328"
 description = "arpakitlib"
 authors = [
     { name = "arpakit_company", email = "support@arpakit.com" }
@@ -85,6 +85,10 @@ url = "https://test.pypi.org/legacy/"
 priority = "explicit"
 
 
+[tool.poetry.extras]
+openai = ["openai"]
+
+
 [project.scripts]
 arpakitlib = "arpakitlib.ar_arpakitlib_cli_util:execute_arpakitlib_cli"