minor refactoring

.pre-commit-config.yaml

@@ -9,20 +9,20 @@ repos:
     hooks:
       - id: taplo
   - repo: https://github.com/asottile/reorder-python-imports
-    rev: v3.12.0
+    rev: v3.13.0
     hooks:
       - id: reorder-python-imports
         args: [--py37-plus, --add-import, "from __future__ import annotations"]
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.3.3
+    rev: v0.4.9
     hooks:
       - id: ruff
         types_or: [python, pyi, jupyter]
         args: [--fix]
       - id: ruff-format
         types_or: [python, pyi, jupyter]
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v4.6.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
@@ -31,7 +31,7 @@ repos:
       - id: name-tests-test
       - id: requirements-txt-fixer
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.9.0
+    rev: v1.10.0
     hooks:
       - id: mypy
         additional_dependencies: [types-all]

pyproject.toml

@@ -27,6 +27,7 @@ dependencies = [
   "persistent-cache-decorator",
   "pyfunctional",
   "requests",
+  "urllib3<2.0.0",
   "rich",
   "runtool",
   "typedfzf",
@@ -51,7 +52,7 @@ dev = "comma.main:app_main"
 ',devcon' = "comma.devcon:app_devcon"
 ',docker' = "comma.docker:app_docker"
 ',mux' = "comma.misc.tmux:app_mux"
-',reflection' = "comma.typer.reflection:_main"
+',reflection' = "comma._typer.reflection:_main"
 ',sh' = "comma.shell_scripts.shell_utils:app_sh"
 ',sh-script' = "comma.shell_scripts.shell_scripts:app_shell_scripts"
 

src/comma/__init__.py

@@ -29,7 +29,7 @@
     )
 else:
     logging.basicConfig(
-        level="DEBUG",
+        level="INFO",
         format="[%(asctime)s] [%(levelname)-7s] [%(module)s] %(filename)s:%(lineno)d %(message)s",
         datefmt="%X",
     )

src/comma/typer/pair2.py → src/comma/_typer/pair2.py

@@ -16,8 +16,8 @@
 from typing import NamedTuple
 from typing import TypeVar
 
+from comma._typer.pair import Pair
 from comma.command import Command
-from comma.typer.pair import Pair
 from typing_extensions import TypedDict
 
 L = TypeVar("L")

src/comma/main.py

@@ -5,10 +5,11 @@
 import sys
 
 import typer
+from comma._typer.reflection import TyperReflection
 from comma.devcon import app_devcon
 from comma.docker import app_docker
 from comma.misc.tmux import mux
-from comma.typer.reflection import TyperReflection
+from comma.scratch import app_temp
 
 
 app_main: typer.Typer = typer.Typer(
@@ -17,6 +18,7 @@
 app_main.command()(mux)
 app_main.add_typer(app_docker)
 app_main.add_typer(app_devcon)
+app_main.add_typer(app_temp)
 app_main.add_typer(TyperReflection(app=app_main).get_app())
 
 

src/comma/misc/dual_writer.py

@@ -54,8 +54,8 @@ def __enter__(self) -> Self:
         """
         self.__stack__ = ExitStack().__enter__()
         try:
-            self.left_writer = self.__stack__.enter_context(open(self.__left__, "w"))  # noqa: SIM115
-            self.right_writer = self.__stack__.enter_context(open(self.__right__, "w"))  # noqa: SIM115
+            self.left_writer = self.__stack__.enter_context(open(self.__left__, "w"))
+            self.right_writer = self.__stack__.enter_context(open(self.__right__, "w"))
         except BaseException:
             self.__stack__.close()
             raise

src/comma/scratch.py

@@ -0,0 +1,66 @@
+from __future__ import annotations
+
+import re
+from typing import NamedTuple
+from typing import TYPE_CHECKING
+from urllib.parse import urljoin
+
+import requests
+import typer
+from fzf import fzf
+from persistent_cache.decorators import persistent_cache
+from rich import print
+
+if TYPE_CHECKING:
+    from collections.abc import Iterable
+
+INDEX_ROOT = "https://pypi.org/simple/"
+
+app_temp: typer.Typer = typer.Typer(
+    name="temp",
+    help="temporary commands",
+)
+
+
+@persistent_cache()
+def request_url(url: str) -> str:
+    response = requests.get(url, timeout=5)
+    return response.text
+
+
+PATTERN_ATAG = re.compile(r'<a .*href="([^"]*?)".*>(.*?)</a>')
+
+
+class ATag(NamedTuple):
+    href: str
+    text: str
+    tag: str
+
+
+def extract_links(response: str, domain: str | None = None) -> Iterable[ATag]:
+    for find in PATTERN_ATAG.finditer(response):
+        href, text = find.groups()
+        yield ATag(urljoin(domain, href), text, find.group(0))  # type:ignore[type-var,arg-type]
+
+
+@app_temp.command()
+def list_projects() -> None:
+    choice = fzf(
+        extract_links(request_url(INDEX_ROOT), domain=INDEX_ROOT),  #
+        key=lambda x: x.text,  #
+    )
+    if choice:
+        print(f"https://pypi.org/project/{choice.text}/")
+        print(choice.href)
+        choice2 = fzf(
+            extract_links(request_url(choice.href), domain=choice.href),  #
+            key=lambda x: x.text,  #
+            _options={"tac": True},
+        )
+        if choice2:
+            print(choice2.href)
+            # print(f"{text2} ({href2})")
+
+
+if __name__ == "__main__":
+    app_temp()

tests/comma_test.py

@@ -8,15 +8,15 @@
 import gron as gron_pkg
 import gum as gum_pkg
 import pytest
+from comma._typer.reflection import TyperReflection
 from comma.main import app_main
-from comma.typer.reflection import TyperReflection
 from typer.testing import CliRunner
 
 if TYPE_CHECKING:
     from collections.abc import Sequence
     from collections.abc import Generator
     from types import ModuleType
-    from comma.typer.reflection import TyperNode
+    from comma._typer.reflection import TyperNode
 
 
 runner = CliRunner()
@@ -40,7 +40,7 @@
 }
 
 
-@pytest.mark.parametrize("node", TyperReflection(app=app_main)._traverse_nodes_())  # noqa: SLF001
+@pytest.mark.parametrize("node", TyperReflection(app=app_main)._traverse_nodes_())
 def test_help(node: TyperNode) -> None:
     if node.path in ignore_commands:
         return

tests/entrypoint_test.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import logging
+import shutil
 import subprocess
 from typing import TYPE_CHECKING
 
@@ -22,6 +23,7 @@ def test_help(pair: tuple[str, str]) -> None:
     k, v = pair
     result = subprocess.run([k, "--help"], check=False, capture_output=True, text=True)  # noqa: S603
     if result.returncode != 0:
+        logging.error(shutil.which(k))
         logging.error(result.stderr)
         msg = f"Error running {k} --help"
         raise AssertionError(msg)