shindan-cli 2.2.0__tar.gz → 2.2.1__tar.gz

{shindan_cli-2.2.0 → shindan_cli-2.2.1}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: shindan-cli
-Version: 2.2.0
+Version: 2.2.1
 Summary: ShindanMaker (https://shindanmaker.com) CLI
 Project-URL: Repository, https://github.com/eggplants/shindan-cli
 Author-email: eggplants <w10776e8w@yahoo.co.jp>
-License: MIT
+License-Expression: MIT
 License-File: LICENSE
 Keywords: cli,shindanmaker
 Classifier: Development Status :: 3 - Alpha

{shindan_cli-2.2.0 → shindan_cli-2.2.1}/pyproject.toml

@@ -1,6 +1,5 @@
 [build-system]
 build-backend = "hatchling.build"
-
 requires = [ "hatchling", "uv-dynamic-versioning" ]
 
 [project]
@@ -11,7 +10,7 @@ keywords = [
   "cli",
   "shindanmaker",
 ]
-license = { text = "MIT" }
+license = "MIT"
 authors = [ { name = "eggplants", email = "w10776e8w@yahoo.co.jp" } ]
 requires-python = ">=3.10,<4"
 classifiers = [
@@ -32,7 +31,6 @@ dependencies = [
   "lxml>=5.3,<7",
   "requests>=2.32.3,<3",
 ]
-
 urls.Repository = "https://github.com/eggplants/shindan-cli"
 scripts.shindan = "shindan_cli.main:main"
 
@@ -48,22 +46,19 @@ docs = [
   "pdoc>=16",
 ]
 
-[tool.hatch.version]
-source = "uv-dynamic-versioning"
-
-[tool.hatch.build.targets.sdist]
-include = [ "shindan_cli" ]
-
-[tool.hatch.build.targets.wheel]
-include = [ "shindan_cli" ]
+[tool.hatch]
+build.targets.sdist.include = [ "shindan_cli" ]
+build.targets.wheel.include = [ "shindan_cli" ]
+version.source = "uv-dynamic-versioning"
 
 [tool.uv]
-preview = true
+python-downloads = "never"
 default-groups = [
   "dev",
   "docs",
 ]
 exclude-newer = "P7D"
+preview = true
 
 [tool.ruff]
 line-length = 120

{shindan_cli-2.2.0 → shindan_cli-2.2.1}/shindan_cli/constants.py

@@ -7,34 +7,26 @@ class AIParams(TypedDict):
     _token: str
     randname: str
     type: Literal["ai"]
-    shindan_token: str
     encrypted_exec_key: str
 
 
 class BranchParams(TypedDict):
     _token: str
     randname: str
-    hiddenName: str
     type: Literal["branch"]
-    shindan_token: str
     rbr: str
 
 
 class CheckParams(TypedDict):
     _token: str
     randname: str
-    hiddenName: str
     type: Literal["check"]
-    shindan_token: str
-    # input-check-choice[choice_id]: str
 
 
 class NameParams(TypedDict):
     _token: str
     randname: str
-    hiddenName: str
     type: Literal["name"]
-    shindan_token: str
 
 
 class TargetKeysByType(TypedDict):

{shindan_cli-2.2.0 → shindan_cli-2.2.1}/shindan_cli/get_results.py

@@ -3,18 +3,22 @@
 from __future__ import annotations
 
 import re
-from typing import TYPE_CHECKING, Union
+import time
+from typing import TYPE_CHECKING, cast
 
 from bs4 import BeautifulSoup, Tag
 
-from .constants import BASE_URL, HEADERS, AIParams, BranchParams, CheckParams, NameParams
+from .constants import HEADERS, AIParams, BranchParams, CheckParams, NameParams
 
 if TYPE_CHECKING:
     from requests import Session
 
     from .models import ShindanResult, UserInputs
 
-Params = Union[AIParams, BranchParams, CheckParams, NameParams]
+Params = AIParams | BranchParams | CheckParams | NameParams
+
+_MAX_RETRIES = 3
+_RETRY_WAIT = 4.0
 
 
 def __get_result(
@@ -24,15 +28,23 @@ def __get_result(
     is_renewal: bool = False,
     shindan_url: str,
 ) -> ShindanResult:
-    result_page = session.post(
-        shindan_url + ("/r" if is_renewal else ""),
-        data=params,
-        headers=HEADERS,
-    )
-    soup = BeautifulSoup(result_page.text, features="lxml")
-    result_tag = soup.find(id="share-copytext-shindanresult-textarea")
+    result_tag: Tag | None = None
+
+    for attempt in range(_MAX_RETRIES):
+        if attempt > 0:
+            time.sleep(_RETRY_WAIT)
+        result_page = session.post(
+            shindan_url + ("/r" if is_renewal else ""),
+            data=params,
+            headers=HEADERS,
+        )
+        soup = BeautifulSoup(result_page.text, features="lxml")
+        found = soup.find(id="share-copytext-shindanresult-textarea")
+        if isinstance(found, Tag) and found.text:
+            result_tag = found
+            break
 
-    if not isinstance(result_tag, Tag) or not result_tag.text:
+    if result_tag is None:
         msg = f"Could not find a tag contains the result, returns: {result_tag}"
         raise TypeError(msg)
 
@@ -54,6 +66,7 @@ def get_result_by_ai(
     *,
     user_inputs: UserInputs,
     hashtag: str | None,
+    csrf_token: str,
     shindan_url: str,
 ) -> ShindanResult:
     """Get result by AI type shindan.
@@ -63,34 +76,14 @@ def get_result_by_ai(
         params (Params): input parameters fetched from shindan page
         user_inputs (UserInputs): user inputs
         hashtag (str | None): hashtag
+        csrf_token (str): CSRF token extracted from the shindan page
         shindan_url (str): shindan url
 
     Returns:
         ShindanResult: the returned result from <https://shindanmaker.com>
 
     """
-    res = session.post(
-        shindan_url,
-        data=params,
-        headers=HEADERS,
-    )
-    meta = BeautifulSoup(
-        res.text,
-        features="lxml",
-    ).select_one('meta[name="csrf-token"]')
-    if not res.ok or not meta or not isinstance(csrf_token := meta.get("content"), str):
-        msg = f"Failed to get the csrf token. ({res.status_code})"
-        raise ValueError(msg)
-    HEADERS.update({"x-csrf-token": csrf_token})
-    if not res.ok:
-        res = session.post(
-            f"{BASE_URL}/ai_life_update",
-            data={"ai_life": 3},
-            headers=HEADERS,
-        )
-        if not res.ok:
-            msg = f"Failed to update AI life. ({res.status_code})"
-            raise ValueError(msg)
+    ai_headers = {**HEADERS, "x-csrf-token": csrf_token}
 
     result_sse = session.post(
         f"{shindan_url}/ai_result",
@@ -100,7 +93,7 @@ def get_result_by_ai(
             "ai_result_request_times": 0,
             "encrypted_exec_key": params["encrypted_exec_key"],
         },
-        headers=HEADERS,
+        headers=ai_headers,
     )
     gpt_results = "".join(
         re.findall(r'"content":"([^"]+)', result_sse.text),
@@ -151,8 +144,9 @@ def get_result_by_check(
         ShindanResult: the returned result from <https://shindanmaker.com>
 
     """
+    check_params = cast("dict[str, str]", params)
     for choice_id, answer_id in user_choices.items():
-        params[f"input-check-choice[{choice_id}]"] = answer_id  # type: ignore[literal-required]
+        check_params[f"input-check-choice[{choice_id}]"] = answer_id
 
     return __get_result(session, params, is_renewal=True, shindan_url=shindan_url)
 

{shindan_cli-2.2.0 → shindan_cli-2.2.1}/shindan_cli/interactive.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
-from shindan_cli.models import QuestionBranchChoice, QuestionChoiceChoice, UserInput, QuestionBranch, QuestionChoice
+from shindan_cli.models import QuestionBranch, QuestionBranchChoice, QuestionChoice, QuestionChoiceChoice, UserInput
 
 if TYPE_CHECKING:
     from bs4 import BeautifulSoup
@@ -27,7 +27,7 @@ def get_user_inputs(
 
     """
     user_inputs: dict[str, UserInput] = {}
-    form_labels = source.select("form#shindanForm > div.px-3 > div > span")
+    form_labels = source.select("form#shindanForm label")
     for idx, question in enumerate([*form_labels, *range(10 - len(form_labels))]):
         if isinstance(question, int):
             user_inputs[f"user_input_{idx + 1}"] = UserInput({"q": "", "a": None})

{shindan_cli-2.2.0 → shindan_cli-2.2.1}/shindan_cli/shindan.py

@@ -55,10 +55,10 @@ def shindan(
     shindan_url = f"{BASE_URL}/{page_id}"
 
     session = cloudscraper.create_scraper()
-    assert isinstance(session, Session)
+    assert isinstance(session, Session)  # noqa: S101
 
     shindan_page = session.get(shindan_url, headers=HEADERS)
-    if shindan_page.status_code != 200:
+    if shindan_page.status_code != 200:  # noqa: PLR2004
         raise ShindanError(shindan_page.status_code)
 
     source = BeautifulSoup(shindan_page.text, features="lxml")
@@ -89,11 +89,16 @@ def shindan(
             str,
         ):
             hashtag = None
+        csrf_meta = source.select_one('meta[name="csrf-token"]')
+        if not csrf_meta or not isinstance(csrf_token := csrf_meta.get("content"), str):
+            msg = "Could not find CSRF token on the shindan page."
+            raise ShindanError(msg)
         return get_result_by_ai(
             session,
             params,
             user_inputs=get_user_inputs(source, shindan_name),
             hashtag=hashtag,
+            csrf_token=csrf_token,
             shindan_url=shindan_url,
         )
     if params["type"] == "branch":