arpakitlib 1.4.8__tar.gz → 1.5.3__tar.gz

{arpakitlib-1.4.8 → arpakitlib-1.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: arpakitlib
-Version: 1.4.8
+Version: 1.5.3
 Summary: arpakitlib
 License: Apache-2.0
 Author: arpakit

{arpakitlib-1.4.8 → arpakitlib-1.5.3}/arpakitlib/ar_fastapi_util.py

@@ -86,7 +86,7 @@ class APIException(fastapi.exceptions.HTTPException):
             error_data = {}
         self.error_data = error_data
 
-        self.easy_api_error_so = APIErrorSO(
+        self.api_error_so = APIErrorSO(
             has_error=True,
             error_code=self.error_code,
             error_specification=self.error_code_specification,
@@ -96,7 +96,7 @@ class APIException(fastapi.exceptions.HTTPException):
 
         super().__init__(
             status_code=self.status_code,
-            detail=self.easy_api_error_so.model_dump(mode="json")
+            detail=self.api_error_so.model_dump(mode="json")
         )
 
 
@@ -115,7 +115,7 @@ def from_exception_to_api_json_response(
     status_code = starlette.status.HTTP_500_INTERNAL_SERVER_ERROR
 
     if isinstance(exception, APIException):
-        easy_api_error_so = exception.easy_api_error_so
+        easy_api_error_so = exception.api_error_so
 
     elif isinstance(exception, starlette.exceptions.HTTPException):
         status_code = exception.status_code

{arpakitlib-1.4.8 → arpakitlib-1.5.3}/arpakitlib/ar_sqlalchemy_util.py

@@ -44,7 +44,7 @@ class SimpleDBM(BaseDBM):
     )
 
 
-class SQLAlchemyDB:
+class EasySQLAlchemyDB:
     def __init__(self, *, db_url: str, echo: bool = False):
         self._logger = logging.getLogger(self.__class__.__name__)
         self.engine = create_engine(
@@ -101,16 +101,16 @@ class SQLAlchemyDB:
             return False
         return True
 
-    def generate_unique_id(self, *, class_dbm: type[BaseDBM]):
+    def generate_unique_id(self, *, class_dbm: type[SimpleDBM]):
         with self.new_session() as session:
-            res = session.query(func.max(class_dbm.id)).scalar()
+            res: int = session.query(func.max(class_dbm.id)).scalar()
             while session.query(class_dbm).filter(class_dbm.id == res).first() is not None:
                 res += 1
         return res
 
-    def generate_unique_long_id(self, *, class_dbm: type[BaseDBM]):
+    def generate_unique_long_id(self, *, class_dbm: type[SimpleDBM]):
         with self.new_session() as session:
-            res = str(uuid4())
+            res: str = str(uuid4())
             while session.query(class_dbm).filter(class_dbm.long_id == res).first() is not None:
                 res = str(uuid4())
         return res

{arpakitlib-1.4.8 → arpakitlib-1.5.3}/arpakitlib/ar_zabbix_util.py

@@ -10,7 +10,7 @@ from arpakitlib.ar_type_util import raise_for_type
 _ARPAKIT_LIB_MODULE_VERSION = "3.0"
 
 
-class EasyZabbixApi:
+class ZabbixApiClient:
 
     def __init__(
             self,

{arpakitlib-1.4.8 → arpakitlib-1.5.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "arpakitlib"
-version = "1.4.8"
+version = "1.5.3"
 description = "arpakitlib"
 authors = ["arpakit <arpakit@gmail.com>"]
 license = "Apache License 2.0"