tumblrbot 1.9.4__tar.gz → 1.9.5__tar.gz

{tumblrbot-1.9.4 → tumblrbot-1.9.5}/.gitignore

@@ -1,221 +1,221 @@
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[codz]
-*$py.class
-
-# C extensions
-*.so
-
-# Distribution / packaging
-.Python
-build/
-develop-eggs/
-dist/
-downloads/
-eggs/
-.eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-wheels/
-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.
-*.manifest
-*.spec
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.nox/
-.coverage
-.coverage.*
-.cache
-nosetests.xml
-coverage.xml
-*.cover
-*.py.cover
-.hypothesis/
-.pytest_cache/
-cover/
-
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
-*.log
-local_settings.py
-db.sqlite3
-db.sqlite3-journal
-
-# Flask stuff:
-instance/
-.webassets-cache
-
-# Scrapy stuff:
-.scrapy
-
-# Sphinx documentation
-docs/_build/
-
-# PyBuilder
-.pybuilder/
-target/
-
-# Jupyter Notebook
-.ipynb_checkpoints
-
-# IPython
-profile_default/
-ipython_config.py
-
-# pyenv
-#   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
-
-# 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/
-ENV/
-env.bak/
-venv.bak/
-
-# Spyder project settings
-.spyderproject
-.spyproject
-
-# Rope project settings
-.ropeproject
-
-# mkdocs documentation
-/site
-
-# mypy
-.mypy_cache/
-.dmypy.json
-dmypy.json
-
-# Pyre type checker
-.pyre/
-
-# 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
-
-data
-*.jsonl
-*.toml
-tumblrbot.exe.lnk
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[codz]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+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.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py.cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   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
+
+# 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/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# 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
+
+data
+*.toml
+*.jsonl
+*.lnk

{tumblrbot-1.9.4 → tumblrbot-1.9.5}/PKG-INFO

@@ -1,12 +1,11 @@
 Metadata-Version: 2.4
 Name: tumblrbot
-Version: 1.9.4
+Version: 1.9.5
 Summary: An updated bot that posts to Tumblr, based on your very own blog!
-Requires-Python: >= 3.13
+Requires-Python: >= 3.14
 Description-Content-Type: text/markdown
 Requires-Dist: click
 Requires-Dist: openai
-Requires-Dist: pwinput
 Requires-Dist: pydantic
 Requires-Dist: requests
 Requires-Dist: requests-oauthlib
@@ -18,6 +17,8 @@ Project-URL: Source, https://github.com/MaidScientistIzutsumiMarin/tumblrbot
 
 # tumblrbot
 
+[tumblrbot.exe]: https://github.com/MaidScientistIzutsumiMarin/tumblrbot/releases/latest/download/tumblrbot.exe
+
 [OAuth]: https://oauth.net/1
 [Python]: https://python.org/download
 
@@ -31,6 +32,7 @@ Project-URL: Source, https://github.com/MaidScientistIzutsumiMarin/tumblrbot
 [OpenAI Pricing]: https://platform.openai.com/docs/pricing#fine-tuning
 [OpenAI Tokens]: https://platform.openai.com/settings/organization/api-keys
 [OpenAI Moderation API]: https://platform.openai.com/docs/guides/moderation
+[Flags]: https://platform.openai.com/docs/guides/moderation/over#content-classifications
 [Fine-Tuning Portal]: https://platform.openai.com/finetune
 
 [Tumblr]: https://tumblr.com
@@ -82,11 +84,21 @@ Features:
 - Colorful output, progress bars, and post previews using [rich].
 - Automatically keeps the [config][configurable] file up-to-date and recreates it if missing (without overriding user settings).
 
+**To-Do:**
+
+- Add retry logic for rate limiting.
+
 **Known Issues:**
 
+- Fine-tuning can fail after the validation phase due to the examples file not passing [OpenAI] moderation checks. There are a few workarounds for this that can be tried in combination:
+  - You can retry with the same examples file. This has, on rare occasions, worked.
+  - You can submit the examples file to the [OpenAI] moderation API with this program's guided prompts. This has worked consistently for our dataset, but others have reported it not being thorough enough.
+  - You can use regular expressions to filter out training data in the [config][configurable]. This is more of a brute-force solution, but it can work if the other solutions do not.
+  - You can try limiting your dataset by specifying fewer blogs to download from or limiting the number of posts taken from each one in the [config][configurable].
+  - If all else fails, you can manually remove data from the examples file until it passes. It is unfortunately not a definitive resource, but it can help to read about what the [OpenAI moderation API flags][Flags].
 - Sometimes, you will get an error about the training file not being found when starting fine-tuning. We do not currently have a fix or workaround for this. You should instead use the online portal for fine-tuning if this continues to happen. Read more in [fine-tuning].
 - Post counts are incorrect when downloading posts. We are not certain what the cause of this is, but our tests suggest this is a [Tumblr] API problem that is giving inaccurate numbers.
