MainShortcuts2 2.2.3__tar.gz → 2.3.0__tar.gz

{mainshortcuts2-2.2.3 → mainshortcuts2-2.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MainShortcuts2
-Version: 2.2.3
+Version: 2.3.0
 Summary: Сокращение и улучшение функций
 Home-page: https://github.com/MainPlay-TG/MainShortcuts2.py
 Author: MainPlay TG

{mainshortcuts2-2.2.3 → mainshortcuts2-2.3.0}/pyproject.toml

@@ -1,5 +1,5 @@
 [tool.poetry]
-version = "2.2.3"
+version = "2.3.0"
 name = "MainShortcuts2"
 description = "Сокращение и улучшение функций"
 authors = [ "MainPlay TG <xbox.roman6666666666@gmail.com>",]

{mainshortcuts2-2.2.3 → mainshortcuts2-2.3.0}/src/MainShortcuts2/_module_info.py

@@ -1,2 +1,2 @@
 name = "MainShortcuts2"
-version = "2.2.3"
+version = "2.3.0"

mainshortcuts2-2.3.0/src/MainShortcuts2/api/base.py

@@ -0,0 +1,35 @@
+import requests
+
+
+class Base:
+  def __init__(self, session: requests.Session = None):
+    self._headers = {}
+    self._http = requests.Session() if session is None else session
+    self._params = {}
+    self._url_data = {}
+    self._url = "https://example.com/api/{method}"
+
+  @property
+  def http(self) -> requests.Session:
+    return self._http
+
+  def _request(self, http_method: str, api_method: str, *, headers: dict[str, str] = None, params: dict[str, str] = None, raise_for_status: bool = True, url_data: dict[str, str] = None, **kw):
+    _headers = self._headers.copy()
+    _params = self._params.copy()
+    _url_data = self._url_data.copy()
+    _url_data["method"] = api_method
+    _headers.update({} if headers is None else headers)
+    _params.update({} if params is None else params)
+    _url_data.update({} if url_data is None else url_data)
+    kw["headers"] = _headers
+    kw["method"] = http_method
+    kw["params"] = _params
+    kw["url"] = self._url.format(**_url_data)
+    result = self.http.request(**kw)
+    if raise_for_status:
+      result.raise_for_status()
+    return result
+
+  def request(self, *args, **kwargs) -> requests.Response:
+    """Отправить запрос к API"""
+    return self._request(*args, **kwargs)

mainshortcuts2-2.3.0/src/MainShortcuts2/api/gigachat.py

@@ -0,0 +1,65 @@
+import os
+from .base import Base, requests
+from datetime import timedelta
+from time import time
+CERT_PATH = os.path.dirname(__file__) + "/russian_trusted_root_ca_pem.crt"
+
+
+class GigaChat(Base):
+  def __init__(self, auth_data: str, client_id: str, *,
+               cert_path: str = None,
+               **kw):
+    Base.__init__(self, **kw)
+    self._access_token = {"expire_at": 0, "kw": None, "token": None}
+    self._auth_data: str = auth_data
+    self._client_id: str = client_id
+    self._url = "https://gigachat.devices.sberbank.ru/api/v1/{method}"
+    self.http.verify = CERT_PATH if cert_path is None else cert_path
+
+  @property
+  def access_token(self) -> str:
+    if True:  # TODO Сделать проверку истёк ли токен доступа. Пока что каждый раз новый токен
+      if self._access_token["kw"] is None:  # Если изменились данные для авторизации
+        kw = {}
+        kw["data"] = {}
+        kw["headers"] = {}
+        kw["stream"] = False
+        kw["url"] = "https://ngw.devices.sberbank.ru:9443/api/v2/oauth"
+        kw["data"]["scope"] = "GIGACHAT_API_PERS"
+        kw["headers"]["Authorization"] = "Basic: " + self.auth_data
+        kw["headers"]["Content-Type"] = "application/x-www-form-urlencoded"
+        kw["headers"]["RqUID"] = self.client_id
+        self._access_token["kw"] = kw
+      else:
+        kw = self._access_token["kw"]
+      with self.http.post(**kw) as resp:  # Получить новый токен
+        resp.raise_for_status()
+        json = resp.json()
+        self._access_token["expire_at"] = json["expires_at"] / 1000
+        self._access_token["token"] = json["access_token"]
+    return self._access_token["token"]
+
+  @property
+  def auth_data(self) -> str:
+    return self._auth_data
+
+  @auth_data.setter
+  def auth_data(self, v: str):
+    self._access_token["kw"] = None
+    self._auth_data = v
+
+  @property
+  def client_id(self) -> str:
+    return self._client_id
+
+  @client_id.setter
+  def client_id(self, v: str):
+    self._access_token["kw"] = None
+    self._client_id = v
+
+  def request(self, http_method: str, api_method: str, **kw):
+    self._headers["Authorization"] = "Bearer " + self.access_token
+    kw["api_method"] = api_method
+    kw["http_method"] = http_method
+    return self._request(**kw).json()
+  # TODO Добавить методы

mainshortcuts2-2.3.0/src/MainShortcuts2/api/russian_trusted_root_ca_pem.crt

@@ -0,0 +1,33 @@
+-----BEGIN CERTIFICATE-----
+MIIFwjCCA6qgAwIBAgICEAAwDQYJKoZIhvcNAQELBQAwcDELMAkGA1UEBhMCUlUx
+PzA9BgNVBAoMNlRoZSBNaW5pc3RyeSBvZiBEaWdpdGFsIERldmVsb3BtZW50IGFu
+ZCBDb21tdW5pY2F0aW9uczEgMB4GA1UEAwwXUnVzc2lhbiBUcnVzdGVkIFJvb3Qg
+Q0EwHhcNMjIwMzAxMjEwNDE1WhcNMzIwMjI3MjEwNDE1WjBwMQswCQYDVQQGEwJS
+VTE/MD0GA1UECgw2VGhlIE1pbmlzdHJ5IG9mIERpZ2l0YWwgRGV2ZWxvcG1lbnQg
+YW5kIENvbW11bmljYXRpb25zMSAwHgYDVQQDDBdSdXNzaWFuIFRydXN0ZWQgUm9v
+dCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMfFOZ8pUAL3+r2n
+qqE0Zp52selXsKGFYoG0GM5bwz1bSFtCt+AZQMhkWQheI3poZAToYJu69pHLKS6Q
+XBiwBC1cvzYmUYKMYZC7jE5YhEU2bSL0mX7NaMxMDmH2/NwuOVRj8OImVa5s1F4U
+zn4Kv3PFlDBjjSjXKVY9kmjUBsXQrIHeaqmUIsPIlNWUnimXS0I0abExqkbdrXbX
+YwCOXhOO2pDUx3ckmJlCMUGacUTnylyQW2VsJIyIGA8V0xzdaeUXg0VZ6ZmNUr5Y
+Ber/EAOLPb8NYpsAhJe2mXjMB/J9HNsoFMBFJ0lLOT/+dQvjbdRZoOT8eqJpWnVD
+U+QL/qEZnz57N88OWM3rabJkRNdU/Z7x5SFIM9FrqtN8xewsiBWBI0K6XFuOBOTD
+4V08o4TzJ8+Ccq5XlCUW2L48pZNCYuBDfBh7FxkB7qDgGDiaftEkZZfApRg2E+M9
+G8wkNKTPLDc4wH0FDTijhgxR3Y4PiS1HL2Zhw7bD3CbslmEGgfnnZojNkJtcLeBH
+BLa52/dSwNU4WWLubaYSiAmA9IUMX1/RpfpxOxd4Ykmhz97oFbUaDJFipIggx5sX
+ePAlkTdWnv+RWBxlJwMQ25oEHmRguNYf4Zr/Rxr9cS93Y+mdXIZaBEE0KS2iLRqa
+OiWBki9IMQU4phqPOBAaG7A+eP8PAgMBAAGjZjBkMB0GA1UdDgQWBBTh0YHlzlpf
+BKrS6badZrHF+qwshzAfBgNVHSMEGDAWgBTh0YHlzlpfBKrS6badZrHF+qwshzAS
+BgNVHRMBAf8ECDAGAQH/AgEEMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsF
+AAOCAgEAALIY1wkilt/urfEVM5vKzr6utOeDWCUczmWX/RX4ljpRdgF+5fAIS4vH
+tmXkqpSCOVeWUrJV9QvZn6L227ZwuE15cWi8DCDal3Ue90WgAJJZMfTshN4OI8cq
+W9E4EG9wglbEtMnObHlms8F3CHmrw3k6KmUkWGoa+/ENmcVl68u/cMRl1JbW2bM+
+/3A+SAg2c6iPDlehczKx2oa95QW0SkPPWGuNA/CE8CpyANIhu9XFrj3RQ3EqeRcS
+AQQod1RNuHpfETLU/A2gMmvn/w/sx7TB3W5BPs6rprOA37tutPq9u6FTZOcG1Oqj
+C/B7yTqgI7rbyvox7DEXoX7rIiEqyNNUguTk/u3SZ4VXE2kmxdmSh3TQvybfbnXV
+4JbCZVaqiZraqc7oZMnRoWrXRG3ztbnbes/9qhRGI7PqXqeKJBztxRTEVj8ONs1d
+WN5szTwaPIvhkhO3CO5ErU2rVdUr89wKpNXbBODFKRtgxUT70YpmJ46VVaqdAhOZ
+D9EUUn4YaeLaS8AjSF/h7UkjOibNc4qVDiPP+rkehFWM66PVnP1Msh93tc+taIfC
+EYVMxjh8zNbFuoc7fzvvrFILLe7ifvEIUqSVIC/AzplM/Jxw7buXFeGP1qVCBEHq
+391d/9RAfaZ12zkwFsl+IKwE/OZxW8AHa9i1p4GO0YSNuczzEm4=
+-----END CERTIFICATE-----

mainshortcuts2-2.3.0/src/MainShortcuts2/api/russian_trusted_sub_ca_pem.crt

@@ -0,0 +1,41 @@
+-----BEGIN CERTIFICATE-----
+MIIHQjCCBSqgAwIBAgICEAIwDQYJKoZIhvcNAQELBQAwcDELMAkGA1UEBhMCUlUx
+PzA9BgNVBAoMNlRoZSBNaW5pc3RyeSBvZiBEaWdpdGFsIERldmVsb3BtZW50IGFu
+ZCBDb21tdW5pY2F0aW9uczEgMB4GA1UEAwwXUnVzc2lhbiBUcnVzdGVkIFJvb3Qg
+Q0EwHhcNMjIwMzAyMTEyNTE5WhcNMjcwMzA2MTEyNTE5WjBvMQswCQYDVQQGEwJS
+VTE/MD0GA1UECgw2VGhlIE1pbmlzdHJ5IG9mIERpZ2l0YWwgRGV2ZWxvcG1lbnQg
+YW5kIENvbW11bmljYXRpb25zMR8wHQYDVQQDDBZSdXNzaWFuIFRydXN0ZWQgU3Vi
+IENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA9YPqBKOk19NFymrE
+wehzrhBEgT2atLezpduB24mQ7CiOa/HVpFCDRZzdxqlh8drku408/tTmWzlNH/br
+HuQhZ/miWKOf35lpKzjyBd6TPM23uAfJvEOQ2/dnKGGJbsUo1/udKSvxQwVHpVv3
+S80OlluKfhWPDEXQpgyFqIzPoxIQTLZ0deirZwMVHarZ5u8HqHetRuAtmO2ZDGQn
+vVOJYAjls+Hiueq7Lj7Oce7CQsTwVZeP+XQx28PAaEZ3y6sQEt6rL06ddpSdoTMp
+BnCqTbxW+eWMyjkIn6t9GBtUV45yB1EkHNnj2Ex4GwCiN9T84QQjKSr+8f0psGrZ
+vPbCbQAwNFJjisLixnjlGPLKa5vOmNwIh/LAyUW5DjpkCx004LPDuqPpFsKXNKpa
+L2Dm6uc0x4Jo5m+gUTVORB6hOSzWnWDj2GWfomLzzyjG81DRGFBpco/O93zecsIN
+3SL2Ysjpq1zdoS01CMYxie//9zWvYwzI25/OZigtnpCIrcd2j1Y6dMUFQAzAtHE+
+qsXflSL8HIS+IJEFIQobLlYhHkoE3avgNx5jlu+OLYe0dF0Ykx1PGNjbwqvTX37R
+Cn32NMjlotW2QcGEZhDKj+3urZizp5xdTPZitA+aEjZM/Ni71VOdiOP0igbw6asZ
+2fxdozZ1TnSSYNYvNATwthNmZysCAwEAAaOCAeUwggHhMBIGA1UdEwEB/wQIMAYB
+Af8CAQAwDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBTR4XENCy2BTm6KSo9MI7NM
+XqtpCzAfBgNVHSMEGDAWgBTh0YHlzlpfBKrS6badZrHF+qwshzCBxwYIKwYBBQUH
+AQEEgbowgbcwOwYIKwYBBQUHMAKGL2h0dHA6Ly9yb3N0ZWxlY29tLnJ1L2NkcC9y
+b290Y2Ffc3NsX3JzYTIwMjIuY3J0MDsGCCsGAQUFBzAChi9odHRwOi8vY29tcGFu
+eS5ydC5ydS9jZHAvcm9vdGNhX3NzbF9yc2EyMDIyLmNydDA7BggrBgEFBQcwAoYv
+aHR0cDovL3JlZXN0ci1wa2kucnUvY2RwL3Jvb3RjYV9zc2xfcnNhMjAyMi5jcnQw
+gbAGA1UdHwSBqDCBpTA1oDOgMYYvaHR0cDovL3Jvc3RlbGVjb20ucnUvY2RwL3Jv
+b3RjYV9zc2xfcnNhMjAyMi5jcmwwNaAzoDGGL2h0dHA6Ly9jb21wYW55LnJ0LnJ1
+L2NkcC9yb290Y2Ffc3NsX3JzYTIwMjIuY3JsMDWgM6Axhi9odHRwOi8vcmVlc3Ry
+LXBraS5ydS9jZHAvcm9vdGNhX3NzbF9yc2EyMDIyLmNybDANBgkqhkiG9w0BAQsF
+AAOCAgEARBVzZls79AdiSCpar15dA5Hr/rrT4WbrOfzlpI+xrLeRPrUG6eUWIW4v
+Sui1yx3iqGLCjPcKb+HOTwoRMbI6ytP/ndp3TlYua2advYBEhSvjs+4vDZNwXr/D
+anbwIWdurZmViQRBDFebpkvnIvru/RpWud/5r624Wp8voZMRtj/cm6aI9LtvBfT9
+cfzhOaexI/99c14dyiuk1+6QhdwKaCRTc1mdfNQmnfWNRbfWhWBlK3h4GGE9JK33
+Gk8ZS8DMrkdAh0xby4xAQ/mSWAfWrBmfzlOqGyoB1U47WTOeqNbWkkoAP2ys94+s
+Jg4NTkiDVtXRF6nr6fYi0bSOvOFg0IQrMXO2Y8gyg9ARdPJwKtvWX8VPADCYMiWH
+h4n8bZokIrImVKLDQKHY4jCsND2HHdJfnrdL2YJw1qFskNO4cSNmZydw0Wkgjv9k
+F+KxqrDKlB8MZu2Hclph6v/CZ0fQ9YuE8/lsHZ0Qc2HyiSMnvjgK5fDc3TD4fa8F
+E8gMNurM+kV8PT8LNIM+4Zs+LKEV8nqRWBaxkIVJGekkVKO8xDBOG/aN62AZKHOe
+GcyIdu7yNMMRihGVZCYr8rYiJoKiOzDqOkPkLOPdhtVlgnhowzHDxMHND/E2WA5p
+ZHuNM/m0TXt2wTTPL7JH2YC0gPz/BvvSzjksgzU5rLbRyUKQkgU=
+-----END CERTIFICATE-----

{mainshortcuts2-2.2.3 → mainshortcuts2-2.3.0}/src/MainShortcuts2/dir.py

@@ -34,7 +34,7 @@ def create(path: PATH_TYPES, force: bool = False, **kw):
 
 def _list_filter(path: Path, *, exts: Iterable[str], func: Callable[[Path], bool], links: bool, type: str):
   if not exts is None:
-    if not path.ext in exts:
+    if not path.ext.lower() in exts:
       return False
   if not func is None:
     if not func(path):
@@ -50,14 +50,20 @@ def _list_filter(path: Path, *, exts: Iterable[str], func: Callable[[Path], bool
 
 def list(path: PATH_TYPES = ".", *, exts: Iterable[str] = None, func: Callable[[Path], bool] = None, links: bool = None, type: str = None) -> list[Path]:
   """Список содержимого папки"""
-  r = []
   kw = {}
-  kw["exts"] = None if exts is None else builtins.list(exts)
+  path = _check(path)
+  r = []
   kw["func"] = func
   kw["links"] = links
   kw["type"] = type
-  for i in os.listdir(_check(path)):
-    i = Path(_check(path) + "/" + i)
+  if exts is None:
+    kw["exts"] = None
+  else:
+    kw["exts"] = []
+    for i in exts:
+      kw["exts"].append((i if i.startswith(".") else "." + i).lower())
+  for i in os.listdir(path):
+    i = Path(path + "/" + i)
     if _list_filter(i, **kw):
       r.append(i)
   return r

{mainshortcuts2-2.2.3 → mainshortcuts2-2.3.0}/src/MainShortcuts2/path.py

@@ -55,6 +55,9 @@ class Path:
     self.rn = self.rename
     self.use_cache = use_cache
 
+  def __fspath__(self) -> str:
+    return self.path
+
   def reload(self, full: bool = False):
     """Удаление кешированной информации"""
     if full:

{mainshortcuts2-2.2.3 → mainshortcuts2-2.3.0}/src/MainShortcuts2/term.py

@@ -115,4 +115,10 @@ def clear():
   _clear()
 
 
+def set_title(title: str):
+  """Установить заголовок окна"""
+  # Не работает на bpython: AssertionError
+  print("\u001b]2;" + title + "\u0007", end="")
+
+
 cls = clear

{mainshortcuts2-2.2.3 → mainshortcuts2-2.3.0}/src/MainShortcuts2/utils.py

@@ -365,6 +365,7 @@ class OnlyOneInstance:
   def __init__(self, name: str = "main", lock_path: str = None):
     import tempfile
     self.name: str = name
+    self.running = False
     if lock_path is None:
       lock_path = tempfile.gettempdir() + "/" + ms.MAIN_FILE.replace(":", "").replace("/", "_") + "." + name + ".lock"
     self.lock = ms.path.Path(lock_path, use_cache=False)
@@ -373,9 +374,9 @@ class OnlyOneInstance:
 
       def _enter():
         try:
-          if self.lock.exists:
+          if os.path.exists(self.lock.path):
             os.unlink(self.lock.path)
-          self.fd = os.open(self.lockfile, flags)
+          self.fd = os.open(self.lock.path, flags)
         except OSError as err:
           if err.errno == 13:
             raise OnlyOneInstanceError()
@@ -398,8 +399,8 @@ class OnlyOneInstance:
 
       def _exit():
         fcntl.lockf(self.fp, fcntl.LOCK_UN)
-        os.close(self.fp)
-        if self.lock.exists:
+        self.fp.close()
+        if os.path.exists(self.lock.path):
           os.unlink(self.lock.path)
     self._enter = _enter
     self._exit = _exit
@@ -429,5 +430,27 @@ class OnlyOneInstance:
     pass
 
 
+def multi_and(*values: bool) -> bool:
+  for i in values:
+    if not i:
+      return False
+  return True
+
+
+def multi_or(*values: bool) -> bool:
+  for i in values:
+    if i:
+      return True
+  return False
+
+
+def is_int(value: float) -> bool:
+  return value == int(value)
+
+
+def get_self_module(__name__: str):
+  return sys.modules[__name__]
+
+
 download_file = sync_download_file
 request = sync_request