tumblrbot 1.0.0__tar.gz → 1.1.0__tar.gz

tumblrbot-1.1.0/PKG-INFO

@@ -0,0 +1,114 @@
+Metadata-Version: 2.4
+Name: tumblrbot
+Version: 1.1.0
+Summary: An updated bot that posts to Tumblr, based on your very own blog!
+Requires-Python: >= 3.13
+Description-Content-Type: text/markdown
+License-Expression: Unlicense
+License-File: UNLICENSE
+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: Issues, https://github.com/MaidThatPrograms/tumblrbot/issues
+Project-URL: Repository, https://github.com/MaidThatPrograms/tumblrbot
+
+[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
+[Utils]: tumblrbot/utils/common.py
+[Models]: tumblrbot/utils/models.py
+[Settings]: tumblrbot/utils/settings.py
+[Tumblr]: tumblrbot/utils/tumblr.py
+[Main]: __main__.py
+[README.md]: README.md
+
+# tumblrbot
+![PyPI](https://img.shields.io/pypi/v/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.
+
+
+**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`
+   - On Linux, you will have to make a virtual environment.
+   - Alternatively, you can install from this repository: `pip install git+https://github.com/MaidThatPrograms/tumblrbot.git`
+
+## Usage
+If you cloned the repo, either:
+   - Double-click `__main__.py` in the root directory.
+   - Run `python __main__.py` in the root directory.
+
+If you installed through [Pip]:
+   - Run `tumblrbot` from anywhere.
+
+## More Information
+   - WIP

tumblrbot-1.1.0/README.md

@@ -0,0 +1,94 @@
+[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
+[Utils]: tumblrbot/utils/common.py
+[Models]: tumblrbot/utils/models.py
+[Settings]: tumblrbot/utils/settings.py
+[Tumblr]: tumblrbot/utils/tumblr.py
+[Main]: __main__.py
+[README.md]: README.md
+
+# tumblrbot
+![PyPI](https://img.shields.io/pypi/v/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.
+
+
+**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`
+   - On Linux, you will have to make a virtual environment.
+   - Alternatively, you can install from this repository: `pip install git+https://github.com/MaidThatPrograms/tumblrbot.git`
+
+## Usage
+If you cloned the repo, either:
+   - Double-click `__main__.py` in the root directory.
+   - Run `python __main__.py` in the root directory.
+
+If you installed through [Pip]:
+   - Run `tumblrbot` from anywhere.
+
+## More Information
+   - WIP

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

@@ -1,6 +1,6 @@
 [project]
 name = "tumblrbot"
-version = "1.0.0"
+version = "1.1.0"
 description = "An updated bot that posts to Tumblr, based on your very own blog!"
 readme = "README.md"
 requires-python = ">= 3.13"

tumblrbot-1.1.0/src/tumblrbot/__main__.py

@@ -0,0 +1,39 @@
+import sys
+
+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.settings import Tokens
+from tumblrbot.utils.tumblr import TumblrClient
+
+
+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()
+
+
+if __name__ == "__main__":
+    sys.exit(main())

{tumblrbot-1.0.0 → tumblrbot-1.1.0}/src/tumblrbot/flow/download.py

@@ -30,16 +30,16 @@ class PostDownloader(UtilClass):
                 break
 
     def get_data_path(self, blog_name: str) -> Path:
-        return (self.config.training.data_directory / blog_name).with_suffix(".jsonl")
+        return (self.config.data_directory / blog_name).with_suffix(".jsonl")
 
     def get_data_paths(self) -> list[Path]:
-        return list(map(self.get_data_path, self.config.training.blog_names))
+        return list(map(self.get_data_path, self.config.download_blog_identifiers))
 
     def download(self) -> None:
-        self.config.training.data_directory.mkdir(parents=True, exist_ok=True)
+        self.config.data_directory.mkdir(parents=True, exist_ok=True)
 
         with PreviewLive() as live:
-            for blog_name in self.config.training.blog_names:
+            for blog_name in self.config.download_blog_identifiers:
                 data_path = self.get_data_path(blog_name)
                 lines = data_path.read_text("utf_8").splitlines() if data_path.exists() else []
 

{tumblrbot-1.0.0 → tumblrbot-1.1.0}/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.0}/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:
@@ -94,15 +90,15 @@ 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.[/]

{tumblrbot-1.0.0 → tumblrbot-1.1.0}/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,7 +23,7 @@ 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)
@@ -36,16 +36,16 @@ class DraftGenerator(UtilClass):
         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_draft_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}")

{tumblrbot-1.0.0 → tumblrbot-1.1.0}/src/tumblrbot/utils/models.py

@@ -22,7 +22,7 @@ class Post(FullyValidatedModel):
         text: str = ""
         blocks: set[int] = set()  # noqa: RUF012
 
-    tags: Annotated[set[str], PlainSerializer(",".join)] = set()  # noqa: RUF012
+    tags: Annotated[list[str], PlainSerializer(",".join)] = []  # noqa: RUF012
     content: SkipJsonSchema[list[Block]] = []  # noqa: RUF012
     layout: SkipJsonSchema[list[Block]] = []  # noqa: RUF012
     trail: SkipJsonSchema[list[Any]] = []  # noqa: RUF012

tumblrbot-1.1.0/src/tumblrbot/utils/settings.py

@@ -0,0 +1,131 @@
+from collections.abc import Generator, Sequence
+from pathlib import Path
+from typing import TYPE_CHECKING, Any, Self, override
+
+import rich
+from openai.types import ChatModel
+from pydantic import Field, PositiveFloat, PositiveInt, Secret, model_validator
+from pydantic_settings import BaseSettings, PydanticBaseSettingsSource, SettingsConfigDict, TomlConfigSettingsSource
+from rich.prompt import Prompt
+from tomlkit import comment, document, dumps
+
+if TYPE_CHECKING:
+    from _typeshed import StrPath
+
+
+class TOMLSettings(BaseSettings):
+    model_config = SettingsConfigDict(
+        extra="ignore",
+        validate_assignment=True,
+        validate_return=True,
+        validate_by_name=True,
+    )
+
+    @override
+    @classmethod
+    def settings_customise_sources(cls, settings_cls: type[BaseSettings], *args: PydanticBaseSettingsSource, **kwargs: PydanticBaseSettingsSource) -> tuple[PydanticBaseSettingsSource, ...]:
+        return (TomlConfigSettingsSource(settings_cls),)
+
+    @model_validator(mode="after")
+    def write_to_file(self) -> Self:
+        # Make sure to call this if updating values in nested models.
+        toml_files = self.model_config.get("toml_file")
+        if isinstance(toml_files, (Path, str)):
+            self.dump_toml(toml_files)
+        elif isinstance(toml_files, Sequence):
+            for toml_file in toml_files:
+                self.dump_toml(toml_file)
+
+        return self
+
+    def dump_toml(self, toml_file: "StrPath") -> None:
+        toml_table = document()
+
+        dumped_model = self.model_dump(mode="json")
+        for name, field in self.__class__.model_fields.items():
+            if field.description:
+                for line in field.description.split(". "):
+                    toml_table.add(comment(f"{line.removesuffix('.')}."))
+
+            value = getattr(self, name)
+            toml_table[name] = value.get_secret_value() if isinstance(value, Secret) else dumped_model[name]
+
+        Path(toml_file).write_text(
+            dumps(toml_table),
+            encoding="utf_8",
+        )
+
+
+class Config(TOMLSettings):
+    model_config = SettingsConfigDict(
+        cli_parse_args=True,
+        cli_avoid_json=True,
+        cli_kebab_case=True,
+        toml_file="config.toml",
+    )
+
+    fine_tuned_model: str = Field("", description="The name of the OpenAI model that was fine-tuned with your posts.")
+    upload_blog_identifier: str = Field(
+        "",
+        description="The identifier of the blog which generated drafts will be uploaded to. This must be a blog associated with the same account as the configured Tumblr secret tokens.",
+    )
+    draft_count: PositiveInt = Field(150, description="The number of drafts to process. This will affect the number of tokens used with OpenAI")
+    tags_chance: float = Field(0.1, description="The chance to generate tags for any given post. This will incur extra calls to OpenAI.")
+
+    download_blog_identifiers: list[str] = Field(
+        [],
+        description="The identifiers of the blogs which post data will be downloaded from. These must be blogs associated with the same account as the configured Tumblr secret tokens.",
+    )
+    data_directory: Path = Field(Path("data"), description="Where to store downloaded post data.")
+    examples_file: Path = Field(Path("examples.jsonl"), description="Where to output the examples that will be used to fine-tune the model.")
+    job_id: str = Field("", description="The fine-tuning job ID that will be polled on next run.")
+    expected_epochs: PositiveInt = Field(3, description="The expected number of epochs fine-tuning will be run for. This will be updated during fine-tuning.")
+    token_price: PositiveFloat = Field(1.50, description="The expected price in USD per million tokens during fine-tuning for the current model.")
+
+    base_model: ChatModel = Field("gpt-4.1-nano-2025-04-14", description="The name of the model that will be fine-tuned by the generated training data.")
+    developer_message: str = Field("You are a Tumblr post bot. Please generate a Tumblr post in accordance with the user's request.", description="The developer message used by the OpenAI API to generate drafts.")
+    user_input: str = Field("Please write a comical Tumblr post.", description="The user input used by the OpenAI API to generate drafts.")
+
+    @override
+    def model_post_init(self, context: object) -> None:
+        super().model_post_init(context)
+
+        if not self.download_blog_identifiers:
+            rich.print("Enter the [cyan]identifiers of your blogs[/] that data should be [bold purple]downloaded[/] from, separated by commas.")
+            self.download_blog_identifiers = list(map(str.strip, Prompt.ask("[bold]Example: staff.tumblr.com,changes").split(",")))
+
+        if not self.upload_blog_identifier:
+            rich.print("Enter the [cyan]identifier of your blog[/] that drafts should be [bold purple]uploaded[/] to.")
+            self.upload_blog_identifier = Prompt.ask("[bold]Examples: staff.tumblr.com or changes").strip()
+
+
+class Tokens(TOMLSettings):
+    model_config = SettingsConfigDict(toml_file="env.toml")
+
+    openai_api_key: Secret[str] = Secret("")
+
+    tumblr_client_id: Secret[str] = Secret("")
+    tumblr_client_secret: Secret[str] = Secret("")
+    tumblr_token: Secret[Any] = Secret({})
+
+    @staticmethod
+    def online_token_prompt(url: str, *tokens: str) -> Generator[Secret[str]]:
+        formatted_tokens = [f"[cyan]{token}[/]" for token in tokens]
+        formatted_token_string = " and ".join(formatted_tokens)
+
+        rich.print(f"Retrieve your {formatted_token_string} from: {url}")
+        for token in formatted_tokens:
+            prompt = f"Enter your {token} [yellow](hidden)"
+            yield Secret(Prompt.ask(prompt, password=True).strip())
+
+        rich.print()
+
+    @override
+    def model_post_init(self, context: object) -> None:
+        super().model_post_init(context)
+
+        if not self.openai_api_key.get_secret_value():
+            (self.openai_api_key,) = self.online_token_prompt("https://platform.openai.com/api-keys", "API key")
+
+        if not (self.tumblr_client_id.get_secret_value() and self.tumblr_client_secret.get_secret_value()):
+            self.tumblr_client_id, self.tumblr_client_secret = self.online_token_prompt("https://tumblr.com/oauth/apps", "consumer key", "consumer secret")

{tumblrbot-1.0.0 → tumblrbot-1.1.0}/src/tumblrbot/utils/tumblr.py

@@ -17,11 +17,15 @@ class TumblrClient(OAuth2Session):
 
     def __post_init__(self) -> None:
         super().__init__(
-            self.tokens.tumblr.client_id.get_secret_value(),
+            self.tokens.tumblr_client_id.get_secret_value(),
             auto_refresh_url="https://api.tumblr.com/v2/oauth2/token",
-            auto_refresh_kwargs=self.tokens.tumblr.model_dump(mode="json"),
+            auto_refresh_kwargs={
+                "client_id": self.tokens.tumblr_client_id.get_secret_value(),
+                "client_secret": self.tokens.tumblr_client_secret.get_secret_value(),
+                "token": self.tokens.tumblr_token.get_secret_value(),
+            },
             scope=["basic", "write", "offline_access"],
-            token=self.tokens.tumblr.token.get_secret_value(),
+            token=self.tokens.tumblr_token.get_secret_value(),
             token_updater=self.token_saver,
         )
 
@@ -30,7 +34,7 @@ class TumblrClient(OAuth2Session):
     def __enter__(self) -> Self:
         super().__enter__()
 
-        if not self.tokens.tumblr.token.get_secret_value():
+        if not self.tokens.tumblr_token.get_secret_value():
             authorization_url, _ = self.authorization_url("https://tumblr.com/oauth2/authorize")
 
             rich.print(f"Please go to {authorization_url} and authorize access.")
@@ -41,15 +45,14 @@ class TumblrClient(OAuth2Session):
                 self.fetch_token(
                     "https://api.tumblr.com/v2/oauth2/token",
                     authorization_response=authorization_response,
-                    client_secret=self.tokens.tumblr.client_secret.get_secret_value(),
+                    client_secret=self.tokens.tumblr_client_secret.get_secret_value(),
                 ),
             )
 
         return self
 
     def token_saver(self, token: object) -> None:
-        self.tokens.tumblr.token = Secret(token)
-        self.tokens.model_post_init()
+        self.tokens.tumblr_token = Secret(token)
 
     def response_hook(self, response: Response, **_: object) -> None:
         try: