tumblrbot 1.5.0__tar.gz → 1.6.0__tar.gz

{tumblrbot-1.5.0 → tumblrbot-1.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tumblrbot
-Version: 1.5.0
+Version: 1.6.0
 Summary: An updated bot that posts to Tumblr, based on your very own blog!
 Requires-Python: >= 3.13
 Description-Content-Type: text/markdown
@@ -73,14 +73,14 @@ Features:
    1. [Generates and uploads posts][Generate] to the [configured][config] [Tumblr] blog using the [configured][config] fine-tuned model.
       - Creates tags by extracting keywords at the [configured][config] frequency using the [configured][config] model.
       - Uploads posts as drafts to the [configured][config] [Tumblr] blog.
+      - Reblog posts at the [configured][config] frequency.
       - Shows progress and previews the current post.
 - Colorful output, progress bars, and post previews using [rich].
 - Automatically keeps the [config] file up-to-date and recreates it if missing.
 
 **To-Do:**
 
-- Add code documentation.
-- Add reblog generation logic.
+- ...
 
 **Known Issues:**
 

{tumblrbot-1.5.0 → tumblrbot-1.6.0}/README.md

@@ -55,14 +55,14 @@ Features:
    1. [Generates and uploads posts][Generate] to the [configured][config] [Tumblr] blog using the [configured][config] fine-tuned model.
       - Creates tags by extracting keywords at the [configured][config] frequency using the [configured][config] model.
       - Uploads posts as drafts to the [configured][config] [Tumblr] blog.
+      - Reblog posts at the [configured][config] frequency.
       - Shows progress and previews the current post.
 - Colorful output, progress bars, and post previews using [rich].
 - Automatically keeps the [config] file up-to-date and recreates it if missing.
 
 **To-Do:**
 
-- Add code documentation.
-- Add reblog generation logic.
+- ...
 
 **Known Issues:**
 

{tumblrbot-1.5.0 → tumblrbot-1.6.0}/pyproject.toml

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

{tumblrbot-1.5.0 → tumblrbot-1.6.0}/src/tumblrbot/flow/generate.py

@@ -1,4 +1,4 @@
-from random import random
+from random import random, randrange
 from typing import override
 
 import rich
@@ -28,18 +28,28 @@ class DraftGenerator(FlowClass):
         rich.print(f":chart_increasing: [bold green]Generated {self.config.draft_count} draft(s).[/] {message}")
 
     def generate_post(self) -> Post:
-        text = self.generate_text()
+        if random() < self.config.reblog_chance:  # noqa: S311
+            original = self.get_random_post()
+            user_message = f"{self.config.reblog_user_message}\n\n{original.get_content_text()}"
+        else:
+            original = Post()
+            user_message = self.config.user_message
+
+        text = self.generate_text(user_message)
         if tags := self.generate_tags(text):
             tags = tags.tags
         return Post(
             content=[Post.Block(type="text", text=text)],
             tags=tags or [],
             state="draft",
+            parent_tumblelog_uuid=original.blog.uuid,
+            parent_post_id=original.id,
+            reblog_key=original.reblog_key,
         )
 
-    def generate_text(self) -> str:
+    def generate_text(self, user_message: str) -> str:
         return self.openai.responses.create(
-            input=self.config.user_message,
+            input=user_message,
             instructions=self.config.developer_message,
             model=self.config.fine_tuned_model,
         ).output_text
@@ -54,3 +64,11 @@ class DraftGenerator(FlowClass):
             ).output_parsed
 
         return None
+
+    def get_random_post(self) -> Post:
+        total = self.tumblr.retrieve_blog_info(self.config.upload_blog_identifier).response.blog.posts
+        post = self.tumblr.retrieve_published_posts(
+            self.config.upload_blog_identifier,
+            offset=randrange(total),  # noqa: S311
+        ).response.posts[0]
+        return Post.model_validate(post)

{tumblrbot-1.5.0 → tumblrbot-1.6.0}/src/tumblrbot/utils/models.py

