chemql-python 1.5.6__tar.gz → 1.5.8__tar.gz

{chemql_python-1.5.6 → chemql_python-1.5.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chemql-python
-Version: 1.5.6
+Version: 1.5.8
 Summary: A chemistry-focused query language and REPL
 Author-email: Mohammad Rakibul Islam <rakibulofficial1017@gmail.com>
 Requires-Python: >=3.10
@@ -19,7 +19,7 @@ SQL-inspired syntax, inspect elements and molecules, look up reactions,
 balance equations, and combine chemistry queries with Python and shell
 commands.
 
--   **Version:** `1.5.6`
+-   **Version:** `1.5.8`
 -   **PyPI distribution:** `chemql-python`
 -   **Python import / CLI name:** `chemql`
 -   **Author:** Mohammad Rakibul Islam

{chemql_python-1.5.6 → chemql_python-1.5.8}/README.md

@@ -6,7 +6,7 @@ SQL-inspired syntax, inspect elements and molecules, look up reactions,
 balance equations, and combine chemistry queries with Python and shell
 commands.
 
--   **Version:** `1.5.6`
+-   **Version:** `1.5.8`
 -   **PyPI distribution:** `chemql-python`
 -   **Python import / CLI name:** `chemql`
 -   **Author:** Mohammad Rakibul Islam

{chemql_python-1.5.6 → chemql_python-1.5.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "chemql-python"
-version = "1.5.6"
+version = "1.5.8"
 authors = [
     { name = "Mohammad Rakibul Islam", email = "rakibulofficial1017@gmail.com" }
 ]

{chemql_python-1.5.6 → chemql_python-1.5.8}/src/chemql/__init__.py

@@ -64,7 +64,7 @@ __all__ = [
     "__version__"
 ]
 
-__version__ = "1.5.6"
+__version__ = "1.5.8"
 
 # Persistent preprocessor/function state for the current ChemQL session.
 DEFINITIONS = {}

{chemql_python-1.5.6 → chemql_python-1.5.8}/src/chemql/codecql.py

@@ -10,7 +10,7 @@ import shutil
 import subprocess
 import time
 
-VERSION = "0.0.6"
+VERSION = "0.0.8"
 
 
 def _write_system_clipboard(text):
@@ -79,7 +79,8 @@ def _decode_escape_sequence(sequence):
             else:
                 return "\x1b"
             return "+".join((*modifiers, key)) if modifiers else key
-        if final == b"u" and params and params[0] == "127":
+        if final == b"u" and params and params[0] in {"8", "127"}:
+            # CSI-u / Kitty keyboard protocol can encode Backspace as 8 or 127.
             key = "backspace"
             return "+".join((*modifiers, key)) if modifiers else key
     elif sequence.startswith(b"O") and sequence[-1:] in b"ABCDHF":
@@ -129,7 +130,7 @@ if os.name == 'nt':
         0x48: "arrow_up", 0x50: "arrow_down",
         0x4B: "arrow_left", 0x4D: "arrow_right",
         0x47: "arrow_home", 0x4F: "arrow_end",
-        0x53: "delete", 0x73: "ctrl+arrow_left",
+        0x53: "delete", 0x93: "ctrl+delete", 0x73: "ctrl+arrow_left",
         0x74: "ctrl+arrow_right", 0x8D: "ctrl+arrow_up",
         0x91: "ctrl+arrow_down", 0x9B: "alt+arrow_left",
         0x9D: "alt+arrow_right",
@@ -181,8 +182,16 @@ else:
                     return _decode_escape_sequence(sequence)
                 if sequence.startswith(b"O"):
                     return _decode_escape_sequence(sequence)
+                if sequence in (b"\x7f", b"\x08"):
+                    return "alt+backspace"
                 if sequence:
-                    return "alt+" + sequence.decode("utf-8", errors="replace")
+                    # ESC + one printable character is commonly Alt+<key>.
+                    # Never insert an unknown multi-character escape sequence.
+                    if len(sequence) == 1:
+                        char = sequence.decode("utf-8", errors="replace")
+                        if char.isprintable():
+                            return "alt+" + char
+                    return "\x1b"
                 return "\x1b"
             if not first:
                 return ""
@@ -455,7 +464,7 @@ class Editor:
             if self.search_active
             else self.message or (
                 "Ctrl+S Save  Ctrl+Z Undo  Ctrl+Y Redo  Ctrl+Q Quit  "
-                "Ctrl+F Search  Ctrl+T Terminal  Ctrl+Backspace/Delete Word"
+                "Ctrl+F Search  Ctrl+T Terminal  Ctrl+R Run ChemQL  Ctrl+Backspace/Delete Word"
             )
         )
         output.extend((DIM, footer[:cols].ljust(cols), RESET))
@@ -529,7 +538,9 @@ class Editor:
             return self._handle_search_key(key)
         if key in ("\x14", "ctrl+t"):
             self._run_split_terminal()
-            self.message = "Terminal closed"
+            return False
+        if key in ("\x12", "ctrl+r"):
+            self._run_split_terminal(run_chemql=True)
             return False
         if key in ("\x06", "ctrl+f"):
             self._open_search()
@@ -596,7 +607,7 @@ class Editor:
                 self._scroll_view(-1 if base_key == "arrow_up" else 1)
             else:
                 self._move_cursor(base_key, shift=shift, wordwise=wordwise)
-        elif key in ("\x08", "ctrl+backspace"):
+        elif key in ("\x08", "ctrl+backspace", "alt+backspace"):
             if os.name == "nt":
                 if not self._delete_selection(): # For some reason on windows it is the opposit
                     self._backspace()            # I have no idea why just stick to it
@@ -608,7 +619,7 @@ class Editor:
             else:
                 if not self._delete_selection():
                     self._backspace()
-        elif key in ("ctrl+delete",):
+        elif key in ("ctrl+delete", "alt+delete"):
             self._delete_word("right")
         elif key in ("delete", "\x1b[3~"):
             if not self._delete_selection():
@@ -617,7 +628,8 @@ class Editor:
             self._insert_newline()
         elif key == "\t":
             self._insert_text("\t")
-        elif key and key.isprintable():
+        elif key and key.isprintable() and "+" not in key:
+            # Symbolic key names (e.g. "alt+delete") are control events, not text.
             self._insert_text(key)
         if key not in ("\x11",):
             self.quit_requested = False
@@ -627,44 +639,58 @@ class Editor:
         self.cursor_x = min(self.cursor_x, len(self.lines[self.cursor_y]))
         return False
 
-    def _run_split_terminal(self):
-        """Open a shell in a manageable split pane where the platform allows it.
+    def _run_split_terminal(self, run_chemql=False):
+        """Open a shell; Ctrl+R also runs ChemQL on this file's absolute path."""
+        command = None
+        if run_chemql:
+            # Run the current buffer rather than stale on-disk contents.
+            if self.dirty:
+                self.save_file()
+                if self.dirty:
+                    return
+            absolute_path = os.path.abspath(self.filename)
+            if os.name == "nt":
+                command = "chemql -f " + subprocess.list2cmdline([absolute_path])
+            else:
+                import shlex
+                command = "chemql -f " + shlex.quote(absolute_path)
 
-        POSIX uses a PTY in the lower part of the current terminal. Ctrl+T or
-        Esc returns to the editor; Ctrl+Up/Down resizes the shell pane. Window
-        resize events are forwarded to the shell PTY. Windows Terminal owns
-        its split panes, so on Windows its pane is independently resizable and
-        closing the shell returns focus to the editor pane.
-        """
         if os.name == "nt":
             shell = os.environ.get("COMSPEC", "cmd.exe")
             wt = shutil.which("wt.exe") or shutil.which("wt")
 
             if wt and os.environ.get("WT_SESSION"):
                 try:
-                    subprocess.Popen([
+                    args = [
                         wt, "-w", "0", "split-pane", "-V",
                         "--size", "0.35", "--title", "ChemQL Terminal",
                         shell, "/K",
-                    ])
+                    ]
+                    if command:
+                        args.append(command)
+                    subprocess.Popen(args)
                 except OSError as error:
                     self.message = f"Could not open Windows Terminal pane: {error}"
                 else:
                     self.message = (
+                        "ChemQL running in Windows Terminal pane" if command else
                         "Terminal opened in a Windows Terminal pane; resize it with "
                         "Alt+Shift+Plus/Minus or drag the divider. Exit the shell to close it."
                     )
                 return
 
             try:
+                args = [shell]
+                if command:
+                    args.extend(["/K", command])
                 subprocess.Popen(
-                    [shell],
+                    args,
                     creationflags=getattr(subprocess, "CREATE_NEW_CONSOLE", 0),
                 )
             except OSError as error:
                 self.message = f"Could not open terminal: {error}"
             else:
-                self.message = "Terminal opened in a separate console window"
+                self.message = "ChemQL running in a separate console" if command else "Terminal opened in a separate console window"
             return
 
         stdin_fd = sys.stdin.fileno()
@@ -728,6 +754,8 @@ class Editor:
                 struct.pack("HHHH", pane_height, cols, 0, 0),
             )
             tty.setraw(stdin_fd)
+            if command:
+                os.write(master_fd, command.encode("utf-8") + b"\n")
             sys.stdout.write(f"\x1b[{pane_top};{rows}r\x1b[?6h\x1b[1;1H")
             sys.stdout.flush()
 

{chemql_python-1.5.6 → chemql_python-1.5.8}/src/chemql_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chemql-python
-Version: 1.5.6
+Version: 1.5.8
 Summary: A chemistry-focused query language and REPL
 Author-email: Mohammad Rakibul Islam <rakibulofficial1017@gmail.com>
 Requires-Python: >=3.10
@@ -19,7 +19,7 @@ SQL-inspired syntax, inspect elements and molecules, look up reactions,
 balance equations, and combine chemistry queries with Python and shell
 commands.
 
--   **Version:** `1.5.6`
+-   **Version:** `1.5.8`
 -   **PyPI distribution:** `chemql-python`
 -   **Python import / CLI name:** `chemql`
 -   **Author:** Mohammad Rakibul Islam