arpakitlib 1.8.33__py3-none-any.whl → 1.8.35__py3-none-any.whl

arpakitlib/_arpakit_project_template_v_5/arpakitlib_project_template_info.json

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

arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/api_key.py

@@ -43,3 +43,10 @@ class ApiKeyDBM(SimpleDBM):
         server_default="true",
         nullable=False
     )
+
+    def __repr__(self) -> str:
+        res = f"{self.entity_name} (id={self.id}, is_active={self.is_active}"
+        if self.title:
+            res += f", title={self.title}"
+        res += ")"
+        return res

arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/story_log.py

@@ -49,3 +49,11 @@ class StoryLogDBM(SimpleDBM):
         server_default="{}",
         nullable=False
     )
+
+    @property
+    def sdp_allowed_levels(self) -> list[str]:
+        return self.Levels.values_list()
+
+    @property
+    def sdp_allowed_types(self) -> list[str]:
+        return self.Types.values_list()

arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/user.py

@@ -57,6 +57,7 @@ class UserDBM(SimpleDBM):
         nullable=True
     )
 
+    # many to one
     user_tokens: Mapped[list[UserTokenDBM]] = relationship(
         "UserTokenDBM",
         uselist=True,
@@ -64,6 +65,17 @@ class UserDBM(SimpleDBM):
         foreign_keys="UserTokenDBM.user_id"
     )
 
+    def __repr__(self) -> str:
+        if self.email is not None:
+            res = f"{self.entity_name} (id={self.id}, email={self.email})"
+        else:
+            res = f"{self.entity_name} (id={self.id})"
+        return res
+
+    @property
+    def sdp_allowed_roles(self) -> list[str]:
+        return self.Roles.values_list()
+
     @property
     def roles_has_admin(self) -> bool:
         return self.Roles.admin in self.roles
@@ -85,3 +97,78 @@ class UserDBM(SimpleDBM):
             roles = [roles]
         raise_for_type(roles, list)
         return bool(set(roles) & set(self.roles))
+
+    @property
+    def tg_first_name(self) -> str | None:
+        if self.tg_data and "first_name" in self.tg_data:
+            return self.tg_data["first_name"]
+        return None
+
+    @property
+    def sdp_tg_first_name(self) -> str | None:
+        return self.tg_first_name
+
+    @property
+    def tg_last_name(self) -> str | None:
+        if self.tg_data and "last_name" in self.tg_data:
+            return self.tg_data["last_name"]
+        return None
+
+    @property
+    def sdp_tg_last_name(self) -> str | None:
+        return self.tg_last_name
+
+    @property
+    def tg_language_code(self) -> str | None:
+        if self.tg_data and "language_code" in self.tg_data:
+            return self.tg_data["language_code"]
+        return None
+
+    @property
+    def sdp_tg_language_code(self) -> str | None:
+        return self.tg_language_code
+
+    @property
+    def tg_username(self) -> str | None:
+        if self.tg_data and "username" in self.tg_data:
+            return self.tg_data["username"]
+        return None
+
+    @property
+    def sdp_tg_username(self) -> str | None:
+        return self.tg_username
+
+    @property
+    def tg_at_username(self) -> str | None:
+        if self.tg_username:
+            return f"@{self.tg_username}"
+        return None
+
+    @property
+    def sdp_tg_at_username(self) -> str | None:
+        return self.tg_at_username
+
+    @property
+    def tg_fullname(self) -> str | None:
+        if not self.tg_first_name and not self.tg_last_name:
+            return None
+        res = ""
+        if self.tg_first_name:
+            res += self.tg_first_name
+        if self.tg_last_name:
+            res += " " + self.tg_last_name
+        return res
+
+    @property
+    def sdp_tg_fullname(self) -> str | None:
+        return self.tg_fullname
+
+    @property
+    def tg_link_by_username(self) -> str | None:
+        if not self.tg_username:
+            return None
+        return f"https://t.me/{self.tg_username}"
+
+    @property
+    def sdp_tg_link_by_username(self) -> str | None:
+        return self.tg_link_by_username

arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/user_token.py

@@ -45,9 +45,14 @@ class UserTokenDBM(SimpleDBM):
         nullable=False
     )
 
+    # one to many
     user: Mapped[UserDBM] = relationship(
         "UserDBM",
         uselist=False,
         back_populates="user_tokens",
         foreign_keys=[user_id]
     )
+
+    def __repr__(self) -> str:
+        res = f"{self.entity_name} (id={self.id}, user_id={self.user_id})"
+        return res

arpakitlib/ar_arpakitlib_cli_util.py

