fiddler-client 3.0.0.dev4__py3-none-any.whl → 3.0.0.dev5__py3-none-any.whl

fiddler/VERSION

@@ -1 +1 @@
-3.0.0.dev4
+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/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/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/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.dist-info → fiddler_client-3.0.0.dev5.dist-info}/METADATA

@@ -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.dist-info → fiddler_client-3.0.0.dev5.dist-info}/RECORD

@@ -1,6 +1,5 @@
-fiddler/VERSION,sha256=VgDxBOh248Q0kqVJVmQ1SbmY6ukeyeEwRVuHHpFqauU,11
+fiddler/VERSION,sha256=UQ3IJpH6gZGP-vWjehD7g68w-idDM4WCOAjN3EGl-xk,11
 fiddler/__init__.py,sha256=VCfPx51-NUioKq0OZSKmQTq0Qd20G088BcZt4CIzmG0,3378
-fiddler/_version.py,sha256=K7PSOxsEF8o1sOiOqRYXX-SPQRva9fUCeDPddjcVZAc,27
 fiddler/configs.py,sha256=s8nKw_2gCEKYk8dnmRxd92J8rCl08V4vPcH0xATT4Lw,258
 fiddler/connection.py,sha256=pYaOyyJytsljofaMyRPV-Vs_i4wHKO48BxIJMqEBxHg,5760
 fiddler/decorators.py,sha256=tWZliQQeUGwY0rU52FO9JXuOBueQXVEJywEbrgUEw1U,1820
@@ -9,7 +8,7 @@ fiddler/version.py,sha256=8fyg3UhFpqghMpxbtYIwNcB1lhCG6yTkPBbDS7IrwxY,140
 fiddler/constants/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fiddler/constants/alert_rule.py,sha256=cmFq-VKAlQbRKEkTtMmVNdD5R52uMI2zJai6TESFwfs,512
 fiddler/constants/baseline.py,sha256=NhmiGf73gy2IHKKpbm64HCE4eJfbxkAPy3uk_Z-6qSo,321
-fiddler/constants/common.py,sha256=4C14p_Kdng3canYWDyT244ikhFH6jo8oAfoYkZaq5vw,610
+fiddler/constants/common.py,sha256=pfUe_aA3GCDJcnXxOQXyv8TEBoHePbh8nJz0GTaSDCs,543
 fiddler/constants/dataset.py,sha256=ZxPmzycSlrKpUYShpfTDqfmz8LAebzyBtIV_dBy-pRI,126
 fiddler/constants/events.py,sha256=3SgjNo4IS-_Nod8wbj98di4B4GctF9R414MZxfQ4MkU,114
 fiddler/constants/job.py,sha256=tMT0vr3x3IiCTQcifP2s1-VWC5gskflKexfU_VfDIzA,233
@@ -24,10 +23,10 @@ fiddler/entities/baseline.py,sha256=1y2bFIapzlDSBd4EUfNy6e-Q8fm3t0AGAZTdiz97hXQ,
 fiddler/entities/custom_metric.py,sha256=Oxcnx-o1D4WowDIa5nclGDbw5eYwpemlIyhDhjyq0Ow,6802
 fiddler/entities/dataset.py,sha256=dmOWae2IxwoIbIRX62fCtjr6uNrht3mSuFw_QTnvZwI,4712
 fiddler/entities/events.py,sha256=usFxs8Cq0ds1MIrOjZT5jVt3XDXMdGYakOoNFnTFQ8Y,4370
-fiddler/entities/file.py,sha256=14DzU3Cs86IWEgXsfGggPlmsGBpiCsO8qareimc6p34,4846
+fiddler/entities/file.py,sha256=U8IlMYl2iOdGwRWSCYmVbvFlx3rVJM-Xxr0soqLux0U,4667
 fiddler/entities/job.py,sha256=Feiqo6ns4bRcp2uaV-kuGYAKs90-aYXvzqqi1yLivYE,5220
 fiddler/entities/model.py,sha256=TiI-n6TfFP8gdML_kbrowBotFIsRqb2UmiClkyzXn3c,16499
