m3tam3re/fabric
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed how the API key was loaded to be sent to OpenAI.

Browse Source
This commit is contained in:
Daniel Miessler 2024-02-03 06:11:29 -08:00
parent b7f04937e5
commit d1e5eea301
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
client/utils.py
View File

@ -3,6 +3,7 @@ import os
from openai import OpenAI from openai import OpenAI
import pyperclip import pyperclip
import sys import sys
from dotenv import load_dotenv
current_directory = os.path.dirname(os.path.realpath(__file__)) current_directory = os.path.dirname(os.path.realpath(__file__))
config_directory = os.path.expanduser("~/.config/fabric") config_directory = os.path.expanduser("~/.config/fabric")
@ -10,11 +11,16 @@ env_file = os.path.join(config_directory, ".env")
class Standalone: class Standalone:
def __init__(self, args, pattern=""): def __init__(self, args, pattern="", env_file="~/.config/fabric/.env"):
env_file = os.path.expanduser(env_file) # Expand the tilde to the full path
load_dotenv(env_file)
try: try:
with open(env_file, "r") as f: apikey = os.environ["OPENAI_API_KEY"]
apikey = f.read().split("=")[1] self.client = OpenAI()
self.client = OpenAI(api_key=apikey) self.client.api_key = apikey
except KeyError:
print("OPENAI_API_KEY not found in environment variables.")
except FileNotFoundError: except FileNotFoundError:
print("No API key found. Use the --apikey option to set the key") print("No API key found. Use the --apikey option to set the key")
sys.exit() sys.exit()
@ -42,7 +48,7 @@ class Standalone:
messages = [user_message] messages = [user_message]
try: try:
stream = self.client.chat.completions.create( stream = self.client.chat.completions.create(
model="gpt-4-turbo-preview", model="gpt-4",
messages=messages, messages=messages,
temperature=0.0, temperature=0.0,
top_p=1, top_p=1,
@ -63,6 +69,7 @@ class Standalone:
sys.stdout.flush() sys.stdout.flush()
except Exception as e: except Exception as e:
print(f"Error: {e}") print(f"Error: {e}")
print(e)
if self.args.copy: if self.args.copy:
pyperclip.copy(buffer) pyperclip.copy(buffer)
if self.args.output: if self.args.output:
@ -88,16 +95,18 @@ class Standalone:
messages = [user_message] messages = [user_message]
try: try:
response = self.client.chat.completions.create( response = self.client.chat.completions.create(
model="gpt-4-turbo-preview", model="gpt-4",
messages=messages, messages=messages,
temperature=0.0, temperature=0.0,
top_p=1, top_p=1,
frequency_penalty=0.1, frequency_penalty=0.1,
presence_penalty=0.1, presence_penalty=0.1,
) )
print(response)
print(response.choices[0].message.content) print(response.choices[0].message.content)
except Exception as e: except Exception as e:
print(f"Error: {e}") print(f"Error: {e}")
print(e)
if self.args.copy: if self.args.copy:
pyperclip.copy(response.choices[0].message.content) pyperclip.copy(response.choices[0].message.content)
if self.args.output: if self.args.output: