unitypredict 1.1.56__tar.gz → 1.1.58__tar.gz

{unitypredict-1.1.56 → unitypredict-1.1.58}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unitypredict
-Version: 1.1.56
+Version: 1.1.58
 Summary:  
 Home-page: https://unitypredict.com
 Author: UnityPredict

{unitypredict-1.1.56 → unitypredict-1.1.58}/unitypredict/UnityPredictClient.py

@@ -6,6 +6,13 @@ import time
 
 import requests
 
+
+
+class LocalFile:
+    fileName: str = ''
+    def __init__(self, fileName: str):
+        self.fileName = fileName
+
 class UnityPredictFileTransmitDto:
 
     """
@@ -101,6 +108,7 @@ class UnityPredictClient:
     ApiBaseUrl: str = 'https://api.prod.unitypredict.com/api'
     ApiMaxTimeout: int = 12 * 60 * 60
 
+
     def __init__(self, apiKey, apiMaxTimeoutInSec = 12 * 60 * 60):
         
         """
@@ -115,6 +123,7 @@ class UnityPredictClient:
 
 
 
+
     def _uploadFileAndStartPredict(self, modelId: str, request: UnityPredictRequest):
 
         apiKey = self.ApiKey
@@ -128,7 +137,7 @@ class UnityPredictClient:
         #####
         # first get a list of file that we'll need to upload later & update the POST obj
         for xvarName in request.InputValues:
-            if isinstance(request.InputValues.get(xvarName), UnityPredictFileTransmitDto):
+            if isinstance(request.InputValues.get(xvarName), LocalFile):
                 needFileUpload = True
                 break
 
@@ -164,10 +173,14 @@ class UnityPredictClient:
             
             # upload the files
             for xvarName in request.InputValues: 
-                if isinstance(request.InputValues.get(xvarName), UnityPredictFileTransmitDto):
-                    fileToUpload: UnityPredictFileTransmitDto = request.InputValues.get(xvarName)
+                if isinstance(request.InputValues.get(xvarName), LocalFile):
+                    fileName = request.InputValues.get(xvarName).fileName
+                    if not os.path.exists(fileName):
+                        results.ErrorMessages = f"File {fileName} does not exist!"
+                        return (results, {})
+                    fileToUpload: UnityPredictFileTransmitDto = UnityPredictFileTransmitDto(fileName, open(fileName, 'rb'))
                     print (f"Uploading {fileToUpload.FileName}...")
-                    response = requests.get(url = "{}/predict/upload/{}/{}".format(apiBaseUrl, requestId, fileToUpload.FileName), headers={"Authorization": "Bearer {}".format(apiKey)})
+                    response = requests.get(url = "{}/predict/upload/{}/{}".format(apiBaseUrl, requestId, os.path.basename(fileToUpload.FileName)), headers={"Authorization": "Bearer {}".format(apiKey)})
                     if response.status_code != 200:
                         results.ErrorMessages = 'Error from server: {}'.format(response.status_code)
                         return (results, {})
@@ -287,7 +300,7 @@ class UnityPredictClient:
             if (finalResponseJson.get('status') == 'Processing'):
                 statusUrl = finalResponseJson.get('statusUrl') # this is probably a long-running inference
 
-            loopCount = 0
+            loopWaitTime = 0.25
             startTime = time.time()
             maxPredictTime = self.ApiMaxTimeout
             maxTimeExceed = False
@@ -302,10 +315,10 @@ class UnityPredictClient:
                 response = requests.get(url = statusUrl, headers={"Authorization": "Bearer {}".format(apiKey)})
                 finalResponseJson = response.json()
 
-                delay = min(loopCount * 2, 30)
+                delay = min(loopWaitTime, 30)
                 time.sleep(delay)
 
-                loopCount = loopCount + 1
+                loopWaitTime *= 2
 
                 print('Waiting {} seconds for job to finish...'.format(delay))
 

{unitypredict-1.1.56 → unitypredict-1.1.58}/unitypredict.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unitypredict
-Version: 1.1.56
+Version: 1.1.58
 Summary:  
 Home-page: https://unitypredict.com
 Author: UnityPredict