Revert "Update add_model_content to current API specs; include dict uploads"

This reverts commit 856afef.

Author: smlindauer

src/sasctl/_services/model_repository.py

@@ -7,8 +7,6 @@
 """The Model Repository service supports registering and managing models."""
 
 from warnings import warn
-from io import StringIO
-import json
 
 from .service import Service
 from ..core import current_session, get, delete, sasctl_command, HTTPError
@@ -368,24 +366,22 @@ def create_model(
         )
 
     @classmethod
-    def add_model_content(cls, model, file, name, content_type="multipart/form-data", role=None):
-        """Add additional files to the model. Additional files can come in the form of
-        a bytes-like, string, or dict object. String and dict objects will be converted to
-        a bytes-like object for upload.
+    def add_model_content(cls, model, file, name, role=None, content_type=None):
+        """Add additional files to the model.
 
         Parameters
         ----------
         model : str or dict
             The name or id of the model, or a dictionary representation of
             the model.
-        file : str, dict, or bytes
+        file : str or bytes
             A file related to the model, such as the model code.
         name : str
             Name of the file related to the model.
-        content_type : str, optional
-            An HTTP Content-Type value. Default value is multipart/form-data.            
-        role : str, optional
-            Role of the model file, such as 'Python pickle'. Default value is None.
+        role : str
+            Role of the model file, such as 'Python pickle'.
+        content_type : str
+            an HTTP Content-Type value
 
         Returns
         -------
@@ -400,45 +396,38 @@ def add_model_content(cls, model, file, name, content_type="multipart/form-data"
         else:
             model = cls.get_model(model)
             id_ = model["id"]
-            
-        # Convert string file representations to bytes-like object
-        if isinstance(file, str):
-            file = StringIO(file)
-            content_type="multipart/form-data"
-        # Convert dict file representations to bytes-like object
-        elif isinstance(file, dict):
-            file = StringIO(json.dumps(file))
-            content_type="multipart/form-data"
-
-        files = {"files": (name, file, content_type)}
-
-        if role is None:
-            params = {}
+
+        if content_type is None and isinstance(file, bytes):
+            content_type = "application/octet-stream"
+
+        if content_type is not None:
+            files = {name: (name, file, content_type)}
         else:
-            params = {"role": role}
-        params = "&".join("{}={}".format(k, v) for k, v in params.items())
+            files = {name: file}
+
+        metadata = {"role": role, "name": name}
 
-        # If the file already exists, a 409 error will be returned
+        # return cls.post('/models/{}/contents'.format(id_), files=files, data=metadata)
+
+        # if the file already exists, a 409 error will be returned
         try:
             return cls.post(
-                "/models/{}/contents".format(id_), 
-                files=files, 
-                params=params,
+                "/models/{}/contents".format(id_), files=files, data=metadata
             )
-        except HTTPError as err:
-            # Delete the older duplicate model file and rerun the API call
-            if err.code == 409:
+        # delete the older duplicate model and rerun the API call
+        except HTTPError as e:
+            if e.code == 409:
                 model_contents = cls.get_model_contents(id_)
                 for item in model_contents:
                     if item.name == name:
                         cls.delete("/models/{}/contents/{}".format(id_, item.id))
                         return cls.post(
                             "/models/{}/contents".format(id_),
                             files=files,
-                            params=params,
+                            data=metadata,
                         )
             else:
-                raise err
+                raise e
 
     @classmethod
     def default_repository(cls):