-- During post downloading or post generation, you may receive a "Limit Exceeded" error message from the [Tumblr] API. This is caused by server-side rate-limiting by [Tumblr]. The only workaround is trying again or waiting for a period of time before retrying. In most cases, you either have to wait for a minute or an hour for the limits to reset. You can read more about the limits in the [Tumblr API documentation on rate limits].
+- During post downloading or post generation, you may receive a “Limit Exceeded” error message from the [Tumblr] API. This is caused by server-side rate-limiting by [Tumblr]. The only workaround is trying again or waiting for a period of time before retrying. In most cases, you either have to wait for a minute or an hour for the limits to reset. You can read more about the limits in the [Tumblr API documentation on rate limits].
 - Similar to the above issue, you may sometimes get a message saying your IP is blocked. This block is temporary and probably follows the same rules as previously described.
 
 **Please submit an issue or contact us for features you want added/reimplemented.**
@@ -101,6 +113,11 @@ Features:
    - Alternatively, you can install from this repository: `pip install git+https://github.com/MaidThatPrograms/tumblrbot.git`
    - On Linux, you will have to make a virtual environment or use the flag to install packages system-wide.
 
+### Alternative Installation for Windows
+
+1. Download the latest release's [tumblrbot.exe].
+1. Run the file directly, or add it to your path, and use it as normal.
+
 ## Usage
 
 Run `tumblrbot` from anywhere. Run `tumblrbot --help` for command-line options. Every command-line option corresponds to a value from the [config][configurable].
@@ -160,7 +177,7 @@ Specific Options:
    To be specific, it should follow the [JSON Lines] file format with one collection of name/value pairs (a dictionary) per line. You can validate your file using the [JSON Lines Validator].
 
 - **`post_limit`** - At most, this many valid posts will be included in the training data. This effectively is a filter to select the `N` most recent valid posts from each blog. `0` will use every available valid post.
-- **`filtered_words`** - During training data generation, any posts with the specified words will be removed. Word boundaries are not checked by default, so "the" will also filter out posts with "them" or "thematic". This setting supports regular expressions, so you can explicitly look for word boundaries by surrounding an entry with "\\\b", i.e. "\\\bthe\\\b". Regular expressions have to be escaped like so due to how JSON data is read in. If you are familiar with regular expressions, it could be useful for you to know that every entry is joined with a "|" which is then used to search the post content for any matches.
+- **`filtered_words`** - During training data generation, any posts with the specified words will be removed. Word boundaries are not checked by default, so “the” will also filter out posts with “them” or “thematic”. This setting supports regular expressions, so you can explicitly look for word boundaries by surrounding an entry with “\\\b”, i.e., “\\\bthe\\\b”. Regular expressions have to be escaped like so due to how JSON data is read in. If you are familiar with regular expressions, it could be useful for you to know that every entry is joined with a “|” which is then used to search the post content for any matches.
 - **`developer_message`** - This message is used in for fine-tuning the AI as well as generating prompts. If you change this, you will need to run the fine-tuning again with the new value before generating posts.
 - **`user_message`** - This setting is used and works in the same way as `developer_message`.
 - **`expected_epochs`** - The default value here is the default number of epochs for `base_model`. You may have to change this value if you change `base_model`. After running fine-tuning once, you will see the number of epochs used in the [fine-tuning portal] under *Hyperparameters*. This value will also be updated automatically if you run fine-tuning through this program.

{tumblrbot-1.9.4 → tumblrbot-1.9.5}/README.md

@@ -1,5 +1,7 @@
 # tumblrbot
 
+[tumblrbot.exe]: https://github.com/MaidScientistIzutsumiMarin/tumblrbot/releases/latest/download/tumblrbot.exe
+
 [OAuth]: https://oauth.net/1
 [Python]: https://python.org/download
 
@@ -13,6 +15,7 @@
 [OpenAI Pricing]: https://platform.openai.com/docs/pricing#fine-tuning
 [OpenAI Tokens]: https://platform.openai.com/settings/organization/api-keys
 [OpenAI Moderation API]: https://platform.openai.com/docs/guides/moderation
+[Flags]: https://platform.openai.com/docs/guides/moderation/over#content-classifications
 [Fine-Tuning Portal]: https://platform.openai.com/finetune
 
 [Tumblr]: https://tumblr.com
@@ -64,11 +67,21 @@ Features:
 - Colorful output, progress bars, and post previews using [rich].
 - Automatically keeps the [config][configurable] file up-to-date and recreates it if missing (without overriding user settings).
 
+**To-Do:**
+
+- Add retry logic for rate limiting.
+
 **Known Issues:**
 
