commandchat 0.0.6__tar.gz → 0.0.7__tar.gz

{commandchat-0.0.6 → commandchat-0.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: commandchat
-Version: 0.0.6
+Version: 0.0.7
 Summary: use command to chat with openai models
 Home-page: https://github.com/
 Author: xoto

{commandchat-0.0.6 → commandchat-0.0.7}/commandchat.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: commandchat
-Version: 0.0.6
+Version: 0.0.7
 Summary: use command to chat with openai models
 Home-page: https://github.com/
 Author: xoto

{commandchat-0.0.6 → commandchat-0.0.7}/occ/CommandChat.py

@@ -1,6 +1,7 @@
 import json
 import openai
 from openai import OpenAI
+from openai import AzureOpenAI
 import os
 
 from occ.commons.config import get_env
@@ -34,7 +35,12 @@ class CommandChat:
         if not os.path.exists(self.file_name):
             open(self.file_name, 'w').close()
         self.messages = [json.loads(line) for line in (line.strip() for line in open(self.file_name)) if line.strip()]
-        self.client = OpenAI()
+        if "azure" == get_env(profile or DEFAULT_PROFILE, "api_server_type"):
+            self.client = AzureOpenAI(api_key=self.api_key,
+                                      api_version=get_env(profile or DEFAULT_PROFILE, "api_version"),
+                                      azure_endpoint=self.api_base)
+        else:
+            self.client = OpenAI()
 
     def image_create(self, description, size, num):
         try:
@@ -64,7 +70,29 @@ class CommandChat:
             print(e.http_status)
             print(e.error)
 
+    def completions(self, message, model):
+        waiting_start()
+        stream = self.client.completions.create(
+            model=model,
+            prompt=message,
+            max_tokens=4090 - len(message),
+            temperature=0.1,
+            stream=True
+        )
+        waiting_stop()
+        for completion in stream:
+            for choice in completion.choices:
+                print(choice.text, end="")
+
+        print("\n")
+
     def chat(self, message, model):
+        if model == "gpt-35-turbo-instruct":
+            self.completions(message, model)
+        else:
+            self.chat_completions(message, model)
+
+    def chat_completions(self, message, model):
         openai.api_key = self.api_key
         openai.api_base = self.api_base
         message = {"role": "user", "content": message}
@@ -117,3 +145,8 @@ class CommandChat:
             f.seek(0)
             f.truncate()
             f.writelines(lines)
+
+
+if __name__ == '__main__':
+    command_chat = CommandChat()
+    command_chat.chat("帮我写一个python的冒泡排序算法", "gpt-35-turbo-instruct")

{commandchat-0.0.6 → commandchat-0.0.7}/occ/configuration/profile_config.py

@@ -9,14 +9,22 @@ def add_default_profile():
                            default=config.get_default_env("api_key"), type=str)
     config.set_env('default', 'api_key', api_key)
 
-    api_key = click.prompt(logger.style('\n[default] Your api_base_url(Optional) '),
+    api_base_url = click.prompt(logger.style('\n[default] Your api_base_url(Optional) '),
                            default=config.get_default_env("api_base_url"), type=str)
-    config.set_env('default', 'api_base_url', api_key)
+    config.set_env('default', 'api_base_url', api_base_url)
 
     limit_history = click.prompt(logger.style('\n[default] Your default limit_history '),
                                  default=config.get_default_env("limit_history"), type=str)
     config.set_env('default', 'limit_history', limit_history)
 
+    api_server_type = click.prompt(logger.style('\n[default] Your default api_server_type '),
+                                 default=config.get_default_env("api_server_type"), type=str)
+    config.set_env('default', 'api_server_type', api_server_type)
+
+    api_version = click.prompt(logger.style('\n[default] Your default api_version '),
+                                 default=config.get_default_env("api_version"), type=str)
+    config.set_env('default', 'api_version', api_version)
+
 
 def input_config_vars(profile_name, key_name, is_default_exist):
     if is_default_exist:
@@ -34,3 +42,5 @@ def add_profile(profile_name):
     input_config_vars(profile_name, 'api_key', False)
     input_config_vars(profile_name, 'api_base_url', False)
     input_config_vars(profile_name, 'limit_history', False)
+    input_config_vars(profile_name, 'api_server_type', False)
+    input_config_vars(profile_name, 'api_version', False)

{commandchat-0.0.6 → commandchat-0.0.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "commandchat"
-version = "0.0.6"
+version = "0.0.7"
 description = "use command to chat with openai models"
 readme = "README.md"
 requires-python = ">=3.8"