tumblrbot 1.1.2__tar.gz → 1.1.3__tar.gz

{tumblrbot-1.1.2 → tumblrbot-1.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tumblrbot
-Version: 1.1.2
+Version: 1.1.3
 Summary: An updated bot that posts to Tumblr, based on your very own blog!
 Requires-Python: >= 3.13
 Description-Content-Type: text/markdown
@@ -82,8 +82,8 @@ This fork is largely a rewrite of the source code with similarities in its struc
 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.
+- Allow adding arbitrary data to examples.
 
 
 **Please submit an issue or contact us for features you want to added/reimplemented.**

{tumblrbot-1.1.2 → tumblrbot-1.1.3}/README.md

@@ -65,8 +65,8 @@ This fork is largely a rewrite of the source code with similarities in its struc
 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.
+- Allow adding arbitrary data to examples.
 
 
 **Please submit an issue or contact us for features you want to added/reimplemented.**

{tumblrbot-1.1.2 → tumblrbot-1.1.3}/pyproject.toml

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

{tumblrbot-1.1.2 → tumblrbot-1.1.3}/src/tumblrbot/flow/download.py

@@ -7,12 +7,12 @@ 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)
+    def paginate_posts(self, blog_identifier: str, completed: int, after: int, fp: TextIOBase, live: PreviewLive) -> None:
+        task_id = live.progress.add_task(f"Downloading posts from '{blog_identifier}'...", total=None, completed=completed)
 
         while True:
-            response = self.tumblr.retrieve_published_posts(blog_identifier, offset).json()["response"]
-            live.progress.update(task_id, total=response["blog"]["posts"], completed=offset)
+            response = self.tumblr.retrieve_published_posts(blog_identifier, after=after).json()["response"]
+            live.progress.update(task_id, total=response["blog"]["posts"], completed=completed)
 
             if posts := response["posts"]:
                 for post in posts:
@@ -20,11 +20,12 @@ class PostDownloader(UtilClass):
                     fp.write("\n")
 
                     model = Post.model_validate(post)
+                    after = model.timestamp
                     live.custom_update(model)
 
-                offset += len(posts)
+                completed += len(posts)
             else:
-                break
+                return
 
     def get_data_path(self, blog_identifier: str) -> Path:
         return (self.config.data_directory / blog_identifier).with_suffix(".jsonl")
@@ -39,10 +40,19 @@ class PostDownloader(UtilClass):
             for blog_identifier in self.config.download_blog_identifiers:
                 data_path = self.get_data_path(blog_identifier)
 
+                completed = 0
+                after = 0
+                if data_path.exists():
+                    lines = data_path.read_text("utf_8").splitlines() if data_path.exists() else []
+                    completed = len(lines)
+                    if lines:
+                        after = Post.model_validate_json(lines[-1]).timestamp
+
                 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,
+                        completed,
+                        after,
                         fp,
                         live,
                     )

{tumblrbot-1.1.2 → tumblrbot-1.1.3}/src/tumblrbot/utils/models.py

@@ -1,7 +1,7 @@
-from typing import Annotated, Any, Literal, override
+from typing import Any, Literal, override
 
 from openai import BaseModel
-from pydantic import ConfigDict, PlainSerializer
+from pydantic import ConfigDict
 from pydantic.json_schema import SkipJsonSchema
 from rich.panel import Panel
 
@@ -22,11 +22,14 @@ class Post(FullyValidatedModel):
         text: str = ""
         blocks: list[int] = []  # noqa: RUF012
 
-    tags: Annotated[list[str], PlainSerializer(",".join)] = []  # noqa: RUF012
+    timestamp: SkipJsonSchema[int] = 0
+    tags: list[str] = []  # noqa: RUF012
+    state: SkipJsonSchema[Literal["published", "queued", "draft", "private", "unapproved"]] = "published"
+
     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"]] = "published"
+
     is_submission: SkipJsonSchema[bool] = False
 
     def __rich__(self) -> Panel:

{tumblrbot-1.1.2 → tumblrbot-1.1.3}/src/tumblrbot/utils/tumblr.py

@@ -39,7 +39,6 @@ class TumblrClient(OAuth2Session):
 
             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(  # pyright: ignore[reportUnknownMemberType]
@@ -58,21 +57,14 @@ class TumblrClient(OAuth2Session):
         try:
             response.raise_for_status()
         except HTTPError as error:
-            json = response.json()
-            if error_description := json.get("error_description", None):
-                error.add_note(error_description)
-            elif errors := json.get("errors", None):
-                for suberror in errors:
-                    error.add_note(f"{suberror['title']} ({suberror['code']}): {suberror['detail']}")
-            else:
-                error.add_note(str(json))
+            error.add_note(response.text)
             raise
 
-    def retrieve_published_posts(self, blog_identifier: str, offset: int) -> Response:
+    def retrieve_published_posts(self, blog_identifier: str, after: int) -> Response:
         return self.get(
             f"https://api.tumblr.com/v2/blog/{blog_identifier}/posts",
             params={
-                "offset": offset,
+                "after": after,
                 "sort": "asc",
                 "npf": True,
             },