Temporarily restore Python 3.7 compatibility

I'll roll this back after the release.

This reverts commit b86fb1d.

Author: codeofdusk

README.md

@@ -2,7 +2,7 @@
 Gptcmd allows you to interact with large language models, such as OpenAI's GPT, efficiently in your terminal. Gptcmd can manage multiple concurrent "threads" of conversation, allowing for free and easy prompt experimentation and iteration. Individual messages can be manipulated, loaded from, and saved to files (both plain text and JSON), and API parameters are fully customizable. In short, Gptcmd is simple yet flexible, useful for both basic conversation and more involved prototyping.
 
 ## Getting started
-Gptcmd requires [Python](https://python.org) 3.8.6 or later. It is available on PyPI, and can, for instance, be installed with `pip install gptcmd` at a command line shell. Running `gptcmd` at a shell starts the application. If Python's `bin` or `scripts` directory isn't on your path, you may need to launch the application with a command like `~/.local/bin/gptcmd` (depending on your system configuration). In most cases though, `gptcmd` should "just work".
+Gptcmd requires [Python](https://python.org) 3.7.1. Python 3.8.6 or later is strongly recommended and will be required to run future releases. Gptcmd is available on PyPI, and can, for instance, be installed with `pip install gptcmd` at a command line shell. Running `gptcmd` at a shell starts the application. If Python's `bin` or `scripts` directory isn't on your path, you may need to launch the application with a command like `~/.local/bin/gptcmd` (depending on your system configuration). In most cases though, `gptcmd` should "just work".
 
 If you'd like to use OpenAI models and you don't have an OpenAI account, you'll need to create one and [add some credit](https://platform.openai.com/account/billing/overview). $5 or so goes very far, [especially on `gpt-4o-mini`](#model-selection).
 

pyproject.toml

@@ -9,16 +9,20 @@ authors = [
 ]
 description = "Command line GPT conversation and experimentation environment"
 readme = "README.md"
-requires-python = ">=3.8.6"
+requires-python = ">=3.7.1"
 classifiers = [
     "Programming Language :: Python :: 3",
     "License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)",
     "Operating System :: OS Independent",
 ]
 dependencies = [
-    "openai>=1.54.0, < 2.0.0",
-    "tomli>=1.1.0, < 2.0.0 ; python_version < '3.11'", 
-    "backports.strenum>=1.3.1, < 2.0.0 ; python_version < '3.11'", 
+    # openai/openai-python#1784: versions 1.40.0 and above fail to install on Python 3.7
+    "openai>=1.26.0, <2.0.0 ; python_version >= '3.8'",
+    "openai>=1.26.0, <1.40.0 ; python_version < '3.8'",
+    "tomli>=1.1.0 ; python_version < '3.11'",
+    "backports.strenum>=1.3.1, <2.0.0 ; python_full_version >= '3.8.6' and python_version < '3.11'",
+    "StrEnum==0.4.15 ; python_full_version < '3.8.6'",
+    "importlib-metadata>=1.0.0, < 9.0.0 ; python_version < '3.8'"
 ]
 dynamic = ["version"]
 
@@ -37,5 +41,5 @@ version = {attr = "gptcmd.cli.__version__"}
 
 [tool.black]
 line-length = 79
-target-version = ['py38']
+target-version = ['py37']
 preview=true

src/gptcmd/cli.py

@@ -1133,7 +1133,6 @@ def _edit_interactively(
                 mode="w",
                 delete=False,
                 encoding="utf-8",
-                errors="ignore",
             ) as cam:
                 cam.write(initial_text)
                 tempname = cam.name

src/gptcmd/config.py

@@ -15,9 +15,13 @@
 import shlex
 import shutil
 from importlib import resources
-from importlib.metadata import entry_points
 from typing import Dict, List, Optional, Type
 
+if sys.version_info >= (3, 8):
+    from importlib.metadata import entry_points
+else:
+    from importlib_metadata import entry_points
+
 if sys.version_info >= (3, 11):
     import tomllib
 else:

src/gptcmd/llm/openai.py

@@ -198,13 +198,18 @@ def complete(self, messages: Sequence[Message]) -> LLMResponse:
             )
         choice = resp.choices[0]
         prompt_tokens = resp.usage.prompt_tokens
+        # Older versions of the openai package return
+        # prompt_tokens_details as a dict, and newer versions return it as
+        # a custom type or None.
+        # Standardize on a dict representation.
         prompt_tokens_details = getattr(
             resp.usage, "prompt_tokens_details", None
         )
         if prompt_tokens_details is None:
-            cached_prompt_tokens = 0
+            prompt_tokens_details = {}
         else:
-            cached_prompt_tokens = prompt_tokens_details.cached_tokens
+            prompt_tokens_details = dict(prompt_tokens_details)
+        cached_prompt_tokens = prompt_tokens_details.get("cached_tokens", 0)
         sampled_tokens = resp.usage.completion_tokens
 
         return LLMResponse(
@@ -320,13 +325,20 @@ def __next__(self):
             raise CompletionError(str(e)) from e
         if chunk.usage:
             prompt_tokens = chunk.usage.prompt_tokens
+            # Older versions of the openai package return
+            # prompt_tokens_details as a dict, and newer versions return it as
+            # a custom type or None.
+            # Standardize on a dict representation.
             prompt_tokens_details = getattr(
                 chunk.usage, "prompt_tokens_details", None
             )
             if prompt_tokens_details is None:
-                cached_prompt_tokens = 0
+                prompt_tokens_details = {}
             else:
-                cached_prompt_tokens = prompt_tokens_details.cached_tokens
+                prompt_tokens_details = dict(prompt_tokens_details)
+            cached_prompt_tokens = prompt_tokens_details.get(
+                "cached_tokens", 0
+            )
             sampled_tokens = chunk.usage.completion_tokens
             self.prompt_tokens = prompt_tokens
             self.sampled_tokens = sampled_tokens

src/gptcmd/message.py

@@ -14,7 +14,6 @@
 import sys
 from abc import ABC, abstractmethod
 from collections.abc import Sequence
-from enum import auto
 from typing import (
     Any,
     Callable,
@@ -30,8 +29,10 @@
 
 if sys.version_info >= (3, 11):
     from enum import StrEnum
-else:
+elif sys.version_info >= (3, 8, 6):
     from backports.strenum import StrEnum
+else:
+    from strenum import StrEnum
 
 
 T = TypeVar("T")
@@ -192,9 +193,14 @@ class MessageRole(StrEnum):
     Message objects
     """
 
-    USER = auto()
-    ASSISTANT = auto()
-    SYSTEM = auto()
+    # Don't use enum.auto() to define member values since its behaviour
+    # differs between strenum and enum.
+    # When gptcmd no longer supports Python 3.7, we can migrate to the
+    # backports.strenum package.
+
+    USER = "user"
+    ASSISTANT = "assistant"
+    SYSTEM = "system"
 
 
 @dataclasses.dataclass