tumblrbot 1.0.0__tar.gz → 1.1.1__tar.gz

tumblrbot-1.1.1/.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "pip" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"

tumblrbot-1.1.1/.gitignore

@@ -0,0 +1,215 @@
+# 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
+
+# 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
+
+# Cursor
+#  Cursor is an AI-powered code editor. `.cursorignore` specifies files/directories to
+#  exclude from AI features like autocomplete and code analysis. Recommended for sensitive data
+#  refer to https://docs.cursor.com/context/ignore-files
+.cursorignore
+.cursorindexingignore
+
+# Marimo
+marimo/_static/
+marimo/_lsp/
+__marimo__/
+
+# Streamlit
+.streamlit/secrets.toml
+
+# Custom
+data
+*.toml
+*.jsonl

tumblrbot-1.1.1/PKG-INFO

@@ -0,0 +1,15 @@
+Metadata-Version: 2.4
+Name: tumblrbot
+Version: 1.1.1
+Summary: An updated bot that posts to Tumblr, based on your very own blog!
+Requires-Python: >= 3.13
+Requires-Dist: more-itertools
+Requires-Dist: openai
+Requires-Dist: pydantic
+Requires-Dist: pydantic-settings
+Requires-Dist: requests
+Requires-Dist: requests-oauthlib
+Requires-Dist: rich
+Requires-Dist: tiktoken
+Requires-Dist: tomlkit
+Project-URL: Source, https://github.com/MaidThatPrograms/tumblrbot

tumblrbot-1.1.1/README.md