-fiddler/entities/model_artifact.py,sha256=taVXg1gIy1mNpasteKclEDvmOomX7kp-N5tZBs-siQA,5635
+fiddler/entities/model_artifact.py,sha256=ktyFkg-nUPtdpSUGNXHfLOwSMiBaaRkdU0s9DQ67lLs,5514
 fiddler/entities/model_deployment.py,sha256=JefFd7uUgPaxWhtVTJZqTMCLWz_18DM8o2zZmY_Hn6c,3757
 fiddler/entities/organization.py,sha256=XvUAdBUOYXzdmblxIs4hi0mAg45NtAwy5DBaMiqi47o,1074
 fiddler/entities/project.py,sha256=_ONa4srk6zrDl6o6-BznmjiINn7TDabYSsWxve7BZxw,4595
@@ -36,7 +35,7 @@ fiddler/entities/user.py,sha256=ev_Xx9QHAdEHYzNDafzQihXOcD8ME5XkpKgc8MiqCnw,1243
 fiddler/entities/webhook.py,sha256=I-mcl92Tg2-oUUqNMOeDPBe0XawVYhNcTGXHBway7_A,3798
 fiddler/entities/xai.py,sha256=t5LOOWRtr0KnNJHOPfdhrH1WdNT6MBpAZoQ8Teiu9a8,20232
 fiddler/libs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fiddler/libs/http_client.py,sha256=NvENXPm5w713OH9l6yq_KcJmXm4N1AsetYRIHY4oNBQ,7072
+fiddler/libs/http_client.py,sha256=bl2V-q66NoPHm950CiDqOoF-kCPztYWUYNy9hVUsbqg,6027
 fiddler/libs/json_encoder.py,sha256=brsrWySvtZdaBArIkqKM5WwJUbvZf6ZbKozn1CewjOc,512
 fiddler/libs/semver.py,sha256=3HbXG1S-ABIxL3E0FHSm5OR_YrhYtCB2Q3XJ8-tywts,15995
 fiddler/packtools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -101,8 +100,8 @@ fiddler/utils/logger.py,sha256=FdJ3LkS9dbRjWsw5oJmNNsd7q0XRVEIvx5-TWys7L0k,669
 fiddler/utils/model_generator.py,sha256=TwQMQDpy-0gcq6HyL68s37N-sk_nGPq33mmppK6i7hI,2203
 fiddler/utils/validations.py,sha256=i8NtgrpCsitq6BPa5lygpKDh07oaOXu7PAlCIcMvqzY,408
 fiddler/utils/version.py,sha256=iC8Ry7UFl9EJW_xU1WbzO_l4yK6V7eQ6U5exB3xT864,531
-fiddler_client-3.0.0.dev4.dist-info/LICENSE.txt,sha256=w8-LUAb_VLBWSsCNmih0pAqLIicJfGu8OJXpDjkIg_o,559
-fiddler_client-3.0.0.dev4.dist-info/METADATA,sha256=r1pCGGOu-jLgVxJO3SoVM3ECy-J8qgoMUizqs0-JFWw,20679
-fiddler_client-3.0.0.dev4.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-fiddler_client-3.0.0.dev4.dist-info/top_level.txt,sha256=ndC6LqvKmrTTs8czRlBOYdYgSqZbHuMf0zHt_HWpzzk,8
-fiddler_client-3.0.0.dev4.dist-info/RECORD,,
+fiddler_client-3.0.0.dev5.dist-info/LICENSE.txt,sha256=w8-LUAb_VLBWSsCNmih0pAqLIicJfGu8OJXpDjkIg_o,559
+fiddler_client-3.0.0.dev5.dist-info/METADATA,sha256=iyTcPoK3ebTms6F_Tmm3csGfUcmxgy-Ced_ASIAg4s4,20679
+fiddler_client-3.0.0.dev5.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+fiddler_client-3.0.0.dev5.dist-info/top_level.txt,sha256=ndC6LqvKmrTTs8czRlBOYdYgSqZbHuMf0zHt_HWpzzk,8
+fiddler_client-3.0.0.dev5.dist-info/RECORD,,

fiddler/_version.py

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