Cleanup (#12)

openai/api_resources/__init__.py

@@ -1,14 +1,8 @@
-from openai.api_resources.branch import Branch
 from openai.api_resources.completion import Completion
 from openai.api_resources.engine import Engine
 from openai.api_resources.error_object import ErrorObject
-from openai.api_resources.event import Event
 from openai.api_resources.file import File
 from openai.api_resources.answer import Answer
 from openai.api_resources.classification import Classification
-from openai.api_resources.plan import Plan
-from openai.api_resources.run import Run
 from openai.api_resources.snapshot import Snapshot
-from openai.api_resources.tag import Tag
-from openai.api_resources.update import Update
 from openai.api_resources.fine_tune import FineTune

openai/api_resources/engine.py

@@ -4,9 +4,6 @@
 
 from openai import api_requestor, util
 from openai.api_resources.abstract import (
-    APIResource,
-    CreateableAPIResource,
-    DeletableAPIResource,
     ListableAPIResource,
     UpdateableAPIResource,
 )

openai/api_resources/experimental/completion_config.py

@@ -1,9 +1,7 @@
 from openai.api_resources.abstract import (
-    APIResource,
     CreateableAPIResource,
     DeletableAPIResource,
     ListableAPIResource,
-    UpdateableAPIResource,
 )
 
 

openai/api_resources/file.py

@@ -1,17 +1,11 @@
 from __future__ import absolute_import, division, print_function
 
-import json
-import os
-import tempfile
-
 import openai
 from openai import api_requestor, util
 from openai.api_resources.abstract import (
     DeletableAPIResource,
     ListableAPIResource,
-    UpdateableAPIResource,
 )
-from openai.util import log_info
 
 
 class File(ListableAPIResource, DeletableAPIResource):

openai/api_resources/snapshot.py

@@ -1,7 +1,10 @@
 from openai.api_resources.abstract.engine_api_resource import EngineAPIResource
-from openai.api_resources.abstract import ListableAPIResource, DeletableAPIResource
+from openai.api_resources.abstract import (
+    ListableAPIResource,
+    DeletableAPIResource,
+)
 
 
-class Snapshot(EngineAPIResource, ListableAPIResource, DeletableAPIResource):
+class Snapshot(ListableAPIResource, DeletableAPIResource):
     engine_required = False
     OBJECT_NAME = "snapshot"

openai/cli.py

@@ -162,16 +162,6 @@ def create(cls, args):
 
 
 class Snapshot:
-    @classmethod
-    def create(cls, args):
-        resp = openai.Snapshot.create(
-            engine=args.engine,
-            branch=args.branch,
-            description=args.description,
-            timeout=args.timeout,
-        )
-        print(resp)
-
     @classmethod
     def get(cls, args):
         resp = openai.Snapshot.retrieve(
@@ -190,28 +180,6 @@ def list(cls, args):
         print(snapshots)
 
 
-class Tag:
-    @classmethod
-    def create(cls, args):
-        resp = openai.Tag.create(id=args.id, model=args.model, force=args.force)
-        print(resp)
-
-    @classmethod
-    def get(cls, args):
-        resp = openai.Tag.retrieve(id=args.id)
-        print(resp)
-
-    @classmethod
-    def delete(cls, args):
-        tag = openai.Tag(id=args.id).delete()
-        print(tag)
-
-    @classmethod
-    def list(cls, args):
-        tags = openai.Tag.list()
-        print(tags)
-
-
 class File:
     @classmethod
     def create(cls, args):
@@ -423,24 +391,6 @@ def help(args):
     sub = subparsers.add_parser("snapshots.list")
     sub.set_defaults(func=Snapshot.list)
 
-    sub = subparsers.add_parser("snapshots.create")
-    sub.add_argument(
-        "-e", "--engine", required=True, help="The engine this snapshot is running on"
-    )
-    sub.add_argument(
-        "-b", "--branch", required=True, help="The branch to turn into a snapshot"
-    )
-    sub.add_argument(
-        "-d", "--description", help="A human-readable description of this snapshot"
-    )
-    sub.add_argument(
-        "-t",
-        "--timeout",
-        help="An optional amount of time to block for the snapshot to transition from pending. If the timeout expires, a pending snapshot will be returned.",
-        type=float,
-    )
-    sub.set_defaults(func=Snapshot.create)
-
     sub = subparsers.add_parser("snapshots.get")
     sub.add_argument("-e", "--engine", help="The engine this snapshot is running on")
     sub.add_argument("-i", "--id", required=True, help="The snapshot ID")
@@ -456,34 +406,6 @@ def help(args):
     sub.add_argument("-i", "--id", required=True, help="The snapshot ID")
     sub.set_defaults(func=Snapshot.delete)
 
-    # Tags
-    sub = subparsers.add_parser("tags.create")
-    sub.add_argument("-i", "--id", help="The ID of the tag to create", required=True)
-    sub.add_argument(
-        "-f",
-        "--force",
-        action="store_true",
-        help="Whether to overwrite an existing tag with this ID",
-    )
-    sub.add_argument(
-        "-m",
-        "--model",
-        help="Which model (most commonly a snapshot ID) to tag",
-        required=True,
-    )
-    sub.set_defaults(func=Tag.create)
-
-    sub = subparsers.add_parser("tags.get")
-    sub.add_argument("-i", "--id", required=True, help="The tag ID")
-    sub.set_defaults(func=Tag.get)
-
-    sub = subparsers.add_parser("tags.delete")
-    sub.add_argument("-i", "--id", required=True, help="The tag ID")
-    sub.set_defaults(func=Tag.delete)
-
-    sub = subparsers.add_parser("tags.list")
-    sub.set_defaults(func=Tag.list)
-
     # Files
     sub = subparsers.add_parser("files.create")
 

openai/object_classes.py

@@ -6,10 +6,7 @@
 OBJECT_CLASSES = {
     "engine": api_resources.Engine,
     "experimental.completion_config": CompletionConfig,
+    "file": api_resources.File,
+    "fine-tune": api_resources.FineTune,
     "snapshot": api_resources.Snapshot,
-    "tag": api_resources.Tag,
-    "branch": api_resources.Branch,
-    "plan": api_resources.Plan,
-    "update": api_resources.Update,
-    "event": api_resources.Event,
 }

openai/version.py

@@ -1 +1 @@
-VERSION = "0.6.2"
+VERSION = "0.6.3"