tumblrbot 1.3.1__py3-none-any.whl → 1.3.2__py3-none-any.whl

tumblrbot/flow/fine_tune.py

@@ -4,7 +4,10 @@ from textwrap import dedent
 from time import sleep
 
 import rich
+from openai import BadRequestError
+from openai.types import FileObject
 from openai.types.fine_tuning import FineTuningJob
+from tenacity import retry, retry_if_exception_type, stop_after_attempt, wait_fixed, wait_random
 
 from tumblrbot.utils.common import FlowClass, PreviewLive
 
@@ -46,6 +49,18 @@ class FineTuner(FlowClass):
 
         return job
 
+    @retry(
+        stop=stop_after_attempt(5),
+        wait=wait_fixed(1.5) + wait_random(),
+        retry=retry_if_exception_type(BadRequestError),
+        reraise=True,
+    )
+    def attempt_submit_job(self, file: FileObject) -> FineTuningJob:
+        return self.openai.fine_tuning.jobs.create(
+            model=self.config.base_model,
+            training_file=file.id,
+        )
+
     def create_job(self, live: PreviewLive) -> FineTuningJob:
         if self.config.job_id:
             return self.poll_job_status()
@@ -56,10 +71,7 @@ class FineTuner(FlowClass):
                 purpose="fine-tune",
             )
 
-        job = self.openai.fine_tuning.jobs.create(
-            model=self.config.base_model,
-            training_file=file.id,
-        )
+        job = self.attempt_submit_job(file)
 
         self.config.job_id = job.id
         return job
@@ -84,6 +96,7 @@ class FineTuner(FlowClass):
 
                 live.progress.update(
                     task_id,
+                    total=job.estimated_finish,
                     description=f"Fine-tuning: [italic]{job.status.replace('_', ' ').title()}[/]...",
                 )
 

tumblrbot/utils/config.py

@@ -5,7 +5,7 @@ from typing import TYPE_CHECKING, Self, override
 import rich
 import tomlkit
 from openai.types import ChatModel
-from pydantic import Field, PositiveFloat, PositiveInt, Secret, model_validator
+from pydantic import Field, NonNegativeFloat, PositiveFloat, PositiveInt, Secret, model_validator
 from pydantic_settings import BaseSettings, PydanticBaseSettingsSource, SettingsConfigDict, TomlConfigSettingsSource
 from rich.prompt import Prompt
 from tomlkit import comment, document
@@ -32,7 +32,7 @@ class Config(BaseSettings):
         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.")
+    tags_chance: NonNegativeFloat = 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(
         [],

tumblrbot/utils/models.py

@@ -109,15 +109,10 @@ class Post(FullyValidatedModel):
         )
 
     def only_text_blocks(self) -> bool:
-        return all(block.type == "text" for block in self.content)
+        return all(block.type == "text" for block in self.content) and not any(block.type == "ask" for block in self.layout)
 
     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":
-                for i in block.blocks:
-                    del blocks[i]
-        return "\n\n".join(blocks.values())
+        return "\n\n".join(block.text for block in self.content)
 
 
 class Example(FullyValidatedModel):

