arpakitlib 1.8.107__tar.gz → 1.8.109__tar.gz

{arpakitlib-1.8.107 → arpakitlib-1.8.109}/PKG-INFO

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

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

@@ -0,0 +1,45 @@
+import asyncio
+from functools import lru_cache
+
+import httpx
+from arpakitlib.ar_logging_util import setup_normal_logging
+from arpakitlib.ar_openai_api_client_util import EasyOpenAIAPIClient
+from openai import OpenAI, AsyncOpenAI
+
+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():
+    setup_normal_logging()
+
+
+if __name__ == '__main__':
+    asyncio.run(__async_example())

{arpakitlib-1.8.107 → arpakitlib-1.8.109}/arpakitlib/_arpakit_project_template_v_5/project/core/settings.py

@@ -173,6 +173,10 @@ class Settings(SimpleSettings):
         raise_for_type(self.local_timezone, str)
         return pytz.timezone(self.local_timezone)
 
+    openai_api_key: str | None = None
+
+    openai_api_base_url: str | None = "https://api.proxyapi.ru/openai/v1"
+
 
 @lru_cache()
 def get_cached_settings() -> Settings:

{arpakitlib-1.8.107 → arpakitlib-1.8.109}/arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/api_key.py

@@ -9,7 +9,26 @@ class ApiKeyMV(SimpleMV, model=ApiKeyDBM):
     name = "ApiKey"
     name_plural = "ApiKeys"
     icon = "fa-solid fa-key"
-    column_list = sqlalchemy.inspect(ApiKeyDBM).columns
+    column_list = [
+        ApiKeyDBM.id,
+        ApiKeyDBM.long_id,
+        ApiKeyDBM.slug,
+        ApiKeyDBM.creation_dt,
+        ApiKeyDBM.title,
+        ApiKeyDBM.value,
+        ApiKeyDBM.is_active,
+        ApiKeyDBM.extra_data
+    ]
+    column_details_list = [
+        ApiKeyDBM.id,
+        ApiKeyDBM.long_id,
+        ApiKeyDBM.slug,
+        ApiKeyDBM.creation_dt,
+        ApiKeyDBM.title,
+        ApiKeyDBM.value,
+        ApiKeyDBM.is_active,
+        ApiKeyDBM.extra_data
+    ]
     form_columns = [
         ApiKeyDBM.slug,
         ApiKeyDBM.title,
@@ -22,8 +41,6 @@ class ApiKeyMV(SimpleMV, model=ApiKeyDBM):
     ]
     column_searchable_list = [
         ApiKeyDBM.id,
-        ApiKeyDBM.long_id,
-        ApiKeyDBM.slug,
         ApiKeyDBM.value,
     ]
     column_formatters = {

{arpakitlib-1.8.107 → arpakitlib-1.8.109}/arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/operation.py

@@ -1,4 +1,5 @@
 import sqlalchemy
+from sqladmin.fields import SelectField
 
 from project.sqladmin_.model_view.common import SimpleMV
 from project.sqladmin_.util.etc import format_datetime_, format_json_for_preview_, format_json_
@@ -9,7 +10,21 @@ class OperationMV(SimpleMV, model=OperationDBM):
     name = "Operation"
     name_plural = "Operations"
     icon = "fa-solid fa-gears"
-    column_list = sqlalchemy.inspect(OperationDBM).columns
+    column_list = [
+        OperationDBM.id,
+        OperationDBM.long_id,
+        OperationDBM.slug,
+        OperationDBM.creation_dt,
+        OperationDBM.status,
+        OperationDBM.type,
+        OperationDBM.title,
+        OperationDBM.execution_start_dt,
+        OperationDBM.execution_finish_dt,
+        OperationDBM.input_data,
+        OperationDBM.output_data,
+        OperationDBM.error_data,
+        OperationDBM.extra_data
+    ]
     form_columns = [
         OperationDBM.slug,
         OperationDBM.status,
@@ -22,14 +37,22 @@ class OperationMV(SimpleMV, model=OperationDBM):
         OperationDBM.error_data,
         OperationDBM.extra_data
     ]
+    form_overrides = {
+        OperationDBM.status.key: SelectField
+    }
+    form_args = {
+        OperationDBM.status.key: {
+            "choices": [(status, status) for status in OperationDBM.Statuses.values_list()],
+            "description": "Выберите статус"
+        }
+    }
     column_sortable_list = sqlalchemy.inspect(OperationDBM).columns
     column_default_sort = [
         (OperationDBM.creation_dt, True)
     ]
     column_searchable_list = [
         OperationDBM.id,
-        OperationDBM.long_id,
-        OperationDBM.slug,
+        OperationDBM.long_id
     ]
     column_formatters = {
         OperationDBM.creation_dt: lambda m, _: format_datetime_(m.creation_dt),

{arpakitlib-1.8.107 → arpakitlib-1.8.109}/arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/user.py

@@ -1,4 +1,5 @@
 import sqlalchemy
+from wtforms import SelectMultipleField
 
 from project.sqladmin_.model_view.common import SimpleMV
 from project.sqladmin_.util.etc import format_datetime_, format_json_for_preview_, format_json_
@@ -36,6 +37,15 @@ class UserMV(SimpleMV, model=UserDBM):
         UserDBM.tg_bot_last_action_dt,
         UserDBM.extra_data
     ]
+    form_overrides = {
+        UserDBM.roles.key: SelectMultipleField
+    }
+    form_args = {
+        UserDBM.roles.key: {
+            "choices": [(role, role) for role in UserDBM.Roles.values_list()],
+            "description": "Выберите роли пользователя"
+        }
+    }
     column_sortable_list = sqlalchemy.inspect(UserDBM).columns
     column_default_sort = [
         (UserDBM.creation_dt, True)

{arpakitlib-1.8.107 → arpakitlib-1.8.109}/arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/user_token.py

@@ -2,7 +2,7 @@ import sqlalchemy
 
 from project.sqladmin_.model_view.common import SimpleMV
 from project.sqladmin_.util.etc import format_datetime_, format_json_for_preview_, format_json_
-from project.sqlalchemy_db_.sqlalchemy_model import UserTokenDBM
+from project.sqlalchemy_db_.sqlalchemy_model import UserTokenDBM, UserDBM
 
 
 class UserTokenMV(SimpleMV, model=UserTokenDBM):
@@ -45,3 +45,11 @@ class UserTokenMV(SimpleMV, model=UserTokenDBM):
         UserTokenDBM.creation_dt: lambda m, _: format_datetime_(m.creation_dt),
         UserTokenDBM.extra_data: lambda m, a: format_json_(m.extra_data),
     }
+    form_ajax_refs = {
+        UserTokenDBM.user.key: {
+            "fields": [UserDBM.id.key, UserDBM.email.key],
+            "placeholder": 'Search by id or email',
+            "minimum_input_length": 1,
+            "page_size": 10,
+        }
+    }

{arpakitlib-1.8.107 → arpakitlib-1.8.109}/arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/verification_code.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import sqlalchemy
+from sqladmin.fields import SelectField
 
 from project.sqladmin_.model_view import SimpleMV
 from project.sqladmin_.util.etc import format_datetime_, format_json_for_preview_, format_json_
@@ -32,16 +33,23 @@ class VerificationCodeMV(SimpleMV, model=VerificationCodeDBM):
         VerificationCodeDBM.is_active,
         VerificationCodeDBM.extra_data
     ]
+    form_overrides = {
+        VerificationCodeDBM.type.key: SelectField
+    }
+    form_args = {
+        VerificationCodeDBM.type.key: {
+            "choices": [(status, status) for status in VerificationCodeDBM.Types.values_list()],
+            "description": "Выберите тип"
+        }
+    }
     column_sortable_list = sqlalchemy.inspect(VerificationCodeDBM).columns
     column_default_sort = [
         (VerificationCodeDBM.creation_dt, True)
     ]
     column_searchable_list = [
         VerificationCodeDBM.id,
-        VerificationCodeDBM.long_id,
-        VerificationCodeDBM.slug,
         VerificationCodeDBM.value,
-        VerificationCodeDBM.recipient,
+        VerificationCodeDBM.recipient
     ]
     column_formatters = {
         VerificationCodeDBM.creation_dt: lambda m, _: format_datetime_(m.creation_dt),

{arpakitlib-1.8.107 → arpakitlib-1.8.109}/pyproject.toml

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