Merge pull request #71 from jlowin/llm-api

add llm settings

src/controlflow/core/agent.py

@@ -76,7 +76,7 @@ class Agent(ControlFlowModel, ExposeSyncMethodsMixin):
     )
     model: str = Field(
         description="The model used by the agent. If not provided, the default model will be used.",
-        default_factory=lambda: controlflow.settings.model,
+        default_factory=lambda: controlflow.settings.llm_model,
     )
 
     def __init__(self, name, **kwargs):

src/controlflow/llm/completions.py

@@ -64,7 +64,13 @@ def completion(
     handler = CompoundHandler(handlers=handlers or [])
 
     if model is None:
-        model = controlflow.settings.model
+        model = controlflow.settings.llm_model
+    if "api_key" not in kwargs:
+        kwargs["api_key"] = controlflow.settings.llm_api_key
+    if "api_version" not in kwargs:
+        kwargs["api_version"] = controlflow.settings.llm_api_version
+    if "api_base" not in kwargs:
+        kwargs["api_base"] = controlflow.settings.llm_api_base
 
     tools = as_tools(tools or [])
 
@@ -151,7 +157,13 @@ def _completion_stream(
 
     handler = CompoundHandler(handlers=handlers or [])
     if model is None:
-        model = controlflow.settings.model
+        model = controlflow.settings.llm_model
+    if "api_key" not in kwargs:
+        kwargs["api_key"] = controlflow.settings.llm_api_key
+    if "api_version" not in kwargs:
+        kwargs["api_version"] = controlflow.settings.llm_api_version
+    if "api_base" not in kwargs:
+        kwargs["api_base"] = controlflow.settings.llm_api_base
 
     tools = as_tools(tools or [])
 
@@ -273,7 +285,13 @@ async def completion_async(
 
     handler = CompoundHandler(handlers=handlers or [])
     if model is None:
-        model = controlflow.settings.model
+        model = controlflow.settings.llm_model
+    if "api_key" not in kwargs:
+        kwargs["api_key"] = controlflow.settings.llm_api_key
+    if "api_version" not in kwargs:
+        kwargs["api_version"] = controlflow.settings.llm_api_version
+    if "api_base" not in kwargs:
+        kwargs["api_base"] = controlflow.settings.llm_api_base
 
     tools = as_tools(tools or [])
 
@@ -379,7 +397,13 @@ async def _completion_stream_async(
 
     handler = CompoundHandler(handlers=handlers or [])
     if model is None:
-        model = controlflow.settings.model
+        model = controlflow.settings.llm_model
+    if "api_key" not in kwargs:
+        kwargs["api_key"] = controlflow.settings.llm_api_key
+    if "api_version" not in kwargs:
+        kwargs["api_version"] = controlflow.settings.llm_api_version
+    if "api_base" not in kwargs:
+        kwargs["api_base"] = controlflow.settings.llm_api_base
 
     tools = as_tools(tools or [])
 

src/controlflow/settings.py

@@ -90,7 +90,14 @@ class Settings(ControlFlowSettings):
 
     # ------------ LLM settings ------------
 
-    model: str = Field("gpt-4o", description="The LLM model to use.")
+    llm_model: str = Field("gpt-4o", description="The LLM model to use.")
+    llm_api_key: Optional[str] = Field(None, description="The LLM API key to use.")
+    llm_api_base: Optional[str] = Field(
+        None, description="The LLM API base URL to use."
+    )
+    llm_api_version: Optional[str] = Field(
+        None, description="The LLM API version to use."
+    )
 
     # ------------ Flow visualization settings ------------