Fixing problem passing api key in options and dirrectly as parameter.

longevity-genie · Jun 23, 2024 · ce094a1 · ce094a1
1 parent b8bfda8
commit ce094a1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/just_agents/streaming/openai_streaming.py b/just_agents/streaming/openai_streaming.py
@@ -15,6 +15,8 @@ async def resp_async_generator(self, memory: Memory,
                                    key_getter: Callable[[], str] = None
                                    ) -> AsyncGenerator[str, None]:
         api_key = key_getter() if key_getter is not None else None
+        if api_key is None:
+            api_key = options.pop("api_key", None)
         response: ModelResponse = completion(messages=memory.messages, stream=True, api_key=api_key, **options)
         parser: Optional[FunctionParser] = None
         tool_messages: list[Message] = []

diff --git a/just_agents/streaming/qwen_streaming.py b/just_agents/streaming/qwen_streaming.py
@@ -95,6 +95,9 @@ async def resp_async_generator(self, memory: Memory, options: Dict, available_to
         :return:
         """
         api_key = key_getter() if key_getter is not None else None
+        if api_key is None:
+            api_key = options.pop("api_key", None)
+
         response: ModelResponse = completion(messages=memory.messages, stream=True, api_key=api_key, **options)
         parser: QwenFunctionParser = QwenFunctionParser()
         deltas: list[str] = []