tgblocks 0.2.0__tar.gz → 0.2.2__tar.gz

{tgblocks-0.2.0 → tgblocks-0.2.2}/CHANGELOG.md

@@ -1,5 +1,34 @@
 # Changelog
 
+## 0.2.1
+
+Metadata, tests and documentation. The generated aiogram code is unchanged.
+
+### Changed
+
+- **Minimum Python is now 3.10.** `aiogram` itself requires 3.10, so on 3.9 the
+  `runtime` extra could only pull an old version that the suite could not cover. The
+  CI matrix is 3.10, 3.11 and 3.13 on Windows and Linux.
+- The PyPI summary is the same sentence as the README: three visual editors, not one.
+
+### Fixed
+
+- The test poll payload is built from the installed aiogram, so a new release that adds
+  required `Poll` fields (3.31 added three) no longer turns the whole matrix red.
+- `tools/qa_smoke.py` no longer hardcodes a Windows path: it works from any clone and on
+  Linux.
+- `tools/check_markdown.py` and `tools/qa_smoke.py` write UTF-8, so the Windows runner
+  reports a failure instead of crashing on Russian output.
+
+### Documentation
+
+- README rewritten for a first-time visitor: a demo GIF, one install command, the three
+  views as sections with screenshots, actions and events as aligned code blocks instead
+  of wide tables, and a Russian section that reads like a person wrote it.
+- `docs/` screenshots are taken from a demo project with a fake token.
+- `GITHUB.md` is the full publishing guide (GitHub, tokens, CI, PyPI, releases,
+  troubleshooting).
+
 ## 0.2.0
 
 The release that made the three editors agree with each other.

{tgblocks-0.2.0 → tgblocks-0.2.2}/GITHUB.md

@@ -13,7 +13,7 @@
 **git** — отправлять код: <https://git-scm.com/download/win>
 (при установке оставь галочки по умолчанию)
 
-**Python 3.9 или новее** — собирать пакет: <https://www.python.org/downloads/>
+**Python 3.10 или новее** — собирать пакет: <https://www.python.org/downloads/>
 
 **Аккаунт PyPI** — чтобы работал `pip install`: <https://pypi.org/account/register/>
 
@@ -105,7 +105,7 @@ git push
 
 1. Открой страницу репозитория — файлы на месте, README и `docs/demo.gif` видны.
 2. Вкладка **Actions**: workflow **CI** должен стать зелёным. Он прогоняет 261 тест на
-   Windows и Linux (Python 3.9, 3.11, 3.13), проверяет JS редакторов, собирает пакет и
+   Windows и Linux (Python 3.10, 3.11, 3.13), проверяет JS редакторов, собирает пакет и
    ставит его в чистое окружение.
 3. Бейдж в README (вставь после заголовка):
 

{tgblocks-0.2.0 → tgblocks-0.2.2}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.5
 Name: tgblocks
-Version: 0.2.0
-Summary: A tiny text DSL and a visual block editor for Telegram bots
+Version: 0.2.2
+Summary: Visual editor for building Telegram bots on aiogram 3
 Project-URL: Homepage, https://github.com/Pupka228228/tgblocks
 Project-URL: Repository, https://github.com/Pupka228228/tgblocks
 Project-URL: Issues, https://github.com/Pupka228228/tgblocks/issues
@@ -17,7 +17,6 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
@@ -25,7 +24,7 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Communications :: Chat
 Classifier: Topic :: Software Development :: Code Generators
 Classifier: Topic :: Software Development :: User Interfaces
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Provides-Extra: dev
 Requires-Dist: build>=1; extra == 'dev'
 Requires-Dist: pytest>=7; extra == 'dev'
@@ -38,12 +37,12 @@ Description-Content-Type: text/markdown
 
 **A tiny text DSL and three visual editors for Telegram bots on aiogram 3.**
 
-Five lines of text — or five dragged blocks — and you get plain, editable `aiogram`
+Five lines of text — or five dragged blocks — and you get ordinary, editable aiogram
 code. No account, no cloud, no lock-in: the editor is a local server on
