Merge pull request #84 from daily-co/use-openai-api-key

aconchillo · web-flow · commit e8a9d43287a2 · 2024-03-21T21:57:40.000+08:00
use OPENAI_API_KEY instead of OPENAI_CHATGPT_API_KEY
diff --git a/examples/foundational/02-llm-say-one-thing.py b/examples/foundational/02-llm-say-one-thing.py
@@ -36,7 +36,7 @@ async def main(room_url):
         )
 
         llm = OpenAILLMService(
-            api_key=os.getenv("OPENAI_CHATGPT_API_KEY"),
+            api_key=os.getenv("OPENAI_API_KEY"),
             model="gpt-4-turbo-preview")
 
         messages = [
diff --git a/examples/foundational/05-sync-speech-and-image.py b/examples/foundational/05-sync-speech-and-image.py
@@ -82,7 +82,7 @@ async def main(room_url):
         )
 
         llm = OpenAILLMService(
-            api_key=os.getenv("OPENAI_CHATGPT_API_KEY"),
+            api_key=os.getenv("OPENAI_API_KEY"),
             model="gpt-4-turbo-preview")
 
         imagegen = FalImageGenService(
diff --git a/examples/foundational/05a-local-sync-speech-and-text.py b/examples/foundational/05a-local-sync-speech-and-text.py
@@ -38,7 +38,7 @@ async def main(room_url):
         )
 
         llm = OpenAILLMService(
-            api_key=os.getenv("OPENAI_CHATGPT_API_KEY"),
+            api_key=os.getenv("OPENAI_API_KEY"),
             model="gpt-4-turbo-preview")
 
         dalle = FalImageGenService(
diff --git a/examples/foundational/06-listen-and-respond.py b/examples/foundational/06-listen-and-respond.py
@@ -44,7 +44,7 @@ async def main(room_url: str, token):
         )
 
         llm = OpenAILLMService(
-            api_key=os.getenv("OPENAI_CHATGPT_API_KEY"),
+            api_key=os.getenv("OPENAI_API_KEY"),
             model="gpt-4-turbo-preview")
         fl = FrameLogger("Inner")
         fl2 = FrameLogger("Outer")
diff --git a/examples/foundational/06a-image-sync.py b/examples/foundational/06a-image-sync.py
@@ -65,7 +65,7 @@ async def main(room_url: str, token):
         )
 
         llm = OpenAILLMService(
-            api_key=os.getenv("OPENAI_CHATGPT_API_KEY"),
+            api_key=os.getenv("OPENAI_API_KEY"),
             model="gpt-4-turbo-preview")
 
         img = FalImageGenService(
diff --git a/examples/foundational/07-interruptible.py b/examples/foundational/07-interruptible.py
@@ -46,7 +46,7 @@ async def main(room_url: str, token):
         )
 
         llm = OpenAILLMService(
-            api_key=os.getenv("OPENAI_CHATGPT_API_KEY"),
+            api_key=os.getenv("OPENAI_API_KEY"),
             model="gpt-4-turbo-preview")
 
         pipeline = Pipeline([FrameLogger(), llm, FrameLogger(), tts])
diff --git a/examples/foundational/10-wake-word.py b/examples/foundational/10-wake-word.py
@@ -135,7 +135,7 @@ async def main(room_url: str, token):
         transport._camera_height = 1280
 
         llm = OpenAILLMService(
-            api_key=os.getenv("OPENAI_CHATGPT_API_KEY"),
+            api_key=os.getenv("OPENAI_API_KEY"),
             model="gpt-4-turbo-preview")
 
         tts = ElevenLabsTTSService(
diff --git a/examples/foundational/11-sound-effects.py b/examples/foundational/11-sound-effects.py
@@ -84,7 +84,7 @@ async def main(room_url: str, token):
         )
 
         llm = OpenAILLMService(
-            api_key=os.getenv("OPENAI_CHATGPT_API_KEY"),
+            api_key=os.getenv("OPENAI_API_KEY"),
             model="gpt-4-turbo-preview")
 
         tts = ElevenLabsTTSService(
diff --git a/examples/starter-apps/chatbot.py b/examples/starter-apps/chatbot.py
@@ -113,7 +113,7 @@ async def main(room_url: str, token):
         )
 
         llm = OpenAILLMService(
-            api_key=os.getenv("OPENAI_CHATGPT_API_KEY"),
+            api_key=os.getenv("OPENAI_API_KEY"),
             model="gpt-4-turbo-preview")
 
         ta = TalkingAnimation()
diff --git a/examples/starter-apps/patient-intake.py b/examples/starter-apps/patient-intake.py
@@ -310,7 +310,7 @@ async def main(room_url: str, token):
         messages = []
 
         llm = OpenAILLMService(
-            api_key=os.getenv("OPENAI_CHATGPT_API_KEY"),
+            api_key=os.getenv("OPENAI_API_KEY"),
             model="gpt-4-1106-preview",
         )
         # tts = DeepgramTTSService(