+- Fine-tuning can fail after the validation phase due to the examples file not passing [OpenAI] moderation checks. There are a few workarounds for this that can be tried in combination:
+  - You can retry with the same examples file. This has, on rare occasions, worked.
+  - You can submit the examples file to the [OpenAI] moderation API with this program's guided prompts. This has worked consistently for our dataset, but others have reported it not being thorough enough.
+  - You can use regular expressions to filter out training data in the [config][configurable]. This is more of a brute-force solution, but it can work if the other solutions do not.
+  - You can try limiting your dataset by specifying fewer blogs to download from or limiting the number of posts taken from each one in the [config][configurable].
+  - If all else fails, you can manually remove data from the examples file until it passes. It is unfortunately not a definitive resource, but it can help to read about what the [OpenAI moderation API flags][Flags].
 - Sometimes, you will get an error about the training file not being found when starting fine-tuning. We do not currently have a fix or workaround for this. You should instead use the online portal for fine-tuning if this continues to happen. Read more in [fine-tuning].
 - Post counts are incorrect when downloading posts. We are not certain what the cause of this is, but our tests suggest this is a [Tumblr] API problem that is giving inaccurate numbers.
-- During post downloading or post generation, you may receive a "Limit Exceeded" error message from the [Tumblr] API. This is caused by server-side rate-limiting by [Tumblr]. The only workaround is trying again or waiting for a period of time before retrying. In most cases, you either have to wait for a minute or an hour for the limits to reset. You can read more about the limits in the [Tumblr API documentation on rate limits].
+- During post downloading or post generation, you may receive a “Limit Exceeded” error message from the [Tumblr] API. This is caused by server-side rate-limiting by [Tumblr]. The only workaround is trying again or waiting for a period of time before retrying. In most cases, you either have to wait for a minute or an hour for the limits to reset. You can read more about the limits in the [Tumblr API documentation on rate limits].
 - Similar to the above issue, you may sometimes get a message saying your IP is blocked. This block is temporary and probably follows the same rules as previously described.
 
 **Please submit an issue or contact us for features you want added/reimplemented.**
@@ -83,6 +96,11 @@ Features:
    - Alternatively, you can install from this repository: `pip install git+https://github.com/MaidThatPrograms/tumblrbot.git`
    - On Linux, you will have to make a virtual environment or use the flag to install packages system-wide.
 
+### Alternative Installation for Windows
+
+1. Download the latest release's [tumblrbot.exe].
+1. Run the file directly, or add it to your path, and use it as normal.
+
 ## Usage
 
 Run `tumblrbot` from anywhere. Run `tumblrbot --help` for command-line options. Every command-line option corresponds to a value from the [config][configurable].
@@ -142,7 +160,7 @@ Specific Options:
    To be specific, it should follow the [JSON Lines] file format with one collection of name/value pairs (a dictionary) per line. You can validate your file using the [JSON Lines Validator].
 
 - **`post_limit`** - At most, this many valid posts will be included in the training data. This effectively is a filter to select the `N` most recent valid posts from each blog. `0` will use every available valid post.
-- **`filtered_words`** - During training data generation, any posts with the specified words will be removed. Word boundaries are not checked by default, so "the" will also filter out posts with "them" or "thematic". This setting supports regular expressions, so you can explicitly look for word boundaries by surrounding an entry with "\\\b", i.e. "\\\bthe\\\b". Regular expressions have to be escaped like so due to how JSON data is read in. If you are familiar with regular expressions, it could be useful for you to know that every entry is joined with a "|" which is then used to search the post content for any matches.
+- **`filtered_words`** - During training data generation, any posts with the specified words will be removed. Word boundaries are not checked by default, so “the” will also filter out posts with “them” or “thematic”. This setting supports regular expressions, so you can explicitly look for word boundaries by surrounding an entry with “\\\b”, i.e., “\\\bthe\\\b”. Regular expressions have to be escaped like so due to how JSON data is read in. If you are familiar with regular expressions, it could be useful for you to know that every entry is joined with a “|” which is then used to search the post content for any matches.
 - **`developer_message`** - This message is used in for fine-tuning the AI as well as generating prompts. If you change this, you will need to run the fine-tuning again with the new value before generating posts.
 - **`user_message`** - This setting is used and works in the same way as `developer_message`.
 - **`expected_epochs`** - The default value here is the default number of epochs for `base_model`. You may have to change this value if you change `base_model`. After running fine-tuning once, you will see the number of epochs used in the [fine-tuning portal] under *Hyperparameters*. This value will also be updated automatically if you run fine-tuning through this program.

{tumblrbot-1.9.4 → tumblrbot-1.9.5}/pyproject.toml

@@ -1,13 +1,12 @@
 [project]
 name = "tumblrbot"
-version = "1.9.4"
+version = "1.9.5"
 description = "An updated bot that posts to Tumblr, based on your very own blog!"
 readme = "README.md"