@@ -14,7 +14,6 @@ def execute_arpakitlib_cli(*, full_command: str | None = None):
         full_command = " ".join(sys.argv)
 
     parsed_command = parse_command(text=full_command)
-    parsed_command.raise_for_command(needed_command="arpakitlib", lower_=True)
 
     command = parsed_command.get_value_by_keys(keys=["command", "c"])
     if command:

arpakitlib/ar_openai_api_client_util.py

@@ -2,9 +2,12 @@
 
 import asyncio
 import logging
-from typing import Optional
 
+import httpx
 from openai import OpenAI, AsyncOpenAI
+from openai.types.chat import ChatCompletion
+
+from arpakitlib.ar_logging_util import setup_normal_logging
 
 _ARPAKIT_LIB_MODULE_VERSION = "3.0"
 
@@ -17,8 +20,8 @@ class OpenAIAPIClient:
     def __init__(
             self,
             *,
-            open_ai: Optional[OpenAI] = None,
-            async_open_ai: Optional[AsyncOpenAI] = None
+            open_ai: OpenAI,
+            async_open_ai: AsyncOpenAI
     ):
         self._logger = logging.getLogger(self.__class__.__name__)
 
@@ -47,27 +50,80 @@ class OpenAIAPIClient:
             self._logger.error(e)
         return False
 
+    def simple_ask(self, *, prompt: str | None = None, string: str) -> ChatCompletion:
+        messages = []
+        if prompt is not None:
+            messages.append({
+                "role": "system",
+                "content": prompt
+            })
+        messages.append({
+            "role": "user",
+            "content": string
+        })
+        response: ChatCompletion = self.open_ai.chat.completions.create(
+            model="gpt-4o",
+            messages=messages,
+            n=1,
+            temperature=0.1,
+            top_p=0.9,
+            max_tokens=300
+        )
+        return response
+
+    async def async_simple_ask(self, *, prompt: str | None = None, string: str) -> ChatCompletion:
+        messages = []
+        if prompt is not None:
+            messages.append({
+                "role": "system",
+                "content": prompt
+            })
+        messages.append({
+            "role": "user",
+            "content": string
+        })
+        response: ChatCompletion = await self.async_open_ai.chat.completions.create(
+            model="gpt-4o",
+            messages=messages,
+            n=1,
+            temperature=0.1,
+            top_p=0.9,
+            max_tokens=300
+        )
+        return response
 
-def __example():
-    open_ai = OpenAI(api_key="your-api-key")
-    client = OpenAIAPIClient(open_ai=open_ai)
 
-    print("Checking OpenAI API connection...")
-    if client.is_conn_good():
-        print("Connection to OpenAI API is good")
-    else:
-        print("Failed to connect to OpenAI API")
+def __example():
+    pass
 
 
 async def __async_example():
-    async_open_ai = AsyncOpenAI(api_key="your-api-key")
-    client = OpenAIAPIClient(async_open_ai=async_open_ai)
-
-    print("Checking OpenAI API async connection...")
-    if await client.async_is_conn_good():
-        print("Async connection to OpenAI API is good")
-    else:
-        print("Failed to async connect to OpenAI API")
+    setup_normal_logging()
+    api_key = ""
+    base_url = "https://api.proxyapi.ru/openai/v1"
+    client = OpenAIAPIClient(
+        open_ai=OpenAI(
+            api_key=api_key,
+            base_url=base_url,
+            timeout=httpx.Timeout(
+                timeout=60,
+            )
+        ),
+        async_open_ai=AsyncOpenAI(
+            api_key=api_key,
+            base_url=base_url,
+            timeout=httpx.Timeout(
+                timeout=60,
+            )
+        )
+    )
+
+    print(await client.async_is_conn_good())
+
+    response = client.simple_ask(
+        string="Привет, проверяю тебя"
+    )
+    print(response.choices[0].message.content)
 
 
 if __name__ == '__main__':

arpakitlib/ar_parse_command.py

@@ -4,8 +4,6 @@ import shlex
 
 from pydantic import BaseModel
 
-from arpakitlib.ar_enumeration_util import ValuesForParseType
-
 _ARPAKIT_LIB_MODULE_VERSION = "3.0"
 
 
@@ -19,15 +17,6 @@ class ParsedCommand(BaseModel):
     key_to_value: dict[str, str | None] = {}
     values_without_key: list[str] = []
 
-    def raise_for_command(self, needed_command: str, lower_: bool = True):
-        needed_command = needed_command.strip()
-
-        if (
-                (self.command.lower() if lower_ else self.command)
-                != (needed_command.lower() if lower_ else needed_command)
-        ):
-            raise ValuesForParseType(f"needed_command != {self.command}, lower_={lower_}")
-
     @property
     def keys(self) -> list[str]:
         return [k for k, v in self.key_to_value.items() if v is not None]

