tumblrbot 1.9.6__tar.gz → 1.9.7__tar.gz

{tumblrbot-1.9.6 → tumblrbot-1.9.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tumblrbot
-Version: 1.9.6
+Version: 1.9.7
 Summary: An updated bot that posts to Tumblr, based on your very own blog!
 Requires-Python: >= 3.14
 Description-Content-Type: text/markdown
@@ -12,8 +12,10 @@ Requires-Dist: rich
 Requires-Dist: tenacity
 Requires-Dist: tiktoken
 Requires-Dist: tomlkit
+Requires-Dist: pyinstaller ; extra == "dev"
 Project-URL: Funding, https://ko-fi.com/maidscientistizutsumimarin
 Project-URL: Source, https://github.com/MaidScientistIzutsumiMarin/tumblrbot
+Provides-Extra: dev
 
 # tumblrbot
 
@@ -38,7 +40,6 @@ Project-URL: Source, https://github.com/MaidScientistIzutsumiMarin/tumblrbot
 [Tumblr]: https://tumblr.com
 [Tumblr Tokens]: https://tumblr.com/oauth/apps
 [Tumblr API Documentation on Blog Identifiers]: https://tumblr.com/docs/en/api/v2#blog-identifiers
-[Tumblr API Documentation on Rate Limits]: https://tumblr.com/docs/en/api/v2#rate-limits
 
 [Format String]: https://docs.python.org/3/library/string.html#format-string-syntax
 
@@ -92,10 +93,9 @@ Features:
   - You can use regular expressions to filter out training data in the [config][configurable]. This is more of a brute-force solution, but it can work if the other solutions do not.
   - You can try limiting your dataset by specifying fewer blogs to download from or limiting the number of posts taken from each one in the [config][configurable].
   - If all else fails, you can manually remove data from the examples file until it passes. It is unfortunately not a definitive resource, but it can help to read about what the [OpenAI moderation API flags][Flags].
-- Sometimes, you will get an error about the training file not being found when starting fine-tuning. We do not currently have a fix or workaround for this. You should instead use the online portal for fine-tuning if this continues to happen. Read more in [fine-tuning].
-- Post counts are incorrect when downloading posts. We are not certain what the cause of this is, but our tests suggest this is a [Tumblr] API problem that is giving inaccurate numbers.
-- During post downloading or post generation, you may receive a “Limit Exceeded” error message from the [Tumblr] API. This is caused by server-side rate-limiting by [Tumblr]. The only workaround is trying again or waiting for a period of time before retrying. In most cases, you either have to wait for a minute or an hour for the limits to reset. You can read more about the limits in the [Tumblr API documentation on rate limits].
-- Similar to the above issue, you may sometimes get a message saying your IP is blocked. This block is temporary and probably follows the same rules as previously described.
+- Sometimes, you will get an error about the training file not being found when starting fine-tuning. We do not currently have a fix or workaround for this. You should instead use the online portal for fine-tuning if this continues to happen. Read more in [fine-tuning]
+  - *We are unsure if this is still happening.*
+- Post counts are incorrect when downloading posts. Our tests suggest this is a [Tumblr] API problem that is giving inaccurate numbers, so treat them as estimates.
 
 **Please submit an issue or contact us for features you want added/reimplemented.**
 

{tumblrbot-1.9.6 → tumblrbot-1.9.7}/README.md

@@ -21,7 +21,6 @@
 [Tumblr]: https://tumblr.com
 [Tumblr Tokens]: https://tumblr.com/oauth/apps
 [Tumblr API Documentation on Blog Identifiers]: https://tumblr.com/docs/en/api/v2#blog-identifiers
-[Tumblr API Documentation on Rate Limits]: https://tumblr.com/docs/en/api/v2#rate-limits
 
 [Format String]: https://docs.python.org/3/library/string.html#format-string-syntax
 
@@ -75,10 +74,9 @@ Features:
   - You can use regular expressions to filter out training data in the [config][configurable]. This is more of a brute-force solution, but it can work if the other solutions do not.
   - You can try limiting your dataset by specifying fewer blogs to download from or limiting the number of posts taken from each one in the [config][configurable].
   - If all else fails, you can manually remove data from the examples file until it passes. It is unfortunately not a definitive resource, but it can help to read about what the [OpenAI moderation API flags][Flags].
-- Sometimes, you will get an error about the training file not being found when starting fine-tuning. We do not currently have a fix or workaround for this. You should instead use the online portal for fine-tuning if this continues to happen. Read more in [fine-tuning].
-- Post counts are incorrect when downloading posts. We are not certain what the cause of this is, but our tests suggest this is a [Tumblr] API problem that is giving inaccurate numbers.
-- During post downloading or post generation, you may receive a “Limit Exceeded” error message from the [Tumblr] API. This is caused by server-side rate-limiting by [Tumblr]. The only workaround is trying again or waiting for a period of time before retrying. In most cases, you either have to wait for a minute or an hour for the limits to reset. You can read more about the limits in the [Tumblr API documentation on rate limits].
-- Similar to the above issue, you may sometimes get a message saying your IP is blocked. This block is temporary and probably follows the same rules as previously described.
+- Sometimes, you will get an error about the training file not being found when starting fine-tuning. We do not currently have a fix or workaround for this. You should instead use the online portal for fine-tuning if this continues to happen. Read more in [fine-tuning]
+  - *We are unsure if this is still happening.*
+- Post counts are incorrect when downloading posts. Our tests suggest this is a [Tumblr] API problem that is giving inaccurate numbers, so treat them as estimates.
 
 **Please submit an issue or contact us for features you want added/reimplemented.**
 

tumblrbot-1.9.7/build.ps1

@@ -0,0 +1,8 @@
+pyinstaller.exe `
+    --noconfirm `
+    --onefile `
+    --name tumblrbot `
+    --hidden-import tiktoken_ext.openai_public `
+    --optimize 2 `
+    src\tumblrbot\__main__.py &&
+Remove-Item tumblrbot.spec

{tumblrbot-1.9.6 → tumblrbot-1.9.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "tumblrbot"
-version = "1.9.6"
+version = "1.9.7"
 description = "An updated bot that posts to Tumblr, based on your very own blog!"
 readme = "README.md"
 requires-python = ">= 3.14"
@@ -22,6 +22,9 @@ Source = "https://github.com/MaidScientistIzutsumiMarin/tumblrbot"
 [project.scripts]
 tumblrbot = "tumblrbot.__main__:main"
 
+[project.optional-dependencies]
+dev = ["pyinstaller"]
+
 [build-system]
 requires = ["flit_core"]
 build-backend = "flit_core.buildapi"

{tumblrbot-1.9.6 → tumblrbot-1.9.7}/src/tumblrbot/__main__.py

@@ -19,16 +19,16 @@ def main() -> None:
     tokens = Tokens.load()
     with OpenAI(api_key=tokens.openai_api_key) as openai, TumblrSession(tokens) as tumblr:
         if Confirm.ask("Download latest posts?", default=False):
-            PostDownloader(openai=openai, tumblr=tumblr).main()
+            PostDownloader(openai, tumblr).main()
 
-        examples_writer = ExamplesWriter(openai=openai, tumblr=tumblr)
+        examples_writer = ExamplesWriter(openai, tumblr)
         if Confirm.ask("Create training data?", default=False):
             examples_writer.main()
 
         if Confirm.ask("Remove training data flagged by the OpenAI moderation? [bold]This can sometimes resolve errors with fine-tuning validation, but is slow.", default=False):
             examples_writer.filter_examples()
 
-        fine_tuner = FineTuner(openai=openai, tumblr=tumblr)
+        fine_tuner = FineTuner(openai, tumblr)
         fine_tuner.print_estimates()
 
         message = "Resume monitoring the previous fine-tuning process?" if FlowClass.config.job_id else "Upload data to OpenAI for fine-tuning?"
@@ -36,7 +36,7 @@ def main() -> None:
             fine_tuner.main()
 
         if Confirm.ask("Generate drafts?", default=False):
-            DraftGenerator(openai=openai, tumblr=tumblr).main()
+            DraftGenerator(openai, tumblr).main()
 
 
 if __name__ == "__main__":

{tumblrbot-1.9.6 → tumblrbot-1.9.7}/src/tumblrbot/flow/generate.py

@@ -1,8 +1,8 @@
+from dataclasses import dataclass
 from functools import cache
 from random import choice, random, sample
 from typing import TYPE_CHECKING, override
 
-from pydantic import ConfigDict
 from rich import print as rich_print
 from rich.prompt import IntPrompt
 
@@ -13,9 +13,8 @@ if TYPE_CHECKING:
     from collections.abc import Iterable
 
 
+@dataclass(frozen=True)
 class DraftGenerator(FlowClass):
-    model_config = ConfigDict(frozen=True)  # Makes this class hashable.
-
     @override
     def main(self) -> None:
         self.config.draft_count = IntPrompt.ask("How many drafts should be generated?", default=self.config.draft_count)
@@ -48,7 +47,7 @@ class DraftGenerator(FlowClass):
             tags = tags.tags
 
         return Post(
-            content=[Block(type="text", text=text)],
+            content=[Block(text=text)],
             tags=tags or [],
             parent_tumblelog_uuid=original.blog.uuid,
             parent_post_id=original.id,

{tumblrbot-1.9.6 → tumblrbot-1.9.7}/src/tumblrbot/utils/common.py

@@ -1,15 +1,15 @@
 from abc import abstractmethod
+from dataclasses import dataclass
 from random import choice
-from typing import TYPE_CHECKING, ClassVar, Self, override
+from typing import TYPE_CHECKING, ClassVar
 
 from openai import OpenAI  # noqa: TC002
-from pydantic import ConfigDict
 from rich._spinners import SPINNERS
 from rich.live import Live
 from rich.progress import MofNCompleteColumn, Progress, SpinnerColumn, TimeElapsedColumn
 from rich.table import Table
 
-from tumblrbot.utils.models import Config, FullyValidatedModel
+from tumblrbot.utils.models import Config
 from tumblrbot.utils.tumblr import TumblrSession  # noqa: TC001
 
 if TYPE_CHECKING:
@@ -18,9 +18,8 @@ if TYPE_CHECKING:
     from rich.console import RenderableType
 
 
-class FlowClass(FullyValidatedModel):
-    model_config = ConfigDict(arbitrary_types_allowed=True)
-
+@dataclass(frozen=True)
+class FlowClass:
     config: ClassVar = Config.load()
 
     openai: OpenAI
@@ -51,11 +50,6 @@ class PreviewLive(Live):
 
         self.custom_update()
 
-    @override
-    def __enter__(self) -> Self:
-        super().__enter__()
-        return self
-
     def custom_update(self, *renderables: RenderableType | None) -> None:
         table = Table.grid()
         table.add_row(self.progress)

{tumblrbot-1.9.6 → tumblrbot-1.9.7}/src/tumblrbot/utils/models.py

@@ -112,6 +112,16 @@ class Tokens(FileSyncSettings):
     openai_api_key: str = ""
     tumblr: Tumblr = Tumblr()
 
+    @staticmethod
+    def online_token_prompt(url: str, *tokens: str) -> Generator[str]:
+        formatted_token_string = " and ".join(f"[cyan]{token}[/]" for token in tokens)
+
+        rich_print(f"Retrieve your {formatted_token_string} from: {url}")
+        for token in tokens:
+            yield getpass(f"Enter your {token} (masked): ", echo_char="*").strip()
+
+        rich_print()
+
     @override
     def model_post_init(self, context: object) -> None:
         super().model_post_init(context)
@@ -126,38 +136,18 @@ class Tokens(FileSyncSettings):
             # This is the whole OAuth 1.0 process.
             # https://requests-oauthlib.readthedocs.io/en/latest/examples/tumblr.html
             # We tried setting up OAuth 2.0, but the token refresh process is far too unreliable for this sort of program.
-            with OAuth1Session(
-                self.tumblr.client_key,
-                self.tumblr.client_secret,
-            ) as oauth_session:
-                fetch_response = oauth_session.fetch_request_token("http://tumblr.com/oauth/request_token")  # pyright: ignore[reportUnknownMemberType]
-                full_authorize_url = oauth_session.authorization_url("http://tumblr.com/oauth/authorize")  # pyright: ignore[reportUnknownMemberType]
-                (redirect_response,) = self.online_token_prompt(full_authorize_url, "full redirect URL")
-                oauth_response = oauth_session.parse_authorization_response(redirect_response)
-
-            with OAuth1Session(
-                self.tumblr.client_key,
-                self.tumblr.client_secret,
-                *self.get_oauth_tokens(fetch_response),
-                verifier=oauth_response["oauth_verifier"],
-            ) as oauth_session:
-                oauth_tokens = oauth_session.fetch_access_token("http://tumblr.com/oauth/access_token")  # pyright: ignore[reportUnknownMemberType]
-
-            self.tumblr.resource_owner_key, self.tumblr.resource_owner_secret = self.get_oauth_tokens(oauth_tokens)
-
-    @staticmethod
-    def online_token_prompt(url: str, *tokens: str) -> Generator[str]:
-        formatted_token_string = " and ".join(f"[cyan]{token}[/]" for token in tokens)
+            with OAuth1Session(**self.tumblr.model_dump()) as session:
+                session.fetch_request_token("http://tumblr.com/oauth/request_token")  # pyright: ignore[reportUnknownMemberType]
 
-        rich_print(f"Retrieve your {formatted_token_string} from: {url}")
-        for token in tokens:
-            yield getpass(f"Enter your {token} (masked): ", echo_char="*").strip()
+                rich_print("Open the link below in your browser, and authorize this application.\nAfter authorizing, copy and paste the URL of the page you are redirected to below.")
+                authorization_url = session.authorization_url("http://tumblr.com/oauth/authorize")  # pyright: ignore[reportUnknownMemberType]
+                (authorization_response,) = self.online_token_prompt(authorization_url, "full redirect URL")
+                session.parse_authorization_response(authorization_response)
 
-        rich_print()
+                access_token = session.fetch_access_token("http://tumblr.com/oauth/access_token")  # pyright: ignore[reportUnknownMemberType]
 
-    @staticmethod
-    def get_oauth_tokens(token: dict[str, str]) -> tuple[str, str]:
-        return token["oauth_token"], token["oauth_token_secret"]
+            self.tumblr.resource_owner_key = access_token["oauth_token"]
+            self.tumblr.resource_owner_secret = access_token["oauth_token_secret"]
 
 
 class Blog(FullyValidatedModel):
@@ -166,35 +156,34 @@ class Blog(FullyValidatedModel):
     uuid: str = ""
 
 
-class Response(FullyValidatedModel):
-    blog: Blog = Blog()
-    posts: list[Any] = []
-
-
 class ResponseModel(FullyValidatedModel):
+    class Response(FullyValidatedModel):
+        blog: Blog = Blog()
+        posts: list[Any] = []
+
     response: Response
 
 
 class Block(FullyValidatedModel):
-    type: str = ""
+    type: str = "text"
     text: str = ""
     blocks: list[int] = []
 
 
 class Post(FullyValidatedModel):
-    blog: SkipJsonSchema[Blog] = Blog()
-    id: SkipJsonSchema[int] = 0
-    parent_tumblelog_uuid: SkipJsonSchema[str] = ""
-    parent_post_id: SkipJsonSchema[int] = 0
-    reblog_key: SkipJsonSchema[str] = ""
+    blog: Blog = Blog()
+    id: int = 0
+    parent_tumblelog_uuid: str = ""
+    parent_post_id: int = 0
+    reblog_key: str = ""
 
-    timestamp: SkipJsonSchema[int] = 0
+    timestamp: int = 0
     tags: Annotated[list[str], PlainSerializer(",".join)] = []
-    state: SkipJsonSchema[Literal["published", "queued", "draft", "private", "unapproved"]] = "draft"
+    state: Literal["published", "queued", "draft", "private", "unapproved"] = "draft"
 
-    content: SkipJsonSchema[list[Block]] = []
-    layout: SkipJsonSchema[list[Block]] = []
-    trail: SkipJsonSchema[list[Self]] = []
+    content: list[Block] = []
+    layout: list[Block] = []
+    trail: list[Self] = []
 
     is_submission: SkipJsonSchema[bool] = False
 

{tumblrbot-1.9.6 → tumblrbot-1.9.7}/src/tumblrbot/utils/tumblr.py

@@ -1,7 +1,5 @@
-from typing import Self
-
-from requests import HTTPError, Response
-from requests_oauthlib import OAuth1Session
+from requests import HTTPError, Response, Session
+from requests_oauthlib import OAuth1
 from rich import print as rich_print
 from tenacity import retry, retry_if_exception_message, stop_after_attempt, wait_random_exponential
 
@@ -16,25 +14,30 @@ rate_limit_retry = retry(
 )
 
 
-class TumblrSession(OAuth1Session):
+class TumblrSession(Session):
     def __init__(self, tokens: Tokens) -> None:
-        super().__init__(**tokens.tumblr.model_dump())  # pyright: ignore[reportUnknownMemberType]
+        super().__init__()
+        self.auth = OAuth1(**tokens.tumblr.model_dump())
         self.hooks["response"].append(self.response_hook)
 
-    def __enter__(self) -> Self:
-        super().__enter__()
-        return self
+        self.api_key = tokens.tumblr.client_key
 
     def response_hook(self, response: Response, *_args: object, **_kwargs: object) -> None:
         try:
             response.raise_for_status()
         except HTTPError as error:
-            error.add_note(response.text)
+            for error_msg in response.json()["errors"]:
+                error.add_note(f"{error_msg['code']}: {error_msg['detail']}")
             raise
 
     @rate_limit_retry
     def retrieve_blog_info(self, blog_identifier: str) -> ResponseModel:
-        response = self.get(f"https://api.tumblr.com/v2/blog/{blog_identifier}/info")
+        response = self.get(
+            f"https://api.tumblr.com/v2/blog/{blog_identifier}/info",
+            params={
+                "api_key": self.api_key,
+            },
+        )
         return ResponseModel.model_validate_json(response.text)
 
     @rate_limit_retry
@@ -47,6 +50,7 @@ class TumblrSession(OAuth1Session):
         response = self.get(
             f"https://api.tumblr.com/v2/blog/{blog_identifier}/posts",
             params={
+                "api_key": self.api_key,
                 "offset": offset,
                 "after": after,
                 "sort": "asc",

tumblrbot-1.9.6/build.ps1

@@ -1 +0,0 @@
-..\..\Powershell\build.ps1 -ExtraArgs '--collect-all tiktoken_ext'