-requires-python = ">= 3.13"
+requires-python = ">= 3.14"
 dependencies = [
   "click",
   "openai",
-  "pwinput",
   "pydantic",
   "requests",
   "requests-oauthlib",
@@ -25,4 +24,4 @@ tumblrbot = "tumblrbot.__main__:main"
 
 [build-system]
 requires = ["flit_core"]
-build-backend = "flit_core.buildapi"
+build-backend = "flit_core.buildapi"

{tumblrbot-1.9.4 → tumblrbot-1.9.5}/sample_custom_prompts.jsonl

@@ -1,7 +1,5 @@
 {"Please write a comical Tumblr post.": " According to the author\u2019s original plan, the present pamphlet was to have been devoted to a detailed development of the ideas expressed in the article \u201cWhere To Begin\u201d, We must first apologise to the reader for the delay in fulfilling the promise made in that article One of the reasons for this delay was the attempt, undertaken in June of the past year to unite all the Social-Democratic organisations abroad."}
 {"Please write a comical Tumblr post.": "It was natural to wait for the results of this attempt, for, had the effort proved successful, it would perhaps have been necessary to expound Iskra\u2019s conceptions of organisation from a somewhat different approach; in any case, such a success promised to put an end very quickly to the existence of the two trends in the Russian Social-Democratic movement."}
-{"Please write a comical Tumblr post.": "As the reader knows, the attempt failed, and, as we propose to show, was bound to fail after the new swing, of Rabocheye Dyelo, in its issue No."}
-{"Please write a comical Tumblr post.": "10, towards Economism."}
 {"Please write a comical Tumblr post.": "It was found to be absolutely essential to begin a determined struggle against this trend, diffuse and ill-defined, but for that reason the more persistent, the more capable of reasserting itself in diverse forms."}
 {"Please write a comical Tumblr post.": "Accordingly, the original plan of the pamphlet was altered and considerably enlarged."}
 {"Please write a comical Tumblr post.": "Its main theme was to have been the three questions raised in the article \u201cWhere To Begin\u201d \u2013 the character and main content of our political agitation; our organisational tasks; and the plan for building, simultaneously and from various sides, a militant, all-Russia organisation."}
@@ -140,9 +138,6 @@
 {"Please write a comical Tumblr post.": "This is a feature of Economism generally, and not of the authors of the Credo alone."}
 {"Please write a comical Tumblr post.": "It was revealed by that most outspoken and honest advocate of Economism, Rabochaya Mysl, and by Rabocheye Dyelo as well as by the Kiev Committee, which two years ago refused to permit the publication of its profession de foi, together with a repudiation of it, and by many other individual representatives of Economism."}
 {"Please write a comical Tumblr post.": "This fear of criticism displayed by the advocates of freedom of criticism cannot be attributed solely to craftiness No, the majority of the Economists look with sincere resentment upon all theoretical controversies, factional disagreements, broad political questions, plans for organising revolutionaries, etc."}
-{"Please write a comical Tumblr post.": "\u201cLeave all that to the people abroad!\u201d said a fairly consistent Economist to me one day, thereby expressing a very widespread view; our concern is the working-class movement, the workers, organisations here, in our localities; all the rest is merely the invention of doctrinaires, \u201cthe overrating of ideology\u201d, as the authors of the letter, published in Iskra, No."}
-{"Please write a comical Tumblr post.": "12, expressed it, in unison with Rabocheye Dyelo, No."}
-{"Please write a comical Tumblr post.": "10."}
 {"Please write a comical Tumblr post.": "The question now arises: such being the peculiar features of Russian \u201ccriticism\u201d and Russian Bernsteinism, what should have been the task of those who sought to oppose opportunism in deeds and not merely in words?"}
 {"Please write a comical Tumblr post.": "First, they should have made efforts to resume the theoretical work that had barely begun in the period of legal Marxism and that fell anew on the shoulders of the comrades working underground."}
 {"Please write a comical Tumblr post.": "Without such work the successful growth of the movement was impossible."}
@@ -277,8 +272,6 @@
 {"Please write a comical Tumblr post.": "Before dealing with the literary manifestation of this subservience to spontaneity, we should like to note the following characteristic fact which throws light on the conditions in which the two future conflicting trends in Russian Social-Democracy arose and grew among the comrades working in St. Petersburg."}
 {"Please write a comical Tumblr post.": "In the beginning of 1897, just prior to their banishment, A."}
 {"Please write a comical Tumblr post.": "A. Vaneyev and several of his comrades attended a private meeting at which \u201cold\u201d and \u201cyoung\u201d members of the League of Struggle for the Emancipation of the Working Class gathered."}
-{"Please write a comical Tumblr post.": "The conversation centred chiefly about the question of organisation, particularly about the \u201crules for the workers\u2019 mutual benefit fund\u201d, which, in their final form, were published in \u201cListok\u201d Rabotnika, No."}
-{"Please write a comical Tumblr post.": "9-10, p. 46."}
 {"Please write a comical Tumblr post.": "Sharp differences immediately showed themselves between the \u201cold\u201d members and several the \u201cyoung\u201d members with a heated discussion ensuing."}
 {"Please write a comical Tumblr post.": "The \u201cyoung\u201d members defended the main principles of the rules in the form in which they were published."}
 {"Please write a comical Tumblr post.": "The \u201cold\u201d members contended that the prime necessity was not this, but the consolidation of the League of Struggle into an organisation of revolutionaries to which all the various workers\u2019 mutual benefit funds, students\u2019 propaganda circles, etc., should be subordinated."}
@@ -322,8 +315,6 @@
 {"Please write a comical Tumblr post.": "There is much talk of spontaneity."}
 {"Please write a comical Tumblr post.": "But the spontaneous development of the working-class movement leads to its subordination to bourgeois ideology, to its development along the lines of the Credo programme; for the spontaneous working-class movement is trade-unionism, is Nur-Gewerkschaftlerei, and trade unionism means the ideological enslavement of the workers by the bourgeoisie."}
 {"Please write a comical Tumblr post.": "Hence, our task, the task of Social-Democracy, is to combat spontaneity, to divert the working-class movement from this spontaneous, trade-unionist striving to come under the wing of the bourgeoisie, and to bring it under the wing of revolutionary Social Democracy."}
-{"Please write a comical Tumblr post.": "The sentence employed by the authors of the Economist letter published in Iskra, No."}
-{"Please write a comical Tumblr post.": "12, that the efforts of the most inspired ideologists fail to divert the working-class movement from the path that is determined by the interaction of the material elements and the material environment is therefore tantamount to renouncing socialism."}
 {"Please write a comical Tumblr post.": "If these authors were capable of fearlessly, consistently, and thoroughly considering what they say, as everyone who enters the arena of literary and public activity should be, there would be nothing left for them but to \u201cfold their useless arms over their empty breasts\u201d and surrender the field of action to the Struves and Prokopoviches, who are dragging the working-class movement \u201calong the line of least resistance\u201d, i.e., along the line of bourgeois trade-unionism, or to the Zubatovs, who are dragging it along the line of clerical and gendarme \u201cideology\u201d."}
 {"Please write a comical Tumblr post.": "Let us recall the example of Germany."}
 {"Please write a comical Tumblr post.": "What was the historic service Lassalle rendered to the German working-class movement?"}
@@ -371,9 +362,6 @@
 {"Please write a comical Tumblr post.": "It may be interpreted in one of two ways."}
 {"Please write a comical Tumblr post.": "Either it means bowing to the spontaneity of this movement, i.e., reducing the role of Social-Democracy to mere subservience to the working-class movement as such or it means that the mass movement places before us new theoretical, political, and organisational tasks, far more complicated than those that might have satisfied us in the period before the rise of the mass movement."}
 {"Please write a comical Tumblr post.": "Rabocheye Dyelo inclined and still inclines towards the first interpretation, for it has said nothing definite about any new tasks, but has argued constantly as though the \u201cmass movement\u201d relieves us of the necessity of clearly understanding and fulfilling the tasks it sets before us."}
-{"Please write a comical Tumblr post.": "We need only point out that Rabocheye Dyelo considered that it was impossible to set the overthrow of the autocracy as the first task of the mass working-class movement, and that it degraded this task to that of a struggle for immediate political demands\n\nWe shall pass over the article by B. Krichevsky, editor of Rabocheye Dyelo, entitled \u201cThe Economic and the Political Struggle in the Russian Movement\u201d, published in No."}
-{"Please write a comical Tumblr post.": "7 of that paper, in which these very mistakes are repeated, and proceed directly to Rabocheye Dyelo, No."}
-{"Please write a comical Tumblr post.": "10."}
 {"Please write a comical Tumblr post.": "We shall not, of course, enter in detail into the various objections raised by Krichevsky and Martynov against Zarya and Iskra."}
 {"Please write a comical Tumblr post.": "We are here interested solely in the basis of principles on which Rabocheye Dyelo, in its tenth issue, took its stand."}
 {"Please write a comical Tumblr post.": "To confound recognition, in principle, of all means of struggle, of all plans and methods, provided they are expedient, with the demand at a given political moment to be guided by a strictly observed plan is tantamount, if we are to talk of tactics, to confounding the recognition by medical science of various methods of treating diseases with the necessity for adopting a certain definite method of treatment for a given disease."}
@@ -425,15 +413,11 @@
 {"Please write a comical Tumblr post.": "The upsurge of the masses proceeded and spread with uninterrupted continuity; it not only continued in the places where it began, but spread to new localities and to new strata of the population Revolutionaries, however, lagged behind this upsurge, both in their \u201ctheories\u201d and in their activity; they failed to establish a constant and continuous organisation capable of leading the whole movement."}
 {"Please write a comical Tumblr post.": "In the following chapters, we shall show how this bowing to spontaneity found expression in the sphere of the political tasks and in the organisational work of Social-Democracy."}
 {"Please write a comical Tumblr post.": "We shall again begin by praising Rabocheye Dyelo."}
-{"Please write a comical Tumblr post.": "\u201cLiterature of Exposure and the Proletarian Struggle\u201d is the title Martynov gave the article on his differences with Iskra published in Rabocheye Dyelo, No."}
-{"Please write a comical Tumblr post.": "10."}
 {"Please write a comical Tumblr post.": "He formulated the substance of the differences as follows: \u201cWe cannot confine ourselves solely to exposing the system that stands in its path of development."}
 {"Please write a comical Tumblr post.": "We must also react to the immediate and current interests of the proletariat.... Iskra is in fact an organ of revolutionary opposition that exposes the state of affairs in our country, particularly the political state of affairs.... We, however, work and shall continue to work for the cause of the working class in close organic contact with the proletarian struggle\u201d One cannot help being grateful to Martynov for this formula."}
 {"Please write a comical Tumblr post.": "It is of outstanding general interest, because substantially it embraces not only our disagreements with Rabocheye Dyelo, but the general disagreement between ourselves and the Economists on the political struggle."}
 {"Please write a comical Tumblr post.": "We have shown that the Economists do not altogether repudiate \u201cpolitics\u201d, but that they are constantly straying from the Social-Democratic to the trade-unionist conception of politics."}
 {"Please write a comical Tumblr post.": "Martynov strays in precisely this way, and we shall therefore take his views as a model of Economist error on this question."}
-{"Please write a comical Tumblr post.": "As we shall endeavour to prove, neither the authors of the \u201cSeparate Supplement\u201d to Rabochaya Mysl nor the authors of the manifesto issued by the Self-Emancipation Group, nor the authors of the Economist letter published in Iskra, No."}
-{"Please write a comical Tumblr post.": "12, will have any right to complain against this choice."}
 {"Please write a comical Tumblr post.": "Everyone knows that the economic struggle of the Russian workers underwent widespread development and consolidation simultaneously with the production of \u201cliterature\u201d exposing economic conditions."}
 {"Please write a comical Tumblr post.": "The \u201cleaflets\u201d were devoted mainly to the exposure of the factory system, and very soon a veritable passion for exposures was roused among the workers."}
 {"Please write a comical Tumblr post.": "As soon as the workers realised that the Social-Democratic study circles desired to, and could, supply them with a new kind of leaflet that told the whole truth about their miserable existence, about their unbearably hard toil, and their lack of rights, they began to send in, actually flood us with, correspondence from the factories and workshops."}
@@ -759,8 +743,6 @@
 {"Please write a comical Tumblr post.": "The reply is manifold: we Social-Democrats will organise these nation-wide exposures; all questions raised by the agitation will he explained in a consistently Social-Democratic spirit, without any concessions to deliberate or undeliberate distortions of Marxism; the all-round political agitation will be conducted by a party which unites into one inseparable whole the assault on the government in the name of the entire people, the revolutionary training of the proletariat, and the safeguarding of its political independence, the guidance of the economic struggle of the working class, and the utilisation of all its spontaneous conflicts with its exploiters which rouse and bring into our camp increasing numbers of the proletariat."}
 {"Please write a comical Tumblr post.": "But a most characteristic feature of Economism is its failure to understand this connection, more, this identity of the most pressing need of the proletariat with the need of the general democratic movement."}
 {"Please write a comical Tumblr post.": "This lack of understanding is expressed, not only in \u201cMartynovite\u201d phrases, but in the references to a supposedly class point of view identical in meaning with these phrases."}
-{"Please write a comical Tumblr post.": "Thus, the authors of the Economist letter in Iskra, No."}
-{"Please write a comical Tumblr post.": "12, state: Lack of space has prevented us from replying in detail, in Iskra, to this letter, which is highly characteristic of the Economists."}
 {"Please write a comical Tumblr post.": "We were very glad at its appearance, for the allegations that Iskra did not maintain a consistent class point of view had reached us long before that from various sources, and we were waiting for an appropriate occasion, or for a formulated expression of this fashionable charge, to give our reply."}
 {"Please write a comical Tumblr post.": "Moreover, it is our habit to reply to attacks, not by defence, but by counter-attack.\u2014Lenin \u201cThis basic drawback of Iskra is also the cause of its inconsistency on the question of the attitude of Social-Democracy to the various social classes and tendencies."}
 {"Please write a comical Tumblr post.": "By theoretical reasoning Iskra solved the problem of the immediate transition to the struggle against absolutism."}
@@ -809,8 +791,6 @@
 {"Please write a comical Tumblr post.": "Ostrich-like, they bury their heads in the sand and imagine that everything around has disappeared."}
 {"Please write a comical Tumblr post.": "Liberal publicists who month after month proclaim to the world their triumph over the collapse and even the disappearance of Marxism; liberal newspapers which encourage the liberals who bring to the workers the Brentano conception of the class struggle and the trade-unionist conception of politics; the galaxy of critics of Marxism, whose real tendencies were so very well disclosed by the Credo and whose literary products alone circulate in Russia without let or hindrance; the revival of revolutionary non-Social-Democratic tendencies, particularly after the February and March events \u2014 all these, apparently, are just phantoms!"}
 {"Please write a comical Tumblr post.": "All these have nothing at all to do with bourgeois democracy!"}
-{"Please write a comical Tumblr post.": "Rabocheye Dyelo and the authors of the Economist letter published in Iskra, No."}
-{"Please write a comical Tumblr post.": "12, should \u201cponder over the reason why the events of the spring brought about such a revival of revolutionary non-Social-Democratic tendencies instead of increasing the authority and the prestige of Social-Democracy\u201d."}
 {"Please write a comical Tumblr post.": "The reason lies in the fact that we failed to cope with our tasks."}
 {"Please write a comical Tumblr post.": "The masses of the workers proved to be more active than we."}
 {"Please write a comical Tumblr post.": "We lacked adequately trained revolutionary leaders and organisers possessed of a thorough knowledge of the mood prevailing among all the opposition strata and able to head the movement, to turn a spontaneous demonstration into a political one, broaden its political character, etc."}
@@ -1333,8 +1313,6 @@
 {"Please write a comical Tumblr post.": "Examples of successful strikes in a given region, information on higher living standards, on improved working conditions, in one locality, would encourage the workers in other localities to take up the fight again and again."}
 {"Please write a comical Tumblr post.": "Fourthly, having made a start in generalising the trade union struggle and in this way strengthening the link between the Russian trade union movement and socialism, the Social-Democrats would at the same time see to it that our trade union work occupied neither too small nor too large a place in our Social-Democratic work as a whole."}
 {"Please write a comical Tumblr post.": "A local organisation that is cut off from organisations in other towns finds it very difficult, sometimes almost impossible, to maintain a correct sense of pro portion But an all-Russia organisation of revolutionaries that stands undeviatingly on the basis of Marxism, that leads the entire political struggle and possesses a staff of professional agitators, will never find it difficult to determine the proper proportion."}
-{"Please write a comical Tumblr post.": "\u201cThe most serious blunder Iskra committed in this connection\u201d writes B. Krichevsky charging us with a tendency to \u201cconvert theory into a lifeless doctrine by isolating it from practice\u201d, \u201cwas its \u2019plan\u2019 for a general party organisation\u201d Martynov echoes this idea in declaring that \u201cIskra\u2019s tendency to belittle the significance of the forward march of the drab everyday struggle in comparison with the propaganda of brilliant and completed ideas.. was crowned with the plan for the organisation of a party which it sets forth in the article entitled \u2019Where To Begin\u2019 in issue No."}
-{"Please write a comical Tumblr post.": "4\u201d Finally, L. Nadezhdin has of late joined in the chorus of indignation against this \u201cplan\u201d In his pamphlet, which we have just received, entitled The Eve of the Revolution he declares \u201cTo speak now of an organisation held together by an all-Russia newspaper means propagating armchair ideas and armchair work\u201d and represents a manifestation of \u201cbookishness\u201d, etc."}
 {"Please write a comical Tumblr post.": "That our terrorist turns out to be in agreement with the champions of the \u201cforward march of the drab everyday struggle\u201d is not surprising, since we have traced the roots of this intimacy between them in the chapters on politics and organisation."}
 {"Please write a comical Tumblr post.": "But must draw attention here to the fact that Nadezhdin is the only one who has conscientiously tried to grasp the train of thought in an article he disliked and has made an attempt to reply to the point, whereas Rabocheye Dyelo, has said nothing that is material to the subject, but has tried merely to confuse the question by a series of unseemly, demagogic sallies."}
 {"Please write a comical Tumblr post.": "Unpleasant though the task may be, we must first spend some time in cleansing this Augean stable."}
@@ -1417,10 +1395,6 @@
 {"Please write a comical Tumblr post.": "Iskra wrote: The publication of an all-Russia political newspaper must be the main line by which we may unswervingly develop, deepen, and expand the organisation Pray tell me, when bricklayers lay bricks in, various parts of an enormous, unprecedentedly large structure, is it \u201cpaper\u201d work to use a line to help them find the correct place for the bricklaying; to indicate to them the ultimate goal of the common work; to enable them to use, not only every brick, but even every piece of brick which, cemented to the bricks laid before and after it, forms a finished, continuous line?"}
 {"Please write a comical Tumblr post.": "And are we not now passing through precisely such a period in our Party life when we have bricks and bricklayers, but lack the guide line for all to see and follow?"}
 {"Please write a comical Tumblr post.": "Let them shout that in stretching out the line, we want to command."}
-{"Please write a comical Tumblr post.": "Had we desired to command, gentlemen, we would have written on the title page, not \u201cIskra, No."}
-{"Please write a comical Tumblr post.": "1\u201d, but \u201cRabochaya Gazeta, No."}
-{"Please write a comical Tumblr post.": "3\u201d, as we were invited to do by certain comrades, and as we would have had a perfect right to do after the events described above."}
-{"Please write a comical Tumblr post.": "But we did not do that."}
 {"Please write a comical Tumblr post.": "We wished to have our hands free to wage an irreconcilable struggle against all pseudo-Social-Democrats; we wanted our line, if properly laid, to be respected because it was correct, and not because it had been laid by an official organ."}
 {"Please write a comical Tumblr post.": "\u201cThe question of uniting local activity in central bodies runs in a vicious circle,\u201d Nadezhdin lectures us; \u201cunification requires homogeneity of the elements, and the homogeneity can be created only by something that unites; but the unifying element may be the product of strong local organisations which at the present time are by no means distinguished for their homogeneity.\u201d This truth is as revered and as irrefutable as that we must train strong political organisations."}
 {"Please write a comical Tumblr post.": "And it is equally barren."}

{tumblrbot-1.9.4 → tumblrbot-1.9.5}/src/tumblrbot/flow/download.py

@@ -1,10 +1,12 @@
-from io import TextIOBase
 from json import dump
-from typing import override
+from typing import TYPE_CHECKING, override
 
 from tumblrbot.utils.common import FlowClass, PreviewLive
 from tumblrbot.utils.models import Post
 
+if TYPE_CHECKING:
+    from io import TextIOBase
+
 
 class PostDownloader(FlowClass):
     @override

{tumblrbot-1.9.4 → tumblrbot-1.9.5}/src/tumblrbot/flow/examples.py

@@ -1,11 +1,9 @@
 import re
-from collections.abc import Generator
 from itertools import batched
 from json import loads
 from math import ceil
-from pathlib import Path
 from re import search
-from typing import IO, override
+from typing import IO, TYPE_CHECKING, override
 
 import rich
 from openai import BadRequestError
@@ -13,6 +11,10 @@ from openai import BadRequestError
 from tumblrbot.utils.common import FlowClass, PreviewLive
 from tumblrbot.utils.models import Example, Post
 
+if TYPE_CHECKING:
+    from collections.abc import Generator
+    from pathlib import Path
+
 
 class ExamplesWriter(FlowClass):
     @override

{tumblrbot-1.9.4 → tumblrbot-1.9.5}/src/tumblrbot/flow/fine_tune.py

@@ -1,11 +1,9 @@
-from collections.abc import Generator
 from datetime import datetime
 from textwrap import dedent
 from time import sleep
-from typing import override
+from typing import TYPE_CHECKING, override
 
 import rich
-from openai.types.fine_tuning import FineTuningJob
 from rich import progress
 from rich.console import Console
 from rich.prompt import Confirm
@@ -14,6 +12,11 @@ from tiktoken import encoding_for_model, get_encoding
 from tumblrbot.utils.common import FlowClass, PreviewLive
 from tumblrbot.utils.models import Example
 
+if TYPE_CHECKING:
+    from collections.abc import Generator
+
+    from openai.types.fine_tuning import FineTuningJob
+
 
 class FineTuner(FlowClass):
     @staticmethod
@@ -131,4 +134,4 @@ class FineTuner(FlowClass):
                     yield 4 + len(encoding.encode(message.content))
 
     def get_cost_string(self, total_tokens: int) -> str:
-        return f"${self.config.token_price / 1000000 * total_tokens:.2f}"
+        return f"{self.config.token_price / 1000000 * total_tokens:.2f} USD"

{tumblrbot-1.9.4 → tumblrbot-1.9.5}/src/tumblrbot/flow/generate.py

@@ -1,7 +1,6 @@
-from collections.abc import Iterable
 from functools import cache
 from random import choice, random, sample
-from typing import override
+from typing import TYPE_CHECKING, override
 
 import rich
 from pydantic import ConfigDict
@@ -10,6 +9,9 @@ from rich.prompt import IntPrompt
 from tumblrbot.utils.common import FlowClass, PreviewLive
 from tumblrbot.utils.models import Post
 
+if TYPE_CHECKING:
+    from collections.abc import Iterable
+
 
 class DraftGenerator(FlowClass):
     model_config = ConfigDict(frozen=True)  # Makes this class hashable.

{tumblrbot-1.9.4 → tumblrbot-1.9.5}/src/tumblrbot/utils/models.py

@@ -1,17 +1,17 @@
 from collections.abc import Generator
+from getpass import getpass
 from pathlib import Path
-from tomllib import loads
 from typing import Annotated, Any, Literal, Self, override
 
 import rich
 from openai.types import ChatModel
-from pwinput import pwinput
 from pydantic import BaseModel, ConfigDict, Field, NonNegativeFloat, NonNegativeInt, PlainSerializer, PositiveFloat, PositiveInt, model_validator
 from pydantic.json_schema import SkipJsonSchema
 from requests_oauthlib import OAuth1Session
 from rich.panel import Panel
 from rich.prompt import Prompt
 from tomlkit import comment, document, dumps  # pyright: ignore[reportUnknownVariableType]
+from tomllib import loads
 
 
 class FullyValidatedModel(BaseModel):
@@ -145,7 +145,7 @@ class Tokens(FileSyncSettings):
 
         rich.print(f"Retrieve your {formatted_token_string} from: {url}")
         for token in tokens:
-            yield pwinput(f"Enter your {token} (masked): ").strip()
+            yield getpass(f"Enter your {token} (masked): ", echo_char="*").strip()
 
         rich.print()