fiddler-client 3.0.0.dev4__tar.gz → 3.0.0.dev5__tar.gz

{fiddler-client-3.0.0.dev4/fiddler_client.egg-info → fiddler-client-3.0.0.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fiddler-client
-Version: 3.0.0.dev4
+Version: 3.0.0.dev5
 Summary: Python client for Fiddler Platform
 Home-page: https://fiddler.ai
 Author: Fiddler Labs

fiddler-client-3.0.0.dev5/fiddler/VERSION

@@ -0,0 +1 @@
+3.0.0.dev5

{fiddler-client-3.0.0.dev4 → fiddler-client-3.0.0.dev5}/fiddler/constants/common.py

@@ -11,5 +11,4 @@ CONTENT_TYPE_OCTET_STREAM = 'application/octet-stream'
 CONTENT_TYPE_OCTET_STREAM_HEADER = {CONTENT_TYPE_HEADER_KEY: CONTENT_TYPE_OCTET_STREAM}
 
 # Multi-part upload
-MULTI_PART_UPLOAD_SIZE_THRESHOLD = 5 * 1024 * 1024  # 5MB in bytes
 MULTI_PART_CHUNK_SIZE = 100 * 1024 * 1024  # 100MB in bytes

{fiddler-client-3.0.0.dev4 → fiddler-client-3.0.0.dev5}/fiddler/entities/file.py

@@ -8,7 +8,6 @@ from typing import Any
 from uuid import UUID
 
 from requests import Response
-from requests_toolbelt import MultipartEncoder
 
 from fiddler.constants.common import MULTI_PART_CHUNK_SIZE
 from fiddler.decorators import handle_api_error
@@ -74,14 +73,12 @@ class File(BaseEntity, CreatedByMixin, UpdatedByMixin):
     @handle_api_error
     def single_upload(self) -> File:
         """Single part file upload"""
-        with open(self.path, 'rb') as f:
-            multipart_data = MultipartEncoder(fields={'file': (self.name, f)})
 
-            response = self._client().post(
-                url='/v3/files/upload',
-                data=multipart_data,
-                headers={'Content-Type': multipart_data.content_type},
-            )
+        response = self._client().post(
+            url='/v3/files/upload',
+            files={'file': (self.name, open(self.path, 'rb'))},
+            headers={'Content-Type': None},
+        )
 
         self._refresh_from_response(response)
         return self

{fiddler-client-3.0.0.dev4 → fiddler-client-3.0.0.dev5}/fiddler/entities/model_artifact.py

@@ -58,25 +58,22 @@ class ModelArtifact(ConnectionMixin):
                 self.model_id,
                 model_dir,
             )
-            tar_file_base_name = Path(tmp) / 'model'
-            tar_file_path = f'{str(tar_file_base_name)}.tar.gz'
-
-            _file_path = shutil.make_archive(
-                base_name=str(tar_file_base_name),
-                format='tar',
-                root_dir=model_dir,
+            file_path = shutil.make_archive(
+                base_name=str(Path(tmp) / 'files'),
+                format='gztar',
+                root_dir=str(model_dir),
                 base_dir='.',
             )
-            os.rename(src=_file_path, dst=tar_file_path)
 
             logger.info(
-                'Model[%s] - Model artifact tar file created at %s',
+                'Model[%s] - Model artifact tar file created at %s - %d bytes',
                 self.model_id,
-                tar_file_path,
+                file_path,
+                os.path.getsize(file_path),
             )
 
             # Upload file
-            file = File(path=tar_file_path).upload()
+            file = File(path=file_path).upload()
 
             # Deploy artifact
             assert file.id is not None

{fiddler-client-3.0.0.dev4 → fiddler-client-3.0.0.dev5}/fiddler/libs/http_client.py

@@ -7,7 +7,6 @@ from urllib.parse import urljoin
 import requests
 import simplejson
 from requests.adapters import HTTPAdapter
-from requests_toolbelt.multipart.encoder import MultipartEncoder
 
 from fiddler.constants.common import JSON_CONTENT_TYPE
 from fiddler.exceptions import (  # pylint: disable=redefined-builtin
@@ -51,7 +50,6 @@ class RequestClient:
         headers: dict | None = None,
         data: dict | bytes | None = None,
         timeout: int | None = None,
-        files_encoders: dict[str, MultipartEncoder] | None = None,
         **kwargs: Any,
     ) -> requests.Response:
         """
@@ -63,9 +61,6 @@ class RequestClient:
         :param headers: Request headers
         :param data: Dict/binary data
         :param timeout: Request timeout in seconds
-        :param files_encoders:  Dictionary of 'filename': file-like-objects
-            for multipart encoding upload. Make sure all MultipartEncoder values have
-            same content_type.
         """
         logger.debug('Making %s call to %s', method, url)
 
@@ -87,31 +82,16 @@ class RequestClient:
         # So setting that as default here
         kwargs.setdefault('verify', self.session.verify)
         try:
-            if files_encoders:
-                encoders = list(files_encoders.values())
-                if encoders:
-                    request_headers['Content-Type'] = encoders[0].content_type
-                response = self.session.request(
-                    method,
-                    full_url,
-                    params=params,
-                    files=files_encoders,
-                    headers=request_headers,
-                    timeout=timeout,
-                    proxies=self.proxies,
-                    **kwargs,
-                )
-            else:
-                response = self.session.request(
-                    method,
-                    full_url,
-                    params=params,
-                    data=data,
-                    headers=request_headers,
-                    timeout=timeout,
-                    proxies=self.proxies,
-                    **kwargs,
-                )
+            response = self.session.request(
+                method,
+                full_url,
+                params=params,
+                data=data,
+                headers=request_headers,
+                timeout=timeout,
+                proxies=self.proxies,
+                **kwargs,
+            )
 
         except requests.Timeout as exc:
             logger.error('%s call failed with Timeout error for URL %s', method, url)
@@ -173,7 +153,6 @@ class RequestClient:
         headers: dict | None = None,
         timeout: int | None = None,
         data: dict | bytes | None = None,
-        files_encoders: dict[str, MultipartEncoder] | None = None,
         **kwargs: dict[str, Any],
     ) -> requests.Response:
         """Construct a post request instance."""
@@ -184,7 +163,6 @@ class RequestClient:
             headers=headers,
             timeout=timeout,
             data=data,
-            files_encoders=files_encoders,
             **kwargs,
         )
 

{fiddler-client-3.0.0.dev4 → fiddler-client-3.0.0.dev5/fiddler_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fiddler-client
-Version: 3.0.0.dev4
+Version: 3.0.0.dev5
 Summary: Python client for Fiddler Platform
 Home-page: https://fiddler.ai
 Author: Fiddler Labs

{fiddler-client-3.0.0.dev4 → fiddler-client-3.0.0.dev5}/fiddler_client.egg-info/SOURCES.txt

@@ -5,7 +5,6 @@ README.md
 setup.py
 fiddler/VERSION
 fiddler/__init__.py
-fiddler/_version.py
 fiddler/configs.py
 fiddler/connection.py
 fiddler/decorators.py

fiddler-client-3.0.0.dev4/fiddler/VERSION

@@ -1 +0,0 @@
-3.0.0.dev4

fiddler-client-3.0.0.dev4/fiddler/_version.py

@@ -1 +0,0 @@
-__version__ = '3.0.0.dev4'