Skip to content

Commit 718e7a4

Browse files
kennyhsu5kennyhsu5
authored
Revert "Add support for fine-tunning and files using the Azure API. (#76)" (#79)
This reverts commit 2b264c3.
1 parent 2b264c3 commit 718e7a4

File tree

12 files changed

+39
-153
lines changed

12 files changed

+39
-153
lines changed

‎.gitignore‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,4 @@ __pycache__
66
build
77
*.egg
88
.vscode/settings.json
9-
.ipynb_checkpoints
10-
.vscode/launch.json
9+
.ipynb_checkpoints

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ search = openai.Engine(id="deployment-namme").search(documents=["White House", "
7777
print(search)
7878
```
7979

80-
Please note that for the moment, the Microsoft Azure endpoints can only be used for completion, search and fine-tuning operations.
80+
Please note that for the moment, the Microsoft Azure endpoints can only be used for completion and search operations.
8181

8282
### Command-line interface
8383

‎openai/api_requestor.py‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ def request(
111111

112112
def handle_error_response(self, rbody, rcode, resp, rheaders, stream_error=False):
113113
try:
114-
error_data = resp["error"] if self.api_type == ApiType.OPEN_AI else resp
114+
error_data = resp["error"]
115115
except (KeyError, TypeError):
116116
raise error.APIError(
117117
"Invalid response object from API: %r (HTTP response code "
@@ -322,10 +322,6 @@ def _interpret_response(
322322
def _interpret_response_line(
323323
self, rbody, rcode, rheaders, stream: bool
324324
) -> OpenAIResponse:
325-
# HTTP 204 response code does not have any content in the body.
326-
if rcode == 204:
327-
return OpenAIResponse(None, rheaders)
328-
329325
if rcode == 503:
330326
raise error.ServiceUnavailableError(
331327
"The server is overloaded or not ready yet.", rbody, rcode, headers=rheaders

‎openai/api_resources/abstract/api_resource.py‎

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88

99
class APIResource(OpenAIObject):
1010
api_prefix = ""
11-
azure_api_prefix = 'openai'
12-
azure_deployments_prefix = 'deployments'
11+
azure_api_prefix = 'openai/deployments'
1312

1413
@classmethod
1514
def retrieve(cls, id, api_key=None, request_id=None, **params):
@@ -47,21 +46,20 @@ def instance_url(self, operation=None):
4746
"id",
4847
)
4948
api_version = self.api_version or openai.api_version
50-
extn = quote_plus(id)
5149

5250
if self.typed_api_type == ApiType.AZURE:
5351
if not api_version:
5452
raise error.InvalidRequestError("An API version is required for the Azure API type.")
55-
5653
if not operation:
57-
base = self.class_url()
58-
return "/%s%s/%s?api-version=%s" % (self.azure_api_prefix, base, extn, api_version)
59-
60-
return "/%s/%s/%s/%s?api-version=%s" % (
61-
self.azure_api_prefix, self.azure_deployments_prefix, extn, operation, api_version)
54+
raise error.InvalidRequestError(
55+
"The request needs an operation (eg: 'search') for the Azure OpenAI API type."
56+
)
57+
extn = quote_plus(id)
58+
return "/%s/%s/%s?api-version=%s" % (self.azure_api_prefix, extn, operation, api_version)
6259

6360
elif self.typed_api_type == ApiType.OPEN_AI:
6461
base = self.class_url()
62+
extn = quote_plus(id)
6563
return "%s/%s" % (base, extn)
6664

6765
else:
@@ -77,7 +75,6 @@ def _static_request(
7775
url_,
7876
api_key=None,
7977
api_base=None,
80-
api_type=None,
8178
request_id=None,
8279
api_version=None,
8380
organization=None,
@@ -88,18 +85,10 @@ def _static_request(
8885
api_version=api_version,
8986
organization=organization,
9087
api_base=api_base,
91-
api_type=api_type
9288
)
9389
response, _, api_key = requestor.request(
9490
method_, url_, params, request_id=request_id
9591
)
9692
return util.convert_to_openai_object(
9793
response, api_key, api_version, organization
9894
)
99-
100-
@classmethod
101-
def _get_api_type_and_version(cls, api_type: str, api_version: str):
102-
typed_api_type = ApiType.from_str(api_type) if api_type else ApiType.from_str(openai.api_type)
103-
typed_api_version = api_version or openai.api_version
104-
return (typed_api_type, typed_api_version)
105-

‎openai/api_resources/abstract/createable_api_resource.py‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
from openai import api_requestor, util, error
1+
from openai import api_requestor, util
22
from openai.api_resources.abstract.api_resource import APIResource
3-
from openai.util import ApiType
43

54

65
class CreateableAPIResource(APIResource):
@@ -11,7 +10,6 @@ def create(
1110
cls,
1211
api_key=None,
1312
api_base=None,
14-
api_type=None,
1513
request_id=None,
1614
api_version=None,
1715
organization=None,
@@ -20,20 +18,10 @@ def create(
2018
requestor = api_requestor.APIRequestor(
2119
api_key,
2220
api_base=api_base,
23-
api_type=api_type,
2421
api_version=api_version,
2522
organization=organization,
2623
)
27-
typed_api_type, api_version = cls._get_api_type_and_version(api_type, api_version)
28-
29-
if typed_api_type == ApiType.AZURE:
30-
base = cls.class_url()
31-
url = "/%s%s?api-version=%s" % (cls.azure_api_prefix, base, api_version)
32-
elif typed_api_type == ApiType.OPEN_AI:
33-
url = cls.class_url()
34-
else:
35-
raise error.InvalidAPIType('Unsupported API type %s' % api_type)
36-
24+
url = cls.class_url()
3725
response, _, api_key = requestor.request(
3826
"post", url, params, request_id=request_id
3927
)

‎openai/api_resources/abstract/deletable_api_resource.py‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,12 @@
11
from urllib.parse import quote_plus
22

3-
from openai import error
43
from openai.api_resources.abstract.api_resource import APIResource
5-
from openai.util import ApiType
4+
65

76
class DeletableAPIResource(APIResource):
87
@classmethod
9-
def delete(cls, sid, api_type=None, api_version=None, **params):
8+
def delete(cls, sid, **params):
109
if isinstance(cls, APIResource):
1110
raise ValueError(".delete may only be called as a class method now.")
12-
13-
base = cls.class_url()
14-
extn = quote_plus(sid)
15-
16-
typed_api_type, api_version = cls._get_api_type_and_version(api_type, api_version)
17-
if typed_api_type == ApiType.AZURE:
18-
url = "/%s%s/%s?api-version=%s" % (cls.azure_api_prefix, base, extn, api_version)
19-
elif typed_api_type == ApiType.OPEN_AI:
20-
url = "%s/%s" % (base, extn)
21-
else:
22-
raise error.InvalidAPIType('Unsupported API type %s' % api_type)
23-
24-
return cls._static_request("delete", url, api_type=api_type, api_version=api_version, **params)
11+
url = "%s/%s" % (cls.class_url(), quote_plus(sid))
12+
return cls._static_request("delete", url, **params)

‎openai/api_resources/abstract/engine_api_resource.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
class EngineAPIResource(APIResource):
1616
engine_required = True
1717
plain_old_data = False
18+
azure_api_prefix = 'openai/deployments'
1819

1920
def __init__(self, engine: Optional[str] = None, **kwargs):
2021
super().__init__(engine=engine, **kwargs)
@@ -24,7 +25,8 @@ def class_url(cls, engine: Optional[str] = None, api_type : Optional[str] = None
2425
# Namespaces are separated in object names with periods (.) and in URLs
2526
# with forward slashes (/), so replace the former with the latter.
2627
base = cls.OBJECT_NAME.replace(".", "/") # type: ignore
27-
typed_api_type, api_version = cls._get_api_type_and_version(api_type, api_version)
28+
typed_api_type = ApiType.from_str(api_type) if api_type else ApiType.from_str(openai.api_type)
29+
api_version = api_version or openai.api_version
2830

2931
if typed_api_type == ApiType.AZURE:
3032
if not api_version:
@@ -34,8 +36,7 @@ def class_url(cls, engine: Optional[str] = None, api_type : Optional[str] = None
3436
"You must provide the deployment name in the 'engine' parameter to access the Azure OpenAI service"
3537
)
3638
extn = quote_plus(engine)
37-
return "/%s/%s/%s/%ss?api-version=%s" % (
38-
cls.azure_api_prefix, cls.azure_deployments_prefix, extn, base, api_version)
39+
return "/%s/%s/%ss?api-version=%s" % (cls.azure_api_prefix, extn, base, api_version)
3940

4041
elif typed_api_type == ApiType.OPEN_AI:
4142
if engine is None:
@@ -132,20 +133,19 @@ def instance_url(self):
132133
"id",
133134
)
134135

135-
extn = quote_plus(id)
136136
params_connector = '?'
137-
138137
if self.typed_api_type == ApiType.AZURE:
139138
api_version = self.api_version or openai.api_version
140139
if not api_version:
141140
raise error.InvalidRequestError("An API version is required for the Azure API type.")
141+
extn = quote_plus(id)
142142
base = self.OBJECT_NAME.replace(".", "/")
143-
url = "/%s/%s/%s/%ss/%s?api-version=%s" % (
144-
self.azure_api_prefix, self.azure_deployments_prefix, self.engine, base, extn, api_version)
143+
url = "/%s/%s/%ss/%s?api-version=%s" % (self.azure_api_prefix, self.engine, base, extn, api_version)
145144
params_connector = '&'
146145

147146
elif self.typed_api_type == ApiType.OPEN_AI:
148147
base = self.class_url(self.engine, self.api_type, self.api_version)
148+
extn = quote_plus(id)
149149
url = "%s/%s" % (base, extn)
150150

151151
else:

‎openai/api_resources/abstract/listable_api_resource.py‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
from openai import api_requestor, util, error
1+
from openai import api_requestor, util
22
from openai.api_resources.abstract.api_resource import APIResource
3-
from openai.util import ApiType
43

54

65
class ListableAPIResource(APIResource):
@@ -16,27 +15,15 @@ def list(
1615
api_version=None,
1716
organization=None,
1817
api_base=None,
19-
api_type=None,
2018
**params,
2119
):
2220
requestor = api_requestor.APIRequestor(
2321
api_key,
2422
api_base=api_base or cls.api_base(),
2523
api_version=api_version,
26-
api_type=api_type,
2724
organization=organization,
2825
)
29-
30-
typed_api_type, api_version = cls._get_api_type_and_version(api_type, api_version)
31-
32-
if typed_api_type == ApiType.AZURE:
33-
base = cls.class_url()
34-
url = "/%s%s?api-version=%s" % (cls.azure_api_prefix, base, api_version)
35-
elif typed_api_type == ApiType.OPEN_AI:
36-
url = cls.class_url()
37-
else:
38-
raise error.InvalidAPIType('Unsupported API type %s' % api_type)
39-
26+
url = cls.class_url()
4027
response, _, api_key = requestor.request(
4128
"get", url, params, request_id=request_id
4229
)

‎openai/api_resources/file.py‎

Lines changed: 7 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
from typing import cast
44

55
import openai
6-
from openai import api_requestor, util, error
6+
from openai import api_requestor, util
77
from openai.api_resources.abstract import DeletableAPIResource, ListableAPIResource
8-
from openai.util import ApiType
98

109

1110
class File(ListableAPIResource, DeletableAPIResource):
@@ -19,7 +18,6 @@ def create(
1918
model=None,
2019
api_key=None,
2120
api_base=None,
22-
api_type=None,
2321
api_version=None,
2422
organization=None,
2523
user_provided_filename=None,
@@ -29,61 +27,35 @@ def create(
2927
requestor = api_requestor.APIRequestor(
3028
api_key,
3129
api_base=api_base or openai.api_base,
32-
api_type=api_type,
3330
api_version=api_version,
3431
organization=organization,
3532
)
36-
typed_api_type, api_version = cls._get_api_type_and_version(api_type, api_version)
37-
38-
if typed_api_type == ApiType.AZURE:
39-
base = cls.class_url()
40-
url = "/%s%s?api-version=%s" % (cls.azure_api_prefix, base, api_version)
41-
elif typed_api_type == ApiType.OPEN_AI:
42-
url = cls.class_url()
43-
else:
44-
raise error.InvalidAPIType('Unsupported API type %s' % api_type)
45-
33+
url = cls.class_url()
4634
# Set the filename on 'purpose' and 'model' to None so they are
4735
# interpreted as form data.
4836
files = [("purpose", (None, purpose))]
4937
if model is not None:
5038
files.append(("model", (None, model)))
5139
if user_provided_filename is not None:
52-
files.append(("file", (user_provided_filename, file, 'application/octet-stream')))
40+
files.append(("file", (user_provided_filename, file)))
5341
else:
54-
files.append(("file", file, 'application/octet-stream'))
42+
files.append(("file", file))
5543
response, _, api_key = requestor.request("post", url, files=files)
5644
return util.convert_to_openai_object(
5745
response, api_key, api_version, organization
5846
)
5947

6048
@classmethod
6149
def download(
62-
cls,
63-
id,
64-
api_key=None,
65-
api_base=None,
66-
api_type=None,
67-
api_version=None,
68-
organization=None
50+
cls, id, api_key=None, api_base=None, api_version=None, organization=None
6951
):
7052
requestor = api_requestor.APIRequestor(
7153
api_key,
7254
api_base=api_base or openai.api_base,
73-
api_type=api_type,
7455
api_version=api_version,
7556
organization=organization,
7657
)
77-
typed_api_type, api_version = cls._get_api_type_and_version(api_type, api_version)
78-
79-
if typed_api_type == ApiType.AZURE:
80-
base = cls.class_url()
81-
url = "/%s%s/%s/content?api-version=%s" % (cls.azure_api_prefix, base, id, api_version)
82-
elif typed_api_type == ApiType.OPEN_AI:
83-
url = f"{cls.class_url()}/{id}/content"
84-
else:
85-
raise error.InvalidAPIType('Unsupported API type %s' % api_type)
86-
58+
url = f"{cls.class_url()}/{id}/content"
8759
result = requestor.request_raw("get", url)
8860
if not 200 <= result.status_code < 300:
8961
raise requestor.handle_error_response(
@@ -103,15 +75,13 @@ def find_matching_files(
10375
purpose,
10476
api_key=None,
10577
api_base=None,
106-
api_type=None,
10778
api_version=None,
10879
organization=None,
10980
):
11081
"""Find already uploaded files with the same name, size, and purpose."""
11182
all_files = cls.list(
11283
api_key=api_key,
11384
api_base=api_base or openai.api_base,
114-
api_type=api_type,
11585
api_version=api_version,
11686
organization=organization,
11787
).get("data", [])
@@ -123,9 +93,7 @@ def find_matching_files(
12393
file_basename = os.path.basename(f["filename"])
12494
if file_basename != basename:
12595
continue
126-
if "bytes" in f and f["bytes"] != bytes:
127-
continue
128-
if "size" in f and int(f["size"]) != bytes:
96+
if f["bytes"] != bytes:
12997
continue
13098
matching_files.append(f)
13199
return matching_files

0 commit comments

Comments
 (0)