-`127.0.0.1`, and the result is a normal `bot.py` you can read, commit and deploy.
+127.0.0.1, and the result is a normal bot.py you can read, commit and deploy.
 
 [![CI](https://github.com/Pupka228228/tgblocks/actions/workflows/ci.yml/badge.svg)](https://github.com/Pupka228228/tgblocks/actions/workflows/ci.yml)
-[![Python](https://img.shields.io/badge/python-3.9%2B-blue)](https://www.python.org/)
+[![Python](https://img.shields.io/badge/python-3.10%2B-blue)](https://www.python.org/)
 [![License: MIT](https://img.shields.io/badge/license-MIT-green)](LICENSE)
 
 ![tgblocks in action](https://raw.githubusercontent.com/Pupka228228/tgblocks/main/docs/demo.gif)
@@ -105,11 +104,11 @@ block names, field captions and hints change with it.
 ## Why
 
 Paid bot constructors keep your bot inside their panel: you rent the hosting, you cannot
-read the code, and leaving means starting again. Plain `aiogram` 3 is the opposite — full
-control, but the first hour is dispatcher, routers, filters, keyboards, callbacks and an
-async entrypoint before anything answers.
+read the code, and leaving means starting again. Writing aiogram 3 by hand is the
+opposite — full control, but the first hour is dispatcher, routers, filters, keyboards,
+callbacks and an async entrypoint before anything answers.
 
-`tgblocks` is the middle: a language small enough to fit on a postcard, or an editor where
+tgblocks is the middle: a language small enough to fit on a postcard, or an editor where
 a bot is boxes with wires. Both produce the same readable aiogram code, and the code is
 yours.
 

{tgblocks-0.2.0 → tgblocks-0.2.2}/README.md

@@ -2,12 +2,12 @@
 
 **A tiny text DSL and three visual editors for Telegram bots on aiogram 3.**
 
-Five lines of text — or five dragged blocks — and you get plain, editable `aiogram`
+Five lines of text — or five dragged blocks — and you get ordinary, editable aiogram
 code. No account, no cloud, no lock-in: the editor is a local server on
-`127.0.0.1`, and the result is a normal `bot.py` you can read, commit and deploy.
+127.0.0.1, and the result is a normal bot.py you can read, commit and deploy.
 
 [![CI](https://github.com/Pupka228228/tgblocks/actions/workflows/ci.yml/badge.svg)](https://github.com/Pupka228228/tgblocks/actions/workflows/ci.yml)
-[![Python](https://img.shields.io/badge/python-3.9%2B-blue)](https://www.python.org/)
+[![Python](https://img.shields.io/badge/python-3.10%2B-blue)](https://www.python.org/)
 [![License: MIT](https://img.shields.io/badge/license-MIT-green)](LICENSE)
 
 ![tgblocks in action](https://raw.githubusercontent.com/Pupka228228/tgblocks/main/docs/demo.gif)
@@ -69,11 +69,11 @@ block names, field captions and hints change with it.
 ## Why
 
 Paid bot constructors keep your bot inside their panel: you rent the hosting, you cannot
-read the code, and leaving means starting again. Plain `aiogram` 3 is the opposite — full
-control, but the first hour is dispatcher, routers, filters, keyboards, callbacks and an
-async entrypoint before anything answers.
+read the code, and leaving means starting again. Writing aiogram 3 by hand is the
+opposite — full control, but the first hour is dispatcher, routers, filters, keyboards,
+callbacks and an async entrypoint before anything answers.
 
-`tgblocks` is the middle: a language small enough to fit on a postcard, or an editor where
+tgblocks is the middle: a language small enough to fit on a postcard, or an editor where
 a bot is boxes with wires. Both produce the same readable aiogram code, and the code is
 yours.
 

{tgblocks-0.2.0 → tgblocks-0.2.2}/pyproject.toml

@@ -4,10 +4,10 @@ build-backend = "hatchling.build"
 
 [project]
 name = "tgblocks"
-version = "0.2.0"
-description = "A tiny text DSL and a visual block editor for Telegram bots"
+version = "0.2.2"
+description = "Visual editor for building Telegram bots on aiogram 3"
 readme = "README.md"
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 license = { text = "MIT" }
 authors = [{ name = "tgblocks contributors" }]
 keywords = ["telegram", "bot", "dsl", "blockly", "aiogram", "low-code", "codegen"]
@@ -17,7 +17,6 @@ classifiers = [
     "License :: OSI Approved :: MIT License",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",

{tgblocks-0.2.0 → tgblocks-0.2.2}/tests/botkit.py

@@ -14,6 +14,43 @@ from aiogram.types import Chat, Message
 
 BOT_TOKEN = "42:TEST_TOKEN"
 
+
+def _model_fields(model) -> set:
+    fields = getattr(model, "model_fields", None)          # pydantic v2
+    if fields is None:
+        fields = getattr(model, "__fields__", {})          # pydantic v1
+    return set(fields)
+
+
+def _poll_payload() -> dict:
+    """A poll payload for the aiogram that is installed.
+
+    Telegram keeps adding required fields (3.31 brought `persistent_id`,
+    `allows_revoting` and `members_only`), and an old aiogram rejects what it does
+    not know. Asking the model which fields exist keeps the suite green on every
+    supported version.
+    """
+    from aiogram.types import Poll, PollOption
+
+    option = {"text": "a", "voter_count": 0}
+    if "persistent_id" in _model_fields(PollOption):
+        option["persistent_id"] = "0"
+
+    payload = {
+        "id": "1",
+        "question": "q",
+        "options": [option],
+        "total_voter_count": 1,
+        "is_closed": False,
+        "is_anonymous": False,
+        "type": "regular",
+        "allows_multiple_answers": False,
+    }
+    for name, value in (("allows_revoting", False), ("members_only", False)):
+        if name in _model_fields(Poll):
+            payload[name] = value
+    return payload
+
 # The smallest payload Telegram would accept for each kind of message content:
 # aiogram validates the update before the dispatcher sees it, so a made-up
 # "file_id only" object would fail for dice, polls, stickers and locations.
@@ -32,9 +69,10 @@ CONTENT = {
                   "duration": 1},
     "location": {"latitude": 1.0, "longitude": 1.0},
     "contact": {"phone_number": "+100", "first_name": "Tester"},
-    "poll": {"id": "1", "question": "q", "options": [{"text": "a", "voter_count": 0}],
-             "total_voter_count": 1, "is_closed": False, "is_anonymous": False,
-             "type": "regular", "allows_multiple_answers": False},
+    # Telegram grows required Poll fields over time (aiogram 3.31 added three).
+    # The payload is built for the aiogram that is installed, so the suite runs on
+    # any supported version instead of only the newest one.
+    "poll": _poll_payload(),
     "dice": {"emoji": "🎲", "value": 3},
 }
 

{tgblocks-0.2.0 → tgblocks-0.2.2}//320/230/320/235/320/241/320/242/320/240/320/243/320/232/320/246/320/230/320/257.md

@@ -22,7 +22,7 @@
 
 ## 1. Что понадобится
 
-- Python **3.9+** (проверить: `python --version`).
+- Python **3.10+** (проверить: `python --version`).
 - Терминал (PowerShell подойдёт).
 - Токен бота — его выдаёт **@BotFather** в Telegram (раздел 4).
 - Интернет: для `pip install`, для первой загрузки Blockly с CDN и для самого бота