gptcmd 2.3.4__tar.gz → 2.4.0__tar.gz

{gptcmd-2.3.4 → gptcmd-2.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gptcmd
-Version: 2.3.4
+Version: 2.4.0
 Summary: Command line GPT conversation and experimentation environment
 Author-email: Bill Dengler <codeofdusk@gmail.com>
 License-Expression: MPL-2.0
@@ -221,7 +221,7 @@ The first ten digits of pi are 3.141592653.
 With no arguments, the `user`, `assistant`, `system`, and `say` commands open an external text editor (based on your system or Gptcmd configuration) for message composition.
 
 ### Working with attachments
-OpenAI's latest models, such as `gppt-4o`, support images alongside text content. Images can be attached to messages with the `image` command, which accepts two arguments: the location of the image, either a URL or path to a local file; and the index of the message to which the image should be attached (if unspecified, it defaults to the last). We'll ask GPT to describe an image by creating a user message and attaching an image from Wikimedia Commons:
+OpenAI's latest models, such as `gpt-4o`, support images alongside text content. Images can be attached to messages with the `image` command, which accepts two arguments: the location of the image, either a URL or path to a local file; and the index of the message to which the image should be attached (if unspecified, it defaults to the last). We'll ask GPT to describe an image by creating a user message and attaching an image from Wikimedia Commons:
 
 ```
 (gpt-4o) user What's in this image?
@@ -451,7 +451,7 @@ Unset all parameters
 ```
 
 ### Names
-GPT allows mesages to be annotated with the name of their author. The `name` command sets the name to be sent with all future messages of the specified role. Its first argument is the role to which this new name should be applied, and its second is the name to use:
+GPT allows messages to be annotated with the name of their author. The `name` command sets the name to be sent with all future messages of the specified role. Its first argument is the role to which this new name should be applied, and its second is the name to use:
 
 ```
 (gpt-4o) name user Michael

{gptcmd-2.3.4 → gptcmd-2.4.0}/README.md

@@ -201,7 +201,7 @@ The first ten digits of pi are 3.141592653.
 With no arguments, the `user`, `assistant`, `system`, and `say` commands open an external text editor (based on your system or Gptcmd configuration) for message composition.
 
 ### Working with attachments
-OpenAI's latest models, such as `gppt-4o`, support images alongside text content. Images can be attached to messages with the `image` command, which accepts two arguments: the location of the image, either a URL or path to a local file; and the index of the message to which the image should be attached (if unspecified, it defaults to the last). We'll ask GPT to describe an image by creating a user message and attaching an image from Wikimedia Commons:
+OpenAI's latest models, such as `gpt-4o`, support images alongside text content. Images can be attached to messages with the `image` command, which accepts two arguments: the location of the image, either a URL or path to a local file; and the index of the message to which the image should be attached (if unspecified, it defaults to the last). We'll ask GPT to describe an image by creating a user message and attaching an image from Wikimedia Commons:
 
 ```
 (gpt-4o) user What's in this image?
@@ -431,7 +431,7 @@ Unset all parameters
 ```
 
 ### Names
-GPT allows mesages to be annotated with the name of their author. The `name` command sets the name to be sent with all future messages of the specified role. Its first argument is the role to which this new name should be applied, and its second is the name to use:
+GPT allows messages to be annotated with the name of their author. The `name` command sets the name to be sent with all future messages of the specified role. Its first argument is the role to which this new name should be applied, and its second is the name to use:
 
 ```
 (gpt-4o) name user Michael

{gptcmd-2.3.4 → gptcmd-2.4.0}/src/gptcmd/__init__.py

@@ -8,6 +8,6 @@ file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 __all__ = ["__version__", "Gptcmd"]
 
-__version__ = "2.3.4"
+__version__ = "2.4.0"
 
 from .cli import Gptcmd  # noqa: E402

{gptcmd-2.3.4 → gptcmd-2.4.0}/src/gptcmd/cli.py

@@ -18,6 +18,7 @@ import json
 import os
 import re
 import shlex
+import signal
 import subprocess
 import sys
 import tempfile
@@ -816,7 +817,7 @@ class Gptcmd(cmd.Cmd):
         """
         Move the message at the beginning of a range to the end of that range.
         In other words, move <i> <j> moves the ith message of a thread to
-        index j.
+        index j, using the same inclusive range syntax as other commands.
         """
         if not arg:
             print("Usage: move <from> <to>")
@@ -831,17 +832,22 @@ class Gptcmd(cmd.Cmd):
         length = len(self._current_thread.messages)
         if i is None:
             i = 0
+        elif i < 0:
+            i += length
+
         if j is None:
             j = length
-        if i < 0:
-            i += length
-        if j < 0:
+        elif j < 0:
             j += length
-        elif j > 0:
-            j -= 1  # Adjust end for 1-based indexing
-        if not (0 <= j <= length):
+        # Range parsing returns an exclusive end; move needs the included end.
+        j -= 1
+
+        if not (0 <= j < length):
             print("Destination out of bounds")
             return
+        if not (0 <= i < length):
+            print("Message doesn't exist")
+            return
         try:
             msg = self._current_thread.move(i, j)
         except IndexError:
@@ -1792,7 +1798,7 @@ class Gptcmd(cmd.Cmd):
         return can_exit  # Truthy return values cause the cmdloop to stop
 
 
-def _write_crash_dump(shell: Gptcmd, exc: Exception) -> Optional[str]:
+def _write_crash_dump(shell: Gptcmd, exc: BaseException) -> Optional[str]:
     """
     Serialize the current shell into a JSON file and return its absolute
     path.
@@ -1834,6 +1840,169 @@ def _write_crash_dump(shell: Gptcmd, exc: Exception) -> Optional[str]:
             shell._threads.pop(detached_key, None)
 
 
+def _shell_has_dirty_state(shell: Gptcmd) -> bool:
+    "Return whether the shell has unsaved conversation state."
+    return bool(
+        (shell._detached and shell._detached.dirty)
+        or any(t and t.dirty for t in shell._threads.values())
+    )
+
+
+def _signal_name(signum: int) -> str:
+    try:
+        return signal.Signals(signum).name
+    except ValueError:
+        return f"signal {signum}"
+
+
+class _ShutdownDumpHandler:
+    """
+    Installs best-effort hooks for process shutdown events.
+    """
+
+    _WINDOWS_HANDLED_EVENTS = {
+        2: "CTRL_CLOSE_EVENT",
+        5: "CTRL_LOGOFF_EVENT",
+        6: "CTRL_SHUTDOWN_EVENT",
+    }
+
+    def __init__(self, shell: Gptcmd):
+        self._shell = shell
+        self._previous_signal_handlers: Dict[int, Any] = {}
+        self._windows_handler = None
+        self._windows_kernel32 = None
+        self._dump_lock = threading.RLock()
+        self._dump_attempted = False
+
+    def install(self) -> None:
+        "Install all shutdown hooks supported by the current platform."
+        self._install_signal_handlers()
+        if os.name == "nt":
+            self._install_windows_console_handler()
+
+    def uninstall(self) -> None:
+        "Remove shutdown hooks installed by this object."
+        for signum, previous_handler in self._previous_signal_handlers.items():
+            try:
+                signal.signal(signum, previous_handler)
+            except (OSError, RuntimeError, ValueError) as e:
+                self._warn(
+                    "Could not restore the previous handler for "
+                    f"{_signal_name(signum)}: {e}"
+                )
+        self._previous_signal_handlers.clear()
+        if self._windows_handler is None:
+            return
+        try:
+            res = self._windows_kernel32.SetConsoleCtrlHandler(
+                self._windows_handler,
+                False,
+            )
+        except OSError as e:
+            self._warn(
+                f"Could not remove the Windows console shutdown handler: {e}"
+            )
+            return
+        if not res:
+            self._warn("Could not remove the Windows console shutdown handler")
+        self._windows_handler = None
+        self._windows_kernel32 = None
+
+    def _install_signal_handlers(self) -> None:
+        signal_names = ["SIGTERM"]
+        if os.name == "nt":
+            signal_names.append("SIGBREAK")
+        else:
+            signal_names.extend(["SIGHUP", "SIGQUIT"])
+
+        for signal_name in signal_names:
+            signum = getattr(signal, signal_name, None)
+            if signum is None:
+                continue
+            if signum in self._previous_signal_handlers:
+                continue
+            try:
+                previous_handler = signal.getsignal(signum)
+                signal.signal(signum, self._handle_signal)
+            except (OSError, RuntimeError, ValueError) as e:
+                self._warn(
+                    "Could not install a shutdown handler for "
+                    f"{signal_name}: {e}"
+                )
+                continue
+            self._previous_signal_handlers[signum] = previous_handler
+
+    def _install_windows_console_handler(self) -> None:
+        try:
+            import ctypes
+            from ctypes import wintypes
+
+            handler_type = ctypes.WINFUNCTYPE(wintypes.BOOL, wintypes.DWORD)
+            kernel32 = ctypes.windll.kernel32
+        except (AttributeError, OSError) as e:
+            self._warn(f"Could not load Windows console shutdown support: {e}")
+            return
+
+        def _handler(ctrl_type: int) -> bool:
+            event = self._WINDOWS_HANDLED_EVENTS.get(ctrl_type)
+            if event is None:
+                return False
+            self._dump_once(event)
+            return True
+
+        console_handler = handler_type(_handler)
+        try:
+            res = kernel32.SetConsoleCtrlHandler(console_handler, True)
+        except OSError as e:
+            self._warn(
+                f"Could not install the Windows console shutdown handler: {e}"
+            )
+            return
+        if not res:
+            self._warn(
+                "Could not install the Windows console shutdown handler"
+            )
+            return
+        self._windows_handler = console_handler
+        self._windows_kernel32 = kernel32
+
+    def _handle_signal(self, signum: int, frame: Any) -> None:
+        del frame
+        self._dump_once(_signal_name(signum))
+        raise SystemExit(128 + signum)
+
+    def _dump_once(self, event: str) -> Optional[str]:
+        with self._dump_lock:
+            if self._dump_attempted:
+                return None
+            self._dump_attempted = True
+
+        if not _shell_has_dirty_state(self._shell):
+            return None
+
+        dump_path = _write_crash_dump(
+            self._shell,
+            RuntimeError(f"Process is shutting down: {event}"),
+        )
+        if dump_path:
+            print(
+                f"Crash dump written to {dump_path}",
+                file=sys.stderr,
+                flush=True,
+            )
+        return dump_path
+
+    @staticmethod
+    def _warn(message: str) -> None:
+        warnings.warn(
+            message
+            + "\nGptcmd may be unable to save a crash dump in the event of "
+            + "unexpected shutdown!",
+            RuntimeWarning,
+            stacklevel=3,
+        )
+
+
 class ExperimentalAPIWarning(Warning):
     pass
 
@@ -1897,17 +2066,15 @@ def _run(shell_cls) -> bool:
         shell.do_account(args.account, _print_on_success=False)
     if args.model:
         shell.do_model(args.model, _print_on_success=False)
+    shutdown_dump_handler = _ShutdownDumpHandler(shell)
+    shutdown_dump_handler.install()
     try:
         shell.cmdloop()
     except SystemExit:
         # Don't write a crash dump
         raise
     except BaseException as e:
-        # Does any thread contain messages?
-        should_save = (shell._detached and shell._detached.dirty) or any(
-            t and t.dirty for t in shell._threads.values()
-        )
-        if should_save:
+        if _shell_has_dirty_state(shell):
             dump_path = _write_crash_dump(shell, e)
             if dump_path:
                 # Hack: Print the "crash dump" notice after the traceback
@@ -1919,6 +2086,8 @@ def _run(shell_cls) -> bool:
                     )
                 )
         raise
+    finally:
+        shutdown_dump_handler.uninstall()
     return True
 
 

{gptcmd-2.3.4 → gptcmd-2.4.0}/src/gptcmd/llm/openai.py

@@ -26,10 +26,35 @@ from ..message import Audio, Image, Message, MessageRole
 import openai
 
 ModelCostInfo = namedtuple(
-    "ModelCostInfo", ("prompt_scale", "sampled_scale", "cache_discount_factor")
+    "ModelCostInfo",
+    (
+        "prompt_scale",
+        "sampled_scale",
+        "cache_discount_factor",
+        "long_prompt_threshold",
+        "long_prompt_factor",
+        "long_sampled_factor",
+    ),
+    defaults=(None, Decimal("1"), Decimal("1")),
 )
 
 OPENAI_COSTS: Dict[str, ModelCostInfo] = {
+    "gpt-5.5-2026-04-23": ModelCostInfo(
+        Decimal("5") / Decimal("1000000"),
+        Decimal("30") / Decimal("1000000"),
+        Decimal("0.1"),
+        272000,
+        Decimal("2"),
+        Decimal("1.5"),
+    ),
+    "gpt-5.4-2026-03-05": ModelCostInfo(
+        Decimal("2.5") / Decimal("1000000"),
+        Decimal("15") / Decimal("1000000"),
+        Decimal("0.1"),
+        272000,
+        Decimal("2"),
+        Decimal("1.5"),
+    ),
     "gpt-5.2-2025-12-11": ModelCostInfo(
         Decimal("1.75") / Decimal("1000000"),
         Decimal("14") / Decimal("1000000"),
@@ -280,10 +305,21 @@ class OpenAI(LLMProvider):
         cached_prompt_tokens = min(max(cached_prompt_tokens, 0), prompt_tokens)
         uncached_prompt_tokens = prompt_tokens - cached_prompt_tokens
         sampled_tokens = max(0, sampled_tokens)
+        long_context = (
+            info.long_prompt_threshold is not None
+            and prompt_tokens > info.long_prompt_threshold
+        )
+        prompt_factor = (
+            info.long_prompt_factor if long_context else Decimal("1")
+        )
+        sampled_factor = (
+            info.long_sampled_factor if long_context else Decimal("1")
+        )
+        cached_prompt_scale *= prompt_factor
         return (
-            Decimal(uncached_prompt_tokens) * info.prompt_scale
+            Decimal(uncached_prompt_tokens) * info.prompt_scale * prompt_factor
             + Decimal(cached_prompt_tokens) * cached_prompt_scale
-            + Decimal(sampled_tokens) * info.sampled_scale
+            + Decimal(sampled_tokens) * info.sampled_scale * sampled_factor
         ) * Decimal("100")
 
     def complete(self, messages: Sequence[Message]) -> LLMResponse:
@@ -371,6 +407,8 @@ class OpenAI(LLMProvider):
 
     def get_best_model(self):
         BEST_MODELS = (
+            "gpt-5.5",
+            "gpt-5.4",
             "gpt-5.2",
             "gpt-5.1",
             "gpt-5",

{gptcmd-2.3.4 → gptcmd-2.4.0}/src/gptcmd.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gptcmd
-Version: 2.3.4
+Version: 2.4.0
 Summary: Command line GPT conversation and experimentation environment
 Author-email: Bill Dengler <codeofdusk@gmail.com>
 License-Expression: MPL-2.0
@@ -221,7 +221,7 @@ The first ten digits of pi are 3.141592653.
 With no arguments, the `user`, `assistant`, `system`, and `say` commands open an external text editor (based on your system or Gptcmd configuration) for message composition.
 
 ### Working with attachments
-OpenAI's latest models, such as `gppt-4o`, support images alongside text content. Images can be attached to messages with the `image` command, which accepts two arguments: the location of the image, either a URL or path to a local file; and the index of the message to which the image should be attached (if unspecified, it defaults to the last). We'll ask GPT to describe an image by creating a user message and attaching an image from Wikimedia Commons:
+OpenAI's latest models, such as `gpt-4o`, support images alongside text content. Images can be attached to messages with the `image` command, which accepts two arguments: the location of the image, either a URL or path to a local file; and the index of the message to which the image should be attached (if unspecified, it defaults to the last). We'll ask GPT to describe an image by creating a user message and attaching an image from Wikimedia Commons:
 
 ```
 (gpt-4o) user What's in this image?
@@ -451,7 +451,7 @@ Unset all parameters
 ```
 
 ### Names
-GPT allows mesages to be annotated with the name of their author. The `name` command sets the name to be sent with all future messages of the specified role. Its first argument is the role to which this new name should be applied, and its second is the name to use:
+GPT allows messages to be annotated with the name of their author. The `name` command sets the name to be sent with all future messages of the specified role. Its first argument is the role to which this new name should be applied, and its second is the name to use:
 
 ```
 (gpt-4o) name user Michael