tumblrbot 1.1.0__py3-none-any.whl → 1.1.2__py3-none-any.whl

tumblrbot/__main__.py

@@ -1,5 +1,3 @@
-import sys
-
 from openai import OpenAI
 from rich.prompt import Confirm
 from rich.traceback import install
@@ -8,8 +6,8 @@ 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
-from tumblrbot.utils.tumblr import TumblrClient
 
 
 def main() -> None:
@@ -33,7 +31,3 @@ def main() -> None:
 
         if Confirm.ask("Generate drafts?", default=False):
             DraftGenerator(openai, tumblr).create_drafts()
-
-
-if __name__ == "__main__":
-    sys.exit(main())

tumblrbot/flow/download.py

@@ -2,19 +2,17 @@ from io import TextIOBase
 from json import dump
 from pathlib import Path
 
-from more_itertools import last
-
 from tumblrbot.utils.common import PreviewLive, UtilClass
 from tumblrbot.utils.models import Post
 
 
 class PostDownloader(UtilClass):
-    def paginate_posts(self, blog_name: str, before: int, completed: int, fp: TextIOBase, live: PreviewLive) -> None:
-        task_id = live.progress.add_task(f"Downloading posts from '{blog_name}'...", total=None, completed=completed)
+    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_name, before).json()["response"]
-            live.progress.update(task_id, total=response["blog"]["posts"])
+            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:
@@ -22,15 +20,14 @@ class PostDownloader(UtilClass):
                     fp.write("\n")
 
                     model = Post.model_validate(post)
-                    before = model.timestamp
-
-                    live.progress.update(task_id, advance=1)
                     live.custom_update(model)
+
+                offset += len(posts)
             else:
                 break
 
-    def get_data_path(self, blog_name: str) -> Path:
-        return (self.config.data_directory / blog_name).with_suffix(".jsonl")
+    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))
@@ -39,15 +36,13 @@ class PostDownloader(UtilClass):
         self.config.data_directory.mkdir(parents=True, exist_ok=True)
 
         with PreviewLive() as live:
-            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 []
+            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_name,
-                        Post.model_validate_json(last(lines, "{}")).timestamp,
-                        len(lines),
+                        blog_identifier,
+                        len(data_path.read_text("utf_8").splitlines()) if data_path.exists() else 0,
                         fp,
                         live,
                     )

tumblrbot/flow/fine_tune.py

@@ -82,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)
@@ -101,5 +101,5 @@ class FineTuner(UtilClass):
             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/flow/generate.py

@@ -30,7 +30,10 @@ class DraftGenerator(UtilClass):
 
     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
@@ -42,7 +45,7 @@ class DraftGenerator(UtilClass):
             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.upload_blog_identifier, 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}")

tumblrbot/utils/models.py

@@ -18,16 +18,15 @@ class FullyValidatedModel(BaseModel):
 
 class Post(FullyValidatedModel):
     class Block(FullyValidatedModel):
-        type: str = "text"
+        type: str = ""
         text: str = ""
-        blocks: set[int] = set()  # noqa: RUF012
+        blocks: list[int] = []  # 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
-    state: SkipJsonSchema[Literal["published", "queued", "draft", "private", "unapproved"]] = "draft"
-    timestamp: SkipJsonSchema[int] = 0
+    state: SkipJsonSchema[Literal["published", "queued", "draft", "private", "unapproved"]] = "published"
     is_submission: SkipJsonSchema[bool] = False
 
     def __rich__(self) -> Panel:
@@ -45,7 +44,7 @@ class Post(FullyValidatedModel):
         indices: set[int] = set()
         for block in self.layout:
             if block.type == "ask":
-                indices |= block.blocks
+                indices.update(block.blocks)
 
         self.content = [block for i, block in enumerate(self.content) if i not in indices and block.type == "text"]
 
@@ -55,7 +54,7 @@ class Post(FullyValidatedModel):
 
 class Example(FullyValidatedModel):
     class Message(FullyValidatedModel):
-        role: str
+        role: Literal["developer", "user", "assistant"]
         content: str
 
     messages: list[Message]

tumblrbot/utils/settings.py