{arpakitlib-1.8.33.dist-info → arpakitlib-1.8.35.dist-info}/METADATA

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

{arpakitlib-1.8.33.dist-info → arpakitlib-1.8.35.dist-info}/RECORD

@@ -8,7 +8,7 @@ arpakitlib/_arpakit_project_template_v_5/alembic/env.py,sha256=Qesmnj5A2kB-Doeuf
 arpakitlib/_arpakit_project_template_v_5/alembic/script.py.mako,sha256=MEqL-2qATlST9TAOeYgscMn1uy6HUS9NFvDgl93dMj8,635
 arpakitlib/_arpakit_project_template_v_5/alembic/versions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/alembic.ini,sha256=8fuyeEvGBiPGbxEFy8ISBV3xX_fgVmuhEGpB10_B5Uo,3733
-arpakitlib/_arpakit_project_template_v_5/arpakitlib_project_template_info.json,sha256=DDW2Aov9mTMDoz9NHR9_E7emwwetdBXETodF4UGZ6Co,97
+arpakitlib/_arpakit_project_template_v_5/arpakitlib_project_template_info.json,sha256=1yBXVYHqWXXFkBgsR8s0cnmOUp-UPhfz4_AboylAxGI,97
 arpakitlib/_arpakit_project_template_v_5/command/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/command/alembic_history.sh,sha256=OMnDNtHIksGh9iavWnzbtxcudZW4vjdcISsBXvzZSPw,22
 arpakitlib/_arpakit_project_template_v_5/command/alembic_revision_autogenerate.sh,sha256=yW2i-SBOtBx15Ya0poVQqKkJM5t2JZp06r9AEW-DmGE,46
@@ -219,12 +219,12 @@ arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/__init__.py,sha2
 arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/const.py,sha256=dcvj5C9E2F2KCsGZPBBncQf_EvVJAC1qQgnyD8P4ZEw,6
 arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_db.py,sha256=1y3FaMFzm_5UM2poqtBve_UP_mh1vjs--krq6yO8PsA,742
 arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/__init__.py,sha256=btSjCQ7RJqomeXzYs9HePCu1dZHs0z6-RuboYKG89_8,598
-arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/api_key.py,sha256=RVkfa6kuhdv1D_3Qindh4bucapqz5MZa5gNkiYuwC14,1096
+arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/api_key.py,sha256=XBw5qVM6Qc5i5Sgercec90y2RhqhMZWouVXd1vTKay4,1310
 arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/common.py,sha256=xhMxNea8ndjmdsNwp_a9L_VUkkRb8jjVLhczxDasNss,2090
 arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/operation.py,sha256=0uhlkE95_lX8Nmgl2n5oJ7lty558Y6ZOoQc6lfuSyCY,3496
-arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/story_log.py,sha256=uB7nKEqvUKJyE_xybJUjXIJtVXh0IKyoPDnDUogq8lE,1306
-arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/user.py,sha256=GaOJkxsQ6B3B4pO43_MOOrJSUE8d7VzXyYLQcoEvCCw,2355
-arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/user_token.py,sha256=AtFEPQZlYl_fr0WgYkS8ToiHluNomXV02HDuD0nVjZw,1398
+arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/story_log.py,sha256=ScXzpiD0El5HE4hRxhIGbfnBRtAqye9-wTeRgo-KpnI,1510
+arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/user.py,sha256=fojNxMRbfiv8RuhkUgOp-AZM4q2bdPZklTO_IjQscoo,4754
+arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/user_token.py,sha256=CquJ6NHlBxUOP8NM8IjZSM1Vh8jaNC5fTO1yT38dR3w,1542
 arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/util.py,sha256=QSA_nT6aWdtE412-Uj3VTd7yh3dzS4HugDK9FivjTPo,570
 arpakitlib/_arpakit_project_template_v_5/project/test_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/project/test_data/make_test_api_keys.py,sha256=RXIEB5zOFHtQ_B0t_JlQ0ihjFbkVtW7six6CLdxft3w,901
@@ -313,7 +313,7 @@ arpakitlib/ar_arpakit_lib_module_util.py,sha256=g9uWwTK2eEzmErqwYeVgXDYVMREN8m5C
 arpakitlib/ar_arpakit_project_template_util.py,sha256=5-o6eTmh-2DqsIqmo63SXw7ttExhmuAehMNc4s0GdtU,3278
 arpakitlib/ar_arpakit_schedule_uust_api_client_util.py,sha256=MRPaF31CRhYA45ldPnoRpaTPMazCJq0jbwDxW5rvMww,12937
 arpakitlib/ar_arpakit_schedule_uust_site_util.py,sha256=8wLct9Gd4MWkXzB6nSmETAwTPLw8lfpWgx0LoWSAOvg,1643
-arpakitlib/ar_arpakitlib_cli_util.py,sha256=--t-J019t-R35AZhi1cQyH5H8iHPiWeBjyH9Z5_Fg5o,2678
+arpakitlib/ar_arpakitlib_cli_util.py,sha256=RJGcfEZ_q74FJ4tqdXvt7xQpShTszOvKu1mbp3D8qzw,2599
 arpakitlib/ar_base64_util.py,sha256=aZkg2cZTuAaP2IWeG_LXJ6RO7qhyskVwec-Lks0iM-k,676
 arpakitlib/ar_base_worker_util.py,sha256=eyaoDy4T_wKSNFu_npigVYZKHpxmt66Vdzb3gZ2BAis,5861
 arpakitlib/ar_blank_util.py,sha256=oMVsRr54dQpsiVSasmqvNR5-d5vARvVPOrfPqIgq2eI,143
@@ -340,8 +340,8 @@ arpakitlib/ar_list_util.py,sha256=2woOAHAU8oTIiVjZ8GLnx15odEaoQUq3Q0JPxlufFF0,45
 arpakitlib/ar_logging_util.py,sha256=GLw87L6qUASHS4-eAoBW0kN2hHXVdmWcmE9huw-J5aI,1681
 arpakitlib/ar_mongodb_util.py,sha256=2ECkTnGAZ92qxioL-fmN6R4yZOSr3bXdXLWTzT1C3vk,4038
 arpakitlib/ar_need_type_util.py,sha256=l4ky_15KKwqgYf2WTgEaKfBI15jZbnszOeQjwC0YUmk,2312
-arpakitlib/ar_openai_api_client_util.py,sha256=_XmlApvHFMSyjvZydPa_kASIt9LsFrZmSC7YEzIG8Bg,1806
-arpakitlib/ar_parse_command.py,sha256=-s61xcATIsfw1eV_iD3xi-grsitbGzSDoAFc5V0OFy4,3447
+arpakitlib/ar_openai_api_client_util.py,sha256=dQv0rWnONkmI9bD2eUWihvutwIfp1oxsBJuHRQu27BU,3185
+arpakitlib/ar_parse_command.py,sha256=1WTdQoWVshoDZ1jDaKeTzajfqaYHP3FNO0-REyo1aMY,3003
 arpakitlib/ar_postgresql_util.py,sha256=1AuLjEaa1Lg4pzn-ukCVnDi35Eg1k91APRTqZhIJAdo,945
 arpakitlib/ar_rat_func_util.py,sha256=Ca10o3RJwyx_DJLxjTxgHDO6NU3M6CWgUR4bif67OE4,2006
 arpakitlib/ar_retry_func_util.py,sha256=LB4FJRsu2cssnPw6X8bCEcaGpQsXhkLkgeU37w1t9fU,2250
@@ -358,8 +358,8 @@ arpakitlib/ar_type_util.py,sha256=Cs_tef-Fc5xeyAF54KgISCsP11NHyzIsglm4S3Xx7iM,40
 arpakitlib/ar_wata_api_client.py,sha256=gdHOqDbuqxhTjVDtRW1DvkRJLdDofCrOq51GTctzLns,242
 arpakitlib/ar_yookassa_api_client_util.py,sha256=VozuZeCJjmLd1zj2BdC9WfiAQ3XYOrIMsdpNK-AUlm0,5347
 arpakitlib/ar_zabbix_api_client_util.py,sha256=Q-VR4MvoZ9aHwZeYZr9G3LwN-ANx1T5KFmF6pvPM-9M,6402
-arpakitlib-1.8.33.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.8.33.dist-info/METADATA,sha256=i2biPan3zsYPCOx4MmEbGGbBHn5Tn4BYFIsESp9jNkI,3477
-arpakitlib-1.8.33.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-arpakitlib-1.8.33.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.8.33.dist-info/RECORD,,
+arpakitlib-1.8.35.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.8.35.dist-info/METADATA,sha256=Xr542pGeITbamcRcWnHqa0O79Vc86xtTi6KC0sIilWQ,3477
+arpakitlib-1.8.35.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+arpakitlib-1.8.35.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
+arpakitlib-1.8.35.dist-info/RECORD,,