1.19.1

Author: matthewdeanmartin

Makefile

@@ -47,6 +47,7 @@ isort: .build_history/isort
 
 .build_history/black: .build_history .build_history/isort $(FILES)
 	@echo "Formatting code"
+	$(VENV) metametameta poetry
 	$(VENV) black dedlin --exclude .venv
 	$(VENV) black tests --exclude .venv
 	$(VENV) black scripts --exclude .venv

dedlin/__about__.py

@@ -0,0 +1,29 @@
+"""Metadata for dedlin."""
+
+__all__ = [
+    "__title__",
+    "__version__",
+    "__description__",
+    "__author__",
+    "__author_email__",
+    "__keywords__",
+    "__status__",
+    "__license__",
+    "__readme__",
+    "__repository__",
+    "__homepage__",
+    "__documentation__"
+]
+
+__title__ = "dedlin"
+__version__ = "1.19.0"
+__description__ = "Line editor, edlin clone with many improvements"
+__author__ = "Matthew Martin"
+__author_email__ = "matthewdeanmartin@gmail.com"
+__keywords__ = ['editor', 'edlin', 'line editor']
+__status__ = "5 - Production/Stable"
+__license__ = "MIT"
+__readme__ = "README.md"
+__repository__ = "https://github.com/matthewdeanmartin/dedlin"
+__homepage__ = "https://github.com/matthewdeanmartin/dedlin"
+__documentation__ = "https://github.com/matthewdeanmartin/dedlin"

dedlin/__init__.py

@@ -2,6 +2,7 @@
 Dedlin is an edlin clone with additional features. Possibly useful as a sed-like DSL or as an editor
 for AI function calls.
 """
+
 from dedlin.command_sources import (
     CommandGenerator,
     InteractiveGenerator,

dedlin/__main__.py

@@ -18,6 +18,7 @@
   --verbose          Displaying all debugging info.
   --blind_mode       Optimize for blind users (experimental).
 """
+
 import logging
 import logging.config
 import sys
@@ -35,6 +36,7 @@
 from dedlin.main import Dedlin
 from dedlin.outputters import rich_output, talking_outputter
 from dedlin.outputters.plain import plain_printer
+from __about__ import __version__
 
 dotenv.load_dotenv()
 
@@ -43,7 +45,7 @@
 
 def main() -> None:
     """Main function."""
