add new model pricings, model aliases for o1

Author: npiv

README.md

@@ -226,8 +226,8 @@ chatblade can be used with an Azure OpenAI endpoint, in which case in addition t
 ### Help
 
 ```
-usage: Chatblade [-h] [--openai-api-key key] [--temperature t] [-c CHAT_GPT] [-i] [-s] [-t] [-p name] [-e] [-r] [-n] [-o] [--theme theme] [-l] [-S sess] [--session-list] [--session-path] [--session-dump] [--session-delete]
-                 [--session-rename newsess]
+usage: Chatblade [-h] [--openai-api-key key] [--openai-base-url key] [--temperature t] [-c CHAT_GPT] [-i] [-s] [-t] [--version] [-p name] [-e] [-r] [-n] [-o] [--theme theme] [-l]
+                 [-S sess] [--session-list] [--session-path] [--session-dump] [--session-delete] [--session-rename newsess]
                  [query ...]
 
 a CLI Swiss Army Knife for ChatGPT
@@ -241,12 +241,12 @@ options:
   --openai-base-url key            A custom url to use the openAI against a local or custom model, eg ollama
   --temperature t                  temperature (openai setting)
   -c CHAT_GPT, --chat-gpt CHAT_GPT
-                                   ChatGPT model - use either the fully qualified model name, or one of 3.5 (gpt-3.5-turbo), 4 (gpt-4),
-                                   4t (gpt-4-turbo), 4o (gpt-4o), mini (gpt-4o-mini). Default is gpt-4o-mini. Can also be set via env variable OPENAI_API_MODEL, see
-                                   https://platform.openai.com/docs/models/continuous-model-upgrades for available models.
+                                   chat GPT model use either the fully qualified model name, or 3.5 (gpt-3.5-turbo), 4 (gpt-4), 4t (gpt-4-turbo), 4o (gpt-4o), mini (gpt-4o-mini),
+                                   o1 (o1-preview), o1mini (o1-mini). Can also be set via env variable OPENAI_API_MODEL
   -i, --interactive                start an interactive chat session. This will implicitly continue the conversation
   -s, --stream                     Stream the incoming text to the terminal
   -t, --tokens                     display what *would* be sent, how many tokens, and estimated costs
+  --version                        display the chatblade version
   -p name, --prompt-file name      prompt name - will load the prompt with that name at ~/.config/chatblade/name or a path to a file
 
 result formatting options:
@@ -265,3 +265,4 @@ session options:
   --session-delete                 delete session
   --session-rename newsess         rename session
 ```
+

chatblade/chat.py

@@ -34,9 +34,12 @@ def import_yaml(cls, seq):
 
 costs = [
     CostConfig("gpt-3.5-turbo", 0.5, 1.5),
-    CostConfig("gpt-4", 5, 15),
-    CostConfig("gpt-4-1106-preview", 5, 15),
-    CostConfig("gpt-4o-mini", 0.15, 0.6),
+    CostConfig("gpt-4-turbo", 10, 30),
+    CostConfig("gpt-4", 30, 60),
+    CostConfig("gpt-4-1106-preview", 10, 60),
+    CostConfig("gpt-4o-mini", 0.15, 0.075),
+    CostConfig("o1-preview", 15, 60),
+    CostConfig("o1-mini", 3, 1.5),
 ]
 
 
@@ -113,7 +116,9 @@ def build_client(config):
             azure_deployment=os.environ.get("OPENAI_API_AZURE_ENGINE"),
         )
     else:
-        return openai.OpenAI(api_key=config["openai_api_key"], base_url=config["openai_base_url"])
+        return openai.OpenAI(
+            api_key=config["openai_api_key"], base_url=config["openai_base_url"]
+        )
 
 
 def query_chat_gpt(messages, config):

chatblade/parser.py

@@ -27,16 +27,20 @@ def get_openai_key(options):
     "4t": "gpt-4-turbo",
     "4o": "gpt-4o",
     "mini": "gpt-4o-mini",
+    "o1": "o1-preview",
+    "o1mini": "o1-mini",
 }
 
+DEFAULT_MODEL = "mini"
+
 
 def get_openai_model(options):
     choice = options["chat_gpt"]
     if not choice:
         if "OPENAI_API_MODEL" in os.environ:
             choice = os.environ["OPENAI_API_MODEL"]
         else:
-            choice = "mini"
+            choice = DEFAULT_MODEL
 
     if choice in model_mappings:
         return model_mappings[choice]

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = chatblade
-version = 0.6.4
+version = 0.7.0
 description = CLI Swiss Army Knife for ChatGPT
 long_description = file: README.md
 long_description_content_type=text/markdown