tumblrbot 1.4.0__tar.gz → 1.4.1__tar.gz

{tumblrbot-1.4.0 → tumblrbot-1.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tumblrbot
-Version: 1.4.0
+Version: 1.4.1
 Summary: An updated bot that posts to Tumblr, based on your very own blog!
 Requires-Python: >= 3.13
 Description-Content-Type: text/markdown
@@ -73,6 +73,8 @@ Features:
 
 **To-Do:**
 - Add code documentation.
+- Fix inaccurate post counts when downloading posts.
+- Fix file not found error when starting fine-tuning.
 
 
 **Please submit an issue or contact us for features you want added/reimplemented.**

{tumblrbot-1.4.0 → tumblrbot-1.4.1}/README.md

@@ -53,6 +53,8 @@ Features:
 
 **To-Do:**
 - Add code documentation.
+- Fix inaccurate post counts when downloading posts.
+- Fix file not found error when starting fine-tuning.
 
 
 **Please submit an issue or contact us for features you want added/reimplemented.**

{tumblrbot-1.4.0 → tumblrbot-1.4.1}/pyproject.toml

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

{tumblrbot-1.4.0 → tumblrbot-1.4.1}/src/tumblrbot/__main__.py

@@ -13,7 +13,7 @@ from tumblrbot.utils.tumblr import TumblrClient
 def main() -> None:
     install()
 
-    tokens = Tokens()
+    tokens = Tokens.read_from_keyring()
     with (
         OpenAI(api_key=tokens.openai_api_key.get_secret_value(), http_client=DefaultHttpxClient(http2=True)) as openai,
         TumblrClient(tokens=tokens) as tumblr,

{tumblrbot-1.4.0 → tumblrbot-1.4.1}/src/tumblrbot/flow/examples.py

@@ -59,7 +59,7 @@ class ExamplesWriter(FlowClass):
     def get_filtered_posts(self) -> Generator[Post]:
         posts = list(self.get_valid_posts())
 
-        if Confirm.ask("Remove posts flagged by the OpenAI moderation? This can sometimes resolve errors with fine-tuning validation, but is slow.", default=False):
+        if Confirm.ask("[gray62]Remove posts flagged by the OpenAI moderation? This can sometimes resolve errors with fine-tuning validation, but is slow.", default=False):
             removed = 0
             chunk_size = self.get_moderation_chunk_limit()
             with PreviewLive() as live:

{tumblrbot-1.4.0 → tumblrbot-1.4.1}/src/tumblrbot/utils/models.py

@@ -1,5 +1,5 @@
 from collections.abc import Generator
-from typing import Annotated, Any, ClassVar, Literal, override
+from typing import Annotated, Any, ClassVar, Literal, Self, override
 
 import rich
 from keyring import get_password, set_password
@@ -10,6 +10,14 @@ from requests_oauthlib import OAuth1Session
 from rich.panel import Panel
 from rich.prompt import Confirm, Prompt
 
+type SerializableSecretStr = Annotated[
+    SecretStr,
+    PlainSerializer(
+        SecretStr.get_secret_value,
+        when_used="json-unless-none",
+    ),
+]
+
 
 class FullyValidatedModel(BaseModel):
     model_config = ConfigDict(
@@ -22,13 +30,17 @@ class FullyValidatedModel(BaseModel):
 
 
 class Tokens(FullyValidatedModel):
+    class Tumblr(FullyValidatedModel):
+        client_key: SerializableSecretStr = SecretStr("")
+        client_secret: SerializableSecretStr = SecretStr("")
+        resource_owner_key: SerializableSecretStr = SecretStr("")
+        resource_owner_secret: SerializableSecretStr = SecretStr("")
+
     service_name: ClassVar = "tumblrbot"
+    username: ClassVar = "tokens"
 
-    openai_api_key: SecretStr = SecretStr("")
-    tumblr_client_key: SecretStr = SecretStr("")
-    tumblr_client_secret: SecretStr = SecretStr("")
-    tumblr_resource_owner_key: SecretStr = SecretStr("")
-    tumblr_resource_owner_secret: SecretStr = SecretStr("")
+    openai_api_key: SerializableSecretStr = SecretStr("")
+    tumblr: Tumblr = Tumblr()
 
     @staticmethod
     def online_token_prompt(url: str, *tokens: str) -> Generator[SecretStr]:
@@ -42,46 +54,44 @@ class Tokens(FullyValidatedModel):
 
         rich.print()
 
+    @classmethod
+    def read_from_keyring(cls) -> Self:
+        if json_data := get_password(cls.service_name, cls.username):
+            return cls.model_validate_json(json_data)
+        return cls()
+
     @override
     def model_post_init(self, context: object) -> None:
         super().model_post_init(context)
 
-        for name, _ in self:
-            if value := get_password(self.service_name, name):
-                setattr(self, name, value)
-
         if not self.openai_api_key.get_secret_value() or Confirm.ask("Reset OpenAI API key?", default=False):
             (self.openai_api_key,) = self.online_token_prompt("https://platform.openai.com/api-keys", "API key")
 
-        if not all(self.get_tumblr_tokens()) or Confirm.ask("Reset Tumblr API tokens?", default=False):
-            self.tumblr_client_key, self.tumblr_client_secret = self.online_token_prompt("https://tumblr.com/oauth/apps", "consumer key", "consumer secret")
-
-            oauth_session = OAuth1Session(*self.get_tumblr_tokens()[:2])
-            fetch_response = oauth_session.fetch_request_token("http://tumblr.com/oauth/request_token")
-            full_authorize_url = oauth_session.authorization_url("http://tumblr.com/oauth/authorize")
-            (redirect_response,) = self.online_token_prompt(full_authorize_url, "full redirect URL")
-            oauth_response = oauth_session.parse_authorization_response(redirect_response.get_secret_value())
-            oauth_session = OAuth1Session(
-                *self.get_tumblr_tokens()[:2],
+        if not all(self.tumblr.model_dump(mode="json").values()) or Confirm.ask("Reset Tumblr API tokens?", default=False):
+            self.tumblr.client_key, self.tumblr.client_secret = self.online_token_prompt("https://tumblr.com/oauth/apps", "consumer key", "consumer secret")
+
+            with OAuth1Session(
+                self.tumblr.client_key.get_secret_value(),
+                self.tumblr.client_secret.get_secret_value(),
+            ) as oauth_session:
+                fetch_response = oauth_session.fetch_request_token("http://tumblr.com/oauth/request_token")
+                full_authorize_url = oauth_session.authorization_url("http://tumblr.com/oauth/authorize")
+                (redirect_response,) = self.online_token_prompt(full_authorize_url, "full redirect URL")
+                oauth_response = oauth_session.parse_authorization_response(redirect_response.get_secret_value())
+
+            with OAuth1Session(
+                self.tumblr.client_key.get_secret_value(),
+                self.tumblr.client_secret.get_secret_value(),
                 fetch_response["oauth_token"],
                 fetch_response["oauth_token_secret"],
                 verifier=oauth_response["oauth_verifier"],
-            )
-            oauth_tokens = oauth_session.fetch_access_token("http://tumblr.com/oauth/access_token")
-            self.tumblr_resource_owner_key = oauth_tokens["oauth_token"]
-            self.tumblr_resource_owner_secret = oauth_tokens["oauth_token_secret"]
-
-        for name, value in self:
-            if isinstance(value, SecretStr):
-                set_password(self.service_name, name, value.get_secret_value())
-
-    def get_tumblr_tokens(self) -> tuple[str, str, str, str]:
-        return (
-            self.tumblr_client_key.get_secret_value(),
-            self.tumblr_client_secret.get_secret_value(),
-            self.tumblr_resource_owner_key.get_secret_value(),
-            self.tumblr_resource_owner_secret.get_secret_value(),
-        )
+            ) as oauth_session:
+                oauth_tokens = oauth_session.fetch_access_token("http://tumblr.com/oauth/access_token")
+
+            self.tumblr.resource_owner_key = oauth_tokens["oauth_token"]
+            self.tumblr.resource_owner_secret = oauth_tokens["oauth_token_secret"]
+
+        set_password(self.service_name, self.username, self.model_dump_json())
 
 
 class Post(FullyValidatedModel):

{tumblrbot-1.4.0 → tumblrbot-1.4.1}/src/tumblrbot/utils/tumblr.py

@@ -16,7 +16,7 @@ class TumblrClient(Session, CacheMixin):  # pyright: ignore[reportIncompatibleMe
         super().__init__(happy_eyeballs=True)
         CacheMixin.__init__(self, use_cache_dir=True)
 
-        self.auth = OAuth1(*self.tokens.get_tumblr_tokens())
+        self.auth = OAuth1(**self.tokens.tumblr.model_dump(mode="json"))
         self.hooks["response"].append(self.response_hook)
 
     def __enter__(self) -> Self: