tumblrbot 1.3.0__tar.gz → 1.3.1__tar.gz

{tumblrbot-1.3.0 → tumblrbot-1.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tumblrbot
-Version: 1.3.0
+Version: 1.3.1
 Summary: An updated bot that posts to Tumblr, based on your very own blog!
 Requires-Python: >= 3.13
 Description-Content-Type: text/markdown

{tumblrbot-1.3.0 → tumblrbot-1.3.1}/pyproject.toml

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

{tumblrbot-1.3.0 → tumblrbot-1.3.1}/src/tumblrbot/flow/examples.py

@@ -53,7 +53,7 @@ class ExamplesWriter(FlowClass):
             with data_path.open(encoding="utf_8") as fp:
                 for line in fp:
                     post = Post.model_validate_json(line)
-                    if not (post.is_submission or post.trail) and post.only_text_blocks() and post.get_response_content():
+                    if not (post.is_submission or post.trail) and post.only_text_blocks() and post.get_content_text():
                         yield post
 
     def get_filtered_posts(self) -> Generator[Post]:
@@ -68,7 +68,7 @@ class ExamplesWriter(FlowClass):
                     ceil(len(posts) / chunk_size),
                     description="Removing flagged posts...",
                 ):
-                    response = self.openai.moderations.create(input=["\n".join(post.get_text_content()) for post in chunk])
+                    response = self.openai.moderations.create(input=list(map(Post.get_content_text, chunk)))
                     for post, moderation in zip(chunk, response.results, strict=True):
                         if moderation.flagged:
                             removed += 1
@@ -89,11 +89,9 @@ class ExamplesWriter(FlowClass):
 
         with self.config.examples_file.open("w", encoding="utf_8") as fp:
             for post in self.get_filtered_posts():
-                ask_content, response_content = post.get_text_content()
-
                 self.write_example(
-                    ask_content or self.config.user_message,
-                    response_content,
+                    self.config.user_message,
+                    post.get_content_text(),
                     fp,
                 )
 

{tumblrbot-1.3.0 → tumblrbot-1.3.1}/src/tumblrbot/flow/fine_tune.py

@@ -46,14 +46,16 @@ class FineTuner(FlowClass):
 
         return job
 
-    def create_job(self) -> FineTuningJob:
+    def create_job(self, live: PreviewLive) -> FineTuningJob:
         if self.config.job_id:
             return self.poll_job_status()
 
-        file = self.openai.files.create(
-            file=self.config.examples_file,
-            purpose="fine-tune",
-        )
+        with live.progress.open(self.config.examples_file, "rb", description=f"Uploading {self.config.examples_file}...") as fp:
+            file = self.openai.files.create(
+                file=fp,
+                purpose="fine-tune",
+            )
+
         job = self.openai.fine_tuning.jobs.create(
             model=self.config.base_model,
             training_file=file.id,
@@ -63,18 +65,18 @@ class FineTuner(FlowClass):
         return job
 
     def fine_tune(self) -> None:
-        job = self.create_job()
+        with PreviewLive() as live:
+            job = self.create_job(live)
 
-        self.dedent_print(f"""
-            [bold]Fine-tuning is starting...[/]
-            View it online at: https://platform.openai.com/finetune/{job.id}
-                Created at: {datetime.fromtimestamp(job.created_at)}
-                Base Model: {job.model}
+            self.dedent_print(f"""
+                [bold]Fine-tuning is starting...[/]
+                View it online at: https://platform.openai.com/finetune/{job.id}
+                    Created at: {datetime.fromtimestamp(job.created_at)}
+                    Base Model: {job.model}
 
-            [italic dim]Closing this terminal will not stop the fine-tuning. This will take a while...
-        """)  # noqa: DTZ006
+                [italic dim]Closing this terminal will not stop the fine-tuning. This will take a while...
+            """)  # noqa: DTZ006
 
-        with PreviewLive() as live:
             task_id = live.progress.add_task("", total=None)
 
             while job.status not in {"succeeded", "failed", "cancelled"}:

{tumblrbot-1.3.0 → tumblrbot-1.3.1}/src/tumblrbot/flow/generate.py

@@ -10,10 +10,10 @@ class DraftGenerator(FlowClass):
     def generate_tags(self, content: Post.Block) -> Post | None:
         if random() < self.config.tags_chance:  # noqa: S311
             return self.openai.responses.parse(
-                input=content.text,
+                input=f"Extract the most important subjects from the following text:\n\n{content.text}",
                 model=self.config.base_model,
                 text_format=Post,
-                instructions="You are an advanced text summarization tool. Extract the most important subjects.",
+                instructions="You are an advanced text summarization tool. You return the requested data to the user as a list of comma-separated strings.",
                 temperature=0.5,
             ).output_parsed
 

{tumblrbot-1.3.0 → tumblrbot-1.3.1}/src/tumblrbot/utils/config.py

@@ -43,9 +43,9 @@ class Config(BaseSettings):
     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.")
+    token_price: PositiveFloat = Field(3, 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.")
+    base_model: ChatModel = Field("gpt-4o-mini-2024-07-18", 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_message: str = Field("Please write a comical Tumblr post.", description="The user input used by the OpenAI API to generate drafts.")
 

{tumblrbot-1.3.0 → tumblrbot-1.3.1}/src/tumblrbot/utils/models.py

@@ -102,25 +102,22 @@ class Post(FullyValidatedModel):
 
     def __rich__(self) -> Panel:
         return Panel(
-            self.get_text_content(),
+            self.get_content_text(),
             title="Preview",
             subtitle=" ".join(f"#{tag}" for tag in self.tags),
             subtitle_align="left",
         )
 
-    @override
-    def model_post_init(self, context: object) -> None:
-        super().model_post_init(context)
+    def only_text_blocks(self) -> bool:
+        return all(block.type == "text" for block in self.content)
 
-        indices: set[int] = set()
+    def get_content_text(self) -> str:
+        blocks = dict(enumerate(block.text for block in self.content))
         for block in self.layout:
             if block.type == "ask":
-                indices.update(block.blocks)
-
-        self.content = [block for i, block in enumerate(self.content) if i not in indices and block.type == "text"]
-
-    def get_text_content(self) -> str:
-        return "\n\n".join(block.text for block in self.content)
+                for i in block.blocks:
+                    del blocks[i]
+        return "\n\n".join(blocks.values())
 
 
 class Example(FullyValidatedModel):