@@ -0,0 +1,90 @@
+[OpenAI]: https://pypi.org/project/openai
+[Python]: https://python.org/download
+[Rich]: https://pypi.org/project/rich
+
+[gpt-4.1-nano-2025-04-14]: https://platform.openai.com/docs/models/gpt-4.1-nano
+[Moderation API]: https://platform.openai.com/docs/api-reference/moderations
+[New Post Format]: https://tumblr.com/docs/npf
+[OAuth 2.0]: https://www.tumblr.com/docs/en/api/v2#oauth2-authorization
+[pip]: https://pypi.org
+
+[Download]: tumblrbot/flow/download.py
+[Examples]: tumblrbot/flow/examples.py
+[Fine-Tune]: tumblrbot/flow/fine_tune.py
+[Generate]: tumblrbot/flow/generate.py
+[Settings]: tumblrbot/utils/settings.py
+[Main]: __main__.py
+[README.md]: README.md
+
+# tumblrbot
+[![PyPI - Version](https://img.shields.io/pypi/v/tumblrbot)](https://python.org/pypi/tumblrbot)
+
+Description of original project:
+> 4tv-tumblrbot was a collaborative project I embarked on with my close friend Dima, who goes by @smoqueen on Tumblr. The aim of this endeavor was straightforward yet silly: to develop a Tumblr bot powered by a machine-learning model. This bot would be specifically trained on the content from a particular Tumblr blog or a selected set of blogs, allowing it to mimic the style, tone, and thematic essence of the original posts.
+
+This fork is largely a rewrite of the source code with similarities in its structure and process:
+- Updates:
+   - Updated to [OAuth 2.0].
+   - Updated to the [New Post Format].
+   - Updated to the latest version of [OpenAI].
+   - Updated the [base model version][Settings] to [gpt-4.1-nano-2025-04-14].
+- Removed features:
+   - [Generation][Generate]:
+      - Removed clearing drafts behavior.
+   - [Training][Examples]:
+      - Removed exports that had HTML or reblogs.
+      - Removed special word-replacement behavior.
+      - Removed filtering by year.
+   - Removed setup and related files.
+- Changed/Added features:
+   - [Generation][Generate]:
+      - Added a link to the blog's draft page.
+      - Added error checking for uploading drafts.
+   - [Training][Examples]:
+      - Added the option to [Download] the latest posts from the [specified blogs][Settings].
+      - Added the option to remove posts flagged by the [Moderation API].
+      - Added the option to automatically [Fine-Tune] the examples on the [specified base model][Settings].
+      - Changed to now escape examples automatically.
+      - Set encoding for reading post data to `UTF-8` to fix decoding errors.
+      - Added newlines between paragraphs.
+      - Removed "ALT", submission, ask, and poll text from posts.
+      - Improved the estimated token counts and costs.
+   - Changed to [Rich] for output.
+      - Added progress bars.
+      - Added post previews.
+      - Added color, formatting, and more information to output.
+   - Created a [guided utility][Main] for every step of building your bot blog.
+   - Maid scripts wait for user input before the console closes.
+   - Added comand-line options to override [Settings] options.
+   - Added behavior to regenerate the default [config.toml][Settings] and [env.toml][Settings] if missing.
+   - Renamed several files.
+   - Renamed several [Settings] options.
+   - Changed the value of several [Settings] options.
+   - Added full type-checking coverage (fully importable from third-party scripts).
+
+To-Do:
+- Add documentation.
+- Finish updating [README.md].
+- Look into places more-itertools can help.
+- Change the differences list to instead just be a list of features.
+
+
+**Please submit an issue or contact us for features you want to added/reimplemented.**
+
+## Installation
+1. Install the latest version of [Python]:
+   - Windows: `winget install python3`
+   - Linux (apt): `apt install python-pip`
+   - Linux (pacman): `pacman install python-pip`
+1. Install the [pip] package: `pip install tumblrbot`
+   - 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.
+
+## Usage
+Run `tumblrbot` from anywhere. Run `tumblrbot --help` for command-line options.
+
+## Obtaining Tokens
+> WIP
+
+## Configuration
+> WIP

{tumblrbot-1.0.0 → tumblrbot-1.1.1}/UNLICENSE

@@ -1,24 +1,24 @@
-This is free and unencumbered software released into the public domain.
-
-Anyone is free to copy, modify, publish, use, compile, sell, or
-distribute this software, either in source code form or as a compiled
-binary, for any purpose, commercial or non-commercial, and by any
-means.
-
-In jurisdictions that recognize copyright laws, the author or authors
-of this software dedicate any and all copyright interest in the
-software to the public domain. We make this dedication for the benefit
-of the public at large and to the detriment of our heirs and
-successors. We intend this dedication to be an overt act of
-relinquishment in perpetuity of all present and future rights to this
-software under copyright law.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-For more information, please refer to <https://unlicense.org/>
+This is free and unencumbered software released into the public domain.
+
+Anyone is free to copy, modify, publish, use, compile, sell, or
+distribute this software, either in source code form or as a compiled
+binary, for any purpose, commercial or non-commercial, and by any
+means.
+
+In jurisdictions that recognize copyright laws, the author or authors
+of this software dedicate any and all copyright interest in the
+software to the public domain. We make this dedication for the benefit
+of the public at large and to the detriment of our heirs and
+successors. We intend this dedication to be an overt act of
+relinquishment in perpetuity of all present and future rights to this
+software under copyright law.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+For more information, please refer to <https://unlicense.org>

{tumblrbot-1.0.0 → tumblrbot-1.1.1}/pyproject.toml

@@ -1,11 +1,8 @@
 [project]
 name = "tumblrbot"
-version = "1.0.0"
+version = "1.1.1"
 description = "An updated bot that posts to Tumblr, based on your very own blog!"
-readme = "README.md"
 requires-python = ">= 3.13"
-license = "Unlicense"
-license-files = ["UNLICENSE"]
 dependencies = [
   "more-itertools",
   "openai",
@@ -19,12 +16,11 @@ dependencies = [
 ]
 
 [project.urls]
-Issues = "https://github.com/MaidThatPrograms/tumblrbot/issues"
-Repository = "https://github.com/MaidThatPrograms/tumblrbot"
+Source = "https://github.com/MaidThatPrograms/tumblrbot"
 
 [project.scripts]
 tumblrbot = "tumblrbot.__main__:main"
 
 [build-system]
-requires = ["flit_core >=3.11,<4"]
-build-backend = "flit_core.buildapi"
+requires = ["hatchling"]
+build-backend = "hatchling.build"

tumblrbot-1.1.1/src/tumblrbot/__main__.py

@@ -0,0 +1,33 @@
+from openai import OpenAI
+from rich.prompt import Confirm
+from rich.traceback import install
+
+from tumblrbot.flow.download import PostDownloader
+from tumblrbot.flow.examples import ExamplesWriter
+from tumblrbot.flow.fine_tune import FineTuner
+from tumblrbot.flow.generate import DraftGenerator
+from tumblrbot.utils.common import TumblrClient
+from tumblrbot.utils.settings import Tokens
+
+
+def main() -> None:
+    install()
+    tokens = Tokens()
+    with OpenAI(api_key=tokens.openai_api_key.get_secret_value()) as openai, TumblrClient(tokens) as tumblr:
+        post_downloader = PostDownloader(openai, tumblr)
+        if Confirm.ask("Download latest posts?", default=False):
+            post_downloader.download()
+        download_paths = post_downloader.get_data_paths()
+
+        examples_writer = ExamplesWriter(openai, tumblr, download_paths)
+        if Confirm.ask("Create training data?", default=False):
+            examples_writer.write_examples()
+        estimated_tokens = sum(examples_writer.count_tokens())
+
+        fine_tuner = FineTuner(openai, tumblr, estimated_tokens)
+        fine_tuner.print_estimates()
+        if Confirm.ask("Upload data to OpenAI for fine-tuning? [bold]You must do this to set the model to generate drafts from. Alternatively, manually enter a model into the config.", default=False):
+            fine_tuner.fine_tune()
+
+        if Confirm.ask("Generate drafts?", default=False):
+            DraftGenerator(openai, tumblr).create_drafts()

tumblrbot-1.1.1/src/tumblrbot/flow/download.py

@@ -0,0 +1,48 @@
+from io import TextIOBase
+from json import dump
+from pathlib import Path
+
+from tumblrbot.utils.common import PreviewLive, UtilClass
+from tumblrbot.utils.models import Post
+
+
+class PostDownloader(UtilClass):
+    def paginate_posts(self, blog_identifier: str, offset: int, fp: TextIOBase, live: PreviewLive) -> None:
+        task_id = live.progress.add_task(f"Downloading posts from '{blog_identifier}'...", total=None, completed=offset)
+
+        while True:
+            response = self.tumblr.retrieve_published_posts(blog_identifier, offset).json()["response"]
+            live.progress.update(task_id, total=response["blog"]["posts"], completed=offset)
+
+            if posts := response["posts"]:
+                for post in posts:
+                    dump(post, fp)
+                    fp.write("\n")
+
+                    model = Post.model_validate(post)
+                    live.custom_update(model)
+
+                offset += len(posts)
+            else:
+                break
+
+    def get_data_path(self, blog_identifier: str) -> Path:
+        return (self.config.data_directory / blog_identifier).with_suffix(".jsonl")
+
+    def get_data_paths(self) -> list[Path]:
+        return list(map(self.get_data_path, self.config.download_blog_identifiers))
+
+    def download(self) -> None:
+        self.config.data_directory.mkdir(parents=True, exist_ok=True)
+
+        with PreviewLive() as live:
+            for blog_identifier in self.config.download_blog_identifiers:
+                data_path = self.get_data_path(blog_identifier)
+
+                with data_path.open("a", encoding="utf_8") as fp:
+                    self.paginate_posts(
+                        blog_identifier,
+                        len(data_path.read_text("utf_8").splitlines()) if data_path.exists() else 0,
+                        fp,
+                        live,
+                    )

{tumblrbot-1.0.0 → tumblrbot-1.1.1}/src/tumblrbot/flow/examples.py

@@ -28,7 +28,7 @@ class ExamplesWriter(UtilClass):
             encoding = get_encoding("o200k_base")
             Console(stderr=True, style="logging.level.warning").print(f"[Warning] Using encoding '{encoding.name}': {''.join(error.args)}\n")
 
-        with self.config.training.output_file.open(encoding="utf_8") as fp:
+        with self.config.examples_file.open(encoding="utf_8") as fp:
             for line in fp:
                 example = Example.model_validate_json(line)
                 yield len(encoding.encode("assistant"))  # every reply is primed with <|start|>assistant<|message|>
@@ -77,8 +77,8 @@ class ExamplesWriter(UtilClass):
             yield from posts
 
     def write_examples(self) -> None:
-        self.config.training.output_file.parent.mkdir(parents=True, exist_ok=True)
-        with self.config.training.output_file.open("w", encoding="utf_8") as fp:
+        self.config.examples_file.parent.mkdir(parents=True, exist_ok=True)
+        with self.config.examples_file.open("w", encoding="utf_8") as fp:
             for post in self.get_filtered_posts():
                 example = Example(
                     messages=[
@@ -89,4 +89,4 @@ class ExamplesWriter(UtilClass):
                 )
                 fp.write(f"{example.model_dump_json()}\n")
 
-        rich.print(f"[bold]The examples file can be found at: '{self.config.training.output_file}'\n")
+        rich.print(f"[bold]The examples file can be found at: '{self.config.examples_file}'\n")

{tumblrbot-1.0.0 → tumblrbot-1.1.1}/src/tumblrbot/flow/fine_tune.py

@@ -24,22 +24,19 @@ class FineTuner(UtilClass):
                 Cost: {self.get_cost_string(job.trained_tokens)}
             """)
 
-        self.config.training.job_id = ""
-        self.config.model_post_init()
+        self.config.job_id = ""
 
         if job.status == "failed" and job.error is not None:
             raise RuntimeError(job.error.message)
 
         if job.fine_tuned_model:
-            self.config.generation.fine_tuned_model = job.fine_tuned_model or ""
-            self.config.model_post_init()
+            self.config.fine_tuned_model = job.fine_tuned_model or ""
 
     def poll_job_status(self) -> FineTuningJob:
-        job = self.openai.fine_tuning.jobs.retrieve(self.config.training.job_id)
+        job = self.openai.fine_tuning.jobs.retrieve(self.config.job_id)
 
-        if self.config.training.expected_epochs != job.hyperparameters.n_epochs and isinstance(job.hyperparameters.n_epochs, int):
-            self.config.training.expected_epochs = job.hyperparameters.n_epochs
-            self.config.model_post_init()
+        if self.config.expected_epochs != job.hyperparameters.n_epochs and isinstance(job.hyperparameters.n_epochs, int):
+            self.config.expected_epochs = job.hyperparameters.n_epochs
 
             self.dedent_print(f"""
                 The number of epochs has been updated to {job.hyperparameters.n_epochs}!
@@ -50,11 +47,11 @@ class FineTuner(UtilClass):
         return job
 
     def create_job(self) -> FineTuningJob:
-        if self.config.training.job_id:
+        if self.config.job_id:
             return self.poll_job_status()
 
         file = self.openai.files.create(
-            file=self.config.training.output_file,
+            file=self.config.examples_file,
             purpose="fine-tune",
         )
         job = self.openai.fine_tuning.jobs.create(
@@ -62,8 +59,7 @@ class FineTuner(UtilClass):
             training_file=file.id,
         )
 
-        self.config.training.job_id = job.id
-        self.config.model_post_init()
+        self.config.job_id = job.id
         return job
 
     def fine_tune(self) -> None:
@@ -86,7 +82,7 @@ class FineTuner(UtilClass):
 
                 live.progress.update(
                     task_id,
-                    description=f"Fine-tuning: {job.status}...",
+                    description=f"Fine-tuning: [italic]{job.status.replace('_', ' ').title()}[/]...",
                 )
 
                 sleep(1)
@@ -94,16 +90,16 @@ class FineTuner(UtilClass):
         self.process_completed_job(job)
 
     def get_cost_string(self, total_tokens: int) -> str:
-        return f"${self.config.training.token_price / 1000000 * total_tokens:.2f}"
+        return f"${self.config.token_price / 1000000 * total_tokens:.2f}"
 
     def print_estimates(self) -> None:
-        total_tokens = self.config.training.expected_epochs * self.estimated_tokens
+        total_tokens = self.config.expected_epochs * self.estimated_tokens
         cost_string = self.get_cost_string(total_tokens)
 
         self.dedent_print(f"""
             Tokens {self.estimated_tokens:,}:
-            Total tokens for [bold orange1]{self.config.training.expected_epochs}[/] epoch(s): {total_tokens:,}
+            Total tokens for [bold orange1]{self.config.expected_epochs}[/] epoch(s): {total_tokens:,}
             Expected cost when trained with [bold purple]{self.config.base_model}[/]: {cost_string}
             NOTE: Token values are approximate and may not be 100% accurate, please be aware of this when using the data.
-                    [italic red]Neither Amelia nor Mutsumi are responsible for any inaccuracies in the token count or estimated price.[/]
+                    [italic red]Amelia, Mutsumi, and Marin are not responsible for any inaccuracies in the token count or estimated price.[/]
         """)

{tumblrbot-1.0.0 → tumblrbot-1.1.1}/src/tumblrbot/flow/generate.py

@@ -8,7 +8,7 @@ from tumblrbot.utils.models import Post
 
 class DraftGenerator(UtilClass):
     def generate_tags(self, content: Post.Block) -> Post | None:
-        if random() < self.config.generation.tags_chance:  # noqa: S311
+        if random() < self.config.tags_chance:  # noqa: S311
             return self.openai.responses.parse(
                 input=content.text,
                 model=self.config.base_model,
@@ -23,29 +23,32 @@ class DraftGenerator(UtilClass):
         content = self.openai.responses.create(
             input=self.config.user_input,
             instructions=self.config.developer_message,
-            model=self.config.generation.fine_tuned_model,
+            model=self.config.fine_tuned_model,
         ).output_text
 
         return Post.Block(type="text", text=content)
 
     def generate_post(self) -> Post:
         content = self.generate_content()
-        post = Post(content=[content])
+        post = Post(
+            content=[content],
+            state="draft",
+        )
         if tags := self.generate_tags(content):
             post.tags = tags.tags
         return post
 
     def create_drafts(self) -> None:
-        message = f"View drafts here: https://tumblr.com/blog/{self.config.generation.blog_name}/drafts"
+        message = f"View drafts here: https://tumblr.com/blog/{self.config.upload_blog_identifier}/drafts"
 
         with PreviewLive() as live:
-            for i in live.progress.track(range(self.config.generation.draft_count), description="Generating drafts..."):
+            for i in live.progress.track(range(self.config.draft_count), description="Generating drafts..."):
                 try:
                     post = self.generate_post()
-                    self.tumblr.create_draft_post(self.config.generation.blog_name, post)
+                    self.tumblr.create_post(self.config.upload_blog_identifier, post)
                     live.custom_update(post)
                 except BaseException as exc:
                     exc.add_note(f"📉 An error occurred! Generated {i} draft(s) before failing. {message}")
                     raise
 
-        rich.print(f":chart_increasing: [bold green]Generated {self.config.generation.draft_count} draft(s).[/] {message}")
+        rich.print(f":chart_increasing: [bold green]Generated {self.config.draft_count} draft(s).[/] {message}")