Revert "Add support for fine-tunning and files using the Azure API. (openai#76)" (openai#79)

This reverts commit 2b264c3.

Author: kennyhsu5

.gitignore

@@ -6,5 +6,4 @@ __pycache__
 build
 *.egg
 .vscode/settings.json
-.ipynb_checkpoints
-.vscode/launch.json
+.ipynb_checkpoints

README.md

@@ -77,7 +77,7 @@ search = openai.Engine(id="deployment-namme").search(documents=["White House", "
 print(search)
 ```
 
-Please note that for the moment, the Microsoft Azure endpoints can only be used for completion, search and fine-tuning operations.
+Please note that for the moment, the Microsoft Azure endpoints can only be used for completion and search operations.
 
 ### Command-line interface
 

openai/api_requestor.py

@@ -111,7 +111,7 @@ def request(
 
     def handle_error_response(self, rbody, rcode, resp, rheaders, stream_error=False):
         try:
-            error_data = resp["error"] if self.api_type == ApiType.OPEN_AI else resp
+            error_data = resp["error"]
         except (KeyError, TypeError):
             raise error.APIError(
                 "Invalid response object from API: %r (HTTP response code "
@@ -322,10 +322,6 @@ def _interpret_response(
     def _interpret_response_line(
         self, rbody, rcode, rheaders, stream: bool
     ) -> OpenAIResponse:
-        # HTTP 204 response code does not have any content in the body.
-        if rcode == 204:
-            return OpenAIResponse(None, rheaders)
-
         if rcode == 503:
             raise error.ServiceUnavailableError(
                 "The server is overloaded or not ready yet.", rbody, rcode, headers=rheaders

openai/api_resources/abstract/api_resource.py

@@ -8,8 +8,7 @@
 
 class APIResource(OpenAIObject):
     api_prefix = ""
-    azure_api_prefix = 'openai'
-    azure_deployments_prefix = 'deployments'
+    azure_api_prefix = 'openai/deployments'
 
     @classmethod
     def retrieve(cls, id, api_key=None, request_id=None, **params):
@@ -47,21 +46,20 @@ def instance_url(http://github.com/self,%20operation=None):
                 "id",
             )
         api_version = self.api_version or openai.api_version
-        extn = quote_plus(id)
 
         if self.typed_api_type == ApiType.AZURE:
             if not api_version:
                 raise error.InvalidRequestError("An API version is required for the Azure API type.")
-            
             if not operation:
-                base = self.class_url()
-                return "/%s%s/%s?api-version=%s" % (self.azure_api_prefix, base, extn, api_version)
-
-            return "/%s/%s/%s/%s?api-version=%s" % (
-                self.azure_api_prefix, self.azure_deployments_prefix, extn, operation, api_version)
+                raise error.InvalidRequestError(
+                    "The request needs an operation (eg: 'search') for the Azure OpenAI API type."
+                )
+            extn = quote_plus(id)
+            return "/%s/%s/%s?api-version=%s" % (self.azure_api_prefix, extn, operation, api_version)
 
         elif self.typed_api_type == ApiType.OPEN_AI:
             base = self.class_url()
+            extn = quote_plus(id)
             return "%s/%s" % (base, extn)
 
         else:
@@ -77,7 +75,6 @@ def _static_request(
         url_,
         api_key=None,
         api_base=None,
-        api_type=None,
         request_id=None,
         api_version=None,
         organization=None,
@@ -88,18 +85,10 @@ def _static_request(
             api_version=api_version,
             organization=organization,
             api_base=api_base,
-            api_type=api_type
         )
         response, _, api_key = requestor.request(
             method_, url_, params, request_id=request_id
         )
         return util.convert_to_openai_object(
             response, api_key, api_version, organization
         )
-
-    @classmethod
-    def _get_api_type_and_version(cls, api_type: str, api_version: str):
-        typed_api_type = ApiType.from_str(api_type) if api_type else ApiType.from_str(openai.api_type)
-        typed_api_version = api_version or openai.api_version
-        return (typed_api_type, typed_api_version)
-

openai/api_resources/abstract/createable_api_resource.py

@@ -1,6 +1,5 @@
-from openai import api_requestor, util, error
+from openai import api_requestor, util
 from openai.api_resources.abstract.api_resource import APIResource
-from openai.util import ApiType
 
 
 class CreateableAPIResource(APIResource):
@@ -11,7 +10,6 @@ def create(
         cls,
         api_key=None,
         api_base=None,
-        api_type=None,
         request_id=None,
         api_version=None,
         organization=None,
@@ -20,20 +18,10 @@ def create(
         requestor = api_requestor.APIRequestor(
             api_key,
             api_base=api_base,
-            api_type=api_type,
             api_version=api_version,
             organization=organization,
         )
-        typed_api_type, api_version = cls._get_api_type_and_version(api_type, api_version)
-
-        if typed_api_type == ApiType.AZURE:
-            base = cls.class_url()
-            url = "/%s%s?api-version=%s" % (cls.azure_api_prefix, base, api_version)
-        elif typed_api_type == ApiType.OPEN_AI:
-            url = cls.class_url()
-        else:
-            raise error.InvalidAPIType('Unsupported API type %s' % api_type)            
-
+        url = cls.class_url()
         response, _, api_key = requestor.request(
             "post", url, params, request_id=request_id
         )

openai/api_resources/abstract/deletable_api_resource.py

@@ -1,24 +1,12 @@
 from urllib.parse import quote_plus
 
-from openai import error
 from openai.api_resources.abstract.api_resource import APIResource
-from openai.util import ApiType
+
 
 class DeletableAPIResource(APIResource):
     @classmethod
-    def delete(cls, sid, api_type=None, api_version=None, **params):
+    def delete(cls, sid, **params):
         if isinstance(cls, APIResource):
             raise ValueError(".delete may only be called as a class method now.")
-
-        base = cls.class_url()
-        extn = quote_plus(sid)
-
-        typed_api_type, api_version = cls._get_api_type_and_version(api_type, api_version)
-        if typed_api_type == ApiType.AZURE:
-            url = "/%s%s/%s?api-version=%s" % (cls.azure_api_prefix, base, extn, api_version)
-        elif typed_api_type == ApiType.OPEN_AI:
-            url = "%s/%s" % (base, extn)
-        else:
-            raise error.InvalidAPIType('Unsupported API type %s' % api_type)            
-        
-        return cls._static_request("delete", url, api_type=api_type, api_version=api_version, **params)
+        url = "%s/%s" % (cls.class_url(), quote_plus(sid))
+        return cls._static_request("delete", url, **params)

openai/api_resources/abstract/engine_api_resource.py

@@ -15,6 +15,7 @@
 class EngineAPIResource(APIResource):
     engine_required = True
     plain_old_data = False
+    azure_api_prefix = 'openai/deployments'
 
     def __init__(self, engine: Optional[str] = None, **kwargs):
         super().__init__(engine=engine, **kwargs)
@@ -24,7 +25,8 @@ def class_url(http://github.com/cls,%20engine:%20Optional[str]%20=%20None,%20api_type%20:%20Optional[str]%20=%20None%3C/div%3E%3C/code%3E%3C/div%3E%3C/td%3E%3C/tr%3E%3Ctr%20class=%22diff-line-row%22%3E%3Ctd%20data-grid-cell-id=%22diff-88f98c1b302c34afb660305fd5f70102d7f137f29e90813f0b5c438d92c6031d-24-25-0%22%20data-selected=%22false%22%20role=%22gridcell%22%20style=%22background-color:var(--bgColor-default);text-align:center" tabindex="-1" valign="top" class="focusable-grid-cell diff-line-number position-relative diff-line-number-neutral left-side">24
         # with forward slashes (/), so replace the former with the latter.
         base = cls.OBJECT_NAME.replace(".", "/")  # type: ignore
-        typed_api_type, api_version = cls._get_api_type_and_version(api_type, api_version)
+        typed_api_type = ApiType.from_str(api_type) if api_type else ApiType.from_str(openai.api_type)
+        api_version = api_version or openai.api_version
 
         if typed_api_type == ApiType.AZURE:
             if not api_version:
@@ -34,8 +36,7 @@ def class_url(http://github.com/cls,%20engine:%20Optional[str]%20=%20None,%20api_type%20:%20Optional[str]%20=%20None%3C/div%3E%3C/code%3E%3C/div%3E%3C/td%3E%3C/tr%3E%3Ctr%20class=%22diff-line-row%22%3E%3Ctd%20data-grid-cell-id=%22diff-88f98c1b302c34afb660305fd5f70102d7f137f29e90813f0b5c438d92c6031d-34-36-0%22%20data-selected=%22false%22%20role=%22gridcell%22%20style=%22background-color:var(--bgColor-default);text-align:center" tabindex="-1" valign="top" class="focusable-grid-cell diff-line-number position-relative diff-line-number-neutral left-side">34
                 )
             extn = quote_plus(engine)
-            return "/%s/%s/%s/%ss?api-version=%s" % (
-                cls.azure_api_prefix, cls.azure_deployments_prefix, extn, base, api_version)
+            return "/%s/%s/%ss?api-version=%s" % (cls.azure_api_prefix, extn, base, api_version)
 
         elif typed_api_type == ApiType.OPEN_AI:
             if engine is None:
@@ -132,20 +133,19 @@ def instance_url(http://github.com/self):
                 "id",
             )
 
-        extn = quote_plus(id)
         params_connector = '?'
-
         if self.typed_api_type == ApiType.AZURE:
             api_version = self.api_version or openai.api_version
             if not api_version:
                 raise error.InvalidRequestError("An API version is required for the Azure API type.")
+            extn = quote_plus(id)
             base = self.OBJECT_NAME.replace(".", "/")
-            url = "/%s/%s/%s/%ss/%s?api-version=%s" % (
-                self.azure_api_prefix, self.azure_deployments_prefix, self.engine, base, extn, api_version)
+            url = "/%s/%s/%ss/%s?api-version=%s" % (self.azure_api_prefix, self.engine, base, extn, api_version)
             params_connector = '&'
 
         elif self.typed_api_type == ApiType.OPEN_AI:
             base = self.class_url(self.engine, self.api_type, self.api_version)
+            extn = quote_plus(id)
             url = "%s/%s" % (base, extn)
 
         else:

openai/api_resources/abstract/listable_api_resource.py

@@ -1,6 +1,5 @@
-from openai import api_requestor, util, error
+from openai import api_requestor, util
 from openai.api_resources.abstract.api_resource import APIResource
-from openai.util import ApiType
 
 
 class ListableAPIResource(APIResource):
@@ -16,27 +15,15 @@ def list(
         api_version=None,
         organization=None,
         api_base=None,
-        api_type=None,
         **params,
     ):
         requestor = api_requestor.APIRequestor(
             api_key,
             api_base=api_base or cls.api_base(),
             api_version=api_version,
-            api_type=api_type,
             organization=organization,
         )
-
-        typed_api_type, api_version = cls._get_api_type_and_version(api_type, api_version)
-
-        if typed_api_type == ApiType.AZURE:
-            base = cls.class_url()
-            url = "/%s%s?api-version=%s" % (cls.azure_api_prefix, base, api_version)
-        elif typed_api_type == ApiType.OPEN_AI:
-            url = cls.class_url()
-        else:
-            raise error.InvalidAPIType('Unsupported API type %s' % api_type)            
-
+        url = cls.class_url()
         response, _, api_key = requestor.request(
             "get", url, params, request_id=request_id
         )

openai/api_resources/file.py

@@ -3,9 +3,8 @@
 from typing import cast
 
 import openai
-from openai import api_requestor, util, error
+from openai import api_requestor, util
 from openai.api_resources.abstract import DeletableAPIResource, ListableAPIResource
-from openai.util import ApiType
 
 
 class File(ListableAPIResource, DeletableAPIResource):
@@ -19,7 +18,6 @@ def create(
         model=None,
         api_key=None,
         api_base=None,
-        api_type=None,
         api_version=None,
         organization=None,
         user_provided_filename=None,
@@ -29,61 +27,35 @@ def create(
         requestor = api_requestor.APIRequestor(
             api_key,
             api_base=api_base or openai.api_base,
-            api_type=api_type,
             api_version=api_version,
             organization=organization,
         )
-        typed_api_type, api_version = cls._get_api_type_and_version(api_type, api_version)
-
-        if typed_api_type == ApiType.AZURE:
-            base = cls.class_url()
-            url = "/%s%s?api-version=%s" % (cls.azure_api_prefix, base, api_version)
-        elif typed_api_type == ApiType.OPEN_AI:
-            url = cls.class_url()
-        else:
-            raise error.InvalidAPIType('Unsupported API type %s' % api_type)            
-
+        url = cls.class_url()
         # Set the filename on 'purpose' and 'model' to None so they are
         # interpreted as form data.
         files = [("purpose", (None, purpose))]
         if model is not None:
             files.append(("model", (None, model)))
         if user_provided_filename is not None:
-            files.append(("file", (user_provided_filename, file, 'application/octet-stream')))
+            files.append(("file", (user_provided_filename, file)))
         else:
-            files.append(("file", file, 'application/octet-stream'))
+            files.append(("file", file))
         response, _, api_key = requestor.request("post", url, files=files)
         return util.convert_to_openai_object(
             response, api_key, api_version, organization
         )
 
     @classmethod
     def download(
-        cls, 
-        id, 
-        api_key=None, 
-        api_base=None,
-        api_type=None,
-        api_version=None, 
-        organization=None
+        cls, id, api_key=None, api_base=None, api_version=None, organization=None
     ):
         requestor = api_requestor.APIRequestor(
             api_key,
             api_base=api_base or openai.api_base,
-            api_type=api_type,
             api_version=api_version,
             organization=organization,
         )
-        typed_api_type, api_version = cls._get_api_type_and_version(api_type, api_version)
-
-        if typed_api_type == ApiType.AZURE:
-            base = cls.class_url()
-            url = "/%s%s/%s/content?api-version=%s" % (cls.azure_api_prefix, base, id, api_version)
-        elif typed_api_type == ApiType.OPEN_AI:
-            url = f"{cls.class_url()}/{id}/content"
-        else:
-            raise error.InvalidAPIType('Unsupported API type %s' % api_type)            
-        
+        url = f"{cls.class_url()}/{id}/content"
         result = requestor.request_raw("get", url)
         if not 200 <= result.status_code < 300:
             raise requestor.handle_error_response(
@@ -103,15 +75,13 @@ def find_matching_files(
         purpose,
         api_key=None,
         api_base=None,
-        api_type=None,
         api_version=None,
         organization=None,
     ):
         """Find already uploaded files with the same name, size, and purpose."""
         all_files = cls.list(
             api_key=api_key,
             api_base=api_base or openai.api_base,
-            api_type=api_type,
             api_version=api_version,
             organization=organization,
         ).get("data", [])
@@ -123,9 +93,7 @@ def find_matching_files(
             file_basename = os.path.basename(f["filename"])
             if file_basename != basename:
                 continue
-            if "bytes" in f and f["bytes"] != bytes:
-                continue
-            if "size" in f and int(f["size"]) != bytes:
+            if f["bytes"] != bytes:
                 continue
             matching_files.append(f)
         return matching_files