@@ -7,7 +7,7 @@ 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
+from tomlkit import comment, document, dumps  # pyright: ignore[reportUnknownVariableType]
 
 if TYPE_CHECKING:
     from _typeshed import StrPath

tumblrbot/utils/tumblr.py

@@ -16,7 +16,7 @@ class TumblrClient(OAuth2Session):
     tokens: Tokens
 
     def __post_init__(self) -> None:
-        super().__init__(
+        super().__init__(  # pyright: ignore[reportUnknownMemberType]
             self.tokens.tumblr_client_id.get_secret_value(),
             auto_refresh_url="https://api.tumblr.com/v2/oauth2/token",
             auto_refresh_kwargs={
@@ -35,14 +35,14 @@ class TumblrClient(OAuth2Session):
         super().__enter__()
 
         if not self.tokens.tumblr_token.get_secret_value():
-            authorization_url, _ = self.authorization_url("https://tumblr.com/oauth2/authorize")
+            authorization_url, _ = self.authorization_url("https://tumblr.com/oauth2/authorize")  # pyright: ignore[reportUnknownMemberType]
 
             rich.print(f"Please go to {authorization_url} and authorize access.")
             authorization_response = Prompt.ask("Enter the full callback URL")
             rich.print("\n")
 
             self.token_saver(
-                self.fetch_token(
+                self.fetch_token(  # pyright: ignore[reportUnknownMemberType]
                     "https://api.tumblr.com/v2/oauth2/token",
                     authorization_response=authorization_response,
                     client_secret=self.tokens.tumblr_client_secret.get_secret_value(),
@@ -68,17 +68,18 @@ class TumblrClient(OAuth2Session):
                 error.add_note(str(json))
             raise
 
-    def create_draft_post(self, blog_name: str, post: Post) -> Response:
-        return self.post(
-            f"https://api.tumblr.com/v2/blog/{blog_name}/posts",
-            json=post.model_dump(mode="json"),
-        )
-
-    def retrieve_published_posts(self, blog_name: str, before: int) -> Response:
+    def retrieve_published_posts(self, blog_identifier: str, offset: int) -> Response:
         return self.get(
-            f"https://api.tumblr.com/v2/blog/{blog_name}/posts",
+            f"https://api.tumblr.com/v2/blog/{blog_identifier}/posts",
             params={
-                "before": before,
+                "offset": offset,
+                "sort": "asc",
                 "npf": True,
             },
         )
+
+    def create_post(self, blog_identifier: str, post: Post) -> Response:
+        return self.post(
+            f"https://api.tumblr.com/v2/blog/{blog_identifier}/posts",
+            json=post.model_dump(mode="json"),
+        )

{tumblrbot-1.1.0.dist-info → tumblrbot-1.1.2.dist-info}/METADATA

@@ -1,11 +1,9 @@
 Metadata-Version: 2.4
 Name: tumblrbot
-Version: 1.1.0
+Version: 1.1.2
 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
@@ -15,8 +13,7 @@ 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
+Project-URL: Source, https://github.com/MaidThatPrograms/tumblrbot
 
 [OpenAI]: https://pypi.org/project/openai
 [Python]: https://python.org/download
@@ -32,15 +29,12 @@ Project-URL: Repository, https://github.com/MaidThatPrograms/tumblrbot
 [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)
+[![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.
@@ -89,6 +83,7 @@ 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.**
@@ -99,16 +94,15 @@ To-Do:
    - 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`
+   - On Linux, you will have to make a virtual environment.
 
 ## Usage
-If you cloned the repo, either:
-   - Double-click `__main__.py` in the root directory.
-   - Run `python __main__.py` in the root directory.
+Run `tumblrbot` from anywhere. Run `tumblrbot --help` for command-line options.
+
+## Obtaining Tokens
+> WIP
 
-If you installed through [Pip]:
-   - Run `tumblrbot` from anywhere.
+## Configuration
+> WIP
 
-## More Information
-   - WIP

tumblrbot-1.1.2.dist-info/RECORD

@@ -0,0 +1,16 @@
+tumblrbot/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tumblrbot/__main__.py,sha256=RSvzROxs8hi_0sOyKsnZtV2-S3T-lPeJuDwULGN1-2U,1509
+tumblrbot/flow/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tumblrbot/flow/download.py,sha256=FsiYJSyinFZi5wHvRL6WQCURmTDzrJ4XgThJkaRFPxw,1911
+tumblrbot/flow/examples.py,sha256=vCJ6KH-kqlmi7zW-jk6fQqSGDkYnXHplTmTmIUC-Xj0,4168
+tumblrbot/flow/fine_tune.py,sha256=AWBxlHfQDDIGku1oZaaMNQtNw3yOaScq6QMgI8sJhd0,3836
+tumblrbot/flow/generate.py,sha256=6b6-Hzqek0AO6i7ceX-mapJfOKLYx6FOqEvHItjg5kU,2088
+tumblrbot/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tumblrbot/utils/common.py,sha256=3PPyutv7yyjvij5anyKQRDRn7lrr8Eu05m8XVhh74Hc,1342
+tumblrbot/utils/models.py,sha256=to4k0b1O0bYNXe_4zx5Vupxtb-739U3nMSGgJLJ3gto,1975
+tumblrbot/utils/settings.py,sha256=yC2srfEw8Kl0z-jDOkc9qWfRkutTzZFfg3uRzfjSGAQ,6507
+tumblrbot/utils/tumblr.py,sha256=tFrGwHY3FsX2kWNiLteettXpnWgqNpzPCQImtEpND2M,3283
+tumblrbot-1.1.2.dist-info/entry_points.txt,sha256=lTiN7PxAbyGY1fpCWApEw6NUIUgobfcOKhvn6cu3IQA,53
+tumblrbot-1.1.2.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+tumblrbot-1.1.2.dist-info/METADATA,sha256=kt0nqEXCBMJ1GZJy1dM6FJsUG0spk-cA9imfKXWrzM4,4590
+tumblrbot-1.1.2.dist-info/RECORD,,

tumblrbot-1.1.0.dist-info/RECORD

@@ -1,17 +0,0 @@
-tumblrbot/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tumblrbot/__main__.py,sha256=TYgj7eH1quLfs9m5mT2oPfrRNP5hou_Bk8zzfGCQp9o,1577
-tumblrbot/flow/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tumblrbot/flow/download.py,sha256=TytuTjductHi_mQ0i84jWdlpXxHC3PwIfd0c0Np63fM,2081
-tumblrbot/flow/examples.py,sha256=vCJ6KH-kqlmi7zW-jk6fQqSGDkYnXHplTmTmIUC-Xj0,4168
-tumblrbot/flow/fine_tune.py,sha256=_bu2Ra5kZAtQqgcNmROIuiTkpCc6YhKngob-42S87l0,3795
-tumblrbot/flow/generate.py,sha256=a_xHj3xh3fPoT1BvX0QNsAOxR3TnANVZ443kxQyyR8k,2041
-tumblrbot/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tumblrbot/utils/common.py,sha256=3PPyutv7yyjvij5anyKQRDRn7lrr8Eu05m8XVhh74Hc,1342
-tumblrbot/utils/models.py,sha256=2M7nLVTcwdmOxQ64tcAoTW5vNfEEa7Z3syD5jfFz1uY,1974
-tumblrbot/utils/settings.py,sha256=h7LfuIdZ8r7ZQL0TevNfoiO6AZINUAwhg5ufkEn3Tp0,6461
-tumblrbot/utils/tumblr.py,sha256=vJVtOU4Z_xOILpjGjZPmJLyan1DD8KamMDvsY65SHUc,3101
-tumblrbot-1.1.0.dist-info/entry_points.txt,sha256=lTiN7PxAbyGY1fpCWApEw6NUIUgobfcOKhvn6cu3IQA,53
-tumblrbot-1.1.0.dist-info/licenses/UNLICENSE,sha256=8Bl77UGlO95Tuu1FjTzqAPr-UU_A11XBQdPct1-E3qE,1236
-tumblrbot-1.1.0.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-tumblrbot-1.1.0.dist-info/METADATA,sha256=H8eLKfdX3wjBQSoBpRKsbkbKL7eBB5n67rQXealO8_E,4820
-tumblrbot-1.1.0.dist-info/RECORD,,

tumblrbot-1.1.0.dist-info/licenses/UNLICENSE

@@ -1,24 +0,0 @@
-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/>