Release v0.4.0

Author: illvart

.gitignore

@@ -1,6 +1,7 @@
+# ---> Python
 # Byte-compiled / optimized / DLL files
 __pycache__/
-*.py[cod]
+*.py[codz]
 *$py.class
 
 # C extensions
@@ -20,16 +21,15 @@ parts/
 sdist/
 var/
 wheels/
-pip-wheel-metadata/
 share/python-wheels/
 *.egg-info/
 .installed.cfg
 *.egg
 MANIFEST
 
 # PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+#   Usually these files are written by a python script from a template
+#   before PyInstaller builds the exe, so as to inject date/other infos into it.
 *.manifest
 *.spec
 
@@ -47,9 +47,10 @@ htmlcov/
 nosetests.xml
 coverage.xml
 *.cover
-*.py,cover
+*.py.cover
 .hypothesis/
 .pytest_cache/
+cover/
 
 # Translations
 *.mo
@@ -72,6 +73,7 @@ instance/
 docs/_build/
 
 # PyBuilder
+.pybuilder/
 target/
 
 # Jupyter Notebook
@@ -82,27 +84,73 @@ profile_default/
 ipython_config.py
 
 # pyenv
-.python-version
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
 
 # pipenv
 #   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
 #   However, in case of collaboration, if having platform-specific dependencies or dependencies
 #   having no cross-platform support, pipenv may install dependencies that don't work, or not
 #   install all needed dependencies.
-#Pipfile.lock
-
-# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+# Pipfile.lock
+
+# UV
+#   Similar to Pipfile.lock, it is generally recommended to include uv.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+# uv.lock
+
+# poetry
+#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
+# poetry.lock
+# poetry.toml
+
+# pdm
+#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
+#   pdm recommends including project-wide configuration in pdm.toml, but excluding .pdm-python.
+#   https://pdm-project.org/en/latest/usage/project/#working-with-version-control
+# pdm.lock
+# pdm.toml
+.pdm-python
+.pdm-build/
+
+# pixi
+#   Similar to Pipfile.lock, it is generally recommended to include pixi.lock in version control.
+# pixi.lock
+#   Pixi creates a virtual environment in the .pixi directory, just like venv module creates one
+#   in the .venv directory. It is recommended not to include this directory in version control.
+.pixi
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
 __pypackages__/
 
 # Celery stuff
 celerybeat-schedule
 celerybeat.pid
 
+# Redis
+*.rdb
+*.aof
+*.pid
+
+# RabbitMQ
+mnesia/
+rabbitmq/
+rabbitmq-data/
+
+# ActiveMQ
+activemq-data/
+
 # SageMath parsed files
 *.sage.py
 
 # Environments
 .env
+.envrc
 .venv
 env/
 venv/
@@ -128,12 +176,46 @@ dmypy.json
 # Pyre type checker
 .pyre/
 
-.progress
-.vscode/*
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+# PyCharm
+#   JetBrains specific template is maintained in a separate JetBrains.gitignore that can
+#   be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+#   and can be added to the global gitignore or merged into this file.  For a more nuclear
+#   option (not recommended) you can uncomment the following to ignore the entire idea folder.
+# .idea/
+
+# Abstra
+#   Abstra is an AI-powered process automation framework.
+#   Ignore directories containing user credentials, local state, and settings.
+#   Learn more at https://abstra.io/docs
+.abstra/
+
+# Visual Studio Code
+#   Visual Studio Code specific template is maintained in a separate VisualStudioCode.gitignore 
+#   that can be found at https://github.com/github/gitignore/blob/main/Global/VisualStudioCode.gitignore
+#   and can be added to the global gitignore or merged into this file. However, if you prefer, 
+#   you could uncomment the following to ignore the entire vscode folder
+# .vscode/
+
+# Ruff stuff:
+.ruff_cache/
+
+# PyPI configuration file
+.pypirc
+
+# Marimo
+marimo/_static/
+marimo/_lsp/
+__marimo__/
+
+# Streamlit
+.streamlit/secrets.toml
 
 logs
-*.db
-*.session*
-alembic*
-unknown_errors.txt
-.ruff*
+*.db*
+data

README.md

@@ -45,7 +45,7 @@ cd ds
 
 #### String Session
 
-Generate `STRING_SESSION` by choosing **Pyrofork** at [@strgen_bot](https://t.me/strgen_bot).
+Generate `STRING_SESSION` by running `python3 strgen.py`.
 
 #### Config
 

docker-compose.yml

@@ -9,7 +9,8 @@ services:
     restart: unless-stopped
 
     volumes:
-      - ./:/app
+      - ./logs:/app/logs
+      - ./data:/app/data
     env_file:
       - .env
     network_mode: bridge

ds/__init__.py

@@ -3,25 +3,33 @@
 # MIT License
 
 from pathlib import Path
-from shutil import rmtree
 from time import monotonic
 
 from version import __version__  # noqa
 
 PROJECT = "ds"
+
 StartTime = monotonic()
+
 Root = Path(__file__).parent.parent
-WORKERS = 3
-
-DIRS = ("logs/",)
-for d in DIRS:
-    if not (Root / d).exists():
-        (Root / d).mkdir(parents=True, exist_ok=True)
-    else:
-        for i in (Root / d).rglob("*"):
-            if i.is_dir():
-                rmtree(i, ignore_errors=True)
-            else:
-                i.unlink(missing_ok=True)
-
-del Path, rmtree, monotonic
+LOG_DIR = Root / "logs"
+DATA_DIR = Root / "data"
+
+
+def ensure_dir(path: Path) -> None:
+    path.mkdir(parents=True, exist_ok=True)
+
+
+def clean_files(path: Path) -> None:
+    if not path.exists():
+        return
+    for i in path.rglob("*"):
+        if i.is_file():
+            i.unlink(missing_ok=True)
+
+
+for path in (
+    LOG_DIR,
+    DATA_DIR,
+):
+    ensure_dir(path)

ds/__main__.py

@@ -23,9 +23,9 @@ async def main() -> None:
     try:
         uvloop.run(main())
     except KeyboardInterrupt:
-        LOG.warning("[APP] Shutdown signal received.")
-    except Exception as err:
-        LOG.exception(f"[APP] Unhandled exception: {err}")
+        LOG.info("[APP] shutdown signal received")
+    except Exception:
+        LOG.exception("[APP] unhandled exception")
         sys.exit(1)
     finally:
-        LOG.warning("[APP] Stopped.")
+        LOG.info("[APP] stopped")

ds/config.py

@@ -1,4 +1,3 @@
-# ruff: noqa: RUF012
 # Copyright (C) 2023-present kastaid
 # https://github.com/kastaid/ds
 # MIT License
@@ -7,7 +6,7 @@
 
 from dotenv import load_dotenv
 
-from . import WORKERS, Root
+from . import Root
 
 load_dotenv(Root / ".env", override=True)
 
@@ -27,13 +26,9 @@ def env(key: str, default: str = "") -> str:
 
 class Var:
     DEV_MODE: bool = to_bool(env("DEV_MODE", "false"))
+    WORKERS: int = int(env("WORKERS", "3"))
     API_ID: int = int(env("API_ID", "0"))
     API_HASH: str = env("API_HASH", "")
     STRING_SESSION: str = env("STRING_SESSION", "")
     HANDLER: str = env("HANDLER", "")
-    WORKERS: int = int(env("WORKERS", str(WORKERS)))
     IS_STARTUP: bool = False
-    ERROR_RETRY: dict[int, int] = {}
-
-
-del load_dotenv, WORKERS, Root