Modify openai model to receive openai client as argument during initialization

docs/reference/models/openai.md

@@ -1,4 +1,4 @@
-# Generate text with the OpenAI API
+# Generate text with the OpenAI and compatible APIs
 
 !!! Installation
 
@@ -16,16 +16,33 @@ print(type(model))
 # OpenAI
 ```
 
+Outlines also supports Azure OpenAI models:
 
-It is possible to pass a system message to the model when initializing it:
 
-```python
+```
 from outlines import models
 
-model = models.openai("gpt-4", system_prompt="You are a useful assistant")
+model = models.azure_openai(
+    api_version="2023-07-01-preview",
+    azure_endpoint="https://example-endpoint.openai.azure.com",
+)
+```
+
+More generally, you can use any API client compatible with the OpenAI interface by passing an instance of the client, a configuration, and optionally the corresponding tokenizer (if you want to be able to use `outlines.generate.choice`):
+
+```
+from openai import AsyncOpenAI
+import tiktoken
+
+from outlines.models.openai import OpenAI, OpenAIConfig
+
+config = OpenAIConfig(model="gpt-4")
+client = AsyncOpenAI()
+tokenizer = tiktoken.encoding_for_model("gpt-4")
+
+model = OpenAI(client, config, tokenizer)
 ```
 
-This message will be used for every subsequent use of the model:
 
 ## Monitoring API use
 

examples/pick_odd_one_out.py

@@ -29,13 +29,15 @@ def build_ooo_prompt(options):
     """
 
 
+options = ["sea", "mountains", "plains", "sock"]
+
 model = models.openai("gpt-3.5-turbo")
-generator = outlines.generate.text(model)
+gen_text = outlines.generate.text(model)
+gen_choice = outlines.generate.choice(model, options)
 
-options = ["sea", "mountains", "plains", "sock"]
 prompt = build_ooo_prompt(options)
-reasoning = generator(prompt, stop_at=["Pick the odd word", "So the odd one"])
+reasoning = gen_text(prompt, stop_at=["Pick the odd word", "So the odd one"])
 prompt += reasoning
-result = generator(prompt)
+result = gen_choice(prompt)
 prompt += result
-print(prompt)
+print(result)

outlines/models/__init__.py

@@ -7,12 +7,10 @@
 """
 from typing import Union
 
-from .azure import AzureOpenAI, azure_openai
 from .exllamav2 import ExLlamaV2Model, exl2
 from .llamacpp import LlamaCpp, llamacpp
 from .mamba import Mamba, mamba
 from .openai import OpenAI, openai
-from .openai_compatible import OpenAICompatibleAPI, openai_compatible_api
 from .transformers import Transformers, transformers
 
 LogitsGenerator = Union[Transformers, LlamaCpp, ExLlamaV2Model, Mamba]