-    arguments = docopt(__doc__, version="1.4.0")
+    arguments = docopt(__doc__, version=__version__)
 
     _ = run(
         arguments["<file>"],

dedlin/ai_interface.py

@@ -1,6 +1,7 @@
 """
 Code for AI
 """
+
 import asyncio
 
 import dotenv
@@ -24,7 +25,7 @@
 class AiClient:
     """Client for AI"""
 
-    def __init__(self)->None:
+    def __init__(self) -> None:
         """Initialize the client"""
         self.client = AsyncOpenAI()
         self.model = "gpt-3.5-turbo"

dedlin/basic_types.py

@@ -1,12 +1,13 @@
 """
 Basic classes and mypy types
 """
+
 import dataclasses
 import logging
 from enum import Enum, auto
 from typing import Generator, Optional, Protocol, runtime_checkable
 
-from pydantic import validator
+from pydantic import field_validator
 from pydantic.dataclasses import dataclass
 
 logger = logging.getLogger(__name__)
@@ -99,7 +100,8 @@ class LineRange:
     repeat: int = 1
 
     # problem when doc is 0 lines long
-    @validator("start", allow_reuse=True)
+    @field_validator("start")
+    @classmethod
     @classmethod
     def start_must_be_one_or_more(cls, start: int) -> int:
         """Start must be 1 or more
@@ -112,7 +114,8 @@ def start_must_be_one_or_more(cls, start: int) -> int:
             raise ValueError("start must be one or more")
         return start
 
-    @validator("offset", allow_reuse=True)
+    @field_validator("offset")
+    @classmethod
     @classmethod
     def offset_zero_or_more(cls, offset: int) -> int:
         """Offset must be zero or more
@@ -125,7 +128,8 @@ def offset_zero_or_more(cls, offset: int) -> int:
         return offset
 
     @classmethod
-    @validator("repeat", allow_reuse=True)
+    @field_validator("repeat")
+    @classmethod
     def repeat_zero_or_more(cls, repeat: int) -> int:
         """Repeat must be zero or more
 
@@ -167,7 +171,7 @@ def validate(self) -> bool:
             logger.warning(f"Invalid line range: {self}")
         return validate
 
-    def to_slice(self)->slice:
+    def to_slice(self) -> slice:
         """Convert to a slice
 
         Returns:
@@ -461,4 +465,3 @@ def generate(
         Returns:
             Generator[str, None, None]: The strings
         """
-

dedlin/command_sources.py

@@ -3,6 +3,7 @@
 
 These handle history, syntax highlighting, and auto-suggestion.
 """
+
 from pathlib import Path
 from typing import Generator, Iterable, Optional
 
@@ -101,7 +102,7 @@ def questionary_command_handler(prompt: str = "*") -> Generator[str, None, None]
 
 
 class CommandGeneratorProtocol:
-    def __init__(self, path: Path)->None:
+    def __init__(self, path: Path) -> None:
         """Initialize the generator.
 
         Args:
@@ -125,7 +126,7 @@ def generate(
 class CommandGenerator:
     """Get a typed command from a file"""
 
-    def __init__(self, path: Path)->None:
+    def __init__(self, path: Path) -> None:
         """Initialize the generator.
 
         Args:
@@ -160,7 +161,7 @@ def generate(
 class InMemoryCommandGenerator:
     """A bunch of predefined commands"""
 
-    def __init__(self, commands: Iterable[Command])->None:
+    def __init__(self, commands: Iterable[Command]) -> None:
         """Initialize the generator.
 
         Args:
@@ -183,7 +184,7 @@ def generate(
 class StringCommandGenerator:
     """Get a typed command from a string"""
 
-    def __init__(self, source: str)->None:
+    def __init__(self, source: str) -> None:
         """Initialize the generator.
 
         Args:

dedlin/document.py

@@ -1,6 +1,7 @@
 """
 Abstract document class.
 """
+
 import logging
 import random
 from typing import Generator, Optional
@@ -27,7 +28,7 @@ class EditStatus:
 
 # noinspection PyShadowingBuiltins
 # pylint: disable=redefined-builtin
-def print(*args, **kwargs)->None:
+def print(*args, **kwargs) -> None:
     """Discourage accidental usage of print.
 
     Args:
@@ -237,7 +238,7 @@ def copy(self, line_range: Optional[LineRange], target_line: int) -> None:
         self.current_line = target_line
         logger.debug(f"Copied {line_range} to {target_line}")
 
-    def move(self, line_range: Optional[LineRange], target_line: int)->None:
+    def move(self, line_range: Optional[LineRange], target_line: int) -> None:
         """Move lines to target_line.
 
         Args:

dedlin/file_converters.py

@@ -1,4 +1,5 @@
 """Primative printing support"""
+
 from pathlib import Path
 
 from markdown_it import MarkdownIt

dedlin/file_system.py

@@ -3,6 +3,7 @@
 
 This could be document lines or macro lines.
 """
+
 from pathlib import Path
 from typing import Optional
 

dedlin/flash.py

@@ -1,6 +1,7 @@
 """
 Flashy stuff
 """
+
 from art import tprint
 
 

dedlin/history_feature.py

@@ -1,6 +1,7 @@
 """
 Manage history on file system
 """
+
 from pathlib import Path
 from typing import Optional
 

dedlin/logging_utils.py

@@ -1,6 +1,7 @@
 """
 Dedupe some logging code
 """
+
 from typing import Any
 
 

dedlin/main.py

@@ -5,6 +5,7 @@
 
 
 """
+
 import asyncio
 import logging
 import os
@@ -425,7 +426,7 @@ def print_ai_help(self, command: Command) -> None:
         ask = ChatCompletionMessageParam(content=content, role="user")
         asyncio.run(client.completion([ask]))
 
-    def feedback(self, string: str, end:str="\n", no_comment: bool = False) -> None:
+    def feedback(self, string: str, end: str = "\n", no_comment: bool = False) -> None:
         """Output feedback to the user.
 
         Args:
@@ -445,7 +446,7 @@ def feedback(self, string: str, end:str="\n", no_comment: bool = False) -> None:
         if self.verbose:
             logger.info(string)
 
-    def echo_if_needed(self, string:str, end:str="\n") -> None:
+    def echo_if_needed(self, string: str, end: str = "\n") -> None:
         """Echos a string to the outputter if needed.
 
         Args:
@@ -498,7 +499,7 @@ def save_document(self, phrases: Optional[Phrases] = None) -> None:
         file_system.save_and_overwrite(self.file_path, self.doc.lines, self.preferred_line_break)
         self.doc.dirty = False
 
-    def save_macro(self)->None:
+    def save_macro(self) -> None:
         """Save the document to the file"""
 
         file_system.save_and_overwrite(

dedlin/outputters/plain.py

@@ -1,6 +1,7 @@
 """
 Abstraction over print-to-standard-out.
 """
+
 from typing import Optional
 
 

dedlin/outputters/rich_output.py

@@ -1,4 +1,5 @@
 """Make the output of the program more readable."""
+
 from typing import Optional
 
 from rich.console import Console

dedlin/outputters/talking_outputter.py

@@ -1,4 +1,5 @@
 """Make text editor hypothetically usable while blind."""
+
 import logging
 from typing import Optional
 

dedlin/parsers.py

@@ -1,6 +1,7 @@
 """
 Code that turns strings to command objects
 """
+
 import logging
 from typing import Iterable, Optional
 

dedlin/pygments_code.py

@@ -1,6 +1,7 @@
 """
 Attempt to make basic syntax highlighting work for the dedlin DSL.
 """
+
 from pygments.lexer import RegexLexer
 from pygments.token import Comment, Keyword, Text
 

dedlin/string_comands.py

@@ -1,4 +1,5 @@
 """Pass string commands to python."""
+
 import textwrap
 
 from dedlin.basic_types import Command, Commands
@@ -28,7 +29,7 @@ def block_commands(lines: list[str], command: Command) -> list[str]:
     return block.split("\n")
 
 
-def process_strings(lines: list[str], command: Command)->None:
+def process_strings(lines: list[str], command: Command) -> None:
     """Apply string function to each line.
 
     Args:

dedlin/text/help_text.py

@@ -109,10 +109,12 @@
 """
 
 if __name__ == "__main__":
+
     def run() -> None:
         """Example"""
         print(HELP_TEXT)
         for key, value in SPECIFIC_HELP.items():
             print(f"\n{key} commands\n")
             print(value)
-    run()
+
+    run()

dedlin/tools/export.py

@@ -1,6 +1,7 @@
 """
 Export to file formats, particularly markdown
 """
+
 import mistune
 
 

dedlin/tools/info_bar.py

@@ -1,6 +1,7 @@
 """
 An info bar that runs after each command, replaces bottom bar in a full screen editor
 """
+
 from typing import Generator
 
 from textstat import textstat

dedlin/tools/spelling_overlay.py

@@ -1,6 +1,7 @@
 """
 Create overlay of spelling markers
 """
+
 from spellchecker import SpellChecker
 
 spell = SpellChecker()

dedlin/tools/web.py

@@ -1,6 +1,7 @@
 """
 Fetch lines from web, assuming html, turn into text
 """
+
 import html2text
 import requests
 

dedlin/utils/file_utils.py

@@ -1,6 +1,7 @@
 """
 File and path manipulation
 """
+
 import os