diff --git a/examples/starter-apps/storybot.py b/examples/starter-apps/storybot.py
@@ -203,7 +203,7 @@ async def main(room_url: str, token):
         story = []
 
         llm = OpenAILLMService(
-            api_key=os.getenv("OPENAI_CHATGPT_API_KEY"),
+            api_key=os.getenv("OPENAI_API_KEY"),
             model="gpt-4-1106-preview",
         )  # gpt-4-1106-preview
         tts = ElevenLabsTTSService(
diff --git a/examples/starter-apps/translator.py b/examples/starter-apps/translator.py
@@ -73,7 +73,7 @@ async def main(room_url: str, token):
             voice="es-ES-AlvaroNeural",
         )
         llm = OpenAILLMService(
-            api_key=os.getenv("OPENAI_CHATGPT_API_KEY"),
+            api_key=os.getenv("OPENAI_API_KEY"),
             model="gpt-4-turbo-preview")
         sa = SentenceAggregator()
         tp = TranslationProcessor("Spanish")

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ async def main(room_url):`
`36`	`36`	`)`
`37`	`37`
`38`	`38`	`llm = OpenAILLMService(`
`39`		`- api_key=os.getenv("OPENAI_CHATGPT_API_KEY"),`
	`39`	`+ api_key=os.getenv("OPENAI_API_KEY"),`
`40`	`40`	`model="gpt-4-turbo-preview")`
`41`	`41`
`42`	`42`	`messages = [`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ async def main(room_url):`
`82`	`82`	`)`
`83`	`83`
`84`	`84`	`llm = OpenAILLMService(`
`85`		`- api_key=os.getenv("OPENAI_CHATGPT_API_KEY"),`
	`85`	`+ api_key=os.getenv("OPENAI_API_KEY"),`
`86`	`86`	`model="gpt-4-turbo-preview")`
`87`	`87`
`88`	`88`	`imagegen = FalImageGenService(`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ async def main(room_url):`
`38`	`38`	`)`
`39`	`39`
`40`	`40`	`llm = OpenAILLMService(`
`41`		`- api_key=os.getenv("OPENAI_CHATGPT_API_KEY"),`
	`41`	`+ api_key=os.getenv("OPENAI_API_KEY"),`
`42`	`42`	`model="gpt-4-turbo-preview")`
`43`	`43`
`44`	`44`	`dalle = FalImageGenService(`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ async def main(room_url: str, token):`
`44`	`44`	`)`
`45`	`45`
`46`	`46`	`llm = OpenAILLMService(`
`47`		`- api_key=os.getenv("OPENAI_CHATGPT_API_KEY"),`
	`47`	`+ api_key=os.getenv("OPENAI_API_KEY"),`
`48`	`48`	`model="gpt-4-turbo-preview")`
`49`	`49`	`fl = FrameLogger("Inner")`
`50`	`50`	`fl2 = FrameLogger("Outer")`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ async def main(room_url: str, token):`
`65`	`65`	`)`
`66`	`66`
`67`	`67`	`llm = OpenAILLMService(`
`68`		`- api_key=os.getenv("OPENAI_CHATGPT_API_KEY"),`
	`68`	`+ api_key=os.getenv("OPENAI_API_KEY"),`
`69`	`69`	`model="gpt-4-turbo-preview")`
`70`	`70`
`71`	`71`	`img = FalImageGenService(`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ async def main(room_url: str, token):`
`46`	`46`	`)`
`47`	`47`
`48`	`48`	`llm = OpenAILLMService(`
`49`		`- api_key=os.getenv("OPENAI_CHATGPT_API_KEY"),`
	`49`	`+ api_key=os.getenv("OPENAI_API_KEY"),`
`50`	`50`	`model="gpt-4-turbo-preview")`
`51`	`51`
`52`	`52`	`pipeline = Pipeline([FrameLogger(), llm, FrameLogger(), tts])`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ async def main(room_url: str, token):`
`84`	`84`	`)`
`85`	`85`
`86`	`86`	`llm = OpenAILLMService(`
`87`		`- api_key=os.getenv("OPENAI_CHATGPT_API_KEY"),`
	`87`	`+ api_key=os.getenv("OPENAI_API_KEY"),`
`88`	`88`	`model="gpt-4-turbo-preview")`
`89`	`89`
`90`	`90`	`tts = ElevenLabsTTSService(`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ async def main(room_url: str, token):`
`113`	`113`	`)`
`114`	`114`
`115`	`115`	`llm = OpenAILLMService(`
`116`		`- api_key=os.getenv("OPENAI_CHATGPT_API_KEY"),`
	`116`	`+ api_key=os.getenv("OPENAI_API_KEY"),`
`117`	`117`	`model="gpt-4-turbo-preview")`
`118`	`118`
`119`	`119`	`ta = TalkingAnimation()`
Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,7 @@ async def main(room_url: str, token):`
`310`	`310`	`messages = []`
`311`	`311`
`312`	`312`	`llm = OpenAILLMService(`
`313`		`- api_key=os.getenv("OPENAI_CHATGPT_API_KEY"),`
	`313`	`+ api_key=os.getenv("OPENAI_API_KEY"),`
`314`	`314`	`model="gpt-4-1106-preview",`
`315`	`315`	`)`
`316`	`316`	`# tts = DeepgramTTSService(`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ async def main(room_url: str, token):`
`73`	`73`	`voice="es-ES-AlvaroNeural",`
`74`	`74`	`)`
`75`	`75`	`llm = OpenAILLMService(`
`76`		`- api_key=os.getenv("OPENAI_CHATGPT_API_KEY"),`
	`76`	`+ api_key=os.getenv("OPENAI_API_KEY"),`
`77`	`77`	`model="gpt-4-turbo-preview")`
`78`	`78`	`sa = SentenceAggregator()`
`79`	`79`	`tp = TranslationProcessor("Spanish")`