Merge pull request #7 from skylab-tech/SCP-4-v2-touchups

Scp 4 v2 touchups

Author: 2lives

README.md

@@ -203,7 +203,7 @@ If upload fails, the photo object is deleted for you. If upload succeeds and you
 
 This function handles downloading the output photos to a specified directory.
 
-```dotnet
+```python
 photos_list = completed_job.photos;
 
 download_results = await api.download_all_photos(photos_list, completed_job.profile, "/output/folder/path");
@@ -216,7 +216,7 @@ Output:
 
 OR
 
-```dotnet
+```python
 api.download_photo(photo_id, "/output/folder/path");
 ```
 

requirements.txt

@@ -2,7 +2,7 @@ aiohttp>=3.9.3
 pylint>=1.8.3
 pytest-cov>=2.6.1
 pytest>=3.0.5
-pyvips>=2.2.2
+pyvips>=2.0.2
 requests>=2.0.0
 requests_mock>=1.5.2
 decouple>=0.0.7

setup.py

@@ -11,7 +11,7 @@
 
 setup(
     name='skylab_studio',
-    version='0.0.11',
+    version='0.0.12',
     author='skylabtech',
     author_email='[email protected]',
     packages=find_packages(),

skylab_studio/studio_client.py

@@ -132,6 +132,8 @@ def _api_request(self, endpoint, http_method, **kwargs):
                   response = requests.post(path, data=data, **req_kw)
               else:
                   response = requests.post(path, **req_kw)
+          elif http_method == 'PATCH':
+              response = requests.patch(path, data=data, **req_kw)
           elif http_method == 'PUT':
               response = requests.put(path, data=data, **req_kw)
           elif http_method == 'DELETE':
@@ -159,7 +161,7 @@ def _api_request(self, endpoint, http_method, **kwargs):
               return formatted_response
 
         return response.json()
-    
+
     ###### JOB ENDPOINTS ######
 
     def list_jobs(self):
@@ -272,13 +274,6 @@ def _create_photo(self, payload=None):
             payload=payload
         )
 
-    def calculate_md5(self, file_path):
-        md5_hash = hashlib.md5()
-        with open(file_path, "rb") as file:
-            for chunk in iter(lambda: file.read(4096), b""):
-                md5_hash.update(chunk)
-        return md5_hash.hexdigest()
-    
     def upload_job_photo(self, photo_path, id):
         return self._upload_photo(photo_path, id, 'job')
 
@@ -320,7 +315,6 @@ def _upload_photo(self, photo_path, id, model='job'):
         photo_id = photo_resp['id']
         res['photo'] = photo_resp
 
-        # md5 = self.calculate_md5(photo_path)
         b64md5 = base64.b64encode(bytes.fromhex(md5hash)).decode('utf-8')
         payload = {
             "use_cache_upload": False,
@@ -411,7 +405,7 @@ async def _download_bg_images(self, profile):
             temp_bgs.append(bg_image)
 
         return temp_bgs if temp_bgs else None
-    
+
     async def _download_image(self, image_url):
         if not image_url.lower().startswith("http"):
             raise Exception(f'Invalid retouchedUrl: "{image_url}" - Please ensure the job is complete')
@@ -451,7 +445,7 @@ async def _download_replaced_bg_image(self, file_name, input_image, output_path,
     async def download_all_photos(self, photos_list, profile, output_path):
         if not os.path.exists(output_path):
             raise Exception("Invalid output path")
-        
+
         success_photos = []
         errored_photos = []
         bgs = []
@@ -461,7 +455,7 @@ async def download_all_photos(self, photos_list, profile, output_path):
             profile = self.get_profile(profile['id'])
             if profile['photos']:
                 bgs = await self._download_bg_images(profile)
-            
+
             photo_ids = [photo["id"] for photo in photos_list]
             photo_options = {
                 'bgs': bgs
@@ -483,10 +477,10 @@ async def download_all_photos(self, photos_list, profile, output_path):
             return { 'success_photos': success_photos, 'errored_photos': errored_photos }
 
         except Exception as e:
-            print(e)
+            print("Error has occurred whilst downloading photos:", e)
 
             return { 'success_photos': success_photos, 'errored_photos': errored_photos }
-    
+
     async def download_photo(self, photo_id, output_path, profile = None, options = {}, semaphore = None):
         if not os.path.exists(output_path):
             raise Exception("Invalid output path")
@@ -496,7 +490,7 @@ async def download_photo(self, photo_id, output_path, profile = None, options =
         photo = self.get_photo(photo_id)
         profile_id = photo['job']['profileId']
         file_name = photo['name']
-        
+
         try:
             if profile is None:
                 profile = self.get_profile(profile_id)

skylab_studio/version.py

@@ -3,4 +3,4 @@
 For more information, visit https://studio.skylabtech.ai
 """
 
-VERSION = '0.0.11'
+VERSION = '0.0.12'

test/test_api.py

@@ -76,7 +76,7 @@ def test_update_job(api):
         'name': new_job_name
     }
     result = api.update_job(job_id, payload=payload)
-    assert result is not None
+    assert result['name'] == new_job_name
 
 def test_cancel_job(api):
     job_name = str(uuid.uuid4())
@@ -148,11 +148,13 @@ def test_get_profile(api):
 
 def test_update_profile(api):
     global profile_id
+    new_profile_name = str(uuid.uuid4())
     payload = {
+        'name': new_profile_name,
         'description': 'a description!'
     }
     result = api.update_profile(profile_id, payload=payload)
-    assert result is not None
+    assert result['name'] == new_profile_name
 
 def test_get_photo(api):
     global photo_id