@@ -74,6 +74,8 @@ class Config(FileSyncSettings):
     draft_count: PositiveInt = Field(150, description="The number of drafts to process. This will affect the number of tokens used with OpenAI")
     tags_chance: NonNegativeFloat = Field(0.1, description="The chance to generate tags for any given post. This will incur extra calls to OpenAI.")
     tags_developer_message: str = Field("You will be provided with a block of text, and your task is to extract a very short list of the most important subjects from it.", description="The developer message used to generate tags.")
+    reblog_chance: NonNegativeFloat = Field(0.05, description="The chance to generate a reblog of a random post.")
+    reblog_user_message: str = Field("Please write a comical Tumblr post in response to the following Tumblr post:", description="The prefix for the user message used to reblog posts.")
 
     @classmethod
     @override
@@ -100,7 +102,7 @@ class Config(FileSyncSettings):
 
             toml_table[name] = value
 
-        Path(self.toml_file).write_text(tomlkit.dumps(toml_table), encoding="utf_8")
+        self.toml_file.write_text(tomlkit.dumps(toml_table), encoding="utf_8")
 
         return self
 
@@ -170,12 +172,14 @@ class Tokens(FileSyncSettings):
         return self
 
 
+class Blog(FullyValidatedModel):
+    posts: int = 0
+    uuid: str = ""
+
+
 class ResponseModel(FullyValidatedModel):
     class Response(FullyValidatedModel):
-        class Blog(FullyValidatedModel):
-            posts: int
-
-        blog: Blog = Blog(posts=0)
+        blog: Blog = Blog()
         posts: list[Any] = []
 
     response: Response
@@ -183,12 +187,18 @@ class ResponseModel(FullyValidatedModel):
 
 class Post(FullyValidatedModel):
     class Block(FullyValidatedModel):
-        type: str
+        type: str = ""
         text: str = ""
         blocks: list[int] = []
 
+    blog: SkipJsonSchema[Blog] = Blog()
+    id: SkipJsonSchema[int] = 0
+    parent_tumblelog_uuid: SkipJsonSchema[str] = ""
+    parent_post_id: SkipJsonSchema[int] = 0
+    reblog_key: SkipJsonSchema[str] = ""
+
     timestamp: SkipJsonSchema[int] = 0
-    tags: Annotated[list[str], PlainSerializer(",".join)]
+    tags: Annotated[list[str], PlainSerializer(",".join)] = []
     state: SkipJsonSchema[Literal["published", "queued", "draft", "private", "unapproved"]] = "published"
 
     content: SkipJsonSchema[list[Block]] = []

{tumblrbot-1.5.0 → tumblrbot-1.6.0}/src/tumblrbot/utils/tumblr.py

@@ -22,20 +22,25 @@ class TumblrSession(OAuth1Session):
             error.add_note(response.text)
             raise
 
-    def retrieve_published_posts(self, blog_identifier: str, after: int) -> ResponseModel:
+    def retrieve_blog_info(self, blog_identifier: str) -> ResponseModel:
+        response = self.get(f"https://api.tumblr.com/v2/blog/{blog_identifier}/info")
+        return ResponseModel.model_validate_json(response.text)
+
+    def retrieve_published_posts(self, blog_identifier: str, offset: int | None = None, after: int | None = None) -> ResponseModel:
         response = self.get(
             f"https://api.tumblr.com/v2/blog/{blog_identifier}/posts",
             params={
+                "offset": offset,
                 "after": after,
                 "sort": "asc",
                 "npf": True,
             },
         )
-        return ResponseModel.model_validate_json(response.content)
+        return ResponseModel.model_validate_json(response.text)
 
     def create_post(self, blog_identifier: str, post: Post) -> ResponseModel:
         response = self.post(
             f"https://api.tumblr.com/v2/blog/{blog_identifier}/posts",
             json=post.model_dump(),
         )
-        return ResponseModel.model_validate_json(response.content)
+        return ResponseModel.model_validate_json(response.text)