{tumblrbot-1.3.1.dist-info → tumblrbot-1.3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tumblrbot
-Version: 1.3.1
+Version: 1.3.2
 Summary: An updated bot that posts to Tumblr, based on your very own blog!
 Requires-Python: >= 3.13
 Description-Content-Type: text/markdown
@@ -12,6 +12,7 @@ Requires-Dist: pydantic-settings
 Requires-Dist: requests
 Requires-Dist: requests-oauthlib
 Requires-Dist: rich
+Requires-Dist: tenacity
 Requires-Dist: tiktoken
 Requires-Dist: tomlkit
 Project-URL: Source, https://github.com/MaidThatPrograms/tumblrbot
@@ -57,7 +58,6 @@ Features:
       - Filters out posts that contain more than just text data.
       - Filters out any posts flagged by the [OpenAI] [Moderation API] (optional).
          - Shows progress and previews the current post.
-      - Formats asks as the user message and the responses as the assistant response.
       - Adds custom user messages and assistant responses to the dataset from the [configured][config] file.
    1. Provides cost estimates if the currently saved examples are used to fine-tune the [configured][config] model.
    1. [Uploads examples][Fine-Tune] to [OpenAI] and begins the fine-tuning process.
@@ -90,11 +90,14 @@ Features:
 Run `tumblrbot` from anywhere. Run `tumblrbot --help` for command-line options. Every command-line option corresponds to a value from the [config](#configuration).
 
 ## Obtaining Tokens
-- The [OpenAI] API token can be created [here](https://platform.openai.com/settings/organization/api-keys).
+### OpenAI
+API token can be created [here](https://platform.openai.com/settings/organization/api-keys).
    1. Leave everything at the defaults and set `Project` to `Default Project`.
    1. Press `Create secret key`.
    1. Press `Copy` to copy the API token to your clipboard.
-- The [Tumblr] API tokens can be created [here](https://tumblr.com/oauth/apps).
+
+### Tumblr
+API tokens can be created [here](https://tumblr.com/oauth/apps).
    1. Press `+ Register Application`.
    1. Enter anything for `Application Name` and `Application Description`.
    1. Enter any URL for `Application Website` and `Default callback URL`, like `https://example.com`.

{tumblrbot-1.3.1.dist-info → tumblrbot-1.3.2.dist-info}/RECORD

@@ -3,14 +3,14 @@ tumblrbot/__main__.py,sha256=uth-d5QsXa-BilOHrgh7Dky4431RLIf9-SS44FFvyOA,1516
 tumblrbot/flow/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tumblrbot/flow/download.py,sha256=CzGv3gpVKFqB0mEbFGk0tJmtwRZM8isvJ7pOPqVfIY0,2307
 tumblrbot/flow/examples.py,sha256=QQWrPo8g6KRFmEaydnk91fBjI2a7ey3vlxsgecuF2yk,4947
-tumblrbot/flow/fine_tune.py,sha256=jPKMub46pM4MxczUf1oLwNqxs5vtjoNu4noW9E7RIY4,4016
+tumblrbot/flow/fine_tune.py,sha256=q5J1fL5ICjL7B72ceHRRbArj345DA0mX0_f6DYX5P4Q,4538
 tumblrbot/flow/generate.py,sha256=PeMMfTLD41iLBbVnNhvdM2UzyOtoTK3OS0R4YLxZjMA,2214
 tumblrbot/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tumblrbot/utils/common.py,sha256=GjyTJmU3NEjxr6Bhta-RmKlvboH4Qhi8Si6Yw5N8BGo,1340
-tumblrbot/utils/config.py,sha256=LOApMYHAggHT2rIhrPY72zf6szT7bwB33oSm4lKtEy8,5001
-tumblrbot/utils/models.py,sha256=elYGUMw42knx4Shrp2bBkPEuy7V_wFBgEzdzpKlEu7U,5415
+tumblrbot/utils/config.py,sha256=32AiFIYXzlNG1K-I_zjflfiEjHJ9uUhfm3OcYzNgv_I,5030
+tumblrbot/utils/models.py,sha256=KmJIxTLZNcrd5sNwN2ldKVr8JGlmcSksH6v8e9zFWkg,5275
 tumblrbot/utils/tumblr.py,sha256=z4kdtHSRx89AQPlLpQ_Vcdfs3tZToFS89k6QKeBu42s,1243
-tumblrbot-1.3.1.dist-info/entry_points.txt,sha256=lTiN7PxAbyGY1fpCWApEw6NUIUgobfcOKhvn6cu3IQA,53
-tumblrbot-1.3.1.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-tumblrbot-1.3.1.dist-info/METADATA,sha256=NCDCJAA7yRAcFC6slOViAGTxGq37WUh3yEQ5vPX2Lbg,6232
-tumblrbot-1.3.1.dist-info/RECORD,,
+tumblrbot-1.3.2.dist-info/entry_points.txt,sha256=lTiN7PxAbyGY1fpCWApEw6NUIUgobfcOKhvn6cu3IQA,53
+tumblrbot-1.3.2.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+tumblrbot-1.3.2.dist-info/METADATA,sha256=KjZINv3bcH64q5SXIB9VJMEkQR4X0bifUf-2q6mgr6I,6163
+tumblrbot-1.3.2.dist-info/RECORD,,